[gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/, app-i18n/fcitx-qt5/files/

[Yixun Lan]

commit:     887f90fd1bb73ebc2fe508e581d2e8dfced48efa
Author:     Jiajun Wang <amesists <AT> gmail <DOT> com>
AuthorDate: Thu Dec 10 08:17:51 2015 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Dec 22 02:31:38 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=887f90fd

app-i18n/fcitx-qt5: fix compatibility issue with qt5.5

Gentoo-Bug: 565942

Package-Manager: portage-2.2.26
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 ...-qt5-1.0.2.ebuild => fcitx-qt5-1.0.2-r1.ebuild} |  2 ++
 .../files/fcitx-qt5-qt-5.5-compatibility-fix.patch | 23 ++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2.ebuild 
b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild
similarity index 88%
rename from app-i18n/fcitx-qt5/fcitx-qt5-1.0.2.ebuild
rename to app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild
index f066264..0af11f2 100644
--- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2.ebuild
+++ b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild
@@ -21,3 +21,5 @@ RDEPEND=">=app-i18n/fcitx-4.2.8
        dev-qt/qtwidgets:5
        kde-frameworks/extra-cmake-modules"
 DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-qt-5.5-compatibility-fix.patch" )

diff --git a/app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch 
b/app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch
new file mode 100644
index 0000000..4bdd058
--- /dev/null
+++ b/app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch
@@ -0,0 +1,23 @@
+From 78c482b3fdfe558da74657893a3bcd1ece6d7758 Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wen...@gmail.com>
+Date: Thu, 2 Jul 2015 20:02:17 -0700
+Subject: [PATCH] [qt5] fixes #6
+
+use macro instead of string literal and fix compatibility issue with qt5.5
+---
+ platforminputcontext/main.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/platforminputcontext/main.h b/platforminputcontext/main.h
+index 1492d72..9938da1 100644
+--- a/platforminputcontext/main.h
++++ b/platforminputcontext/main.h
+@@ -29,7 +29,7 @@ class QFcitxPlatformInputContextPlugin : public 
QPlatformInputContextPlugin
+ {
+     Q_OBJECT
+ public:
+-    Q_PLUGIN_METADATA(IID 
"org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "fcitx.json")
++    Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE 
"fcitx.json")
+     QStringList keys() const;
+     QFcitxPlatformInputContext *create(const QString& system, const 
QStringList& paramList);
+ };