diff options
| author |   Jimi Huotari <chiitoo@gentoo.org> | 2019-03-08 00:11:41 +0200 |
|---|---|---|
| committer |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-03-10 23:45:48 +0100 |
| commit | 4f8ecca5a51df1fac44c814b4af5c33e62198577 (patch) | |
| tree | a1d9da7ffc4347e8776efd7b3cd22a8e43223f4b /x11-terms | |
| parent | x11-libs/qtermwidget: version bump to 0.14.1 (diff) | |
| download | gentoo-4f8ecca5a51df1fac44c814b4af5c33e62198577.tar.gz gentoo-4f8ecca5a51df1fac44c814b4af5c33e62198577.tar.bz2 gentoo-4f8ecca5a51df1fac44c814b4af5c33e62198577.zip | |
x11-terms/qterminal: apply general updates
- Remove 'nofetch' patch, which does not apply any longer as it is,
and upstream has changed their translation set-up away from
'lxqt-base/lxqt-l10n', so disabling them may need a different
approach.
- Bump the required 'lxqt-build-tools' version.
- Use the same formatting for SRC_URI and friends, as is used in
other related packages.
- Update SRC_URI, HOMEPAGE, LICENSE, and SLOT
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Jimi Huotari <chiitoo@gentoo.org>
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'x11-terms')
| -rw-r--r-- | x11-terms/qterminal/files/qterminal-9999-nofetch.patch | 36 | ||||
| -rw-r--r-- | x11-terms/qterminal/qterminal-9999.ebuild | 21 |
2 files changed, 12 insertions, 45 deletions
diff --git a/x11-terms/qterminal/files/qterminal-9999-nofetch.patch b/x11-terms/qterminal/files/qterminal-9999-nofetch.patch deleted file mode 100644 index 72876c954a0e..000000000000 --- a/x11-terms/qterminal/files/qterminal-9999-nofetch.patch +++ /dev/null @@ -1,36 +0,0 @@ -Do not fetch translations using git at build time. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -24,7 +24,6 @@ - endif() - find_package(QTermWidget5 REQUIRED) - find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) --include(LXQtTranslateTs) - include(LXQtCompilerSettings NO_POLICY_SCOPE) - message(STATUS "Qt version: ${Qt5Core_VERSION}") - -@@ -108,23 +107,6 @@ - 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 -- UPDATE_TRANSLATIONS -- ${UPDATE_TRANSLATIONS} -- SOURCES -- ${QTERM_SRC} -- ${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( - "${PROJECT_SOURCE_DIR}" diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild index f63d5d11ad3e..f7797f360159 100644 --- a/x11-terms/qterminal/qterminal-9999.ebuild +++ b/x11-terms/qterminal/qterminal-9999.ebuild @@ -3,18 +3,23 @@ EAPI=7 -inherit cmake-utils git-r3 xdg-utils +inherit cmake-utils xdg-utils DESCRIPTION="Qt-based multitab terminal emulator" -HOMEPAGE="https://github.com/lxde/qterminal" -EGIT_REPO_URI="https://github.com/lxde/qterminal.git" +HOMEPAGE="https://lxqt.org/" -LICENSE="GPL-2+" +if [[ ${PV} = *9999* ]]; 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 + +LICENSE="GPL-2" SLOT="0" -KEYWORDS="" -IUSE="" -BDEPEND="dev-util/lxqt-build-tools" +BDEPEND=">=dev-util/lxqt-build-tools-0.6.0" DEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 @@ -25,8 +30,6 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-nofetch.patch" ) - pkg_postinst() { xdg_icon_cache_update } |