Date: Fri, 5 Jan 2024 15:09:04 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 93bb990ed5d6 - main - x11/hyprland-share-picker: merge into main port Message-ID: <202401051509.405F941V005625@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=93bb990ed5d68768165c8699616083ab9127d834 commit 93bb990ed5d68768165c8699616083ab9127d834 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-01-05 14:44:14 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-01-05 15:07:55 +0000 x11/hyprland-share-picker: merge into main port --- MOVED | 1 + x11/Makefile | 1 - x11/hyprland-share-picker/Makefile | 35 -------------------------------- x11/hyprland-share-picker/distinfo | 3 --- x11/hyprland-share-picker/pkg-descr | 1 - x11/xdg-desktop-portal-hyprland/Makefile | 19 +++++++++-------- 6 files changed, 12 insertions(+), 48 deletions(-) diff --git a/MOVED b/MOVED index dc1c09dff838..fea2448084dd 100644 --- a/MOVED +++ b/MOVED @@ -2928,3 +2928,4 @@ textproc/py-grako||2023-12-31|Project is abandoned math/p5-Math-BigRat|math/p5-Math-BigInt|2024-01-01|Subsumed into math/p5-Math-BigInt www/trac-devel|www/trac|2024-01-02|Trac released stable version with py3 support, so removing -devel port sysutils/rtx|sysutils/mise|2024-01-03|Project renamed +x11/hyprland-share-picker|x11/xdg-desktop-portal-hyprland|2024-01-05|Merged into main port diff --git a/x11/Makefile b/x11/Makefile index 91b77c65c73b..85d748ae781f 100644 --- a/x11/Makefile +++ b/x11/Makefile @@ -119,7 +119,6 @@ SUBDIR += hs-xmobar SUBDIR += hsetroot SUBDIR += hybrid-bar - SUBDIR += hyprland-share-picker SUBDIR += hyprpaper SUBDIR += hyprpicker SUBDIR += i3bar-river diff --git a/x11/hyprland-share-picker/Makefile b/x11/hyprland-share-picker/Makefile deleted file mode 100644 index 3f1498af3768..000000000000 --- a/x11/hyprland-share-picker/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -PORTNAME= hyprland-share-picker -DISTVERSIONPREFIX= v -DISTVERSION= 1.3.0 -CATEGORIES= x11 wayland - -MAINTAINER= jbeich@FreeBSD.org -COMMENT= Share picker for xdg-desktop-portal-hyprland -WWW= https://github.com/hyprwm/xdg-desktop-portal-hyprland - -LICENSE= BSD3CLAUSE -LICENSE_FILE= ${WRKSRC:H}/LICENSE - -RUN_DEPENDS= slurp:x11/slurp - -FLAVORS= qt5 qt6 - -USES= compiler:c++11-lib cmake qt:5 -USE_GITHUB= yes -USE_QT= qmake:build buildtools:build core gui wayland:run widgets -GH_ACCOUNT= hyprwm -GH_PROJECT= xdg-desktop-portal-hyprland -WRKSRC_SUBDIR= ${PORTNAME} -LDFLAGS+= -Wl,--as-needed # GL -PLIST_FILES= bin/${PORTNAME} - -.if ${FLAVOR:U} == qt6 -PKGNAMESUFFIX= -${FLAVOR} -USES:= ${USES:S/qt:5/qt:6/} -USE_QT= base wayland:run -CONFLICTS_INSTALL= ${PORTNAME} -.else -CONFLICTS_INSTALL= ${PORTNAME}-qt6 -.endif - -.include <bsd.port.mk> diff --git a/x11/hyprland-share-picker/distinfo b/x11/hyprland-share-picker/distinfo deleted file mode 100644 index 1c8627770e1d..000000000000 --- a/x11/hyprland-share-picker/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1704308317 -SHA256 (hyprwm-xdg-desktop-portal-hyprland-v1.3.0_GH0.tar.gz) = ea15bad792320dd02f63141eff5d8d8355034102697f6cb97d5148b3a45cd7cf -SIZE (hyprwm-xdg-desktop-portal-hyprland-v1.3.0_GH0.tar.gz) = 46729 diff --git a/x11/hyprland-share-picker/pkg-descr b/x11/hyprland-share-picker/pkg-descr deleted file mode 100644 index 8ca48a6ed474..000000000000 --- a/x11/hyprland-share-picker/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -Share picker for xdg-desktop-portal-hyprland. diff --git a/x11/xdg-desktop-portal-hyprland/Makefile b/x11/xdg-desktop-portal-hyprland/Makefile index 2b1c29f5a767..0bcfe2d7f576 100644 --- a/x11/xdg-desktop-portal-hyprland/Makefile +++ b/x11/xdg-desktop-portal-hyprland/Makefile @@ -1,6 +1,7 @@ PORTNAME= xdg-desktop-portal-hyprland DISTVERSIONPREFIX= v DISTVERSION= 1.3.0 +PORTREVISION= 1 CATEGORIES= x11 wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -26,7 +27,6 @@ LIB_DEPENDS= libhyprlang.so:devel/hyprlang \ libwayland-client.so:graphics/wayland \ libpipewire-0.3.so:multimedia/pipewire RUN_DEPENDS= grim:x11/grim \ - hyprland-share-picker:x11/hyprland-share-picker@${FLAVOR} \ slurp:x11/slurp FLAVORS= qt5 qt6 @@ -34,26 +34,29 @@ qt5_CONFLICTS_INSTALL= ${PORTNAME}-qt6 qt6_CONFLICTS_INSTALL= ${PORTNAME} qt6_PKGNAMESUFFIX= -qt6 -USES= cmake compiler:c++11-lib gl pkgconfig +USES= cmake compiler:c++11-lib gl pkgconfig qt:5 USE_GITHUB= yes USE_GL= gbm +USE_QT= qmake:build buildtools:build core gui wayland:run widgets GH_ACCOUNT= hyprwm GH_TUPLE= hyprwm:hyprland-protocols:v0.2:hyprland_protocols/subprojects/hyprland-protocols -LDFLAGS+= -Wl,--as-needed # sdbus-cpp deps -PLIST_FILES= lib/systemd/user/${PORTNAME}.service \ +LDFLAGS+= -Wl,--as-needed # GL, sdbus-cpp deps +PLIST_FILES= bin/hyprland-share-picker \ + lib/systemd/user/${PORTNAME}.service \ libexec/${PORTNAME} \ share/dbus-1/services/org.freedesktop.impl.portal.desktop.hyprland.service \ share/xdg-desktop-portal/portals/hyprland.portal +.if ${FLAVOR:U} == qt6 +USES:= ${USES:S/qt:5/qt:6/} +USE_QT= base wayland:run +.endif + # XXX Drop after FreeBSD 14.0 EOL around 2025-03-01 .if exists(/usr/lib/libc++.so) && !exists(/usr/include/c++/v1/__format/write_escaped.h) CXXFLAGS+= -fexperimental-library .endif -post-patch: -# XXX Merge with hyprland-share-picker instead - @${REINPLACE_CMD} '/hyprland-share-picker/d' ${WRKSRC}/CMakeLists.txt - # XXX Drop after FreeBSD 13.2 EOL around 2024-05-01 (don't forget distinfo) .if ${CXX} == c++ && exists(/usr/lib/libc++.so) .if !exists(/usr/include/c++/v1/__ranges/as_rvalue_view.h) || make(makesum) || make(fetch)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401051509.405F941V005625>