[arch-commits] Commit in gcin/trunk (PKGBUILD qt-5.5.patch)

[Chih-Hsuan Yen]

    Date: Wednesday, December 12, 2018 @ 06:17:13
  Author: yan12125
Revision: 415551

upgpkg: gcin 2.8.8-1

Most issues of the build system are already fixed by upstream.

Tested with applications using Qt 5.12.

Modified:
  gcin/trunk/PKGBUILD
Deleted:
  gcin/trunk/qt-5.5.patch

--------------+
 PKGBUILD     |   23 +++++++----------------
 qt-5.5.patch |   13 -------------
 2 files changed, 7 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-12-12 05:39:34 UTC (rev 415550)
+++ PKGBUILD	2018-12-12 06:17:13 UTC (rev 415551)
@@ -1,13 +1,14 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Chih-Hsuan Yen <yan12125 at archlinux.org>
+# Contributor: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Gaetan Bisson <bisson at archlinux.org>
 # Contributor: Andreas Radke <andyrtr at archlinux.org>
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=gcin
-pkgver=2.8.6
-pkgrel=4
+pkgver=2.8.8
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
-url='http://hyperrate.com/dir.php?eid=67'
+url='https://hyperrate.com/dir.php?eid=67'
 license=('LGPL')
 arch=('x86_64')
 depends=('gtk2' 'libxtst')
@@ -17,10 +18,8 @@
             'gtk3: support for gtk3 input method'
             'anthy: support for anthy input method'
             'curl: for downloading and uploading vocabulary databases via ts-edit')
-source=("http://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz"
-        qt-5.5.patch)
-sha512sums=('9aded8f4cf73965f506b36c2a0bd1716cf72d0e17a862a23a0a6f83423505b8b7a13d9f399dedaf975d38ba96e5f672d7e502cb38f85b7fb2eb0f7ffa0a86dbb'
-            'cefe7fcd1009ac90a735a9b28ce7749a549a707c97019d54e2227b8e248118b21641878cfcc20cfc781693d4eff1e9fc6ff85742dabe38507505ff2d3cec57c0')
+source=("https://hyperrate.com/gcin-source/${pkgname}-${pkgver}.tar.xz")
+sha512sums=('6fa9955f5f4fdd67b80af9e91b65ff15488368453041dd4c71a3875fc08e9027aa9202783f20d4513f3c01528cb6f8141489546cf21be8fa5ba17060d55d09d4')
 
 install=install
 
@@ -33,16 +32,8 @@
         OPTFLAGS=' \
         -i Makefile
     sed \
-        -e 's:usr/include/qt5:usr/include/qt:g' \
         -e 's:QT=qt5:QT=qt:' \
-        -e '/^MODVERSION=/a INCS+=-I/usr/include/qt/QtGui/$(MODVERSION) -I/usr/include/qt/QtCore/$(MODVERSION)' \
         -i qt5-im/Makefile59
-
-    # FS#45732
-    patch -p1 -i ../qt-5.5.patch
-
-    # Qt 5.6 doesn't provide Qt5PlatformSupport.pc anymore
-    sed -i 's/Qt5PlatformSupport//' qt5-im/Makefile
 }
 
 build() {

Deleted: qt-5.5.patch
===================================================================
--- qt-5.5.patch	2018-12-12 05:39:34 UTC (rev 415550)
+++ qt-5.5.patch	2018-12-12 06:17:13 UTC (rev 415551)
@@ -1,13 +0,0 @@
-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);
- };