diff options
| -rw-r--r-- | x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch | 41 | ||||
| -rw-r--r-- | x11-libs/qtermwidget/qtermwidget-9999.ebuild | 37 |
2 files changed, 21 insertions, 57 deletions
diff --git a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch b/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch deleted file mode 100644 index a4827d6dbb8b..000000000000 --- a/x11-libs/qtermwidget/files/qtermwidget-9999-nofetch.patch +++ /dev/null @@ -1,41 +0,0 @@ -Do not fetch translations using git at build time. - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -29,9 +29,7 @@ - set(CMAKE_INCLUDE_CURRENT_DIR ON) - - find_package(Qt5Widgets "${REQUIRED_QT_VERSION}" REQUIRED) --find_package(Qt5LinguistTools "${REQUIRED_QT_VERSION}" REQUIRED) - find_package(lxqt-build-tools ${LXQTBT_MINIMUM_VERSION} REQUIRED) --include(LXQtTranslateTs) - include(LXQtCompilerSettings NO_POLICY_SCOPE) - include(LXQtCreatePkgConfigFile) - -@@ -117,26 +115,6 @@ - qt5_wrap_ui(UI_SRCS ${UI}) - set(PKG_CONFIG_REQ "Qt5Widgets") - --lxqt_translate_ts(QTERMWIDGET_QM -- TRANSLATION_DIR "lib/translations" -- UPDATE_TRANSLATIONS -- ${UPDATE_TRANSLATIONS} -- SOURCES -- ${SRCS} ${HDRS} ${UI} -- PULL_TRANSLATIONS -- ${PULL_TRANSLATIONS} -- CLEAN_TRANSLATIONS -- ${CLEAN_TRANSLATIONS} -- TRANSLATIONS_REPO -- ${TRANSLATIONS_REPO} -- TRANSLATIONS_REFSPEC -- ${TRANSLATIONS_REFSPEC} -- INSTALL_DIR -- ${TRANSLATIONS_DIR} -- COMPONENT -- Runtime --) -- - add_library(${QTERMWIDGET_LIBRARY_NAME} SHARED ${SRCS} ${MOCS} ${UI_SRCS} ${QTERMWIDGET_QM}) - target_link_libraries(${QTERMWIDGET_LIBRARY_NAME} Qt5::Widgets) - set_target_properties( ${QTERMWIDGET_LIBRARY_NAME} PROPERTIES diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild index cda15baf682a..9c367cc15cbc 100644 --- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild +++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild @@ -1,26 +1,31 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit cmake-utils git-r3 +EAPI=7 + +inherit cmake-utils DESCRIPTION="Qt terminal emulator widget" -HOMEPAGE="https://github.com/lxde/qtermwidget" -EGIT_REPO_URI="https://github.com/lxde/qtermwidget.git" +HOMEPAGE="https://lxqt.org/" + +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="" +LICENSE="BSD GPL-2 LGPL-2+" +SLOT="0/${PV}" -RDEPEND=" +BDEPEND=" + dev-qt/linguist-tools:5 + >=dev-util/lxqt-build-tools-0.6.0 +" +DEPEND=" dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 " -DEPEND="${DEPEND} - dev-util/lxqt-build-tools - dev-qt/linguist-tools:5 -" - -PATCHES=( "${FILESDIR}/${P}-nofetch.patch" ) +RDEPEND="${DEPEND}" |