[arch-commits] Commit in gcin/repos (14 files)

Gaetan Bisson bisson at archlinux.org
Mon Oct 17 03:26:20 EDT 2011


    Date: Monday, October 17, 2011 @ 03:26:20
  Author: bisson
Revision: 140557

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  gcin/repos/extra-i686/PKGBUILD
    (from rev 140556, gcin/trunk/PKGBUILD)
  gcin/repos/extra-i686/install
    (from rev 140556, gcin/trunk/install)
  gcin/repos/extra-i686/qt4-lib64.patch
    (from rev 140556, gcin/trunk/qt4-lib64.patch)
  gcin/repos/extra-x86_64/PKGBUILD
    (from rev 140556, gcin/trunk/PKGBUILD)
  gcin/repos/extra-x86_64/install
    (from rev 140556, gcin/trunk/install)
  gcin/repos/extra-x86_64/qt4-lib64.patch
    (from rev 140556, gcin/trunk/qt4-lib64.patch)
Deleted:
  gcin/repos/extra-i686/PKGBUILD
  gcin/repos/extra-i686/install
  gcin/repos/extra-i686/missing.patch
  gcin/repos/extra-i686/qt4-lib64.patch
  gcin/repos/extra-x86_64/PKGBUILD
  gcin/repos/extra-x86_64/install
  gcin/repos/extra-x86_64/missing.patch
  gcin/repos/extra-x86_64/qt4-lib64.patch

------------------------------+
 extra-i686/PKGBUILD          |   89 +++++++++++++++++++----------------------
 extra-i686/install           |   28 ++++++------
 extra-i686/missing.patch     |   31 --------------
 extra-i686/qt4-lib64.patch   |   80 ++++++++++++++++++------------------
 extra-x86_64/PKGBUILD        |   89 +++++++++++++++++++----------------------
 extra-x86_64/install         |   28 ++++++------
 extra-x86_64/missing.patch   |   31 --------------
 extra-x86_64/qt4-lib64.patch |   80 ++++++++++++++++++------------------
 8 files changed, 194 insertions(+), 262 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-10-17 07:25:53 UTC (rev 140556)
+++ extra-i686/PKGBUILD	2011-10-17 07:26:20 UTC (rev 140557)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=gcin
-pkgver=1.6.8
-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.xz"
-        'qt4-lib64.patch'
-        'missing.patch')
-sha1sums=('c400924a8827723d7d69183bbafae13ae9e1949d'
-          '4307b0d7d6dc10f15909c94973c4357caf31de7e'
-          '791c190c8b0db2e70b0099d4d03a32417497d065')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../missing.patch
-	patch -p1 -i ../qt4-lib64.patch
-	sed '/include suffixes-rule/a \
-		CFLAGS+='"${CFLAGS}"' \
-		LDFLAGS+='"${LDFLAGS}"' \
-		OPTFLAGS=' \
-		-i Makefile
-
-	./configure --prefix=/usr --use_i18n=Y
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}

Copied: gcin/repos/extra-i686/PKGBUILD (from rev 140556, gcin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-17 07:26:20 UTC (rev 140557)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=gcin
+pkgver=1.6.9
+pkgrel=1
+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.xz"
+        'qt4-lib64.patch')
+sha1sums=('61949c4f1e6691ff7d668576dbd56b85e0f0ba06'
+          '4307b0d7d6dc10f15909c94973c4357caf31de7e')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../qt4-lib64.patch
+	sed '/include suffixes-rule/a \
+		CFLAGS+='"${CFLAGS}"' \
+		LDFLAGS+='"${LDFLAGS}"' \
+		OPTFLAGS=' \
+		-i Makefile
+
+	./configure --prefix=/usr --use_i18n=Y
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2011-10-17 07:25:53 UTC (rev 140556)
+++ extra-i686/install	2011-10-17 07:26:20 UTC (rev 140557)
@@ -1,14 +0,0 @@
-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/extra-i686/install (from rev 140556, gcin/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2011-10-17 07:26:20 UTC (rev 140557)
@@ -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
+}

Deleted: extra-i686/missing.patch
===================================================================
--- extra-i686/missing.patch	2011-10-17 07:25:53 UTC (rev 140556)
+++ extra-i686/missing.patch	2011-10-17 07:26:20 UTC (rev 140557)
@@ -1,31 +0,0 @@
-diff -aur old/gen-dist new/gen-dist
---- old/gen-dist	2011-09-07 10:51:59.214132579 -0700
-+++ new/gen-dist	2011-09-07 10:53:27.534010656 -0700
-@@ -1,5 +1,5 @@
- GCIN_VERSION="gcin-`cat VERSION.gcin`"
--sh gen-gtk3
-+#sh gen-gtk3
- sed -i '/^$/d' Changelog.html
- rm -f tags core.*
- cd ..
-diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c
---- old/gtk3-im/gtkimcontextgcin.c	2011-09-07 10:51:59.224132565 -0700
-+++ new/gtk3-im/gtkimcontextgcin.c	2011-09-07 10:53:09.984034884 -0700
-@@ -128,7 +128,7 @@
-   GdkWindow *client_window = context_xim->client_window;
-   if (!client_window)
-     return;
--  GdkScreen *screen = gdk_drawable_get_screen (client_window);
-+  GdkScreen *screen = gdk_window_get_screen (client_window);
-   if (!screen)
-     return;
- 
-@@ -137,7 +137,7 @@
-     return;
- 
-   if (!context_xim->gcin_ch) {
--    if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY())))
-+    if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))
-       perror("cannot open gcin_ch");
- #if 1
-     context_xim->timeout_handle = 0;

Deleted: extra-i686/qt4-lib64.patch
===================================================================
--- extra-i686/qt4-lib64.patch	2011-10-17 07:25:53 UTC (rev 140556)
+++ extra-i686/qt4-lib64.patch	2011-10-17 07:26:20 UTC (rev 140557)
@@ -1,40 +0,0 @@
-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/extra-i686/qt4-lib64.patch (from rev 140556, gcin/trunk/qt4-lib64.patch)
===================================================================
--- extra-i686/qt4-lib64.patch	                        (rev 0)
+++ extra-i686/qt4-lib64.patch	2011-10-17 07:26:20 UTC (rev 140557)
@@ -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) ;\

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2011-10-17 07:25:53 UTC (rev 140556)
+++ extra-x86_64/PKGBUILD	2011-10-17 07:26:20 UTC (rev 140557)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-# Contributor: damir <damir at archlinux.org>
-
-pkgname=gcin
-pkgver=1.6.8
-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.xz"
-        'qt4-lib64.patch'
-        'missing.patch')
-sha1sums=('c400924a8827723d7d69183bbafae13ae9e1949d'
-          '4307b0d7d6dc10f15909c94973c4357caf31de7e'
-          '791c190c8b0db2e70b0099d4d03a32417497d065')
-
-install=install
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	patch -p1 -i ../missing.patch
-	patch -p1 -i ../qt4-lib64.patch
-	sed '/include suffixes-rule/a \
-		CFLAGS+='"${CFLAGS}"' \
-		LDFLAGS+='"${LDFLAGS}"' \
-		OPTFLAGS=' \
-		-i Makefile
-
-	./configure --prefix=/usr --use_i18n=Y
-	make
-}
-
-package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
-}

Copied: gcin/repos/extra-x86_64/PKGBUILD (from rev 140556, gcin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-10-17 07:26:20 UTC (rev 140557)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+# Contributor: damir <damir at archlinux.org>
+
+pkgname=gcin
+pkgver=1.6.9
+pkgrel=1
+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.xz"
+        'qt4-lib64.patch')
+sha1sums=('61949c4f1e6691ff7d668576dbd56b85e0f0ba06'
+          '4307b0d7d6dc10f15909c94973c4357caf31de7e')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+
+	patch -p1 -i ../qt4-lib64.patch
+	sed '/include suffixes-rule/a \
+		CFLAGS+='"${CFLAGS}"' \
+		LDFLAGS+='"${LDFLAGS}"' \
+		OPTFLAGS=' \
+		-i Makefile
+
+	./configure --prefix=/usr --use_i18n=Y
+	make
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}" install
+}

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2011-10-17 07:25:53 UTC (rev 140556)
+++ extra-x86_64/install	2011-10-17 07:26:20 UTC (rev 140557)
@@ -1,14 +0,0 @@
-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/extra-x86_64/install (from rev 140556, gcin/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2011-10-17 07:26:20 UTC (rev 140557)
@@ -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
+}

Deleted: extra-x86_64/missing.patch
===================================================================
--- extra-x86_64/missing.patch	2011-10-17 07:25:53 UTC (rev 140556)
+++ extra-x86_64/missing.patch	2011-10-17 07:26:20 UTC (rev 140557)
@@ -1,31 +0,0 @@
-diff -aur old/gen-dist new/gen-dist
---- old/gen-dist	2011-09-07 10:51:59.214132579 -0700
-+++ new/gen-dist	2011-09-07 10:53:27.534010656 -0700
-@@ -1,5 +1,5 @@
- GCIN_VERSION="gcin-`cat VERSION.gcin`"
--sh gen-gtk3
-+#sh gen-gtk3
- sed -i '/^$/d' Changelog.html
- rm -f tags core.*
- cd ..
-diff -aur old/gtk3-im/gtkimcontextgcin.c new/gtk3-im/gtkimcontextgcin.c
---- old/gtk3-im/gtkimcontextgcin.c	2011-09-07 10:51:59.224132565 -0700
-+++ new/gtk3-im/gtkimcontextgcin.c	2011-09-07 10:53:09.984034884 -0700
-@@ -128,7 +128,7 @@
-   GdkWindow *client_window = context_xim->client_window;
-   if (!client_window)
-     return;
--  GdkScreen *screen = gdk_drawable_get_screen (client_window);
-+  GdkScreen *screen = gdk_window_get_screen (client_window);
-   if (!screen)
-     return;
- 
-@@ -137,7 +137,7 @@
-     return;
- 
-   if (!context_xim->gcin_ch) {
--    if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY())))
-+    if (!(context_xim->gcin_ch = gcin_im_client_open(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()))))
-       perror("cannot open gcin_ch");
- #if 1
-     context_xim->timeout_handle = 0;

Deleted: extra-x86_64/qt4-lib64.patch
===================================================================
--- extra-x86_64/qt4-lib64.patch	2011-10-17 07:25:53 UTC (rev 140556)
+++ extra-x86_64/qt4-lib64.patch	2011-10-17 07:26:20 UTC (rev 140557)
@@ -1,40 +0,0 @@
-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/extra-x86_64/qt4-lib64.patch (from rev 140556, gcin/trunk/qt4-lib64.patch)
===================================================================
--- extra-x86_64/qt4-lib64.patch	                        (rev 0)
+++ extra-x86_64/qt4-lib64.patch	2011-10-17 07:26:20 UTC (rev 140557)
@@ -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) ;\



More information about the arch-commits mailing list