Date: Tue, 23 Aug 2022 06:41:33 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0e4136d42114 - main - x11-themes/adwaita-qt6: new port - adwaita theme for Qt6 Message-ID: <202208230641.27N6fXEv062542@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e4136d42114c04a431cdd86c06202007d1185c2 commit 0e4136d42114c04a431cdd86c06202007d1185c2 Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2022-08-23 06:39:58 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2022-08-23 06:39:58 +0000 x11-themes/adwaita-qt6: new port - adwaita theme for Qt6 - move x11-themes/adwaita-qt to x11-themes/adwaita-qt5 for symmetry --- MOVED | 1 + x11-themes/Makefile | 3 ++- x11-themes/adwaita-qt/Makefile | 23 ----------------- x11-themes/adwaita-qt/pkg-plist | 16 ------------ x11-themes/adwaita-qt5/Makefile | 33 ++++++++++++++++++++++++ x11-themes/{adwaita-qt => adwaita-qt5}/distinfo | 0 x11-themes/{adwaita-qt => adwaita-qt5}/pkg-descr | 0 x11-themes/adwaita-qt5/pkg-plist | 16 ++++++++++++ x11-themes/adwaita-qt6/Makefile | 4 +++ 9 files changed, 56 insertions(+), 40 deletions(-) diff --git a/MOVED b/MOVED index 1f134a11a536..ec70a6f86b2b 100644 --- a/MOVED +++ b/MOVED @@ -17539,3 +17539,4 @@ mail/roundcube-umich||2022-08-05|Removed, broken and no upstream updates science/openkim|science/openkim-models|2022-08-07|Retire obsolete science/openkim, users should install science/openkim-models instead net/zeroconf-ioslave|net/kio-zeroconf|2022-08-18|Renamed upstream japanese/font-hackgen-nerd|japanese/font-hackgen-nf|2022-08-20|Renamed upstream +x11-themes/adwaita-qt|x11-themes/adwaita-qt5|2022-08-23|Renamed to make space for x11-themes/adwaita-qt6 diff --git a/x11-themes/Makefile b/x11-themes/Makefile index 178e8eb094b7..9be704681c93 100644 --- a/x11-themes/Makefile +++ b/x11-themes/Makefile @@ -4,7 +4,8 @@ SUBDIR += adapta-backgrounds SUBDIR += adapta-gtk-theme SUBDIR += adwaita-icon-theme - SUBDIR += adwaita-qt + SUBDIR += adwaita-qt5 + SUBDIR += adwaita-qt6 SUBDIR += ant-dracula-theme SUBDIR += arc-gruvbox-theme SUBDIR += audacious-skins diff --git a/x11-themes/adwaita-qt/Makefile b/x11-themes/adwaita-qt/Makefile deleted file mode 100644 index 6c25a8b5d162..000000000000 --- a/x11-themes/adwaita-qt/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -PORTNAME= adwaita-qt -DISTVERSION= 1.4.1 -CATEGORIES= x11-themes -PKGNAMESUFFIX= 5 - -MAINTAINER= tcberner@FreeBSD.org -COMMENT= Adwaita theme for Qt applications - -LICENSE= GPLv2 LGPL20 -LICENSE_COMB= multi - -BUILD_DEPENDS= sassc:textproc/sassc - -USES= cmake compiler:c++11-lib localbase pkgconfig qt:5 xorg -USE_QT= core dbus gui widgets x11extras \ - buildtools_build qmake_build -USE_XORG= xcb -CMAKE_OFF= USE_QT4 - -USE_GITHUB= yes -GH_ACCOUNT= FedoraQt - -.include <bsd.port.mk> diff --git a/x11-themes/adwaita-qt/pkg-plist b/x11-themes/adwaita-qt/pkg-plist deleted file mode 100644 index cab3ae1ff8ca..000000000000 --- a/x11-themes/adwaita-qt/pkg-plist +++ /dev/null @@ -1,16 +0,0 @@ -include/AdwaitaQt/adwaita.h -include/AdwaitaQt/adwaitacolors.h -include/AdwaitaQt/adwaitaqt_export.h -include/AdwaitaQt/adwaitarenderer.h -lib/cmake/AdwaitaQt/AdwaitaQtConfig.cmake -lib/cmake/AdwaitaQt/AdwaitaQtConfigVersion.cmake -lib/cmake/AdwaitaQt/AdwaitaQtTargets-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/AdwaitaQt/AdwaitaQtTargets.cmake -lib/libadwaitaqt.so -lib/libadwaitaqt.so.1 -lib/libadwaitaqt.so.1.4.1 -lib/libadwaitaqtpriv.so -lib/libadwaitaqtpriv.so.1 -lib/libadwaitaqtpriv.so.1.4.1 -%%QT_PLUGINDIR%%/styles/adwaita.so -libdata/pkgconfig/adwaita-qt.pc diff --git a/x11-themes/adwaita-qt5/Makefile b/x11-themes/adwaita-qt5/Makefile new file mode 100644 index 000000000000..f532bc925251 --- /dev/null +++ b/x11-themes/adwaita-qt5/Makefile @@ -0,0 +1,33 @@ +PORTNAME= adwaita-qt +DISTVERSION= 1.4.1 +CATEGORIES= x11-themes +PKGNAMESUFFIX= ${_qt_version} + +MAINTAINER= tcberner@FreeBSD.org +COMMENT= Adwaita theme for Qt applications + +LICENSE= GPLv2 LGPL20 +LICENSE_COMB= multi + +BUILD_DEPENDS= sassc:textproc/sassc + +USES= cmake compiler:c++11-lib localbase pkgconfig qt:${_qt_version} xorg +USE_GITHUB= yes +GH_ACCOUNT= FedoraQt +USE_QT= ${_qt${_qt_version}_use} +USE_XORG= xcb +CMAKE_ARGS= -DUSE_QT6=${_qt${_qt_version}_qt6_on} + +PLIST_SUB= ${_qt${_qt_version}_plist_sub} + +# Handle Qt 5 and Qt 6 +_qt_version?= 5 +_qt5_qt6_on= OFF +_qt6_qt6_on= ON +_qt5_use= core dbus gui widgets x11extras \ + buildtools_build qmake_build +_qt6_use= base +_qt5_plist_sub= QT_VERSION_SUFFIX= +_qt6_plist_sub= QT_VERSION_SUFFIX=6 + +.include <bsd.port.mk> diff --git a/x11-themes/adwaita-qt/distinfo b/x11-themes/adwaita-qt5/distinfo similarity index 100% rename from x11-themes/adwaita-qt/distinfo rename to x11-themes/adwaita-qt5/distinfo diff --git a/x11-themes/adwaita-qt/pkg-descr b/x11-themes/adwaita-qt5/pkg-descr similarity index 100% rename from x11-themes/adwaita-qt/pkg-descr rename to x11-themes/adwaita-qt5/pkg-descr diff --git a/x11-themes/adwaita-qt5/pkg-plist b/x11-themes/adwaita-qt5/pkg-plist new file mode 100644 index 000000000000..bc90e8177ee8 --- /dev/null +++ b/x11-themes/adwaita-qt5/pkg-plist @@ -0,0 +1,16 @@ +include/AdwaitaQt%%QT_VERSION_SUFFIX%%/adwaita.h +include/AdwaitaQt%%QT_VERSION_SUFFIX%%/adwaitacolors.h +include/AdwaitaQt%%QT_VERSION_SUFFIX%%/adwaitaqt_export.h +include/AdwaitaQt%%QT_VERSION_SUFFIX%%/adwaitarenderer.h +lib/cmake/AdwaitaQt%%QT_VERSION_SUFFIX%%/AdwaitaQt%%QT_VERSION_SUFFIX%%Config.cmake +lib/cmake/AdwaitaQt%%QT_VERSION_SUFFIX%%/AdwaitaQt%%QT_VERSION_SUFFIX%%ConfigVersion.cmake +lib/cmake/AdwaitaQt%%QT_VERSION_SUFFIX%%/AdwaitaQt%%QT_VERSION_SUFFIX%%Targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/AdwaitaQt%%QT_VERSION_SUFFIX%%/AdwaitaQt%%QT_VERSION_SUFFIX%%Targets.cmake +lib/libadwaitaqt%%QT_VERSION_SUFFIX%%.so +lib/libadwaitaqt%%QT_VERSION_SUFFIX%%.so.1 +lib/libadwaitaqt%%QT_VERSION_SUFFIX%%.so.1.4.1 +lib/libadwaitaqt%%QT_VERSION_SUFFIX%%priv.so +lib/libadwaitaqt%%QT_VERSION_SUFFIX%%priv.so.1 +lib/libadwaitaqt%%QT_VERSION_SUFFIX%%priv.so.1.4.1 +%%QT_PLUGINDIR%%/styles/adwaita.so +libdata/pkgconfig/adwaita-qt%%QT_VERSION_SUFFIX%%.pc diff --git a/x11-themes/adwaita-qt6/Makefile b/x11-themes/adwaita-qt6/Makefile new file mode 100644 index 000000000000..102e8a0dae4d --- /dev/null +++ b/x11-themes/adwaita-qt6/Makefile @@ -0,0 +1,4 @@ +_qt_version= 6 + +MASTERDIR= ${.CURDIR}/../adwaita-qt5 +.include "${MASTERDIR}/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208230641.27N6fXEv062542>