commit: f88aa1ddc5ca1e3ff2a671545ecf0207af636aa6
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 15:21:51 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 15:22:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f88aa1dd
x11-terms/qterminal: version bump 0.7.1
Gentoo-bug: 605402
Package-Manager: Portage-2.3.3, Repoman-2.3.1
x11-terms/qterminal/Manifest | 1 +
.../files/qterminal-0.7.1-no-liblxqt.patch | 51 ++++++++++++++++++++++
...terminal-9999.ebuild => qterminal-0.7.1.ebuild} | 10 ++---
x11-terms/qterminal/qterminal-9999.ebuild | 4 +-
4 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index 2b10758..276a0cb 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,2 +1,3 @@
DIST qterminal-0.6.0.tar.xz 100660 SHA256
61121ad0d1d34a5129e1109b6689d7fb7b10130a32831eaf500a86909b29d9bc SHA512
e51b768dc9b467800c7439bf7b021e04d83073a236023632e76ba00551bffa70f3b96f2098c68092283287914ce9103c8dfae8af79c9c25e119528b3f102ab34
WHIRLPOOL
4d67cce15b1ced30916f123ad140f3b00237bd5f4535fe0fb9adbd31829cfdb3120b6788f29cb9545d23d892c6ce22970793c0afed2e5ed225ba8e9a2487a88d
DIST qterminal-0.7.0.tar.xz 98636 SHA256
a9cc63bb6c6bf6e42c9d1061efce641d9c0b57bd455446b6889d1a417a28968d SHA512
ad89bf2639c1c3d15396de1d91121920cbbb52d097d53d2751bf42e1d96b9d00cef8c54456a00b8fa40808a85535f1b88ea7bb3342dc9681fa8e769c2663061e
WHIRLPOOL
8bdfb1b44e67e67d4261e78f305097ca202710e3f6020b76ff729f17b661f30bce1be4bbc77840bc24e197766ecdcba69392e325402f71b4dc885b5287934684
+DIST qterminal-0.7.1.tar.xz 99164 SHA256
8d49b29febccc158dd115a099115e4ed1c487d4308ec92818e1abeb8821c848f SHA512
45f83a4179a90379678b7875de386e04c77505d89d8c0c447a0892a279bc1776d0847a54683d43af085bcb306cc0e4d0858f1c49dc6e0e08f549d7350584625d
WHIRLPOOL
2070cc0f49ed28e75d1ce846ecb1981fb38e167bee558e7e40a3c6faff6cb3022043d9bff6e17f17d6769f7215af6f0aaa86eac9349ecdeafa4e55abb2425eda
diff --git a/x11-terms/qterminal/files/qterminal-0.7.1-no-liblxqt.patch
b/x11-terms/qterminal/files/qterminal-0.7.1-no-liblxqt.patch
new file mode 100644
index 00000000..536c971
--- /dev/null
+++ b/x11-terms/qterminal/files/qterminal-0.7.1-no-liblxqt.patch
@@ -0,0 +1,51 @@
+Translations are fetched from upstream git repo at build time, so disable them.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -30,14 +30,14 @@
+ # we need qpa/qplatformnativeinterface.h for global shortcut
+ find_package(Qt5Gui REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+-find_package(Qt5LinguistTools REQUIRED)
++#find_package(Qt5LinguistTools REQUIRED)
+ if(APPLE)
+ elseif(UNIX)
+ find_package(Qt5X11Extras REQUIRED)
+ endif()
+ find_package(QTermWidget5 REQUIRED)
+-find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
+-include(LXQtTranslateTs)
++#find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED)
++#include(LXQtTranslateTs)
+ message(STATUS "Qt version: ${Qt5Core_VERSION_STRING}")
+
+ include(${QTERMWIDGET_USE_FILE})
+@@ -110,17 +110,17 @@
+ qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
+ qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
+ qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
+-lxqt_translate_ts(QTERM_QM
+- TRANSLATION_DIR "src/translations"
+- PULL_TRANSLATIONS
+- ${PULL_TRANSLATIONS}
+- CLEAN_TRANSLATIONS
+- ${CLEAN_TRANSLATIONS}
+- TRANSLATIONS_REPO
+- ${TRANSLATIONS_REPO}
+- TRANSLATIONS_REFSPEC
+- ${TRANSLATIONS_REFSPEC}
+-)
++#lxqt_translate_ts(QTERM_QM
++# TRANSLATION_DIR "src/translations"
++# PULL_TRANSLATIONS
++# ${PULL_TRANSLATIONS}
++# CLEAN_TRANSLATIONS
++# ${CLEAN_TRANSLATIONS}
++# TRANSLATIONS_REPO
++# ${TRANSLATIONS_REPO}
++# TRANSLATIONS_REFSPEC
++# ${TRANSLATIONS_REFSPEC}
++#)
+
+ include_directories(
+ "${CMAKE_SOURCE_DIR}"
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild
b/x11-terms/qterminal/qterminal-0.7.1.ebuild
similarity index 68%
copy from x11-terms/qterminal/qterminal-9999.ebuild
copy to x11-terms/qterminal/qterminal-0.7.1.ebuild
index 8d6dc6a..ba95d83 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-0.7.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
-inherit cmake-utils git-r3 gnome2-utils
+inherit cmake-utils gnome2-utils
DESCRIPTION="Qt-based multitab terminal emulator"
HOMEPAGE="https://github.com/lxde/qterminal";
-EGIT_REPO_URI="https://github.com/lxde/qterminal.git";
+SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz";
LICENSE="GPL-2+"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~x86"
IUSE=""
RDEPEND="
@@ -24,7 +24,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.7.1-no-liblxqt.patch" )
pkg_preinst() {
gnome2_icon_savelist
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild
b/x11-terms/qterminal/qterminal-9999.ebuild
index 8d6dc6a..368a004 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -24,7 +24,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.7.1-no-liblxqt.patch" )
pkg_preinst() {
gnome2_icon_savelist
