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

Gaetan Bisson bisson at archlinux.org
Mon Oct 17 20:42:56 EDT 2011


    Date: Monday, October 17, 2011 @ 20:42:56
  Author: bisson
Revision: 140668

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

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

------------------------------+
 extra-i686/PKGBUILD          |   43 ++++++++++++++++++++++
 extra-i686/install           |   14 +++++++
 extra-i686/qt4-lib64.patch   |   80 ++++++++++++++++++++---------------------
 extra-x86_64/PKGBUILD        |   43 ++++++++++++++++++++++
 extra-x86_64/install         |   14 +++++++
 extra-x86_64/qt4-lib64.patch |   80 ++++++++++++++++++++---------------------
 6 files changed, 194 insertions(+), 80 deletions(-)

Copied: gcin/repos/extra-i686/PKGBUILD (from rev 140667, gcin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-10-18 00:42:56 UTC (rev 140668)
@@ -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.7.0
+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=('151d1286dc54d7f7fa230d37e89d3d0fe0845258'
+          '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
+}

Copied: gcin/repos/extra-i686/install (from rev 140667, gcin/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2011-10-18 00:42:56 UTC (rev 140668)
@@ -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/qt4-lib64.patch
===================================================================
--- extra-i686/qt4-lib64.patch	2011-10-17 23:02:09 UTC (rev 140667)
+++ extra-i686/qt4-lib64.patch	2011-10-18 00:42:56 UTC (rev 140668)
@@ -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 140667, gcin/trunk/qt4-lib64.patch)
===================================================================
--- extra-i686/qt4-lib64.patch	                        (rev 0)
+++ extra-i686/qt4-lib64.patch	2011-10-18 00:42:56 UTC (rev 140668)
@@ -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/extra-x86_64/PKGBUILD (from rev 140667, gcin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2011-10-18 00:42:56 UTC (rev 140668)
@@ -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.7.0
+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=('151d1286dc54d7f7fa230d37e89d3d0fe0845258'
+          '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
+}

Copied: gcin/repos/extra-x86_64/install (from rev 140667, gcin/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2011-10-18 00:42:56 UTC (rev 140668)
@@ -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/qt4-lib64.patch
===================================================================
--- extra-x86_64/qt4-lib64.patch	2011-10-17 23:02:09 UTC (rev 140667)
+++ extra-x86_64/qt4-lib64.patch	2011-10-18 00:42:56 UTC (rev 140668)
@@ -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 140667, gcin/trunk/qt4-lib64.patch)
===================================================================
--- extra-x86_64/qt4-lib64.patch	                        (rev 0)
+++ extra-x86_64/qt4-lib64.patch	2011-10-18 00:42:56 UTC (rev 140668)
@@ -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