Skip to content

Commit

Permalink
app-i18n/fcitx-qt5: fix compatibility issue with qt5.5
Browse files Browse the repository at this point in the history
Gentoo-Bug: 565942

Package-Manager: portage-2.2.26
Signed-off-by: Yixun Lan <[email protected]>
  • Loading branch information
JiajunW authored and dlan17 committed Dec 22, 2015
1 parent 152ac83 commit 887f90f
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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" )
23 changes: 23 additions & 0 deletions app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 78c482b3fdfe558da74657893a3bcd1ece6d7758 Mon Sep 17 00:00:00 2001
From: Weng Xuetian <[email protected]>
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);
};

0 comments on commit 887f90f

Please sign in to comment.