summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiajun Wang <amesists@gmail.com>2015-12-10 16:17:51 +0800
committerYixun Lan <dlan@gentoo.org>2015-12-22 10:31:38 +0800
commit887f90fd1bb73ebc2fe508e581d2e8dfced48efa (patch)
treeae51bc52abdb721cad9b093b9205b45b3db39b03 /app-i18n
parentapp-i18n/kcm-fcitx: version bump to 0.5.2 (diff)
downloadgentoo-887f90fd1bb73ebc2fe508e581d2e8dfced48efa.tar.gz
gentoo-887f90fd1bb73ebc2fe508e581d2e8dfced48efa.tar.bz2
gentoo-887f90fd1bb73ebc2fe508e581d2e8dfced48efa.zip
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@gentoo.org>
Diffstat (limited to 'app-i18n')
-rw-r--r--app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild (renamed from app-i18n/fcitx-qt5/fcitx-qt5-1.0.2.ebuild)2
-rw-r--r--app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch23
2 files changed, 25 insertions, 0 deletions
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
index f066264ddc8..0af11f22be9 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 00000000000..4bdd058462b
--- /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 <wengxt@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);
+ };