Hi,

I prepare a 10-delayed NUM for #787618 and #800577 to fix gcin/HIME
multi-arch and Qt5 issues. Feel free to cancel it if it has any problem.


-- 
ChangZhuo Chen (陳昌倬) <czc...@debian.org>
Debian Developer
Key fingerprint = EC9F 905D 866D BE46 A896  C827 BE0C 9242 03F4 552D
diff -Nru im-config-0.29/debian/changelog im-config-0.29/debian/changelog
--- im-config-0.29/debian/changelog	2015-03-22 00:10:26.000000000 +0800
+++ im-config-0.29/debian/changelog	2015-10-17 22:19:12.000000000 +0800
@@ -1,3 +1,13 @@
+im-config (0.29-1.1) experimental; urgency=medium
+
+  * Non-maintainer upload.
+  * Update gcin configuration for multi-arch and Qt5.
+    Closes: #787618
+  * Update HIME configuration for multi-arch and Qt5.
+    Closes: #800577
+
+ -- ChangZhuo Chen (陳昌倬) <czc...@debian.org>  Sat, 17 Oct 2015 22:19:09 +0800
+
 im-config (0.29-1) experimental; urgency=medium
 
   * Refine regex for locale dependent override control and adjust
diff -Nru im-config-0.29/debian/patches/gcin-qt5.patch im-config-0.29/debian/patches/gcin-qt5.patch
--- im-config-0.29/debian/patches/gcin-qt5.patch	1970-01-01 08:00:00.000000000 +0800
+++ im-config-0.29/debian/patches/gcin-qt5.patch	2015-10-17 22:38:37.000000000 +0800
@@ -0,0 +1,34 @@
+--- a/data/26_gcin.conf
++++ b/data/26_gcin.conf
+@@ -4,11 +4,10 @@
+ IM_CONFIG_LONG="$(gettext "Chinese input method (gcin)
+  * Required for all: gcin
+  * Language specific input conversion support:
+-  * Traditional Chinese: gcin-chewing
+   * Japanese: gcin-anthy
+  * Application platform support:
+-  * GNOME/GTK+: gcin-gtk3-immodule
+-  * KDE/Qt: gcin-qt4-immodule")"
++  * GNOME/GTK+: gcin-gtk2-immodule, gcin-gtk3-immodule
++  * KDE/Qt: gcin-qt4-immodule, gcin-qt5-immodule")"
+ 
+ package_auto () {
+     package_status gcin
+--- a/data/26_gcin.rc
++++ b/data/26_gcin.rc
+@@ -44,6 +44,15 @@
+     fi
+ done
+ 
++QT_IM_MODULE=xim
++# use immodule when available for Qt5
++for IM_CONFIG_MARKER in /usr/lib/*/qt5/plugins/platforminputcontexts/libgcinplatforminputcontextplugin.so ; do
++    if [ -e $IM_CONFIG_MARKER ]; then
++        QT_IM_MODULE=gcin
++        break
++    fi
++done
++
+ # gcin has no clutter support, and qt3 immodule is not compiled.
+ CLUTTER_IM_MODULE=xim
+ fi
diff -Nru im-config-0.29/debian/patches/hime-qt5.patch im-config-0.29/debian/patches/hime-qt5.patch
--- im-config-0.29/debian/patches/hime-qt5.patch	1970-01-01 08:00:00.000000000 +0800
+++ im-config-0.29/debian/patches/hime-qt5.patch	2015-10-17 22:16:28.000000000 +0800
@@ -0,0 +1,31 @@
+--- a/data/25_hime.conf
++++ b/data/25_hime.conf
+@@ -7,8 +7,8 @@
+   * Traditional Chinese: hime-chewing
+   * Japanese: hime-anthy
+  * Application platform support:
+-  * GNOME/GTK+: hime-gtk3-immodule
+-  * KDE/Qt: hime-qt4-immodule")"
++  * GNOME/GTK+: hime-gtk2-immodule, hime-gtk3-immodule
++  * KDE/Qt: hime-qt4-immodule, hime-qt5-immodule")"
+ 
+ package_auto () {
+     package_status hime && package_status hime-gtk3-immodule && package_status hime-qt4-immodule
+--- a/data/25_hime.rc
++++ b/data/25_hime.rc
+@@ -44,6 +44,15 @@
+     fi
+ done
+ 
++QT_IM_MODULE=xim
++# use immodule when available for Qt5
++for IM_CONFIG_MARKER in /usr/lib/*/qt5/plugins/platforminputcontexts/im-hime.so ; do
++    if [ -e $IM_CONFIG_MARKER ]; then
++        QT_IM_MODULE=hime
++        break
++    fi
++done
++
+ # hime has no clutter support, and qt3 immodule is not compiled.
+ CLUTTER_IM_MODULE=xim
+ fi
diff -Nru im-config-0.29/debian/patches/series im-config-0.29/debian/patches/series
--- im-config-0.29/debian/patches/series	1970-01-01 08:00:00.000000000 +0800
+++ im-config-0.29/debian/patches/series	2015-10-17 22:16:06.000000000 +0800
@@ -0,0 +1,2 @@
+gcin-qt5.patch
+hime-qt5.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to