1 |
commit: 74566133ba68d9722535ce8dc04cea89667bc8aa |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Oct 6 17:08:27 2016 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Oct 6 17:09:15 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74566133 |
7 |
|
8 |
x11-terms/qterminal: version bump |
9 |
|
10 |
Gentoo-bug: 596232 |
11 |
|
12 |
Package-Manager: portage-2.3.1 |
13 |
|
14 |
x11-terms/qterminal/Manifest | 1 + |
15 |
.../qterminal/files/qterminal-no-liblxqt.patch | 52 ++++++++++++++++++++++ |
16 |
x11-terms/qterminal/qterminal-0.7.0.ebuild | 39 ++++++++++++++++ |
17 |
x11-terms/qterminal/qterminal-9999.ebuild | 44 +++++++++--------- |
18 |
4 files changed, 113 insertions(+), 23 deletions(-) |
19 |
|
20 |
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest |
21 |
index 3b3a2bb..2b10758 100644 |
22 |
--- a/x11-terms/qterminal/Manifest |
23 |
+++ b/x11-terms/qterminal/Manifest |
24 |
@@ -1 +1,2 @@ |
25 |
DIST qterminal-0.6.0.tar.xz 100660 SHA256 61121ad0d1d34a5129e1109b6689d7fb7b10130a32831eaf500a86909b29d9bc SHA512 e51b768dc9b467800c7439bf7b021e04d83073a236023632e76ba00551bffa70f3b96f2098c68092283287914ce9103c8dfae8af79c9c25e119528b3f102ab34 WHIRLPOOL 4d67cce15b1ced30916f123ad140f3b00237bd5f4535fe0fb9adbd31829cfdb3120b6788f29cb9545d23d892c6ce22970793c0afed2e5ed225ba8e9a2487a88d |
26 |
+DIST qterminal-0.7.0.tar.xz 98636 SHA256 a9cc63bb6c6bf6e42c9d1061efce641d9c0b57bd455446b6889d1a417a28968d SHA512 ad89bf2639c1c3d15396de1d91121920cbbb52d097d53d2751bf42e1d96b9d00cef8c54456a00b8fa40808a85535f1b88ea7bb3342dc9681fa8e769c2663061e WHIRLPOOL 8bdfb1b44e67e67d4261e78f305097ca202710e3f6020b76ff729f17b661f30bce1be4bbc77840bc24e197766ecdcba69392e325402f71b4dc885b5287934684 |
27 |
|
28 |
diff --git a/x11-terms/qterminal/files/qterminal-no-liblxqt.patch b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch |
29 |
new file mode 100644 |
30 |
index 00000000..f2a9795 |
31 |
--- /dev/null |
32 |
+++ b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch |
33 |
@@ -0,0 +1,52 @@ |
34 |
+Translations are fetched from upstream git repo at build time, so disable them. |
35 |
+ |
36 |
+--- a/CMakeLists.txt |
37 |
++++ b/CMakeLists.txt |
38 |
+@@ -29,15 +29,15 @@ |
39 |
+ # we need qpa/qplatformnativeinterface.h for global shortcut |
40 |
+ find_package(Qt5Gui REQUIRED) |
41 |
+ find_package(Qt5Widgets REQUIRED) |
42 |
+-find_package(Qt5LinguistTools REQUIRED) |
43 |
++#find_package(Qt5LinguistTools REQUIRED) |
44 |
+ if(APPLE) |
45 |
+ elseif(UNIX) |
46 |
+ find_package(Qt5X11Extras REQUIRED) |
47 |
+ endif() |
48 |
+ find_package(QTermWidget5 REQUIRED) |
49 |
+ #Note: no run-time dependency on liblxqt, just a build dependency for lxqt_translate_ts/desktop |
50 |
+-find_package(lxqt REQUIRED) |
51 |
+-include(LXQtTranslateTs) |
52 |
++#find_package(lxqt REQUIRED) |
53 |
++#include(LXQtTranslateTs) |
54 |
+ message(STATUS "Qt version: ${Qt5Core_VERSION_STRING}") |
55 |
+ |
56 |
+ include(${QTERMWIDGET_USE_FILE}) |
57 |
+@@ -110,17 +110,17 @@ |
58 |
+ qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} ) |
59 |
+ qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} ) |
60 |
+ qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} ) |
61 |
+-lxqt_translate_ts(QTERM_QM |
62 |
+- TRANSLATION_DIR "src/translations" |
63 |
+- PULL_TRANSLATIONS |
64 |
+- ${PULL_TRANSLATIONS} |
65 |
+- CLEAN_TRANSLATIONS |
66 |
+- ${CLEAN_TRANSLATIONS} |
67 |
+- TRANSLATIONS_REPO |
68 |
+- ${TRANSLATIONS_REPO} |
69 |
+- TRANSLATIONS_REFSPEC |
70 |
+- ${TRANSLATIONS_REFSPEC} |
71 |
+-) |
72 |
++#lxqt_translate_ts(QTERM_QM |
73 |
++# TRANSLATION_DIR "src/translations" |
74 |
++# PULL_TRANSLATIONS |
75 |
++# ${PULL_TRANSLATIONS} |
76 |
++# CLEAN_TRANSLATIONS |
77 |
++# ${CLEAN_TRANSLATIONS} |
78 |
++# TRANSLATIONS_REPO |
79 |
++# ${TRANSLATIONS_REPO} |
80 |
++# TRANSLATIONS_REFSPEC |
81 |
++# ${TRANSLATIONS_REFSPEC} |
82 |
++#) |
83 |
+ |
84 |
+ include_directories( |
85 |
+ "${CMAKE_SOURCE_DIR}" |
86 |
|
87 |
diff --git a/x11-terms/qterminal/qterminal-0.7.0.ebuild b/x11-terms/qterminal/qterminal-0.7.0.ebuild |
88 |
new file mode 100644 |
89 |
index 00000000..f3a882e |
90 |
--- /dev/null |
91 |
+++ b/x11-terms/qterminal/qterminal-0.7.0.ebuild |
92 |
@@ -0,0 +1,39 @@ |
93 |
+# Copyright 1999-2016 Gentoo Foundation |
94 |
+# Distributed under the terms of the GNU General Public License v2 |
95 |
+# $Id$ |
96 |
+ |
97 |
+EAPI=6 |
98 |
+inherit cmake-utils gnome2-utils |
99 |
+ |
100 |
+DESCRIPTION="Qt-based multitab terminal emulator" |
101 |
+HOMEPAGE="https://github.com/lxde/qterminal" |
102 |
+SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz" |
103 |
+ |
104 |
+LICENSE="GPL-2+" |
105 |
+SLOT="0" |
106 |
+KEYWORDS="~amd64 ~arm ~x86" |
107 |
+IUSE="" |
108 |
+ |
109 |
+RDEPEND=" |
110 |
+ dev-qt/qtcore:5 |
111 |
+ dev-qt/qtgui:5 |
112 |
+ dev-qt/qtwidgets:5 |
113 |
+ dev-qt/qtx11extras:5 |
114 |
+ x11-libs/libX11 |
115 |
+ ~x11-libs/qtermwidget-${PV} |
116 |
+" |
117 |
+DEPEND="${RDEPEND}" |
118 |
+ |
119 |
+PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" ) |
120 |
+ |
121 |
+pkg_preinst() { |
122 |
+ gnome2_icon_savelist |
123 |
+} |
124 |
+ |
125 |
+pkg_postinst() { |
126 |
+ gnome2_icon_cache_update |
127 |
+} |
128 |
+ |
129 |
+pkg_postrm() { |
130 |
+ gnome2_icon_cache_update |
131 |
+} |
132 |
|
133 |
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild |
134 |
index 2d55241..8d6dc6a 100644 |
135 |
--- a/x11-terms/qterminal/qterminal-9999.ebuild |
136 |
+++ b/x11-terms/qterminal/qterminal-9999.ebuild |
137 |
@@ -3,7 +3,7 @@ |
138 |
# $Id$ |
139 |
|
140 |
EAPI=6 |
141 |
-inherit cmake-utils git-r3 |
142 |
+inherit cmake-utils git-r3 gnome2-utils |
143 |
|
144 |
DESCRIPTION="Qt-based multitab terminal emulator" |
145 |
HOMEPAGE="https://github.com/lxde/qterminal" |
146 |
@@ -12,30 +12,28 @@ EGIT_REPO_URI="https://github.com/lxde/qterminal.git" |
147 |
LICENSE="GPL-2+" |
148 |
SLOT="0" |
149 |
KEYWORDS="" |
150 |
-IUSE="qt5" |
151 |
+IUSE="" |
152 |
|
153 |
RDEPEND=" |
154 |
- !qt5? ( |
155 |
- dev-qt/qtcore:4 |
156 |
- dev-qt/qtgui:4 |
157 |
- x11-libs/libqxt |
158 |
- ~x11-libs/qtermwidget-${PV}[qt4] |
159 |
- ) |
160 |
- qt5? ( |
161 |
- dev-qt/qtcore:5 |
162 |
- dev-qt/qtgui:5 |
163 |
- dev-qt/qtwidgets:5 |
164 |
- ~x11-libs/qtermwidget-${PV}[qt5] |
165 |
- ) |
166 |
-" |
167 |
-DEPEND="${RDEPEND} |
168 |
- qt5? ( dev-qt/linguist-tools:5 ) |
169 |
+ dev-qt/qtcore:5 |
170 |
+ dev-qt/qtgui:5 |
171 |
+ dev-qt/qtwidgets:5 |
172 |
+ dev-qt/qtx11extras:5 |
173 |
+ x11-libs/libX11 |
174 |
+ ~x11-libs/qtermwidget-${PV} |
175 |
" |
176 |
+DEPEND="${RDEPEND}" |
177 |
+ |
178 |
+PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" ) |
179 |
+ |
180 |
+pkg_preinst() { |
181 |
+ gnome2_icon_savelist |
182 |
+} |
183 |
+ |
184 |
+pkg_postinst() { |
185 |
+ gnome2_icon_cache_update |
186 |
+} |
187 |
|
188 |
-src_configure() { |
189 |
- local mycmakeargs=( |
190 |
- -DUSE_QT5=$(usex qt5) |
191 |
- -DUSE_SYSTEM_QXT=$(usex !qt5) |
192 |
- ) |
193 |
- cmake-utils_src_configure |
194 |
+pkg_postrm() { |
195 |
+ gnome2_icon_cache_update |
196 |
} |