aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornomoo <nomoo@nomoo.ru>2025-01-12 13:18:41 +0000
committerRobert Clausecker <fuz@FreeBSD.org>2025-01-17 12:36:53 +0000
commitae9fe1bd7555cf0a35448639ef9db344ef4ce539 (patch)
treea6db6b9cf4a663c002a4cc0d7feb9b9806beadc7
parenta654373a19cd02b83ed81e40931ac296fc08155b (diff)
x11/rofi{,-wayland}: update to 1.7.7
MANPAGES option added Fix for rofi-theme-selector is in upstream, so it is working now. PR: 283951
-rw-r--r--x11/rofi-wayland/Makefile6
-rw-r--r--x11/rofi-wayland/distinfo14
-rw-r--r--x11/rofi/Makefile22
-rw-r--r--x11/rofi/distinfo14
-rw-r--r--x11/rofi/pkg-plist22
5 files changed, 44 insertions, 34 deletions
diff --git a/x11/rofi-wayland/Makefile b/x11/rofi-wayland/Makefile
index 8e67bb35e22e..8e596ded57ed 100644
--- a/x11/rofi-wayland/Makefile
+++ b/x11/rofi-wayland/Makefile
@@ -1,7 +1,8 @@
-DISTVERSION= 1.7.5
-DISTVERSIONSUFFIX= +wayland2
+DISTVERSION= 1.7.7
+DISTVERSIONSUFFIX= +wayland1
PORTREVISION= 0
PKGNAMESUFFIX= -wayland
+EXTRA_CATEGORIES= wayland
MASTERDIR= ${.CURDIR}/../rofi
DISTINFO_FILE= ${.CURDIR}/distinfo
@@ -15,4 +16,3 @@ GH_ACCOUNT= lbonn
CONFLICTS_INSTALL= ${PORTNAME}
.include "${MASTERDIR}/Makefile"
-CATEGORIES+= wayland
diff --git a/x11/rofi-wayland/distinfo b/x11/rofi-wayland/distinfo
index 807ea56bb5d8..e535470b1c11 100644
--- a/x11/rofi-wayland/distinfo
+++ b/x11/rofi-wayland/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1708761556
-SHA256 (lbonn-rofi-1.7.5+wayland2_GH0.tar.gz) = 8dec4342c5393770a86f598f4b6c5b6efcefeb6551918eff6283fdc660ab0d0a
-SIZE (lbonn-rofi-1.7.5+wayland2_GH0.tar.gz) = 696353
-SHA256 (sardemff7-libgwater-555fa6d_GH0.tar.gz) = ebb0ef22fc7d668dddbc11123858cfa818dc384ce2186769515c605f8d07f270
-SIZE (sardemff7-libgwater-555fa6d_GH0.tar.gz) = 10785
-SHA256 (sardemff7-libnkutils-d08fa89_GH0.tar.gz) = e829be3e498f8d7c55ec9e866598db98800476b91e60f1f3c76316cc91c09b75
-SIZE (sardemff7-libnkutils-d08fa89_GH0.tar.gz) = 62317
+TIMESTAMP = 1736362023
+SHA256 (lbonn-rofi-1.7.7+wayland1_GH0.tar.gz) = 9ce714d6597e4046596e2bc8df11944330713f805b307c38364ed91e7192c9b1
+SIZE (lbonn-rofi-1.7.7+wayland1_GH0.tar.gz) = 7985415
+SHA256 (sardemff7-libgwater-d86f990_GH0.tar.gz) = ecfeaeabcdd06ec1653916bc2dbe8c5d57dbc293d87d5f4ef601d029588b2ef1
+SIZE (sardemff7-libgwater-d86f990_GH0.tar.gz) = 10872
+SHA256 (sardemff7-libnkutils-72bd7fb_GH0.tar.gz) = 88439b124accd4b9aad1ee421c5f871dd516db4dbc56e7f93f115cc67030c7c3
+SIZE (sardemff7-libnkutils-72bd7fb_GH0.tar.gz) = 66176
diff --git a/x11/rofi/Makefile b/x11/rofi/Makefile
index c748a85cef48..91f6afd8963c 100644
--- a/x11/rofi/Makefile
+++ b/x11/rofi/Makefile
@@ -1,7 +1,7 @@
PORTNAME= rofi
-DISTVERSION?= 1.7.5
+DISTVERSION?= 1.7.7
PORTREVISION?= 0
-CATEGORIES= x11
+CATEGORIES= x11 ${EXTRA_CATEGORIES}
MAINTAINER= nomoo@nomoo.ru
COMMENT= Window switcher, run dialog and dmenu replacement
@@ -16,29 +16,35 @@ LIB_DEPENDS+= libstartup-notification-1.so:x11/startup-notification \
libxcb-icccm.so:x11/xcb-util-wm \
libxcb-util.so:x11/xcb-util \
libxcb-xrm.so:x11/xcb-util-xrm \
- libxkbcommon-x11.so:x11/libxkbcommon
+ libxkbcommon-x11.so:x11/libxkbcommon \
+ libxcb-keysyms.so:x11/xcb-util-keysyms
+RUN_DEPENDS= gsed:textproc/gsed
USES= bison gnome meson pkgconfig shebangfix xorg
USE_GITHUB= yes # required by rofi-wayland
USE_GNOME= cairo gdkpixbuf2 librsvg2 pango
USE_XORG= xcb
GH_ACCOUNT?= davatorium
-GH_TUPLE= sardemff7:libgwater:555fa6d:libgwater/subprojects/libgwater \
- sardemff7:libnkutils:d08fa89:libnkutils/subprojects/libnkutils
+GH_TUPLE= sardemff7:libgwater:d86f990:libgwater/subprojects/libgwater \
+ sardemff7:libnkutils:72bd7fb:libnkutils/subprojects/libnkutils
SHEBANG_FILES= script/get_git_rev.sh \
script/rofi-sensible-terminal
-bash_CMD= /bin/sh
+bash_CMD= ${SH}
CONFLICTS_INSTALL?= ${PORTNAME}-wayland
-OPTIONS_DEFINE= TEST
+OPTIONS_DEFINE= TEST MANPAGES
+OPTIONS_DEFAULT= MANPAGES
+OPTIONS_SUB= yes
+
+MANPAGES_BUILD_DEPENDS= pandoc:textproc/hs-pandoc
TEST_BUILD_DEPENDS= checkmk:devel/check
TEST_MESON_ENABLED= check
post-patch:
# Fix rofi-theme-selector which assumes we have GNU sed
- @${REINPLACE_CMD} 's|$${SED} -i |$${SED} -i "" |' \
+ @${REINPLACE_CMD} 's|$${SED} -i |$${SED} -i"" |' \
${WRKSRC}/script/rofi-theme-selector
.include <bsd.port.mk>
diff --git a/x11/rofi/distinfo b/x11/rofi/distinfo
index 424fe485ab92..77eab4e791f1 100644
--- a/x11/rofi/distinfo
+++ b/x11/rofi/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1706079770
-SHA256 (davatorium-rofi-1.7.5_GH0.tar.gz) = fe5684eb4f903dc004e4b05829e77292d75b5f3507f2dabc46ceb6054a58a2a9
-SIZE (davatorium-rofi-1.7.5_GH0.tar.gz) = 8096887
-SHA256 (sardemff7-libgwater-555fa6d_GH0.tar.gz) = ebb0ef22fc7d668dddbc11123858cfa818dc384ce2186769515c605f8d07f270
-SIZE (sardemff7-libgwater-555fa6d_GH0.tar.gz) = 10785
-SHA256 (sardemff7-libnkutils-d08fa89_GH0.tar.gz) = e829be3e498f8d7c55ec9e866598db98800476b91e60f1f3c76316cc91c09b75
-SIZE (sardemff7-libnkutils-d08fa89_GH0.tar.gz) = 62317
+TIMESTAMP = 1736067144
+SHA256 (davatorium-rofi-1.7.7_GH0.tar.gz) = 743573c619258481d5928f34d09df73fb21a05b58b1a07bd06a2b056c8145139
+SIZE (davatorium-rofi-1.7.7_GH0.tar.gz) = 12296166
+SHA256 (sardemff7-libgwater-d86f990_GH0.tar.gz) = ecfeaeabcdd06ec1653916bc2dbe8c5d57dbc293d87d5f4ef601d029588b2ef1
+SIZE (sardemff7-libgwater-d86f990_GH0.tar.gz) = 10872
+SHA256 (sardemff7-libnkutils-72bd7fb_GH0.tar.gz) = 88439b124accd4b9aad1ee421c5f871dd516db4dbc56e7f93f115cc67030c7c3
+SIZE (sardemff7-libnkutils-72bd7fb_GH0.tar.gz) = 66176
diff --git a/x11/rofi/pkg-plist b/x11/rofi/pkg-plist
index 9e6ff6b47080..61ed090516bc 100644
--- a/x11/rofi/pkg-plist
+++ b/x11/rofi/pkg-plist
@@ -10,14 +10,6 @@ libdata/pkgconfig/rofi.pc
share/applications/rofi-theme-selector.desktop
share/applications/rofi.desktop
share/icons/hicolor/scalable/apps/rofi.svg
-share/man/man1/rofi-sensible-terminal.1.gz
-share/man/man1/rofi-theme-selector.1.gz
-share/man/man1/rofi.1.gz
-share/man/man5/rofi-debugging.5.gz
-share/man/man5/rofi-dmenu.5.gz
-share/man/man5/rofi-keys.5.gz
-share/man/man5/rofi-script.5.gz
-share/man/man5/rofi-theme.5.gz
%%DATADIR%%/themes/Adapta-Nokto.rasi
%%DATADIR%%/themes/Arc-Dark.rasi
%%DATADIR%%/themes/Arc.rasi
@@ -32,8 +24,10 @@ share/man/man5/rofi-theme.5.gz
%%DATADIR%%/themes/dmenu.rasi
%%DATADIR%%/themes/docu.rasi
%%DATADIR%%/themes/fancy.rasi
+%%DATADIR%%/themes/fancy2.rasi
+%%DATADIR%%/themes/fullscreen-preview.rasi
%%DATADIR%%/themes/glue_pro_blue.rasi
-%%DATADIR%%/themes/gruvbox-common.rasi
+%%DATADIR%%/themes/gruvbox-common.rasinc
%%DATADIR%%/themes/gruvbox-dark-hard.rasi
%%DATADIR%%/themes/gruvbox-dark-soft.rasi
%%DATADIR%%/themes/gruvbox-dark.rasi
@@ -43,9 +37,19 @@ share/man/man5/rofi-theme.5.gz
%%DATADIR%%/themes/iggy.jpg
%%DATADIR%%/themes/iggy.rasi
%%DATADIR%%/themes/lb.rasi
+%%DATADIR%%/themes/material.rasi
%%DATADIR%%/themes/paper-float.rasi
%%DATADIR%%/themes/purple.rasi
%%DATADIR%%/themes/sidebar-v2.rasi
%%DATADIR%%/themes/sidebar.rasi
%%DATADIR%%/themes/solarized.rasi
%%DATADIR%%/themes/solarized_alternate.rasi
+%%MANPAGES%%share/man/man1/rofi-sensible-terminal.1.gz
+%%MANPAGES%%share/man/man1/rofi-theme-selector.1.gz
+%%MANPAGES%%share/man/man1/rofi.1.gz
+%%MANPAGES%%share/man/man5/rofi-debugging.5.gz
+%%MANPAGES%%share/man/man5/rofi-dmenu.5.gz
+%%MANPAGES%%share/man/man5/rofi-keys.5.gz
+%%MANPAGES%%share/man/man5/rofi-script.5.gz
+%%MANPAGES%%share/man/man5/rofi-theme.5.gz
+%%MANPAGES%%share/man/man5/rofi-thumbnails.5.gz