[arch-commits] Commit in gcin/trunk (PKGBUILD qt4-lib64.patch qt4.patch)
Gaetan Bisson
bisson at archlinux.org
Sun Mar 4 22:37:34 UTC 2012
Date: Sunday, March 4, 2012 @ 17:37:34
Author: bisson
Revision: 152119
upstream update
Added:
gcin/trunk/qt4.patch
(from rev 152117, gcin/trunk/qt4-lib64.patch)
Modified:
gcin/trunk/PKGBUILD
Deleted:
gcin/trunk/qt4-lib64.patch
-----------------+
PKGBUILD | 10 +++++-----
qt4-lib64.patch | 31 -------------------------------
qt4.patch | 10 ++++++++++
3 files changed, 15 insertions(+), 36 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-03-04 21:47:12 UTC (rev 152118)
+++ PKGBUILD 2012-03-04 22:37:34 UTC (rev 152119)
@@ -4,7 +4,7 @@
# Contributor: damir <damir at archlinux.org>
pkgname=gcin
-pkgver=2.7.4
+pkgver=2.7.5
pkgrel=1
pkgdesc='Input method server supporting various input methods'
url='http://hyperrate.com/dir.php?eid=67'
@@ -17,16 +17,16 @@
'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=('d580c772b670ccb34f510dce5535628dd22dd6cb'
- '3d1b769dcd8820c8351f239ec32ee5bcd9d98b70')
+ 'qt4.patch')
+sha1sums=('5b480965985616beb972d8fc32f90cc173c72264'
+ '1c6cdcaa218615e53869bb9d67d7f9d2141e86fe')
install=install
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 -i ../qt4-lib64.patch
+ patch -p1 -i ../qt4.patch
sed '/include suffixes-rule/a \
CFLAGS+='"${CFLAGS}"' \
LDFLAGS+='"${LDFLAGS}"' \
Deleted: qt4-lib64.patch
===================================================================
--- qt4-lib64.patch 2012-03-04 21:47:12 UTC (rev 152118)
+++ qt4-lib64.patch 2012-03-04 22:37:34 UTC (rev 152119)
@@ -1,31 +0,0 @@
-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)
-
Copied: gcin/trunk/qt4.patch (from rev 152117, gcin/trunk/qt4-lib64.patch)
===================================================================
--- qt4.patch (rev 0)
+++ qt4.patch 2012-03-04 22:37:34 UTC (rev 152119)
@@ -0,0 +1,10 @@
+diff -Naur old/qt4-im/Makefile new/qt4-im/Makefile
+--- old/qt4-im/Makefile 2011-12-19 14:52:46.000000000 +1100
++++ new/qt4-im/Makefile 2012-03-05 09:22:46.732614803 +1100
+@@ -1,5 +1,5 @@
+ include ../config.mak
+-QT=qt4
++QT=qt
+ QTIM=$(QT)/plugins/inputmethods
+ IMMODULES=$(libdir)/$(QTIM)
+
More information about the arch-commits
mailing list