update to cool-retro-term-1.2.0

This commit is contained in:
sthen 2022-08-15 16:20:53 +00:00
parent 425dc250e1
commit bb43d38e11
4 changed files with 17 additions and 51 deletions

View File

@ -4,10 +4,10 @@ CATEGORIES = x11
GH_ACCOUNT = Swordfish90
GH_PROJECT = cool-retro-term
GH_TAGNAME = 1.1.1
REVISION = 2
GH_TAGNAME = 1.2.0
QMLTERMWIDGET = 48274c75660e28d44af7c195e79accdf1bd44963
# check version in submodule at https://github.com/Swordfish90/cool-retro-term
QMLTERMWIDGET = 63228027e1f97c24abb907550b22ee91836929c5
MASTER_SITES0 = https://github.com/Swordfish90/qmltermwidget/archive/
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
qmltermwidget-{}${QMLTERMWIDGET}.tar.gz:0
@ -19,9 +19,9 @@ HOMEPAGE = https://github.com/Swordfish90/cool-retro-term
# GPLv3 only
PERMIT_PACKAGE = Yes
WANTLIB += GL Qt5Core Qt5Gui Qt5Network Qt5Qml Qt5Quick Qt5Sql
WANTLIB += Qt5Widgets Qt5QmlModels c m pthread
WANTLIB += ${COMPILER_LIBCXX}
WANTLIB += GL Qt5Core Qt5Gui Qt5Network Qt5Qml Qt5QmlModels Qt5Quick
WANTLIB += Qt5QuickControls2 Qt5Sql Qt5Widgets c m
MODULES = devel/qmake x11/qt5
@ -30,7 +30,9 @@ RUN_DEPENDS = devel/desktop-file-utils \
x11/qt5/qtgraphicaleffects \
x11/qt5/qtquickcontrols
LIB_DEPENDS = x11/qt5/qtdeclarative
# (yes, both qtquickcontrols + qtquickcontrols2)
LIB_DEPENDS = x11/qt5/qtdeclarative \
x11/qt5/qtquickcontrols2
MAKE_FLAGS = CXX="${CXX}" CXXFLAGS="${CXXFLAGS} -fPIC -std=c++11"

View File

@ -1,4 +1,4 @@
SHA256 (cool-retro-term-1.1.1.tar.gz) = ElK6+jPIvvu4ZSjtdduYZ3zcEphwTbco4yb/0ljV7RM=
SHA256 (qmltermwidget-48274c75660e28d44af7c195e79accdf1bd44963.tar.gz) = oU1pZMHuvpKELoJK+GBr4ilbYbsmCUWl1eh2lDxGjiY=
SIZE (cool-retro-term-1.1.1.tar.gz) = 1975853
SIZE (qmltermwidget-48274c75660e28d44af7c195e79accdf1bd44963.tar.gz) = 219645
SHA256 (cool-retro-term-1.2.0.tar.gz) = aL0xN0OZQeYlOpfH3NJ7VTzk12yMOOf422PbTWzHAAs=
SHA256 (qmltermwidget-63228027e1f97c24abb907550b22ee91836929c5.tar.gz) = Zy7qA9pcJhfIjs40m9jSU9eQvi49VCnA5eLWglKVGN0=
SIZE (cool-retro-term-1.2.0.tar.gz) = 1996540
SIZE (qmltermwidget-63228027e1f97c24abb907550b22ee91836929c5.tar.gz) = 235028

View File

@ -1,36 +0,0 @@
Adapt to modern Qt versions.
See pull request: https://github.com/Swordfish90/qmltermwidget/pull/10
--- qmltermwidget/qmltermwidget.pro.orig Fri Jan 30 22:30:12 2015
+++ qmltermwidget/qmltermwidget.pro Mon Dec 28 21:11:44 2015
@@ -25,12 +25,6 @@ OTHER_FILES += \
test-app/test-app.qml \
src/qmldir
-# Copy the files useful to the plugin in DESTDIR
-QMAKE_POST_LINK = $(COPY_DIR) $$PWD/lib/color-schemes $$DESTDIR && \
- $(COPY_DIR) $$PWD/lib/kb-layouts $$DESTDIR && \
- $$QMAKE_COPY $$PWD/src/qmldir $$DESTDIR && \
- $$QMAKE_COPY $$PWD/src/QMLTermScrollbar.qml $$DESTDIR
-
#########################################
## INTALLS
#########################################
@@ -49,4 +43,17 @@ assets.path += $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH
qmldir.files += $$PWD/src/qmldir
qmldir.path += $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH
-INSTALLS += target qmldir assets
+colorschemes.files = $$PWD/lib/color-schemes/*
+colorschemes.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/color-schemes
+colorschemes2.files = $$PWD/lib/color-schemes/historic/*
+colorschemes2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/color-schemes/historic
+
+kblayouts.files = $$PWD/lib/kb-layouts/*
+kblayouts.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts
+kblayouts2.files = $$PWD/lib/kb-layouts/historic/*
+kblayouts2.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH/kb-layouts/historic
+
+scrollbar.files = $$PWD/src/QMLTermScrollbar.qml
+scrollbar.path = $$INSTALL_DIR/$$PLUGIN_IMPORT_PATH
+
+INSTALLS += target qmldir assets colorschemes colorschemes2 kblayouts kblayouts2 scrollbar

View File

@ -2,9 +2,9 @@
lib/qt5/qml/QMLTermWidget/
lib/qt5/qml/QMLTermWidget/QMLTermScrollbar.qml
lib/qt5/qml/QMLTermWidget/color-schemes/
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnLightYellow.schema
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnLightYellow.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnRandomLight.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnWhite.schema
lib/qt5/qml/QMLTermWidget/color-schemes/BlackOnWhite.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/BreezeModified.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/DarkPastels.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/GreenOnBlack.colorscheme
@ -13,8 +13,8 @@ lib/qt5/qml/QMLTermWidget/color-schemes/Solarized.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/SolarizedLight.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/Tango.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/Ubuntu.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/WhiteOnBlack.schema
lib/qt5/qml/QMLTermWidget/color-schemes/cool-retro-term.schema
lib/qt5/qml/QMLTermWidget/color-schemes/WhiteOnBlack.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/cool-retro-term.colorscheme
lib/qt5/qml/QMLTermWidget/color-schemes/historic/
lib/qt5/qml/QMLTermWidget/color-schemes/historic/BlackOnLightColor.schema
lib/qt5/qml/QMLTermWidget/color-schemes/historic/DarkPicture.schema
@ -43,7 +43,7 @@ lib/qt5/qml/QMLTermWidget/kb-layouts/linux.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/macbook.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/solaris.keytab
lib/qt5/qml/QMLTermWidget/kb-layouts/vt420pc.keytab
lib/qt5/qml/QMLTermWidget/libqmltermwidget.so
@so lib/qt5/qml/QMLTermWidget/libqmltermwidget.so
lib/qt5/qml/QMLTermWidget/qmldir
share/applications/cool-retro-term.desktop
share/icons/hicolor/128x128/apps/cool-retro-term.png