Compare commits

..

No commits in common. "rawhide" and "f15" have entirely different histories.

11 changed files with 153 additions and 260 deletions

View file

@ -1 +0,0 @@
1

11
.gitignore vendored
View file

@ -1,13 +1,2 @@
libthai-0.1.12.tar.gz
libdatrie-0.2.2.tar.gz
/libdatrie-0.2.6.tar.xz
/libthai-0.1.19.tar.xz
/libdatrie-0.2.8.tar.xz
/libthai-0.1.20.tar.xz
/libthai-0.1.21.tar.xz
/libthai-0.1.24.tar.xz
/libthai-0.1.25.tar.xz
/libthai-0.1.27.tar.xz
/libthai-0.1.28.tar.xz
/libthai-0.1.29.tar.xz
/libthai-0.1.30.tar.xz

View file

@ -1,36 +0,0 @@
Index: ChangeLog
===================================================================
--- ChangeLog.orig
+++ ChangeLog
@@ -28,6 +28,18 @@
2015-11-22 Theppitak Karoonboonyanan <theppitak@gmail.com>
+ Fix compilation error with GCC 6
+
+ * include/thai/thctype.h (_th_bitmsk):
+ - Use unsigned int instead of unsigned short for bitmask base,
+ as GCC 6 takes ~0 as -1 for unsigned short,
+ and causes compilation error for scim-thai.
+
+ Thanks Martin Michlmayr for the report via Debian #811690
+ http://bugs.debian.org/811690
+
+2016-01-20 Theppitak Karoonboonyanan <theppitak@gmail.com>
+
* configure.ac: Post-release version suffix added.
2015-10-22 Theppitak Karoonboonyanan <theppitak@gmail.com>
Index: include/thai/thctype.h
===================================================================
--- include/thai/thctype.h.orig
+++ include/thai/thctype.h
@@ -363,7 +363,7 @@ extern int th_iscombchar(thchar_t c);
#include <ctype.h>
#define _th_ISbit(bit) (1 << (bit))
#define _th_bitfld(base, val) ((val) << (base))
-#define _th_bitmsk(base, bits) (~((~(unsigned short)0) << (bits)) << (base))
+#define _th_bitmsk(base, bits) (~((~(unsigned)0) << (bits)) << (base))
enum {
_th_IStis = _th_ISbit(0), /* TIS-620 char */

View file

@ -0,0 +1,27 @@
diff -up libthai-0.1.9/doc/Doxyfile.in.doxygen-segfault libthai-0.1.9/doc/Doxyfile.in
--- libthai-0.1.9/doc/Doxyfile.in.doxygen-segfault 2007-11-13 16:37:16.000000000 -0500
+++ libthai-0.1.9/doc/Doxyfile.in 2007-11-13 16:37:31.000000000 -0500
@@ -29,7 +29,6 @@ STRIP_FROM_PATH = @top_srcdir@/in
STRIP_FROM_INC_PATH = @top_srcdir@/include
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = NO
-QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
DETAILS_AT_TOP = YES
INHERIT_DOCS = YES
@@ -50,7 +49,6 @@ EXTRACT_PRIVATE = NO
EXTRACT_STATIC = NO
EXTRACT_LOCAL_CLASSES = YES
EXTRACT_LOCAL_METHODS = NO
-EXTRACT_ANON_NSPACES = NO
HIDE_UNDOC_MEMBERS = YES
HIDE_UNDOC_CLASSES = YES
HIDE_FRIEND_COMPOUNDS = NO
@@ -168,7 +166,6 @@ HTML_FOOTER =
HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO
-HTML_DYNAMIC_SECTIONS = NO
CHM_FILE =
HHC_LOCATION =
GENERATE_CHI = NO

View file

@ -1,21 +1,7 @@
Index: libthai-0.1.30/doc/Doxyfile.in
===================================================================
--- libthai-0.1.30.orig/doc/Doxyfile.in
+++ libthai-0.1.30/doc/Doxyfile.in
@@ -1432,7 +1432,7 @@ HTML_HEADER =
# that Doxygen normally uses.
# This tag requires that the tag GENERATE_HTML is set to YES.
-HTML_FOOTER =
+HTML_FOOTER = no_date_footer.html
# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
# sheet that is used by each HTML page. It can be used to fine-tune the look of
Index: libthai-0.1.30/doc/no_date_footer.html
===================================================================
--- /dev/null
+++ libthai-0.1.30/doc/no_date_footer.html
@@ -0,0 +1,7 @@
diff -up libthai-0.1.9/doc/no_date_footer.html.multilib libthai-0.1.9/doc/no_date_footer.html
--- libthai-0.1.9/doc/no_date_footer.html.multilib 2008-03-17 13:32:26.000000000 -0400
+++ libthai-0.1.9/doc/no_date_footer.html 2008-03-17 13:33:54.000000000 -0400
@@ -0,0 +1,8 @@
+<hr size="1"><address style="text-align: right;"><small>
+Generated for $projectname by&nbsp;<a href="http://www.doxygen.org/
+index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
@ -23,3 +9,16 @@ Index: libthai-0.1.30/doc/no_date_footer.html
+</body>
+</html>
+
+
diff -up libthai-0.1.9/doc/Doxyfile.in.multilib libthai-0.1.9/doc/Doxyfile.in
--- libthai-0.1.9/doc/Doxyfile.in.multilib 2008-03-17 13:34:06.000000000 -0400
+++ libthai-0.1.9/doc/Doxyfile.in 2008-03-17 13:34:16.000000000 -0400
@@ -162,7 +162,7 @@ GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
HTML_HEADER =
-HTML_FOOTER =
+HTML_FOOTER = no_date_footer.html
HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
GENERATE_HTMLHELP = NO

View file

@ -0,0 +1,44 @@
diff -up libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am.static-build libthai-0.1.12/libdatrie-0.2.2/datrie/Makefile.am
--- libthai-0.1.12/libdatrie/datrie/Makefile.am.static-build 2009-04-13 05:18:20.000000000 -0400
+++ libthai-0.1.12/libdatrie/datrie/Makefile.am 2009-06-27 17:58:06.813631702 -0400
@@ -10,7 +10,7 @@ EXTRA_DIST = libdatrie.map libdatrie.def
INCLUDES = -I$(top_srcdir)
-lib_LTLIBRARIES = libdatrie.la
+noinst_LTLIBRARIES = libdatrie.la
libdatrie_la_SOURCES = \
typedefs.h \
diff -up libthai-0.1.12/libthai.pc.in.static-build libthai-0.1.12/libthai.pc.in
--- libthai-0.1.12/libthai.pc.in.static-build 2009-03-31 00:25:23.000000000 -0400
+++ libthai-0.1.12/libthai.pc.in 2009-06-27 17:58:06.814631492 -0400
@@ -6,6 +6,5 @@ includedir=@includedir@
Name: libthai
Description: Thai support library
Version: @VERSION@
-Requires.private: datrie-0.2
Libs: -L${libdir} -lthai
Cflags: -I${includedir}
diff -up libthai-0.1.12/src/Makefile.am.static-build libthai-0.1.12/src/Makefile.am
--- libthai-0.1.12/src/Makefile.am.static-build 2009-06-07 03:20:15.000000000 -0400
+++ libthai-0.1.12/src/Makefile.am 2009-06-27 17:59:20.060630864 -0400
@@ -19,7 +19,8 @@ libthai_sublibs = \
$(top_builddir)/src/thwchar/libthwchar.la \
$(top_builddir)/src/thwctype/libthwctype.la \
$(top_builddir)/src/thwstr/libthwstr.la \
- $(top_builddir)/src/thwbrk/libthwbrk.la
+ $(top_builddir)/src/thwbrk/libthwbrk.la \
+ $(DATRIE_LIBS)
if LD_HAS_VERSION_SCRIPT
EXPORTS_FLAGS = -Wl,-version-script -Wl,$(srcdir)/libthai.map
diff -up libthai-0.1.12/src/thbrk/Makefile.am.static-build libthai-0.1.12/src/thbrk/Makefile.am
--- libthai-0.1.12/src/thbrk/Makefile.am.static-build 2009-01-19 08:32:50.000000000 -0500
+++ libthai-0.1.12/src/thbrk/Makefile.am 2009-06-27 17:58:06.812632123 -0400
@@ -16,5 +16,4 @@ libthbrk_la_SOURCES = \
brk-maximal.c \
brk-maximal.h
-libthbrk_la_LIBADD = $(DATRIE_LIBS)

View file

@ -1,16 +1,25 @@
%define datrie_version 0.2.3
Summary: Thai language support routines
Name: libthai
Version: 0.1.30
Release: 1%{?dist}
License: LGPL-2.1-or-later
Source: http://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.xz
Patch0: libthai-0.1.9-multilib.patch
Version: 0.1.14
Release: 4%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
Source: ftp://linux.thai.net/pub/thailinux/software/libthai/libthai-%{version}.tar.gz
Source1: ftp://linux.thai.net/pub/thailinux/software/libthai/libdatrie-%{datrie_version}.tar.gz
Patch: libthai-libdatrie-static-build.patch
Patch1: libthai-0.1.9-doxygen-segfault.patch
Patch2: libthai-0.1.9-multilib.patch
URL: http://linux.thai.net
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
BuildRequires: gcc
BuildRequires: pkgconfig(datrie-0.2)
BuildRequires: pkgconfig
BuildRequires: doxygen
BuildRequires: make
# we edit the Makefile.am's
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
%description
LibThai is a set of Thai language support routines aimed to ease
@ -20,6 +29,7 @@ output methods as well as basic character and string supports.
%package devel
Summary: Thai language support routines
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig
@ -31,9 +41,41 @@ Install libthai-devel if you want to develop programs which will use
libthai.
%prep
%autosetup -p1
%setup -q -n %{name}-%{version} -a 1
mv libdatrie-%{datrie_version} libdatrie
%patch -p1 -b .static-build
%patch1 -p1 -b .doxygen-segfault
%patch2 -p1 -b .multilib
%build
# libthai depends on this library called libdatrie. libdatrie is a
# data-structure implementaiton that the author of libthai ripped out of it.
# However, since libthai is the only user of that code, there's no reason to
# 1) package it separately, 2) use it as a shared library.
# So, we compile it as a libtool convenience library and include in libthai.so,
# and use symbol hiding to hide them (and other internal symbols).
#
# The patch takes care of making datrie into a convenience lib and making sure
# libthai will include it (and hide its symbols), and the exports make sure
# libthai finds the uninstalled libdatrie. We need to call automake, since
# the patch modifies a few Makefile.am's.
{
pushd libdatrie
mkdir m4
autoreconf -i -f
%configure
make
popd
}
export DATRIE_CFLAGS="-I$PWD/libdatrie"
export DATRIE_LIBS="$PWD/libdatrie/datrie/libdatrie.la"
export PATH="$PWD/libdatrie/tools:$PATH"
autoreconf -i -f
%configure --disable-static
make
@ -50,145 +92,28 @@ rmdir $RPM_BUILD_ROOT%{_docdir}/libthai
rm $RPM_BUILD_ROOT%{_libdir}/*.la
%ldconfig_scriptlets
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%doc README AUTHORS COPYING ChangeLog
%defattr(-, root, root)
%doc README AUTHORS COPYING ChangeLog TODO
%{_libdir}/lib*.so.*
%{_datadir}/libthai
%files devel
%defattr(-, root, root)
%doc installed-docs/*
%{_includedir}/thai
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*
%{_mandir}/man3/*
%changelog
* Mon Jan 05 2026 Peng Wu <pwu@redhat.com> - 0.1.30-1
- Update to 0.1.30
- Resolves: RHBZ#2426765
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed May 17 2023 Peng Wu <pwu@redhat.com> - 0.1.29-5
- Migrate to SPDX license
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.29-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Dec 23 2021 Peng Wu <pwu@redhat.com> - 0.1.29-1
- Update to 0.1.29
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.28-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.28-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.28-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.28-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.28-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.28-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Aug 2 2018 Peng Wu <pwu@redhat.com> - 0.1.28-1
- Update to 0.1.28
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.27-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Nov 1 2017 Peng Wu <pwu@redhat.com> - 0.1.27-1
- Update to 0.1.27
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.25-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.25-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Sun Oct 9 2016 Peng Wu <pwu@redhat.com> - 0.1.25-1
- Update to 1.2.25
- Remove libthai-0.1.24-gcc6.patch, already in upstream tar ball
* Tue Feb 16 2016 Daiki Ueno <dueno@redhat.com> - 0.1.24-1
- Update to 0.1.24
- Apply patch from upstream, which fixes scim-thai FTBFS with GCC6 (Closes: #1308117)
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.21-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.21-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Tue Sep 2 2014 Daiki Ueno <dueno@redhat.com> - 0.1.21-1
- Update to 0.1.21
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.20-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Fri Jul 4 2014 Daiki Ueno <dueno@redhat.com> - 0.1.20-3
- Unbundle libdatrie (Closes: #1062540)
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Wed Apr 23 2014 Daiki Ueno <dueno@redhat.com> - 0.1.20-1
- Update to 0.1.20
- Update bundled libdatrie to 0.2.8
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.19-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jun 12 2013 Daiki Ueno <dueno@redhat.com> - 0.1.19-1
- Update to 0.1.19
- Fix bogus dates in %%changelog
- Remove libthai-0.1.9-doxygen-segfault.patch, which is no longer
necessary with the latest Doxygen
- Don't install man pages, as per upstream's default
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.14-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.14-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.14-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.1.14-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@ -226,10 +151,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
* Thu Aug 23 2007 Adam Jackson <ajax@redhat.com> - 0.1.7-6
- Rebuild for build ID
* Mon Jan 22 2007 Behdad Esfahbod <besfahbo@redhat.com> 0.1.7-5
* Tue Jan 22 2007 Behdad Esfahbod <besfahbo@redhat.com> 0.1.7-5
- Export _th_*_tbl symbols too. They are accessed by some of the macros.
* Wed Jan 17 2007 Behdad Esfahbod <besfahbo@redhat.com> 0.1.7-4
* Tue Jan 17 2007 Behdad Esfahbod <besfahbo@redhat.com> 0.1.7-4
- Patch libthai.pc.in to not require datrie.
* Tue Jan 16 2007 Matthias Clasen <mclasen@redhat.com> 0.1.7-3

View file

@ -1,5 +0,0 @@
summary: Basic smoke test
discover:
how: fmf
execute:
how: tmt

View file

@ -1 +1,2 @@
SHA512 (libthai-0.1.30.tar.xz) = c84d575b6855d54b1ea1d9878a94153ba7807cc736f7bf01327d17a6444c6fd4b18deae2ab5a2612847892c9d94ed4ceb54fbf25244aa6eb88a3605260ad328e
c6814f4fe68aa8d41d1b7183ad78d319 libdatrie-0.2.3.tar.gz
34f64b37ed8f8f49f4a18ae972e6f41e libthai-0.1.14.tar.gz

View file

@ -1,15 +0,0 @@
test: ./runtest.sh
duration: 50m
framework: beakerlib
require:
- make
- gcc
- autoconf
- autoconf-archive
- automake
- libtool
- doxygen
- libdatrie-devel
- libthai
- gnome-common
- rpm-build

View file

@ -1,35 +0,0 @@
#!/bin/bash
. /usr/share/beakerlib/beakerlib.sh || exit 1
rlJournalStart
rlPhaseStartSetup
rlShowPackageVersion libthai
rlRun -t -l "VERSION=$(rpm -q libthai --queryformat='%{version}')" 0 "Get VERSION"
FEDORA_VERSION=$(rlGetDistroRelease)
rlLog "FEDORA_VERSION=${DISTRO_RELEASE}"
rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
rlRun "pushd $tmp"
rlFetchSrcForInstalled "libthai"
rlRun "rpm --define '_topdir $tmp' -i *src.rpm"
rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory"
rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec"
if [ -d BUILD/libthai-${VERSION}-build ]; then
rlRun -t -l "pushd BUILD/libthai-${VERSION}-build/libthai-${VERSION}"
else
rlRun -t -l "pushd BUILD/libthai-${VERSION}"
fi
rlPhaseEnd
rlPhaseStartTest
rlRun "set -o pipefail"
rlRun -t -l "NOCONFIGURE=1 gnome-autogen.sh"
rlRun -t -l "./configure"
rlRun -t -l "make"
rlRun -t -l "make check"
rlPhaseEnd
rlPhaseStartCleanup
rlRun "popd; popd"
rlRun "rm -r $tmp" 0 "Remove tmp directory"
rlPhaseEnd
rlJournalEnd