Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-i18n/fcitx-qt5/files/, app-i18n/fcitx-qt5/
Date: Thu, 28 Apr 2016 21:07:29
Message-Id: 1461877605.d683c745dca8a45ff4ce45a809a38b65cc66c388.floppym@gentoo
1 commit: d683c745dca8a45ff4ce45a809a38b65cc66c388
2 Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
3 AuthorDate: Thu Apr 28 20:19:42 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 28 21:06:45 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d683c745
7
8 app-i18n/fcitx-qt5: Delete old versions.
9
10 app-i18n/fcitx-qt5/Manifest | 2 --
11 app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild | 25 ----------------------
12 app-i18n/fcitx-qt5/fcitx-qt5-1.0.4.ebuild | 23 --------------------
13 .../files/fcitx-qt5-qt-5.5-compatibility-fix.patch | 23 --------------------
14 4 files changed, 73 deletions(-)
15
16 diff --git a/app-i18n/fcitx-qt5/Manifest b/app-i18n/fcitx-qt5/Manifest
17 index c7fa740..00fbb27 100644
18 --- a/app-i18n/fcitx-qt5/Manifest
19 +++ b/app-i18n/fcitx-qt5/Manifest
20 @@ -1,3 +1 @@
21 -DIST fcitx-qt5-1.0.2.tar.xz 53324 SHA256 b8073f07d9384878c616f6d2cea44fc739a3b5731b95b10b3133e0914d49f66d SHA512 f7075d5334e29fd00c54563182c9cc4027011503aa14d577aa2fb75eb8558c385d91c939f1f21e51850c9c64fc5c396aad5b32fdcc8ddd99c46ec74bd577255d WHIRLPOOL 35ae384cf13fdfdb86c34b7dbefbbe780a2c20ac220868824e25a0ba4368581c19d45cbc9447e1c2dd3236b0758ee9e4311dab1f348a524ca2d002d0b43c760c
22 -DIST fcitx-qt5-1.0.4.tar.xz 53552 SHA256 b42a428008d9bf3a5d9140d63c9a475386480d598bb9ce3b78fad43879a50d1c SHA512 f5a2d3ed30bbbb8da3687dc12dd5be3038242ba40e6bef48483931aacfd9f200db9d24d0df03cb93058eedb3941ef6ecb92d874040eb60742f60a44beda77868 WHIRLPOOL c1dcf45eed09625721c175b1b09724f1f9934cb8cb3413df811009815d4231d2758c54a7b346cb29910c0ce156eb9906136d471359566eb288438cc1f5466710
23 DIST fcitx-qt5-1.0.5.tar.xz 53584 SHA256 8cef90024ca84c3f607943b91f6bfe63fd077507bbe100e5a1936464095841de SHA512 f4da9ede8918cef7aa0dbacea534ab81024e3c6d812bedd287c4c4c9a8b9ca994d4708489c602967f3504ce057ec6e118674503f5d796883f1890e8ecc11c501 WHIRLPOOL 764190a5f523fc40ca5f937704d5bc1a7018232284f50b9b1b6a36b5dd41dfbebda5db337bdc49b08e601e94f51935f2a70d96dddbd4091744ec8c89a77f26b0
24
25 diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild
26 deleted file mode 100644
27 index 0af11f2..0000000
28 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.2-r1.ebuild
29 +++ /dev/null
30 @@ -1,25 +0,0 @@
31 -# Copyright 1999-2015 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -# $Id$
34 -
35 -EAPI=5
36 -inherit cmake-utils
37 -
38 -DESCRIPTION="Qt5 input module for Fcitx"
39 -HOMEPAGE="http://fcitx-im.org/"
40 -SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
41 -
42 -LICENSE="GPL-3"
43 -SLOT="0"
44 -KEYWORDS="~amd64 ~x86"
45 -IUSE=""
46 -
47 -RDEPEND=">=app-i18n/fcitx-4.2.8
48 - dev-qt/qtcore:5
49 - dev-qt/qtdbus:5
50 - dev-qt/qtgui:5
51 - dev-qt/qtwidgets:5
52 - kde-frameworks/extra-cmake-modules"
53 -DEPEND="${RDEPEND}"
54 -
55 -PATCHES=( "${FILESDIR}/${PN}-qt-5.5-compatibility-fix.patch" )
56
57 diff --git a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.4.ebuild b/app-i18n/fcitx-qt5/fcitx-qt5-1.0.4.ebuild
58 deleted file mode 100644
59 index f066264..0000000
60 --- a/app-i18n/fcitx-qt5/fcitx-qt5-1.0.4.ebuild
61 +++ /dev/null
62 @@ -1,23 +0,0 @@
63 -# Copyright 1999-2015 Gentoo Foundation
64 -# Distributed under the terms of the GNU General Public License v2
65 -# $Id$
66 -
67 -EAPI=5
68 -inherit cmake-utils
69 -
70 -DESCRIPTION="Qt5 input module for Fcitx"
71 -HOMEPAGE="http://fcitx-im.org/"
72 -SRC_URI="http://download.fcitx-im.org/${PN}/${P}.tar.xz"
73 -
74 -LICENSE="GPL-3"
75 -SLOT="0"
76 -KEYWORDS="~amd64 ~x86"
77 -IUSE=""
78 -
79 -RDEPEND=">=app-i18n/fcitx-4.2.8
80 - dev-qt/qtcore:5
81 - dev-qt/qtdbus:5
82 - dev-qt/qtgui:5
83 - dev-qt/qtwidgets:5
84 - kde-frameworks/extra-cmake-modules"
85 -DEPEND="${RDEPEND}"
86
87 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
88 deleted file mode 100644
89 index 4bdd058..0000000
90 --- a/app-i18n/fcitx-qt5/files/fcitx-qt5-qt-5.5-compatibility-fix.patch
91 +++ /dev/null
92 @@ -1,23 +0,0 @@
93 -From 78c482b3fdfe558da74657893a3bcd1ece6d7758 Mon Sep 17 00:00:00 2001
94 -From: Weng Xuetian <wengxt@×××××.com>
95 -Date: Thu, 2 Jul 2015 20:02:17 -0700
96 -Subject: [PATCH] [qt5] fixes #6
97 -
98 -use macro instead of string literal and fix compatibility issue with qt5.5
99 ----
100 - platforminputcontext/main.h | 2 +-
101 - 1 file changed, 1 insertion(+), 1 deletion(-)
102 -
103 -diff --git a/platforminputcontext/main.h b/platforminputcontext/main.h
104 -index 1492d72..9938da1 100644
105 ---- a/platforminputcontext/main.h
106 -+++ b/platforminputcontext/main.h
107 -@@ -29,7 +29,7 @@ class QFcitxPlatformInputContextPlugin : public QPlatformInputContextPlugin
108 - {
109 - Q_OBJECT
110 - public:
111 -- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPlatformInputContextFactoryInterface" FILE "fcitx.json")
112 -+ Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "fcitx.json")
113 - QStringList keys() const;
114 - QFcitxPlatformInputContext *create(const QString& system, const QStringList& paramList);
115 - };