Date: Saturday, December 24, 2011 @ 12:43:03
Author: bisson
Revision: 145630
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
gcin/repos/extra-i686/PKGBUILD
(from rev 145629, gcin/trunk/PKGBUILD)
gcin/repos/extra-i686/install
(from rev 145629, gcin/trunk/install)
gcin/repos/extra-i686/qt4-lib64.patch
(from rev 145629, gcin/trunk/qt4-lib64.patch)
gcin/repos/extra-x86_64/PKGBUILD
(from rev 145629, gcin/trunk/PKGBUILD)
gcin/repos/extra-x86_64/install
(from rev 145629, gcin/trunk/install)
gcin/repos/extra-x86_64/qt4-lib64.patch
(from rev 145629, gcin/trunk/qt4-lib64.patch)
Deleted:
gcin/repos/extra-i686/PKGBUILD
gcin/repos/extra-i686/install
gcin/repos/extra-i686/qt4-lib64.patch
gcin/repos/extra-x86_64/PKGBUILD
gcin/repos/extra-x86_64/install
gcin/repos/extra-x86_64/qt4-lib64.patch
------------------------------+
extra-i686/PKGBUILD | 86 ++++++++++++++++++++---------------------
extra-i686/install | 28 ++++++-------
extra-i686/qt4-lib64.patch | 62 ++++++++++++++---------------
extra-x86_64/PKGBUILD | 86 ++++++++++++++++++++---------------------
extra-x86_64/install | 28 ++++++-------
extra-x86_64/qt4-lib64.patch | 62 ++++++++++++++---------------
6 files changed, 176 insertions(+), 176 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-12-24 17:42:08 UTC (rev 145629)
+++ extra-i686/PKGBUILD 2011-12-24 17:43:03 UTC (rev 145630)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: Andreas Radke <andy...@archlinux.org>
-# Contributor: damir <da...@archlinux.org>
-
-pkgname=gcin
-pkgver=2.6.0
-pkgrel=1
-pkgdesc='Input method server supporting various input methods'
-url='http://hyperrate.com/dir.php?eid=67'
-license=('LGPL')
-arch=('i686' 'x86_64')
-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=('4abef8d37492b68d54ba40420f65d04779ee2ec5'
- '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc')
-
-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/PKGBUILD (from rev 145629, gcin/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-12-24 17:43:03 UTC (rev 145630)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Andreas Radke <andy...@archlinux.org>
+# Contributor: damir <da...@archlinux.org>
+
+pkgname=gcin
+pkgver=2.6.6
+pkgrel=1
+pkgdesc='Input method server supporting various input methods'
+url='http://hyperrate.com/dir.php?eid=67'
+license=('LGPL')
+arch=('i686' 'x86_64')
+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=('ef2ba1af83ce5f25cf54a7d3e84a5739d3a9e5e0'
+ '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
+
+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-12-24 17:42:08 UTC (rev 145629)
+++ extra-i686/install 2011-12-24 17:43:03 UTC (rev 145630)
@@ -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 145629, gcin/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2011-12-24 17:43:03 UTC (rev 145630)
@@ -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-12-24 17:42:08 UTC (rev 145629)
+++ extra-i686/qt4-lib64.patch 2011-12-24 17:43:03 UTC (rev 145630)
@@ -1,31 +0,0 @@
-diff -aur old/configure new/configure
---- old/configure 2011-11-07 06:51:12.000000000 +1100
-+++ new/configure 2011-11-25 14:02:10.819256960 +1100
-@@ -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 23:03:50.000000000 +1000
-+++ new/qt4-im/Makefile 2011-11-25 14:05:28.844110772 +1100
-@@ -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 145629,
gcin/trunk/qt4-lib64.patch)
===================================================================
--- extra-i686/qt4-lib64.patch (rev 0)
+++ extra-i686/qt4-lib64.patch 2011-12-24 17:43:03 UTC (rev 145630)
@@ -0,0 +1,31 @@
+diff -aur old/configure new/configure
+--- old/configure 2011-12-21 00:48:03.000000000 +1100
++++ new/configure 2011-12-25 04:06:14.424317251 +1100
+@@ -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
+@@ -245,7 +245,7 @@
+ mv gcin.spec gcin.spec.tmp
+ grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec
+ else
+- for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
++ for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
/usr/bin/moc
+ do
+ [ -x $i ] && QT4_MOC=$i
+ done
+diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
+--- old/qt4-im/Makefile 2011-12-19 14:52:46.000000000 +1100
++++ new/qt4-im/Makefile 2011-12-25 04:06:14.424317251 +1100
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-12-24 17:42:08 UTC (rev 145629)
+++ extra-x86_64/PKGBUILD 2011-12-24 17:43:03 UTC (rev 145630)
@@ -1,43 +0,0 @@
-# $Id$
-# Maintainer: Gaetan Bisson <bis...@archlinux.org>
-# Contributor: Andreas Radke <andy...@archlinux.org>
-# Contributor: damir <da...@archlinux.org>
-
-pkgname=gcin
-pkgver=2.6.0
-pkgrel=1
-pkgdesc='Input method server supporting various input methods'
-url='http://hyperrate.com/dir.php?eid=67'
-license=('LGPL')
-arch=('i686' 'x86_64')
-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=('4abef8d37492b68d54ba40420f65d04779ee2ec5'
- '4b121e9a86a2ca25869c69b7d4d9623a0c8f55fc')
-
-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/PKGBUILD (from rev 145629, gcin/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-12-24 17:43:03 UTC (rev 145630)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+# Contributor: Andreas Radke <andy...@archlinux.org>
+# Contributor: damir <da...@archlinux.org>
+
+pkgname=gcin
+pkgver=2.6.6
+pkgrel=1
+pkgdesc='Input method server supporting various input methods'
+url='http://hyperrate.com/dir.php?eid=67'
+license=('LGPL')
+arch=('i686' 'x86_64')
+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=('ef2ba1af83ce5f25cf54a7d3e84a5739d3a9e5e0'
+ '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
+
+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-12-24 17:42:08 UTC (rev 145629)
+++ extra-x86_64/install 2011-12-24 17:43:03 UTC (rev 145630)
@@ -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 145629, gcin/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2011-12-24 17:43:03 UTC (rev 145630)
@@ -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-12-24 17:42:08 UTC (rev 145629)
+++ extra-x86_64/qt4-lib64.patch 2011-12-24 17:43:03 UTC (rev 145630)
@@ -1,31 +0,0 @@
-diff -aur old/configure new/configure
---- old/configure 2011-11-07 06:51:12.000000000 +1100
-+++ new/configure 2011-11-25 14:02:10.819256960 +1100
-@@ -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 23:03:50.000000000 +1000
-+++ new/qt4-im/Makefile 2011-11-25 14:05:28.844110772 +1100
-@@ -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 145629,
gcin/trunk/qt4-lib64.patch)
===================================================================
--- extra-x86_64/qt4-lib64.patch (rev 0)
+++ extra-x86_64/qt4-lib64.patch 2011-12-24 17:43:03 UTC (rev 145630)
@@ -0,0 +1,31 @@
+diff -aur old/configure new/configure
+--- old/configure 2011-12-21 00:48:03.000000000 +1100
++++ new/configure 2011-12-25 04:06:14.424317251 +1100
+@@ -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
+@@ -245,7 +245,7 @@
+ mv gcin.spec gcin.spec.tmp
+ grep -v qt4/plugins/inputmethods gcin.spec.tmp > gcin.spec
+ else
+- for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
++ for i in /usr/share/qt4/bin/moc /usr/lib/qt4/bin/moc /usr/lib64/qt4/bin/moc
/usr/bin/moc
+ do
+ [ -x $i ] && QT4_MOC=$i
+ done
+diff -aur old/qt4-im/Makefile new/qt4-im/Makefile
+--- old/qt4-im/Makefile 2011-12-19 14:52:46.000000000 +1100
++++ new/qt4-im/Makefile 2011-12-25 04:06:14.424317251 +1100
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+
