Date: Sunday, September 4, 2011 @ 16:40:59 Author: bisson Revision: 136992
archrelease: copy trunk to testing-i686, testing-x86_64 Added: gcin/repos/testing-i686/ gcin/repos/testing-i686/PKGBUILD (from rev 136991, gcin/trunk/PKGBUILD) gcin/repos/testing-i686/gtk3-crash.patch (from rev 136991, gcin/trunk/gtk3-crash.patch) gcin/repos/testing-i686/install (from rev 136991, gcin/trunk/install) gcin/repos/testing-i686/qt4-lib64.patch (from rev 136991, gcin/trunk/qt4-lib64.patch) gcin/repos/testing-x86_64/ gcin/repos/testing-x86_64/PKGBUILD (from rev 136991, gcin/trunk/PKGBUILD) gcin/repos/testing-x86_64/gtk3-crash.patch (from rev 136991, gcin/trunk/gtk3-crash.patch) gcin/repos/testing-x86_64/install (from rev 136991, gcin/trunk/install) gcin/repos/testing-x86_64/qt4-lib64.patch (from rev 136991, gcin/trunk/qt4-lib64.patch) ---------------------------------+ testing-i686/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++ testing-i686/gtk3-crash.patch | 12 +++++++++++ testing-i686/install | 14 +++++++++++++ testing-i686/qt4-lib64.patch | 40 ++++++++++++++++++++++++++++++++++++++ testing-x86_64/PKGBUILD | 39 +++++++++++++++++++++++++++++++++++++ testing-x86_64/gtk3-crash.patch | 12 +++++++++++ testing-x86_64/install | 14 +++++++++++++ testing-x86_64/qt4-lib64.patch | 40 ++++++++++++++++++++++++++++++++++++++ 8 files changed, 210 insertions(+) Copied: gcin/repos/testing-i686/PKGBUILD (from rev 136991, gcin/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2011-09-04 20:40:59 UTC (rev 136992) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=gcin +pkgver=1.6.5 +pkgrel=2 +pkgdesc='Input method server supporting various input methods' +arch=('i686' 'x86_64') +license=('LGPL') +url='http://hyperrate.com/dir.php?eid=67' +depends=('gtk2' 'libxtst') +makedepends=('qt' 'gtk3' 'anthy' 'libchewing') +optdepends=('qt: support for qt4 input method' + 'gtk3: support for gtk3 input method' + 'anthy: support for anthy input method' + 'libchewing: support for chewing input method') +source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2" + 'gtk3-crash.patch' + 'qt4-lib64.patch') +sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405' + '5529884d655cf9c95e7bf5ddced3ffed140bbc20' + '4307b0d7d6dc10f15909c94973c4357caf31de7e') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../qt4-lib64.patch + patch -p1 -i ../gtk3-crash.patch + ./configure --prefix=/usr --use_i18n=Y + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: gcin/repos/testing-i686/gtk3-crash.patch (from rev 136991, gcin/trunk/gtk3-crash.patch) =================================================================== --- testing-i686/gtk3-crash.patch (rev 0) +++ testing-i686/gtk3-crash.patch 2011-09-04 20:40:59 UTC (rev 136992) @@ -0,0 +1,12 @@ +diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c +--- old/gtk3-im/gtkimcontextgcin.c 2011-08-31 09:14:58.000000000 -0700 ++++ new/gtk3-im/gtkimcontextgcin.c 2011-09-04 13:29:58.838065420 -0700 +@@ -127,6 +127,8 @@ + { + GdkWindow *client_window = context_xim->client_window; + GdkScreen *screen = gdk_window_get_screen (client_window); ++ if (screen == NULL) ++ return; + GdkDisplay *display = gdk_screen_get_display (screen); + if (!context_xim->gcin_ch) { + if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default())))) Copied: gcin/repos/testing-i686/install (from rev 136991, gcin/trunk/install) =================================================================== --- testing-i686/install (rev 0) +++ testing-i686/install 2011-09-04 20:40:59 UTC (rev 136992) @@ -0,0 +1,14 @@ +post_install() { + echo -n "updating gtk immodules... " + [ -x /usr/bin/gtk-query-immodules-2.0 ] && /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + [ -x /usr/bin/gtk-query-immodules-3.0 ] && /usr/bin/gtk-query-immodules-3.0 > /usr/lib/gtk-3.0/3.0.0/immodules.cache + echo "done." +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: gcin/repos/testing-i686/qt4-lib64.patch (from rev 136991, gcin/trunk/qt4-lib64.patch) =================================================================== --- testing-i686/qt4-lib64.patch (rev 0) +++ testing-i686/qt4-lib64.patch 2011-09-04 20:40:59 UTC (rev 136992) @@ -0,0 +1,40 @@ +diff -aur old/configure new/configure +--- old/configure 2011-06-08 16:00:37.000000000 +0200 ++++ new/configure 2011-07-05 08:02:33.223601351 +0200 +@@ -164,7 +164,7 @@ + + LIB='lib' + if [ -d /lib64 ]; then +-LIB='lib64' ++LIB='lib' + fi + + QT_IM='N' +@@ -188,7 +188,7 @@ + + + QT4_IM='N' +-QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods ++QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods + echo "testing if you have qt4 support" + pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null + if [ $? = 0 ]; then +diff -aur old/qt4-im/Makefile new/qt4-im/Makefile +--- old/qt4-im/Makefile 2011-06-08 15:03:50.000000000 +0200 ++++ new/qt4-im/Makefile 2011-07-05 08:04:15.717731695 +0200 +@@ -1,5 +1,5 @@ + include ../config.mak +-QT=qt4 ++QT=qt + QTIM=$(QT)/plugins/inputmethods + IMMODULES=$(libdir)/$(QTIM) + +@@ -15,7 +15,7 @@ + $(CXX) -E $(CFLAGS) $(INCS) $< > $@ + + moc_gcin-qt.cpp: gcin-qt.h +- /usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp ++ /usr/bin/moc $< -o moc_gcin-qt.cpp + + im-gcin.so: $(OBJS) + export LD_RUN_PATH=$(gcinlibdir) ;\ Copied: gcin/repos/testing-x86_64/PKGBUILD (from rev 136991, gcin/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2011-09-04 20:40:59 UTC (rev 136992) @@ -0,0 +1,39 @@ +# $Id$ +# Maintainer: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=gcin +pkgver=1.6.5 +pkgrel=2 +pkgdesc='Input method server supporting various input methods' +arch=('i686' 'x86_64') +license=('LGPL') +url='http://hyperrate.com/dir.php?eid=67' +depends=('gtk2' 'libxtst') +makedepends=('qt' 'gtk3' 'anthy' 'libchewing') +optdepends=('qt: support for qt4 input method' + 'gtk3: support for gtk3 input method' + 'anthy: support for anthy input method' + 'libchewing: support for chewing input method') +source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.bz2" + 'gtk3-crash.patch' + 'qt4-lib64.patch') +sha1sums=('4ca040981b5a473a8ff70d46e4a92bba39e22405' + '5529884d655cf9c95e7bf5ddced3ffed140bbc20' + '4307b0d7d6dc10f15909c94973c4357caf31de7e') + +install=install + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -p1 -i ../qt4-lib64.patch + patch -p1 -i ../gtk3-crash.patch + ./configure --prefix=/usr --use_i18n=Y + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Copied: gcin/repos/testing-x86_64/gtk3-crash.patch (from rev 136991, gcin/trunk/gtk3-crash.patch) =================================================================== --- testing-x86_64/gtk3-crash.patch (rev 0) +++ testing-x86_64/gtk3-crash.patch 2011-09-04 20:40:59 UTC (rev 136992) @@ -0,0 +1,12 @@ +diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c +--- old/gtk3-im/gtkimcontextgcin.c 2011-08-31 09:14:58.000000000 -0700 ++++ new/gtk3-im/gtkimcontextgcin.c 2011-09-04 13:29:58.838065420 -0700 +@@ -127,6 +127,8 @@ + { + GdkWindow *client_window = context_xim->client_window; + GdkScreen *screen = gdk_window_get_screen (client_window); ++ if (screen == NULL) ++ return; + GdkDisplay *display = gdk_screen_get_display (screen); + if (!context_xim->gcin_ch) { + if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default())))) Copied: gcin/repos/testing-x86_64/install (from rev 136991, gcin/trunk/install) =================================================================== --- testing-x86_64/install (rev 0) +++ testing-x86_64/install 2011-09-04 20:40:59 UTC (rev 136992) @@ -0,0 +1,14 @@ +post_install() { + echo -n "updating gtk immodules... " + [ -x /usr/bin/gtk-query-immodules-2.0 ] && /usr/bin/gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules + [ -x /usr/bin/gtk-query-immodules-3.0 ] && /usr/bin/gtk-query-immodules-3.0 > /usr/lib/gtk-3.0/3.0.0/immodules.cache + echo "done." +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} Copied: gcin/repos/testing-x86_64/qt4-lib64.patch (from rev 136991, gcin/trunk/qt4-lib64.patch) =================================================================== --- testing-x86_64/qt4-lib64.patch (rev 0) +++ testing-x86_64/qt4-lib64.patch 2011-09-04 20:40:59 UTC (rev 136992) @@ -0,0 +1,40 @@ +diff -aur old/configure new/configure +--- old/configure 2011-06-08 16:00:37.000000000 +0200 ++++ new/configure 2011-07-05 08:02:33.223601351 +0200 +@@ -164,7 +164,7 @@ + + LIB='lib' + if [ -d /lib64 ]; then +-LIB='lib64' ++LIB='lib' + fi + + QT_IM='N' +@@ -188,7 +188,7 @@ + + + QT4_IM='N' +-QT4_IM_DIR=/usr/$LIB/qt4/plugins/inputmethods ++QT4_IM_DIR=/usr/$LIB/qt/plugins/inputmethods + echo "testing if you have qt4 support" + pkg-config --libs QtCore QtGui > /dev/null 2> /dev/null + if [ $? = 0 ]; then +diff -aur old/qt4-im/Makefile new/qt4-im/Makefile +--- old/qt4-im/Makefile 2011-06-08 15:03:50.000000000 +0200 ++++ new/qt4-im/Makefile 2011-07-05 08:04:15.717731695 +0200 +@@ -1,5 +1,5 @@ + include ../config.mak +-QT=qt4 ++QT=qt + QTIM=$(QT)/plugins/inputmethods + IMMODULES=$(libdir)/$(QTIM) + +@@ -15,7 +15,7 @@ + $(CXX) -E $(CFLAGS) $(INCS) $< > $@ + + moc_gcin-qt.cpp: gcin-qt.h +- /usr/$(LIB)/$(QT)/bin/moc $< -o moc_gcin-qt.cpp ++ /usr/bin/moc $< -o moc_gcin-qt.cpp + + im-gcin.so: $(OBJS) + export LD_RUN_PATH=$(gcinlibdir) ;\