[gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/files/, x11-terms/qterminal/
commit: 0853026ecb99db16b4dc320fd85dfdf31f98faec Author: Jimi Huotari gentoo org> AuthorDate: Wed Nov 9 13:25:27 2022 + Commit: Jimi Huotari gentoo org> CommitDate: Wed Nov 9 13:46:00 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0853026e x11-terms/qterminal: remove versions 0.17.0 and 1.0.0 Also remove the now unused patch. Signed-off-by: Jimi Huotari gentoo.org> x11-terms/qterminal/Manifest | 2 -- .../qterminal/files/qterminal-0.16.1-appdata.patch | 11 -- x11-terms/qterminal/qterminal-0.17.0.ebuild| 42 -- x11-terms/qterminal/qterminal-1.0.0.ebuild | 42 -- 4 files changed, 97 deletions(-) diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest index cdc90dee82a7..7dbcfe2de5f4 100644 --- a/x11-terms/qterminal/Manifest +++ b/x11-terms/qterminal/Manifest @@ -1,4 +1,2 @@ -DIST qterminal-0.17.0.tar.xz 194332 BLAKE2B bf972608601cd3b4412a95dc4930183655a74d93963f20aadde289eb79d1967737e69d1e25983edc587fb097e1c65c5580dbcdbe79a71aa7f37d62b04819450b SHA512 c5d4ead74feeaec19b917389e7ff6fc4630671deb3442335b8e8c96ec6022c3460343475c95cd40cbaab4c0f813236c23557508b10e26e82ddf1546662f1de57 -DIST qterminal-1.0.0.tar.xz 201644 BLAKE2B e294c575590964710aeb4b433db51844f75fe0f73b966ef5acde148b3f779aa89ae3c5f1d73d3a3877b14d932150702ff871267399cbcab3b4aefc445c942922 SHA512 d3fd04ef94d683aae641367e56185723cf32d2390ab505b956c6736fe674144f6f270ef0def43b1f2d3aec659a2a7735cfb3713da07f49697823f9384572b3a0 DIST qterminal-1.1.0.tar.xz 209908 BLAKE2B 1ff732f9ae2c84ef063c97679fb4acd1c4b0eb9a981ab99aba689d1f48496fa8721b5b7bfbaae3d7e440e74385d47b4dddb834685f03d2b308a597329af463c1 SHA512 422ba05ebed00ac7f355cd9599f930f861141b9f69ff3e475ac9bb1e74aa02b4787d18fe52c03350dcb3b9b579d67b67d5d4e3b86aa204084d16c1097dc3b291 DIST qterminal-1.2.0.tar.xz 217432 BLAKE2B cd5b8e02fe36abcd88b3af1b7d3e9e9791af0d3db867554cc683fe0f821af7668c585a5ebf3cee1ebcb4e9cc06e41c2c1afaf9f5b9fecb9d02f71dbe9a8bc6c8 SHA512 4d0db104004bc4b4a0c6d030978c241c0c57d7642f1a9e215158da5810029a46f21510c9b2a92d32c7218df667015e96b47965e3c2951935af7ab6a1a33a0f9d diff --git a/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch b/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch deleted file mode 100644 index fc3f370fa67a.. --- a/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch +++ /dev/null @@ -1,11 +0,0 @@ a/CMakeLists.txt 2020-11-14 10:11:34.0 +0100 -+++ b/CMakeLists.txt 2021-02-28 22:47:20.119110816 +0100 -@@ -215,7 +215,7 @@ - - install(FILES - qterminal.appdata.xml --DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata" -+DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo" - ) - - if(NOT APPLEBUNDLE) diff --git a/x11-terms/qterminal/qterminal-0.17.0.ebuild b/x11-terms/qterminal/qterminal-0.17.0.ebuild deleted file mode 100644 index 5e8592563aaf.. --- a/x11-terms/qterminal/qterminal-0.17.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -DESCRIPTION="Qt-based multitab terminal emulator" -HOMEPAGE="https://lxqt.github.io/"; - -if [[ ${PV} = ** ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"; -else - SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"; - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86" -fi - -LICENSE="GPL-2 GPL-2+" -SLOT="0" - -BDEPEND=">=dev-util/lxqt-build-tools-0.9.0" -DEPEND=" - dev-qt/qtcore:5 - dev-qt/qtdbus:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - ~x11-libs/qtermwidget-${PV} -" -RDEPEND="${DEPEND}" - -PATCHES=( "${FILESDIR}/qterminal-0.16.1-appdata.patch" ) - -pkg_postinst() { - xdg_icon_cache_update -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/x11-terms/qterminal/qterminal-1.0.0.ebuild b/x11-terms/qterminal/qterminal-1.0.0.ebuild deleted file mode 100644 index 52947cd89a2a.. --- a/x11-terms/qterminal/qterminal-1.0.0.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake xdg-utils - -DESCRIPTION="Qt-based multitab terminal emulator" -HOMEPAGE="https://lxqt-project.org/"; - -if [[ ${PV} = ** ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"; -else - SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz"; - KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86" -fi - -LICENSE="GPL-2 GPL-2+" -SLOT="0" - -BDEPEND=">=dev-util/lxqt-build-tools-0.10.0" -DEPEND=" - >=dev-qt/qtcore-5.15:5 - >=dev-qt/qtdbus-5.15:5 - >=dev-qt/qtgui-5.15:5 - >=dev-qt/qtwidgets-5.15:5 - >=dev-qt/qtx11extras-
[gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/files/, x11-terms/qterminal/
commit: 9c55a4ab2e1adb960521cd9c237fd5e79f987a62 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Feb 28 21:56:26 2021 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Feb 28 21:57:06 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c55a4ab x11-terms/qterminal: Fix appdata installation path Closes: https://bugs.gentoo.org/737626 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch | 11 +++ .../{qterminal-.ebuild => qterminal-0.16.1-r1.ebuild} | 4 +++- x11-terms/qterminal/qterminal-.ebuild | 4 +++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch b/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch new file mode 100644 index 000..fc3f370fa67 --- /dev/null +++ b/x11-terms/qterminal/files/qterminal-0.16.1-appdata.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2020-11-14 10:11:34.0 +0100 b/CMakeLists.txt 2021-02-28 22:47:20.119110816 +0100 +@@ -215,7 +215,7 @@ + + install(FILES + qterminal.appdata.xml +-DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata" ++DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo" + ) + + if(NOT APPLEBUNDLE) diff --git a/x11-terms/qterminal/qterminal-.ebuild b/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild similarity index 90% copy from x11-terms/qterminal/qterminal-.ebuild copy to x11-terms/qterminal/qterminal-0.16.1-r1.ebuild index 1b3cfd71784..1474704c16c 100644 --- a/x11-terms/qterminal/qterminal-.ebuild +++ b/x11-terms/qterminal/qterminal-0.16.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,6 +33,8 @@ RDEPEND="${DEPEND} !lxqt-base/lxqt-l10n " +PATCHES=( "${FILESDIR}/${P}-appdata.patch" ) + pkg_postinst() { xdg_icon_cache_update } diff --git a/x11-terms/qterminal/qterminal-.ebuild b/x11-terms/qterminal/qterminal-.ebuild index 1b3cfd71784..07f53ab940a 100644 --- a/x11-terms/qterminal/qterminal-.ebuild +++ b/x11-terms/qterminal/qterminal-.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,6 +33,8 @@ RDEPEND="${DEPEND} !lxqt-base/lxqt-l10n " +PATCHES=( "${FILESDIR}/${PN}-0.16.1-appdata.patch" ) + pkg_postinst() { xdg_icon_cache_update }
[gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/files/, x11-terms/qterminal/
commit: fddcfebcd359ab2e6b520ee4ac090ab7fe22ab3c Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 14 17:01:04 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 14 18:36:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fddcfebc x11-terms/qterminal: Drop 0.7.1 Package-Manager: Portage-2.3.60, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> x11-terms/qterminal/Manifest | 1 - .../files/qterminal-0.7.1-no-liblxqt.patch | 51 -- x11-terms/qterminal/qterminal-0.7.1.ebuild | 38 3 files changed, 90 deletions(-) diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest index 5e31db7e865..568c877a762 100644 --- a/x11-terms/qterminal/Manifest +++ b/x11-terms/qterminal/Manifest @@ -1,2 +1 @@ -DIST qterminal-0.7.1.tar.xz 99164 BLAKE2B d1f831cc8eb9ff5ba4a81325a29461d698addcfcba44e0881b0f5adfc20ec2dda5b408e8909e7a3faa3c0a283cff805b91cfb31c41ef6d02fbf99a9936409357 SHA512 45f83a4179a90379678b7875de386e04c77505d89d8c0c447a0892a279bc1776d0847a54683d43af085bcb306cc0e4d0858f1c49dc6e0e08f549d7350584625d DIST qterminal-0.9.0.tar.xz 107072 BLAKE2B 08673e6cde08d9b95a1197d8125a2997e3f28be4e2825bb7b3a757f01ba7a29808c71eb22d80ba1b3c92885230c275414b501120316be91af9f623f3ff05b4e0 SHA512 42553a847873e71543161855b6f07b521ebf7db8091a1753dfc4ad4bbdf7f074f74b7e7195e56ee482b5b9ff3ea3037250ba74fb64a8137fb3959fceaa2baa6e 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 deleted file mode 100644 index 536c971a0da..000 --- a/x11-terms/qterminal/files/qterminal-0.7.1-no-liblxqt.patch +++ /dev/null @@ -1,51 +0,0 @@ -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-0.7.1.ebuild b/x11-terms/qterminal/qterminal-0.7.1.ebuild deleted file mode 100644 index 53bd102090d..000 --- a/x11-terms/qterminal/qterminal-0.7.1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils gnome2-utils - -DESCRIPTION="Qt-based multitab terminal emulator" -HOMEPAGE="https://github.com/lxde/qterminal"; -SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - ~x11-libs/qtermwidget-${PV} -" -DEPEND="${RDEPEND}" - -PATCHES=( "${FILESDIR}/${PN}-0.7.1-no-liblxqt.patch" ) - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/files/, x11-terms/qterminal/
commit: 096c3cbdffa617c2078740f0a6e4a3261bebd874 Author: Jonathan Scruggs gmail com> AuthorDate: Wed Jul 11 15:21:11 2018 + Commit: Jonathan Scruggs gentoo org> CommitDate: Sat Aug 11 10:09:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=096c3cbd x11-terms/qterminal: version update to 0.9.0 Closes: https://bugs.gentoo.org/636560 x11-terms/qterminal/Manifest | 1 + .../qterminal/files/qterminal-0.9.0-nofetch.patch | 28 x11-terms/qterminal/qterminal-0.9.0.ebuild | 50 ++ 3 files changed, 79 insertions(+) diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest index d81b418290e..5e31db7e865 100644 --- a/x11-terms/qterminal/Manifest +++ b/x11-terms/qterminal/Manifest @@ -1 +1,2 @@ DIST qterminal-0.7.1.tar.xz 99164 BLAKE2B d1f831cc8eb9ff5ba4a81325a29461d698addcfcba44e0881b0f5adfc20ec2dda5b408e8909e7a3faa3c0a283cff805b91cfb31c41ef6d02fbf99a9936409357 SHA512 45f83a4179a90379678b7875de386e04c77505d89d8c0c447a0892a279bc1776d0847a54683d43af085bcb306cc0e4d0858f1c49dc6e0e08f549d7350584625d +DIST qterminal-0.9.0.tar.xz 107072 BLAKE2B 08673e6cde08d9b95a1197d8125a2997e3f28be4e2825bb7b3a757f01ba7a29808c71eb22d80ba1b3c92885230c275414b501120316be91af9f623f3ff05b4e0 SHA512 42553a847873e71543161855b6f07b521ebf7db8091a1753dfc4ad4bbdf7f074f74b7e7195e56ee482b5b9ff3ea3037250ba74fb64a8137fb3959fceaa2baa6e diff --git a/x11-terms/qterminal/files/qterminal-0.9.0-nofetch.patch b/x11-terms/qterminal/files/qterminal-0.9.0-nofetch.patch new file mode 100644 index 000..646d0ce0990 --- /dev/null +++ b/x11-terms/qterminal/files/qterminal-0.9.0-nofetch.patch @@ -0,0 +1,28 @@ +From 26907a1bffbd975529598a3dea2094448a43fe93 Mon Sep 17 00:00:00 2001 +From: Alf Gaida +Date: Tue, 5 Jun 2018 22:21:48 +0200 +Subject: [PATCH] Removed translation related git stuff from CMakeLists.txt + +--- + CMakeLists.txt | 8 + 1 file changed, 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6e45aa1..f92aa79 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -125,14 +125,6 @@ lxqt_translate_ts(QTERM_QM + ${QTERM_UI_SRC} + ${QTERM_MOC_SRC} + TRANSLATION_DIR "src/translations" +-PULL_TRANSLATIONS +-${PULL_TRANSLATIONS} +-CLEAN_TRANSLATIONS +-${CLEAN_TRANSLATIONS} +-TRANSLATIONS_REPO +-${TRANSLATIONS_REPO} +-TRANSLATIONS_REFSPEC +-${TRANSLATIONS_REFSPEC} + ) + + include_directories( diff --git a/x11-terms/qterminal/qterminal-0.9.0.ebuild b/x11-terms/qterminal/qterminal-0.9.0.ebuild new file mode 100644 index 000..6b2342fe629 --- /dev/null +++ b/x11-terms/qterminal/qterminal-0.9.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eapi7-ver gnome2-utils xdg-utils + +if [[ ${PV} = ** ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"; +else + SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"; + KEYWORDS="~amd64 ~arm ~arm64 ~x86" +fi + +DESCRIPTION="Qt-based multitab terminal emulator" +HOMEPAGE="https://lxqt.org/"; + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="0" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5= + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + =x11-libs/qtermwidget-$(ver_cut 1-2)*:* +" +DEPEND="${RDEPEND} + >=dev-util/lxqt-build-tools-0.5.0 +" + +src_configure() { + local mycmakeargs=( + -DPULL_TRANSLATIONS=OFF + ) + cmake-utils_src_configure +} + +pkg_postinst() { + xdg_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update +}
[gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/files/, x11-terms/qterminal/
commit: bc58082d602c5a14a977dbc715679029587e70ba Author: Michael Palimaka gentoo org> AuthorDate: Mon Mar 13 03:17:12 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Mar 13 03:18:31 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc58082d x11-terms/qterminal: remove old Package-Manager: Portage-2.3.4, Repoman-2.3.2 x11-terms/qterminal/Manifest | 2 - .../qterminal/files/qterminal-no-liblxqt.patch | 52 -- x11-terms/qterminal/qterminal-0.6.0-r1.ebuild | 40 - x11-terms/qterminal/qterminal-0.7.0.ebuild | 38 4 files changed, 132 deletions(-) diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest index 276a0cba65b..2fc01a56cb6 100644 --- a/x11-terms/qterminal/Manifest +++ b/x11-terms/qterminal/Manifest @@ -1,3 +1 @@ -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-no-liblxqt.patch b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch deleted file mode 100644 index f2a9795fb48..000 --- a/x11-terms/qterminal/files/qterminal-no-liblxqt.patch +++ /dev/null @@ -1,52 +0,0 @@ -Translations are fetched from upstream git repo at build time, so disable them. - a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,15 +29,15 @@ - # 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) - #Note: no run-time dependency on liblxqt, just a build dependency for lxqt_translate_ts/desktop --find_package(lxqt REQUIRED) --include(LXQtTranslateTs) -+#find_package(lxqt 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-0.6.0-r1.ebuild b/x11-terms/qterminal/qterminal-0.6.0-r1.ebuild deleted file mode 100644 index 348105afa99..000 --- a/x11-terms/qterminal/qterminal-0.6.0-r1.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit cmake-utils - -DESCRIPTION="Qt-based multitab terminal emulator" -HOMEPAGE="https://github.com/lxde/qterminal"; -SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"; - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="qt5" - -RDEPEND=" - !qt5? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - x11-libs/libqxt - ~x11-libs/qtermwidget-${PV}[qt4] - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ~x11-libs/qtermwidget-${PV}[qt5] - ) -" -DEPEND="${RDEPEND} - qt5? ( dev-qt/linguist-tools
[gentoo-commits] repo/gentoo:master commit in: x11-terms/qterminal/files/, x11-terms/qterminal/
commit: 74566133ba68d9722535ce8dc04cea89667bc8aa Author: Michael Palimaka gentoo org> AuthorDate: Thu Oct 6 17:08:27 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Oct 6 17:09:15 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74566133 x11-terms/qterminal: version bump Gentoo-bug: 596232 Package-Manager: portage-2.3.1 x11-terms/qterminal/Manifest | 1 + .../qterminal/files/qterminal-no-liblxqt.patch | 52 ++ x11-terms/qterminal/qterminal-0.7.0.ebuild | 39 x11-terms/qterminal/qterminal-.ebuild | 44 +- 4 files changed, 113 insertions(+), 23 deletions(-) diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest index 3b3a2bb..2b10758 100644 --- a/x11-terms/qterminal/Manifest +++ b/x11-terms/qterminal/Manifest @@ -1 +1,2 @@ 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 diff --git a/x11-terms/qterminal/files/qterminal-no-liblxqt.patch b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch new file mode 100644 index ..f2a9795 --- /dev/null +++ b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch @@ -0,0 +1,52 @@ +Translations are fetched from upstream git repo at build time, so disable them. + +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -29,15 +29,15 @@ + # 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) + #Note: no run-time dependency on liblxqt, just a build dependency for lxqt_translate_ts/desktop +-find_package(lxqt REQUIRED) +-include(LXQtTranslateTs) ++#find_package(lxqt 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-0.7.0.ebuild b/x11-terms/qterminal/qterminal-0.7.0.ebuild new file mode 100644 index ..f3a882e --- /dev/null +++ b/x11-terms/qterminal/qterminal-0.7.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit cmake-utils gnome2-utils + +DESCRIPTION="Qt-based multitab terminal emulator" +HOMEPAGE="https://github.com/lxde/qterminal"; +SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"; + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + ~x11-libs/qtermwidget-${PV} +" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" ) + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update +} + +pkg_postrm() { + gnome2_icon_cache_update +} diff --git a/x11-terms/qterminal/qterminal-.ebuild b/x11-terms/qterminal/qterminal-.ebuild index 2d55241..8d6dc6a 100644 --- a/x11-terms/qterminal/qterminal-.ebuild +++ b/x11-terms/qterminal/qterminal-.ebuild @@ -3,7 +3,7 @@ # $Id$ EAPI=6 -inherit cmake-utils git-r3 +inherit cmake-utils git-r3 gnome2-utils DESCRIPTION="Qt-based multitab terminal emulator"