From da10158c3830fd51ae93f8ef67bc031d09853691 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Tue, 16 Feb 2016 15:13:59 +0900 Subject: [PATCH] Update to 0.1.24-1 --- .gitignore | 1 + libthai-0.1.24-gcc6.patch | 36 ++++++++++++++++++++++++++++++++++++ libthai-0.1.9-multilib.patch | 20 ++++++++++---------- libthai.spec | 14 ++++++++++---- sources | 2 +- 5 files changed, 58 insertions(+), 15 deletions(-) create mode 100644 libthai-0.1.24-gcc6.patch diff --git a/.gitignore b/.gitignore index 276e7b4..cf6bda3 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ libdatrie-0.2.2.tar.gz /libdatrie-0.2.8.tar.xz /libthai-0.1.20.tar.xz /libthai-0.1.21.tar.xz +/libthai-0.1.24.tar.xz diff --git a/libthai-0.1.24-gcc6.patch b/libthai-0.1.24-gcc6.patch new file mode 100644 index 0000000..1fe65e8 --- /dev/null +++ b/libthai-0.1.24-gcc6.patch @@ -0,0 +1,36 @@ +Index: ChangeLog +=================================================================== +--- ChangeLog.orig ++++ ChangeLog +@@ -28,6 +28,18 @@ + + 2015-11-22 Theppitak Karoonboonyanan + ++ 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 ++ + * configure.ac: Post-release version suffix added. + + 2015-10-22 Theppitak Karoonboonyanan +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 + #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 */ diff --git a/libthai-0.1.9-multilib.patch b/libthai-0.1.9-multilib.patch index 31dea3f..58522cf 100644 --- a/libthai-0.1.9-multilib.patch +++ b/libthai-0.1.9-multilib.patch @@ -1,20 +1,20 @@ -Index: libthai-0.1.19/doc/Doxyfile.in +Index: libthai-0.1.24/doc/Doxyfile.in =================================================================== ---- libthai-0.1.19.orig/doc/Doxyfile.in -+++ libthai-0.1.19/doc/Doxyfile.in -@@ -940,7 +940,7 @@ HTML_HEADER = - # each generated HTML page. If it is left blank doxygen will generate a - # standard footer. +--- libthai-0.1.24.orig/doc/Doxyfile.in ++++ libthai-0.1.24/doc/Doxyfile.in +@@ -1124,7 +1124,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 -Index: libthai-0.1.19/doc/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.24/doc/no_date_footer.html =================================================================== --- /dev/null -+++ libthai-0.1.19/doc/no_date_footer.html ++++ libthai-0.1.24/doc/no_date_footer.html @@ -0,0 +1,7 @@ +
+Generated for $projectname by