From nobody Tue Aug 23 06:41:33 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MBflK7228z4Zb73; Tue, 23 Aug 2022 06:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MBflK4qNkz3brp; Tue, 23 Aug 2022 06:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661236893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kxe+VoXtt1+Qm5PRwRKg9YFOpvLXIKl48AUY2XGTyRM=; b=tmfiJX0E0ODma0kgg9d8JGwz3I0ql2V8salx7KIEUvNgQ3i2o08wn0hGr4B0SRzwAJGXJz TdrNgNlIXUXR6bm1Jmrkek9jEpnOVea1ZSh9eEvjiOnFtdhE52wSHVmbU0MvHY4nuWbmCW fHfPaFc/DEsREr9kRTAnSSfPy97yUyGqVS5j5XBbxqz+zKr0m2CuBw649jpWoZQXRg8peX WNlXu+3XfPruCECemob6kFxcxql8/p0U7YpiSs8roTs3E9+0WeHqIg0hANbKxN8U4a77tU UeGTYa9Gh9oxoOCZS4oIB+NFKNkEyGWDhrUw9nfIINPyodkKXYcUQp4PiY4gUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MBflK3vtSzL3G; Tue, 23 Aug 2022 06:41:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27N6fXVU062543; Tue, 23 Aug 2022 06:41:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27N6fXEv062542; Tue, 23 Aug 2022 06:41:33 GMT (envelope-from git) Date: Tue, 23 Aug 2022 06:41:33 GMT Message-Id: <202208230641.27N6fXEv062542@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 0e4136d42114 - main - x11-themes/adwaita-qt6: new port - adwaita theme for Qt6 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0e4136d42114c04a431cdd86c06202007d1185c2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661236893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kxe+VoXtt1+Qm5PRwRKg9YFOpvLXIKl48AUY2XGTyRM=; b=KwV/GqdWBIKbwNqvJMJlHu9rSA+fnlOk11QJqP/cSsuUpyiHn9yD8cpl758WLB3m0aQX4P f+Rhm1kteFkEOlpD6SBfc7/kayWYT6Y13kdWpQF51cF5uU15IwmsWXZyALwLatUytADL4r aBOMNu3bt1OnQFjwfLBs8H/i8VtHYjMejVAvvQVejqE8Sxf0XNRsCsMY5nw9pdl69kMfWg gnMI4gfiXHnEq606UQYvnXl+9apanPZAj/7wkEBRyDZVcgNKNt4ulMCr5cJ85DQW42CQBo EGpR43RcxT5dQAILDlbaRu1As9CpOheFpAb/Tqxu7vCMXLEL0x1nRuDLpDVSog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661236893; a=rsa-sha256; cv=none; b=N9bQpj9aNyUk5Pa2omre9lAtH7enfQQMfSB9c4CGajeye6ugEoZiMYRJWtnrLdPQyb1TSo bv3oKH9J6kYftcY8JgAa9MCPfOZKtL082DT//bdP7upXo/0VQ9j3VVKzGpEhe5kxxd9jvb UhoIm/MfOuSSdl0UDOqi5/lPF+PwqVTWJ81YyqIhnBRyLazxlBKtNRJ4G1FumihVG/5hRW Xb2Ha0vL+Ts99Lw5DQm/bJvEWm6zfRjLTebOvz5hag+p6qUXZwajc+MU5sl6a4RyxIdUbJ jbSFQUjuRZiOxAXmNnLO0UgXW4NC566DQMCibhGsxiGp6OmPgbbYGzGWRYIcPw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=0e4136d42114c04a431cdd86c06202007d1185c2 commit 0e4136d42114c04a431cdd86c06202007d1185c2 Author: Tobias C. Berner AuthorDate: 2022-08-23 06:39:58 +0000 Commit: Tobias C. Berner 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 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 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"