Date: Friday, September 11, 2015 @ 09:40:20 Author: fyan Revision: 245764
archrelease: copy trunk to extra-i686, extra-x86_64 Added: gcin/repos/extra-i686/PKGBUILD (from rev 245763, gcin/trunk/PKGBUILD) gcin/repos/extra-i686/install (from rev 245763, gcin/trunk/install) gcin/repos/extra-i686/qt-5.5.patch (from rev 245763, gcin/trunk/qt-5.5.patch) gcin/repos/extra-x86_64/PKGBUILD (from rev 245763, gcin/trunk/PKGBUILD) gcin/repos/extra-x86_64/install (from rev 245763, gcin/trunk/install) gcin/repos/extra-x86_64/qt-5.5.patch (from rev 245763, gcin/trunk/qt-5.5.patch) Deleted: gcin/repos/extra-i686/PKGBUILD gcin/repos/extra-i686/install gcin/repos/extra-x86_64/PKGBUILD gcin/repos/extra-x86_64/install ---------------------------+ /PKGBUILD | 108 ++++++++++++++++++++++++++++++++++++++++++++ /install | 28 +++++++++++ extra-i686/PKGBUILD | 48 ------------------- extra-i686/install | 14 ----- extra-i686/qt-5.5.patch | 13 +++++ extra-x86_64/PKGBUILD | 48 ------------------- extra-x86_64/install | 14 ----- extra-x86_64/qt-5.5.patch | 13 +++++ 8 files changed, 162 insertions(+), 124 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2015-09-11 07:39:52 UTC (rev 245763) +++ extra-i686/PKGBUILD 2015-09-11 07:40:20 UTC (rev 245764) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Andreas Radke <andy...@archlinux.org> -# Contributor: damir <da...@archlinux.org> - -pkgname=gcin -pkgver=2.8.3 -pkgrel=3 -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=('qt5-base' 'qt4' 'gtk3' 'anthy' 'libchewing') -optdepends=('qt5-base: support for qt5 input method' - 'qt4: 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://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz") -sha1sums=('95b980f7cf9dc2ad91803113cdbb4ac831f056de') - -install=install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/lib64/lib/g' -i configure - sed '/include suffixes-rule/a \ - CFLAGS+='"${CFLAGS}"' \ - LDFLAGS+='"${LDFLAGS}"' \ - OPTFLAGS=' \ - -i Makefile - sed \ - -e 's:qt5/QtGui/5.2.1:qt/QtGui/5.5.0:g' \ - -e 's:QT=qt5:QT=qt:' \ - -i qt5-im/Makefile -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --use_i18n=Y - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install -} Copied: gcin/repos/extra-i686/PKGBUILD (from rev 245763, gcin/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2015-09-11 07:40:20 UTC (rev 245764) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=gcin +pkgver=2.8.3 +pkgrel=4 +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=('qt5-base' 'qt4' 'gtk3' 'anthy' 'libchewing') +optdepends=('qt5-base: support for qt5 input method' + 'qt4: 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://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz" + qt-5.5.patch) +sha1sums=('95b980f7cf9dc2ad91803113cdbb4ac831f056de' + 'fd29b91d7b573546ecb3a8cb0341d4f11364cd1a') + +install=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's/lib64/lib/g' -i configure + sed '/include suffixes-rule/a \ + CFLAGS+='"${CFLAGS}"' \ + LDFLAGS+='"${LDFLAGS}"' \ + OPTFLAGS=' \ + -i Makefile + sed \ + -e 's:qt5/QtGui/5.2.1:qt/QtGui/5.5.0:g' \ + -e 's:QT=qt5:QT=qt:' \ + -i qt5-im/Makefile + + # FS#45732 + patch -p1 -i ../qt-5.5.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./configure --prefix=/usr --use_i18n=Y + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" install +} Deleted: extra-i686/install =================================================================== --- extra-i686/install 2015-09-11 07:39:52 UTC (rev 245763) +++ extra-i686/install 2015-09-11 07:40:20 UTC (rev 245764) @@ -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 245763, gcin/trunk/install) =================================================================== --- extra-i686/install (rev 0) +++ extra-i686/install 2015-09-11 07:40:20 UTC (rev 245764) @@ -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/extra-i686/qt-5.5.patch (from rev 245763, gcin/trunk/qt-5.5.patch) =================================================================== --- extra-i686/qt-5.5.patch (rev 0) +++ extra-i686/qt-5.5.patch 2015-09-11 07:40:20 UTC (rev 245764) @@ -0,0 +1,13 @@ +diff --git a/qt5-im/gcin-qt5.h.org b/qt5-im/gcin-qt5.h +index 63aacc0..a72ea76 100644 +--- a/qt5-im/gcin-qt5.h.orig ++++ b/qt5-im/gcin-qt5.h +@@ -9,7 +9,7 @@ class QGcinPlatformInputContextPlugin : public QPlatformInputContextPlugin + { + Q_OBJECT + public: +- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "gcin.json") ++ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface.5.1" FILE "gcin.json") + QStringList keys() const; + QGcinPlatformInputContext *create(const QString& system, const QStringList& paramList); + }; Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2015-09-11 07:39:52 UTC (rev 245763) +++ extra-x86_64/PKGBUILD 2015-09-11 07:40:20 UTC (rev 245764) @@ -1,48 +0,0 @@ -# $Id$ -# Maintainer: Gaetan Bisson <bis...@archlinux.org> -# Contributor: Andreas Radke <andy...@archlinux.org> -# Contributor: damir <da...@archlinux.org> - -pkgname=gcin -pkgver=2.8.3 -pkgrel=3 -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=('qt5-base' 'qt4' 'gtk3' 'anthy' 'libchewing') -optdepends=('qt5-base: support for qt5 input method' - 'qt4: 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://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz") -sha1sums=('95b980f7cf9dc2ad91803113cdbb4ac831f056de') - -install=install - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed 's/lib64/lib/g' -i configure - sed '/include suffixes-rule/a \ - CFLAGS+='"${CFLAGS}"' \ - LDFLAGS+='"${LDFLAGS}"' \ - OPTFLAGS=' \ - -i Makefile - sed \ - -e 's:qt5/QtGui/5.2.1:qt/QtGui/5.5.0:g' \ - -e 's:QT=qt5:QT=qt:' \ - -i qt5-im/Makefile -} - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - ./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 245763, gcin/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2015-09-11 07:40:20 UTC (rev 245764) @@ -0,0 +1,54 @@ +# $Id$ +# Maintainer: Felix Yan <felixonm...@archlinux.org> +# Contributor: Gaetan Bisson <bis...@archlinux.org> +# Contributor: Andreas Radke <andy...@archlinux.org> +# Contributor: damir <da...@archlinux.org> + +pkgname=gcin +pkgver=2.8.3 +pkgrel=4 +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=('qt5-base' 'qt4' 'gtk3' 'anthy' 'libchewing') +optdepends=('qt5-base: support for qt5 input method' + 'qt4: 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://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz" + qt-5.5.patch) +sha1sums=('95b980f7cf9dc2ad91803113cdbb4ac831f056de' + 'fd29b91d7b573546ecb3a8cb0341d4f11364cd1a') + +install=install + +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + sed 's/lib64/lib/g' -i configure + sed '/include suffixes-rule/a \ + CFLAGS+='"${CFLAGS}"' \ + LDFLAGS+='"${LDFLAGS}"' \ + OPTFLAGS=' \ + -i Makefile + sed \ + -e 's:qt5/QtGui/5.2.1:qt/QtGui/5.5.0:g' \ + -e 's:QT=qt5:QT=qt:' \ + -i qt5-im/Makefile + + # FS#45732 + patch -p1 -i ../qt-5.5.patch +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + ./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 2015-09-11 07:39:52 UTC (rev 245763) +++ extra-x86_64/install 2015-09-11 07:40:20 UTC (rev 245764) @@ -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 245763, gcin/trunk/install) =================================================================== --- extra-x86_64/install (rev 0) +++ extra-x86_64/install 2015-09-11 07:40:20 UTC (rev 245764) @@ -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/extra-x86_64/qt-5.5.patch (from rev 245763, gcin/trunk/qt-5.5.patch) =================================================================== --- extra-x86_64/qt-5.5.patch (rev 0) +++ extra-x86_64/qt-5.5.patch 2015-09-11 07:40:20 UTC (rev 245764) @@ -0,0 +1,13 @@ +diff --git a/qt5-im/gcin-qt5.h.org b/qt5-im/gcin-qt5.h +index 63aacc0..a72ea76 100644 +--- a/qt5-im/gcin-qt5.h.orig ++++ b/qt5-im/gcin-qt5.h +@@ -9,7 +9,7 @@ class QGcinPlatformInputContextPlugin : public QPlatformInputContextPlugin + { + Q_OBJECT + public: +- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "gcin.json") ++ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface.5.1" FILE "gcin.json") + QStringList keys() const; + QGcinPlatformInputContext *create(const QString& system, const QStringList& paramList); + };