* Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
@ 2023-02-03 20:38 ` subnut
2023-02-03 20:42 ` subnut
` (31 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-03 20:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rofi-wayland
https://github.com/void-linux/void-packages/pull/42064
New package: rofi-wayland-1.7.5+wayland1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rofi-wayland-42064.patch --]
[-- Type: text/x-diff, Size: 7488 bytes --]
From 0232ac096755a16052df0ed981a66b5d28bcab0d Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 4 Feb 2023 00:55:57 +0530
Subject: [PATCH] New package: rofi-wayland-1.7.5+wayland1
---
.../patches/fix-libnkutils-test.patch | 18 +++
.../rofi-wayland/patches/wayland-suffix.patch | 142 ++++++++++++++++++
.../patches/wayland-suffix.patch.args | 1 +
srcpkgs/rofi-wayland/template | 35 +++++
4 files changed, 196 insertions(+)
create mode 100644 srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
create mode 100644 srcpkgs/rofi-wayland/template
diff --git a/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
new file mode 100644
index 000000000000..350e7b6abbcf
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
@@ -0,0 +1,18 @@
+Fix for GLib 2.73.1 %e time format
+https://github.com/sardemff7/libnkutils/issues/4
+https://github.com/GNOME/glib/commit/7074122f308b7b3402fba250f2010778fdad6eff
+
+--- a/subprojects/libnkutils/tests/format-string.c
++++ b/subprojects/libnkutils/tests/format-string.c
+@@ -677,7 +677,11 @@ static const struct {
+ { .name = "timestamp", .content = "1519910048" },
+ { .name = NULL }
+ },
++#if GLIB_CHECK_VERSION(2,73,1)
++ .result = "Thu Mar \u20071 13:14:08 2018"
++#else /* ! GLIB_CHECK_VERSION(2,73,1) */
+ .result = "Thu Mar 1 13:14:08 2018"
++#endif /* ! GLIB_CHECK_VERSION(2,73,1) */
+ }
+ },
+ {
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
new file mode 100644
index 000000000000..87629f34bcd1
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
@@ -0,0 +1,142 @@
+--- script/rofi-sensible-terminal-wayland
++++ script/rofi-sensible-terminal-wayland
+@@ -15,4 +15,4 @@
+ fi
+ done
+
+-rofi -e "Failed to find a suitable terminal"
++rofi-wayland -e "Failed to find a suitable terminal"
+--- script/rofi-theme-selector-wayland
++++ script/rofi-theme-selector-wayland
+@@ -3,7 +3,7 @@
+ # This code is released in public domain by Dave Davenport <qball@gmpclient.org>
+ #
+
+-ROFI=$(which rofi)
++ROFI=$(which rofi-wayland)
+ SED=$(which sed)
+ MKTEMP=$(which mktemp)
+
+--- data/rofi-theme-selector-wayland.desktop
++++ data/rofi-theme-selector-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi-theme-selector
+-Name=Rofi Theme Selector
+-Icon=rofi
++Exec=rofi-theme-selector-wayland
++Name=Rofi Theme Selector (Wayland)
++Icon=rofi-wayland
+--- data/rofi-wayland.desktop
++++ data/rofi-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi -show
+-Name=Rofi
+-Icon=rofi
++Exec=rofi-wayland -show
++Name=Rofi (Wayland)
++Icon=rofi-wayland
+--- meson.build
++++ meson.build
+@@ -141,30 +141,21 @@
+ deps += nk.get_variable('libnkutils')
+ deps += nk.get_variable('libnkutils_bindings')
+
+-install_headers([
+- 'include/mode.h',
+- 'include/mode-private.h',
+- 'include/helper.h',
+- 'include/rofi-types.h',
+- 'include/rofi-icon-fetcher.h'
+- ],
+- subdir: meson.project_name(),
+-)
+ install_data(
+- 'script/rofi-sensible-terminal',
+- 'script/rofi-theme-selector',
++ 'script/rofi-theme-selector-wayland',
+ install_dir: join_paths(get_option('prefix'), get_option('bindir'))
+ )
+
+ install_data(
+- 'data/rofi-theme-selector.desktop',
+- 'data/rofi.desktop',
++ 'data/rofi-theme-selector-wayland.desktop',
++ 'data/rofi-wayland.desktop',
+ install_dir: desktop_install_dir
+ )
+ install_data(
+- 'data/rofi.svg',
++ 'data/rofi-wayland.svg',
++ 'data/rofi-wayland.png',
+ install_dir: icondir
+ )
+
+ flex = generator(find_program('flex'),
+ output: '@BASENAME@.c',
+@@ -296,7 +283,7 @@
+ gnome = import('gnome')
+ default_theme = gnome.compile_resources('resources', files('resources/resources.xml'))
+
+-rofi = executable('rofi', rofi_sources + [
++rofi = executable('rofi-wayland', rofi_sources + [
+ theme_lexer,
+ theme_parser,
+ default_theme,
+@@ -307,49 +294,9 @@
+
+ subdir('doc')
+ install_man(
+- 'doc/rofi.1',
+- 'doc/rofi-theme-selector.1',
+- 'doc/rofi-sensible-terminal.1',
+- 'doc/rofi-script.5',
+- 'doc/rofi-theme.5',
+- 'doc/rofi-debugging.5',
+- 'doc/rofi-dmenu.5',
+- 'doc/rofi-keys.5',
+-)
+-
+-install_data(
+- 'themes/Adapta-Nokto.rasi',
+- 'themes/Arc.rasi',
+- 'themes/Arc-Dark.rasi',
+- 'themes/DarkBlue.rasi',
+- 'themes/Indego.rasi',
+- 'themes/Monokai.rasi',
+- 'themes/Paper.rasi',
+- 'themes/android_notification.rasi',
+- 'themes/arthur.rasi',
+- 'themes/blue.rasi',
+- 'themes/c64.rasi',
+- 'themes/dmenu.rasi',
+- 'themes/docu.rasi',
+- 'themes/glue_pro_blue.rasi',
+- 'themes/gruvbox-common.rasi',
+- 'themes/gruvbox-dark-hard.rasi',
+- 'themes/gruvbox-dark-soft.rasi',
+- 'themes/gruvbox-dark.rasi',
+- 'themes/gruvbox-light-hard.rasi',
+- 'themes/gruvbox-light-soft.rasi',
+- 'themes/gruvbox-light.rasi',
+- 'themes/lb.rasi',
+- 'themes/paper-float.rasi',
+- 'themes/purple.rasi',
+- 'themes/sidebar.rasi',
+- 'themes/sidebar-v2.rasi',
+- 'themes/solarized.rasi',
+- 'themes/solarized_alternate.rasi',
+- 'themes/fancy.rasi',
+- 'themes/iggy.rasi',
+- 'themes/iggy.jpg',
+- install_dir: themedir
++ 'doc/rofi-wayland.1',
++ 'doc/rofi-theme-selector-wayland.1',
+ )
+
+ pkg = import('pkgconfig')
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
new file mode 100644
index 000000000000..4dd9cbd347b2
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
@@ -0,0 +1 @@
+-p0
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..7072d17aad50
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.5+wayland1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git flex glib-devel"
+makedepends="libglib-devel cairo-devel pango-devel libxkbcommon-devel
+ gdk-pixbuf-devel wayland-devel libmpdclient-devel libnl3-devel libxcb-devel
+ xcb-util-devel xcb-util-wm-devel xcb-util-cursor-devel
+ startup-notification-devel wayland-protocols alsa-lib-devel check-devel"
+depends="rofi>=${version%+*} bash which sed coreutils"
+short_desc="Window switcher, run dialog and dmenu replacement - Wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://github.com/lbonn/rofi"
+changelog="https://raw.githubusercontent.com/lbonn/rofi/wayland/Changelog"
+distfiles="https://github.com/lbonn/rofi/releases/download/${version%%+*}%2B${version##*+}/rofi-${version}.tar.gz"
+checksum=4b7b5de0606e91380861dce6f2b894bebf63b2031c8746fd4096f72576ce541a
+
+post_extract() {
+ for f in script/rofi-*; do
+ mv $f "$f-wayland"
+ done
+ for f in data/*; do
+ mv $f "${f%.*}-wayland.${f##*.}"
+ done
+ for f in doc/*.?; do
+ mv $f ${f%.?}-wayland.${f##*.}
+ done
+}
+
+post_install() {
+ vlicense COPYING
+ rm -rf $DESTDIR/usr/lib/pkgconfig
+}
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
2023-02-03 20:38 ` [PR PATCH] [Updated] " subnut
@ 2023-02-03 20:42 ` subnut
2023-02-03 20:49 ` subnut
` (30 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-03 20:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rofi-wayland
https://github.com/void-linux/void-packages/pull/42064
New package: rofi-wayland-1.7.5+wayland1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rofi-wayland-42064.patch --]
[-- Type: text/x-diff, Size: 7478 bytes --]
From 111e43ccaa9a4d8074512f530f5915dbaa4660f7 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 4 Feb 2023 00:55:57 +0530
Subject: [PATCH] New package: rofi-wayland-1.7.5+wayland1
---
.../patches/fix-libnkutils-test.patch | 18 +++
.../rofi-wayland/patches/wayland-suffix.patch | 142 ++++++++++++++++++
.../patches/wayland-suffix.patch.args | 1 +
srcpkgs/rofi-wayland/template | 35 +++++
4 files changed, 196 insertions(+)
create mode 100644 srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
create mode 100644 srcpkgs/rofi-wayland/template
diff --git a/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
new file mode 100644
index 000000000000..350e7b6abbcf
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
@@ -0,0 +1,18 @@
+Fix for GLib 2.73.1 %e time format
+https://github.com/sardemff7/libnkutils/issues/4
+https://github.com/GNOME/glib/commit/7074122f308b7b3402fba250f2010778fdad6eff
+
+--- a/subprojects/libnkutils/tests/format-string.c
++++ b/subprojects/libnkutils/tests/format-string.c
+@@ -677,7 +677,11 @@ static const struct {
+ { .name = "timestamp", .content = "1519910048" },
+ { .name = NULL }
+ },
++#if GLIB_CHECK_VERSION(2,73,1)
++ .result = "Thu Mar \u20071 13:14:08 2018"
++#else /* ! GLIB_CHECK_VERSION(2,73,1) */
+ .result = "Thu Mar 1 13:14:08 2018"
++#endif /* ! GLIB_CHECK_VERSION(2,73,1) */
+ }
+ },
+ {
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
new file mode 100644
index 000000000000..87629f34bcd1
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
@@ -0,0 +1,142 @@
+--- script/rofi-sensible-terminal-wayland
++++ script/rofi-sensible-terminal-wayland
+@@ -15,4 +15,4 @@
+ fi
+ done
+
+-rofi -e "Failed to find a suitable terminal"
++rofi-wayland -e "Failed to find a suitable terminal"
+--- script/rofi-theme-selector-wayland
++++ script/rofi-theme-selector-wayland
+@@ -3,7 +3,7 @@
+ # This code is released in public domain by Dave Davenport <qball@gmpclient.org>
+ #
+
+-ROFI=$(which rofi)
++ROFI=$(which rofi-wayland)
+ SED=$(which sed)
+ MKTEMP=$(which mktemp)
+
+--- data/rofi-theme-selector-wayland.desktop
++++ data/rofi-theme-selector-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi-theme-selector
+-Name=Rofi Theme Selector
+-Icon=rofi
++Exec=rofi-theme-selector-wayland
++Name=Rofi Theme Selector (Wayland)
++Icon=rofi-wayland
+--- data/rofi-wayland.desktop
++++ data/rofi-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi -show
+-Name=Rofi
+-Icon=rofi
++Exec=rofi-wayland -show
++Name=Rofi (Wayland)
++Icon=rofi-wayland
+--- meson.build
++++ meson.build
+@@ -141,30 +141,21 @@
+ deps += nk.get_variable('libnkutils')
+ deps += nk.get_variable('libnkutils_bindings')
+
+-install_headers([
+- 'include/mode.h',
+- 'include/mode-private.h',
+- 'include/helper.h',
+- 'include/rofi-types.h',
+- 'include/rofi-icon-fetcher.h'
+- ],
+- subdir: meson.project_name(),
+-)
+ install_data(
+- 'script/rofi-sensible-terminal',
+- 'script/rofi-theme-selector',
++ 'script/rofi-theme-selector-wayland',
+ install_dir: join_paths(get_option('prefix'), get_option('bindir'))
+ )
+
+ install_data(
+- 'data/rofi-theme-selector.desktop',
+- 'data/rofi.desktop',
++ 'data/rofi-theme-selector-wayland.desktop',
++ 'data/rofi-wayland.desktop',
+ install_dir: desktop_install_dir
+ )
+ install_data(
+- 'data/rofi.svg',
++ 'data/rofi-wayland.svg',
++ 'data/rofi-wayland.png',
+ install_dir: icondir
+ )
+
+ flex = generator(find_program('flex'),
+ output: '@BASENAME@.c',
+@@ -296,7 +283,7 @@
+ gnome = import('gnome')
+ default_theme = gnome.compile_resources('resources', files('resources/resources.xml'))
+
+-rofi = executable('rofi', rofi_sources + [
++rofi = executable('rofi-wayland', rofi_sources + [
+ theme_lexer,
+ theme_parser,
+ default_theme,
+@@ -307,49 +294,9 @@
+
+ subdir('doc')
+ install_man(
+- 'doc/rofi.1',
+- 'doc/rofi-theme-selector.1',
+- 'doc/rofi-sensible-terminal.1',
+- 'doc/rofi-script.5',
+- 'doc/rofi-theme.5',
+- 'doc/rofi-debugging.5',
+- 'doc/rofi-dmenu.5',
+- 'doc/rofi-keys.5',
+-)
+-
+-install_data(
+- 'themes/Adapta-Nokto.rasi',
+- 'themes/Arc.rasi',
+- 'themes/Arc-Dark.rasi',
+- 'themes/DarkBlue.rasi',
+- 'themes/Indego.rasi',
+- 'themes/Monokai.rasi',
+- 'themes/Paper.rasi',
+- 'themes/android_notification.rasi',
+- 'themes/arthur.rasi',
+- 'themes/blue.rasi',
+- 'themes/c64.rasi',
+- 'themes/dmenu.rasi',
+- 'themes/docu.rasi',
+- 'themes/glue_pro_blue.rasi',
+- 'themes/gruvbox-common.rasi',
+- 'themes/gruvbox-dark-hard.rasi',
+- 'themes/gruvbox-dark-soft.rasi',
+- 'themes/gruvbox-dark.rasi',
+- 'themes/gruvbox-light-hard.rasi',
+- 'themes/gruvbox-light-soft.rasi',
+- 'themes/gruvbox-light.rasi',
+- 'themes/lb.rasi',
+- 'themes/paper-float.rasi',
+- 'themes/purple.rasi',
+- 'themes/sidebar.rasi',
+- 'themes/sidebar-v2.rasi',
+- 'themes/solarized.rasi',
+- 'themes/solarized_alternate.rasi',
+- 'themes/fancy.rasi',
+- 'themes/iggy.rasi',
+- 'themes/iggy.jpg',
+- install_dir: themedir
++ 'doc/rofi-wayland.1',
++ 'doc/rofi-theme-selector-wayland.1',
+ )
+
+ pkg = import('pkgconfig')
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
new file mode 100644
index 000000000000..4dd9cbd347b2
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
@@ -0,0 +1 @@
+-p0
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..d68a817fdf60
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.5+wayland1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git flex glib-devel"
+makedepends="libglib-devel cairo-devel pango-devel libxkbcommon-devel
+ gdk-pixbuf-devel wayland-devel libmpdclient-devel libnl3-devel libxcb-devel
+ xcb-util-devel xcb-util-wm-devel xcb-util-cursor-devel
+ startup-notification-devel wayland-protocols alsa-lib-devel check-devel"
+depends="rofi>=${version%+*} bash which sed"
+short_desc="Window switcher, run dialog and dmenu replacement - Wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://github.com/lbonn/rofi"
+changelog="https://raw.githubusercontent.com/lbonn/rofi/wayland/Changelog"
+distfiles="https://github.com/lbonn/rofi/releases/download/${version%%+*}%2B${version##*+}/rofi-${version}.tar.gz"
+checksum=4b7b5de0606e91380861dce6f2b894bebf63b2031c8746fd4096f72576ce541a
+
+post_extract() {
+ for f in script/rofi-*; do
+ mv $f "$f-wayland"
+ done
+ for f in data/*; do
+ mv $f "${f%.*}-wayland.${f##*.}"
+ done
+ for f in doc/*.?; do
+ mv $f ${f%.?}-wayland.${f##*.}
+ done
+}
+
+post_install() {
+ vlicense COPYING
+ rm -rf $DESTDIR/usr/lib/pkgconfig
+}
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
2023-02-03 20:38 ` [PR PATCH] [Updated] " subnut
2023-02-03 20:42 ` subnut
@ 2023-02-03 20:49 ` subnut
2023-02-03 21:14 ` kruceter
` (29 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-03 20:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 286 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#issuecomment-1416388473
Comment:
Dunno what's failing. Seems like a bug in `common/xbps-src/shutils/common.sh`? (That's the only error message being shown)
IDK :man_shrugging:
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (2 preceding siblings ...)
2023-02-03 20:49 ` subnut
@ 2023-02-03 21:14 ` kruceter
2023-02-03 21:17 ` classabbyamp
` (28 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: kruceter @ 2023-02-03 21:14 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 237 bytes --]
New comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#issuecomment-1416409721
Comment:
> Seems like a bug in `common/xbps-src/shutils/common.sh`?
No, the fault lies with patches.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (3 preceding siblings ...)
2023-02-03 21:14 ` kruceter
@ 2023-02-03 21:17 ` classabbyamp
2023-02-03 22:32 ` subnut
` (27 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: classabbyamp @ 2023-02-03 21:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 246 bytes --]
New comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#issuecomment-1416411934
Comment:
you need the `a/` and `b/` in the paths in the patch, because xbps-src uses `patch -Np1` by default
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (4 preceding siblings ...)
2023-02-03 21:17 ` classabbyamp
@ 2023-02-03 22:32 ` subnut
2023-02-03 22:37 ` [PR PATCH] [Updated] " subnut
` (26 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-03 22:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 209 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#issuecomment-1416486802
Comment:
But I've added the corresponding `.patch.args` file containing `-p0`
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (5 preceding siblings ...)
2023-02-03 22:32 ` subnut
@ 2023-02-03 22:37 ` subnut
2023-02-03 22:38 ` subnut
` (25 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-03 22:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rofi-wayland
https://github.com/void-linux/void-packages/pull/42064
New package: rofi-wayland-1.7.5+wayland1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rofi-wayland-42064.patch --]
[-- Type: text/x-diff, Size: 7478 bytes --]
From 1bad08538f40eeed6ad6c911da6cac8241d2dbf2 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 4 Feb 2023 00:55:57 +0530
Subject: [PATCH] New package: rofi-wayland-1.7.5+wayland1
---
.../patches/fix-libnkutils-test.patch | 18 +++
.../rofi-wayland/patches/wayland-suffix.patch | 142 ++++++++++++++++++
.../patches/wayland-suffix.patch.args | 1 +
srcpkgs/rofi-wayland/template | 35 +++++
4 files changed, 196 insertions(+)
create mode 100644 srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
create mode 100644 srcpkgs/rofi-wayland/template
diff --git a/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
new file mode 100644
index 000000000000..350e7b6abbcf
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
@@ -0,0 +1,18 @@
+Fix for GLib 2.73.1 %e time format
+https://github.com/sardemff7/libnkutils/issues/4
+https://github.com/GNOME/glib/commit/7074122f308b7b3402fba250f2010778fdad6eff
+
+--- a/subprojects/libnkutils/tests/format-string.c
++++ b/subprojects/libnkutils/tests/format-string.c
+@@ -677,7 +677,11 @@ static const struct {
+ { .name = "timestamp", .content = "1519910048" },
+ { .name = NULL }
+ },
++#if GLIB_CHECK_VERSION(2,73,1)
++ .result = "Thu Mar \u20071 13:14:08 2018"
++#else /* ! GLIB_CHECK_VERSION(2,73,1) */
+ .result = "Thu Mar 1 13:14:08 2018"
++#endif /* ! GLIB_CHECK_VERSION(2,73,1) */
+ }
+ },
+ {
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
new file mode 100644
index 000000000000..04e164c5cfab
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
@@ -0,0 +1,142 @@
+--- script/rofi-sensible-terminal-wayland
++++ script/rofi-sensible-terminal-wayland
+@@ -15,4 +15,4 @@
+ fi
+ done
+
+-rofi -e "Failed to find a suitable terminal"
++rofi-wayland -e "Failed to find a suitable terminal"
+--- script/rofi-theme-selector-wayland
++++ script/rofi-theme-selector-wayland
+@@ -3,7 +3,7 @@
+ # This code is released in public domain by Dave Davenport <qball@gmpclient.org>
+ #
+
+-ROFI=$(which rofi)
++ROFI=$(which rofi-wayland)
+ SED=$(which sed)
+ MKTEMP=$(which mktemp)
+
+--- data/rofi-theme-selector-wayland.desktop
++++ data/rofi-theme-selector-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi-theme-selector
+-Name=Rofi Theme Selector
+-Icon=rofi
++Exec=rofi-theme-selector-wayland
++Name=Rofi Theme Selector (Wayland)
++Icon=rofi-wayland
+--- data/rofi-wayland.desktop
++++ data/rofi-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi -show
+-Name=Rofi
+-Icon=rofi
++Exec=rofi-wayland -show
++Name=Rofi (Wayland)
++Icon=rofi-wayland
+--- meson.build
++++ meson.build
+@@ -141,30 +141,21 @@
+ deps += nk.get_variable('libnkutils')
+ deps += nk.get_variable('libnkutils_bindings')
+
+-install_headers([
+- 'include/mode.h',
+- 'include/mode-private.h',
+- 'include/helper.h',
+- 'include/rofi-types.h',
+- 'include/rofi-icon-fetcher.h'
+- ],
+- subdir: meson.project_name(),
+-)
+ install_data(
+- 'script/rofi-sensible-terminal',
+- 'script/rofi-theme-selector',
++ 'script/rofi-theme-selector-wayland',
+ install_dir: join_paths(get_option('prefix'), get_option('bindir'))
+ )
+
+ install_data(
+- 'data/rofi-theme-selector.desktop',
+- 'data/rofi.desktop',
++ 'data/rofi-theme-selector-wayland.desktop',
++ 'data/rofi-wayland.desktop',
+ install_dir: desktop_install_dir
+ )
+ install_data(
+- 'data/rofi.svg',
++ 'data/rofi-wayland.svg',
++ 'data/rofi-wayland.png',
+ install_dir: icondir
+ )
+
+ flex = generator(find_program('flex'),
+ output: '@BASENAME@.c',
+@@ -296,7 +283,7 @@
+ gnome = import('gnome')
+ default_theme = gnome.compile_resources('resources', files('resources/resources.xml'))
+
+-rofi = executable('rofi', rofi_sources + [
++rofi = executable('rofi-wayland', rofi_sources + [
+ theme_lexer,
+ theme_parser,
+ default_theme,
+@@ -307,49 +294,8 @@
+
+ subdir('doc')
+ install_man(
+- 'doc/rofi.1',
+- 'doc/rofi-theme-selector.1',
+- 'doc/rofi-sensible-terminal.1',
+- 'doc/rofi-script.5',
+- 'doc/rofi-theme.5',
+- 'doc/rofi-debugging.5',
+- 'doc/rofi-dmenu.5',
+- 'doc/rofi-keys.5',
+-)
+-
+-install_data(
+- 'themes/Adapta-Nokto.rasi',
+- 'themes/Arc.rasi',
+- 'themes/Arc-Dark.rasi',
+- 'themes/DarkBlue.rasi',
+- 'themes/Indego.rasi',
+- 'themes/Monokai.rasi',
+- 'themes/Paper.rasi',
+- 'themes/android_notification.rasi',
+- 'themes/arthur.rasi',
+- 'themes/blue.rasi',
+- 'themes/c64.rasi',
+- 'themes/dmenu.rasi',
+- 'themes/docu.rasi',
+- 'themes/glue_pro_blue.rasi',
+- 'themes/gruvbox-common.rasi',
+- 'themes/gruvbox-dark-hard.rasi',
+- 'themes/gruvbox-dark-soft.rasi',
+- 'themes/gruvbox-dark.rasi',
+- 'themes/gruvbox-light-hard.rasi',
+- 'themes/gruvbox-light-soft.rasi',
+- 'themes/gruvbox-light.rasi',
+- 'themes/lb.rasi',
+- 'themes/paper-float.rasi',
+- 'themes/purple.rasi',
+- 'themes/sidebar.rasi',
+- 'themes/sidebar-v2.rasi',
+- 'themes/solarized.rasi',
+- 'themes/solarized_alternate.rasi',
+- 'themes/fancy.rasi',
+- 'themes/iggy.rasi',
+- 'themes/iggy.jpg',
+- install_dir: themedir
++ 'doc/rofi-wayland.1',
++ 'doc/rofi-theme-selector-wayland.1',
+ )
+
+ pkg = import('pkgconfig')
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
new file mode 100644
index 000000000000..4dd9cbd347b2
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
@@ -0,0 +1 @@
+-p0
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..d68a817fdf60
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.5+wayland1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git flex glib-devel"
+makedepends="libglib-devel cairo-devel pango-devel libxkbcommon-devel
+ gdk-pixbuf-devel wayland-devel libmpdclient-devel libnl3-devel libxcb-devel
+ xcb-util-devel xcb-util-wm-devel xcb-util-cursor-devel
+ startup-notification-devel wayland-protocols alsa-lib-devel check-devel"
+depends="rofi>=${version%+*} bash which sed"
+short_desc="Window switcher, run dialog and dmenu replacement - Wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://github.com/lbonn/rofi"
+changelog="https://raw.githubusercontent.com/lbonn/rofi/wayland/Changelog"
+distfiles="https://github.com/lbonn/rofi/releases/download/${version%%+*}%2B${version##*+}/rofi-${version}.tar.gz"
+checksum=4b7b5de0606e91380861dce6f2b894bebf63b2031c8746fd4096f72576ce541a
+
+post_extract() {
+ for f in script/rofi-*; do
+ mv $f "$f-wayland"
+ done
+ for f in data/*; do
+ mv $f "${f%.*}-wayland.${f##*.}"
+ done
+ for f in doc/*.?; do
+ mv $f ${f%.?}-wayland.${f##*.}
+ done
+}
+
+post_install() {
+ vlicense COPYING
+ rm -rf $DESTDIR/usr/lib/pkgconfig
+}
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (6 preceding siblings ...)
2023-02-03 22:37 ` [PR PATCH] [Updated] " subnut
@ 2023-02-03 22:38 ` subnut
2023-02-03 22:40 ` [PR PATCH] [Updated] " subnut
` (24 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-03 22:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 247 bytes --]
New comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#issuecomment-1416490544
Comment:
Ah, sorry. I'd forgot to commit the fixed version of the patch. (I'd forgot to stage it before commiting.)
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (7 preceding siblings ...)
2023-02-03 22:38 ` subnut
@ 2023-02-03 22:40 ` subnut
2023-02-03 22:47 ` [PR REVIEW] " kruceter
` (23 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-03 22:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rofi-wayland
https://github.com/void-linux/void-packages/pull/42064
New package: rofi-wayland-1.7.5+wayland1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rofi-wayland-42064.patch --]
[-- Type: text/x-diff, Size: 7492 bytes --]
From 6f9672f447bdf2121dc1a482403afaf2521b2c24 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 4 Feb 2023 00:55:57 +0530
Subject: [PATCH] New package: rofi-wayland-1.7.5+wayland1
---
.../patches/fix-libnkutils-test.patch | 18 +++
.../rofi-wayland/patches/wayland-suffix.patch | 142 ++++++++++++++++++
.../patches/wayland-suffix.patch.args | 1 +
srcpkgs/rofi-wayland/template | 35 +++++
4 files changed, 196 insertions(+)
create mode 100644 srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
create mode 100644 srcpkgs/rofi-wayland/template
diff --git a/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
new file mode 100644
index 000000000000..350e7b6abbcf
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
@@ -0,0 +1,18 @@
+Fix for GLib 2.73.1 %e time format
+https://github.com/sardemff7/libnkutils/issues/4
+https://github.com/GNOME/glib/commit/7074122f308b7b3402fba250f2010778fdad6eff
+
+--- a/subprojects/libnkutils/tests/format-string.c
++++ b/subprojects/libnkutils/tests/format-string.c
+@@ -677,7 +677,11 @@ static const struct {
+ { .name = "timestamp", .content = "1519910048" },
+ { .name = NULL }
+ },
++#if GLIB_CHECK_VERSION(2,73,1)
++ .result = "Thu Mar \u20071 13:14:08 2018"
++#else /* ! GLIB_CHECK_VERSION(2,73,1) */
+ .result = "Thu Mar 1 13:14:08 2018"
++#endif /* ! GLIB_CHECK_VERSION(2,73,1) */
+ }
+ },
+ {
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
new file mode 100644
index 000000000000..04e164c5cfab
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
@@ -0,0 +1,142 @@
+--- script/rofi-sensible-terminal-wayland
++++ script/rofi-sensible-terminal-wayland
+@@ -15,4 +15,4 @@
+ fi
+ done
+
+-rofi -e "Failed to find a suitable terminal"
++rofi-wayland -e "Failed to find a suitable terminal"
+--- script/rofi-theme-selector-wayland
++++ script/rofi-theme-selector-wayland
+@@ -3,7 +3,7 @@
+ # This code is released in public domain by Dave Davenport <qball@gmpclient.org>
+ #
+
+-ROFI=$(which rofi)
++ROFI=$(which rofi-wayland)
+ SED=$(which sed)
+ MKTEMP=$(which mktemp)
+
+--- data/rofi-theme-selector-wayland.desktop
++++ data/rofi-theme-selector-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi-theme-selector
+-Name=Rofi Theme Selector
+-Icon=rofi
++Exec=rofi-theme-selector-wayland
++Name=Rofi Theme Selector (Wayland)
++Icon=rofi-wayland
+--- data/rofi-wayland.desktop
++++ data/rofi-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi -show
+-Name=Rofi
+-Icon=rofi
++Exec=rofi-wayland -show
++Name=Rofi (Wayland)
++Icon=rofi-wayland
+--- meson.build
++++ meson.build
+@@ -141,30 +141,21 @@
+ deps += nk.get_variable('libnkutils')
+ deps += nk.get_variable('libnkutils_bindings')
+
+-install_headers([
+- 'include/mode.h',
+- 'include/mode-private.h',
+- 'include/helper.h',
+- 'include/rofi-types.h',
+- 'include/rofi-icon-fetcher.h'
+- ],
+- subdir: meson.project_name(),
+-)
+ install_data(
+- 'script/rofi-sensible-terminal',
+- 'script/rofi-theme-selector',
++ 'script/rofi-theme-selector-wayland',
+ install_dir: join_paths(get_option('prefix'), get_option('bindir'))
+ )
+
+ install_data(
+- 'data/rofi-theme-selector.desktop',
+- 'data/rofi.desktop',
++ 'data/rofi-theme-selector-wayland.desktop',
++ 'data/rofi-wayland.desktop',
+ install_dir: desktop_install_dir
+ )
+ install_data(
+- 'data/rofi.svg',
++ 'data/rofi-wayland.svg',
++ 'data/rofi-wayland.png',
+ install_dir: icondir
+ )
+
+ flex = generator(find_program('flex'),
+ output: '@BASENAME@.c',
+@@ -296,7 +283,7 @@
+ gnome = import('gnome')
+ default_theme = gnome.compile_resources('resources', files('resources/resources.xml'))
+
+-rofi = executable('rofi', rofi_sources + [
++rofi = executable('rofi-wayland', rofi_sources + [
+ theme_lexer,
+ theme_parser,
+ default_theme,
+@@ -307,49 +294,8 @@
+
+ subdir('doc')
+ install_man(
+- 'doc/rofi.1',
+- 'doc/rofi-theme-selector.1',
+- 'doc/rofi-sensible-terminal.1',
+- 'doc/rofi-script.5',
+- 'doc/rofi-theme.5',
+- 'doc/rofi-debugging.5',
+- 'doc/rofi-dmenu.5',
+- 'doc/rofi-keys.5',
+-)
+-
+-install_data(
+- 'themes/Adapta-Nokto.rasi',
+- 'themes/Arc.rasi',
+- 'themes/Arc-Dark.rasi',
+- 'themes/DarkBlue.rasi',
+- 'themes/Indego.rasi',
+- 'themes/Monokai.rasi',
+- 'themes/Paper.rasi',
+- 'themes/android_notification.rasi',
+- 'themes/arthur.rasi',
+- 'themes/blue.rasi',
+- 'themes/c64.rasi',
+- 'themes/dmenu.rasi',
+- 'themes/docu.rasi',
+- 'themes/glue_pro_blue.rasi',
+- 'themes/gruvbox-common.rasi',
+- 'themes/gruvbox-dark-hard.rasi',
+- 'themes/gruvbox-dark-soft.rasi',
+- 'themes/gruvbox-dark.rasi',
+- 'themes/gruvbox-light-hard.rasi',
+- 'themes/gruvbox-light-soft.rasi',
+- 'themes/gruvbox-light.rasi',
+- 'themes/lb.rasi',
+- 'themes/paper-float.rasi',
+- 'themes/purple.rasi',
+- 'themes/sidebar.rasi',
+- 'themes/sidebar-v2.rasi',
+- 'themes/solarized.rasi',
+- 'themes/solarized_alternate.rasi',
+- 'themes/fancy.rasi',
+- 'themes/iggy.rasi',
+- 'themes/iggy.jpg',
+- install_dir: themedir
++ 'doc/rofi-wayland.1',
++ 'doc/rofi-theme-selector-wayland.1',
+ )
+
+ pkg = import('pkgconfig')
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
new file mode 100644
index 000000000000..4dd9cbd347b2
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch.args
@@ -0,0 +1 @@
+-p0
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..f37fd91433f1
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,35 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.5+wayland1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config git flex glib-devel wayland-devel"
+makedepends="libglib-devel cairo-devel pango-devel libxkbcommon-devel
+ gdk-pixbuf-devel wayland-devel libmpdclient-devel libnl3-devel libxcb-devel
+ xcb-util-devel xcb-util-wm-devel xcb-util-cursor-devel
+ startup-notification-devel wayland-protocols alsa-lib-devel check-devel"
+depends="rofi>=${version%+*} bash which sed"
+short_desc="Window switcher, run dialog and dmenu replacement - Wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://github.com/lbonn/rofi"
+changelog="https://raw.githubusercontent.com/lbonn/rofi/wayland/Changelog"
+distfiles="https://github.com/lbonn/rofi/releases/download/${version%%+*}%2B${version##*+}/rofi-${version}.tar.gz"
+checksum=4b7b5de0606e91380861dce6f2b894bebf63b2031c8746fd4096f72576ce541a
+
+post_extract() {
+ for f in script/rofi-*; do
+ mv $f "$f-wayland"
+ done
+ for f in data/*; do
+ mv $f "${f%.*}-wayland.${f##*.}"
+ done
+ for f in doc/*.?; do
+ mv $f ${f%.?}-wayland.${f##*.}
+ done
+}
+
+post_install() {
+ vlicense COPYING
+ rm -rf $DESTDIR/usr/lib/pkgconfig
+}
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (8 preceding siblings ...)
2023-02-03 22:40 ` [PR PATCH] [Updated] " subnut
@ 2023-02-03 22:47 ` kruceter
2023-02-03 22:47 ` kruceter
` (22 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: kruceter @ 2023-02-03 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096344399
Comment:
```suggestion
--- a/script/rofi-theme-selector-wayland
+++ b/script/rofi-theme-selector-wayland
```
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (9 preceding siblings ...)
2023-02-03 22:47 ` [PR REVIEW] " kruceter
@ 2023-02-03 22:47 ` kruceter
2023-02-03 22:47 ` kruceter
` (21 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: kruceter @ 2023-02-03 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096345938
Comment:
```suggestion
--- a/data/rofi-wayland.desktop
+++ b/data/rofi-wayland.desktop
```
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (10 preceding siblings ...)
2023-02-03 22:47 ` kruceter
@ 2023-02-03 22:47 ` kruceter
2023-02-03 22:47 ` kruceter
` (20 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: kruceter @ 2023-02-03 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 257 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096344242
Comment:
```suggestion
--- a/script/rofi-sensible-terminal-wayland
+++ b/script/rofi-sensible-terminal-wayland
```
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (11 preceding siblings ...)
2023-02-03 22:47 ` kruceter
@ 2023-02-03 22:47 ` kruceter
2023-02-03 22:47 ` kruceter
` (19 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: kruceter @ 2023-02-03 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 205 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096346079
Comment:
```suggestion
--- a/meson.build
+++ b/meson.build
```
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (12 preceding siblings ...)
2023-02-03 22:47 ` kruceter
@ 2023-02-03 22:47 ` kruceter
2023-02-03 22:47 ` kruceter
` (18 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: kruceter @ 2023-02-03 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 263 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096344694
Comment:
```suggestion
--- a/data/rofi-theme-selector-wayland.desktop
+++ b/data/rofi-theme-selector-wayland.desktop
```
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (13 preceding siblings ...)
2023-02-03 22:47 ` kruceter
@ 2023-02-03 22:47 ` kruceter
2023-02-03 23:37 ` paper42
` (17 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: kruceter @ 2023-02-03 22:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 192 bytes --]
New review comment by kruceter on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096349047
Comment:
```suggestion
```
Get rid of this file.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (14 preceding siblings ...)
2023-02-03 22:47 ` kruceter
@ 2023-02-03 23:37 ` paper42
2023-02-03 23:37 ` paper42
` (16 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: paper42 @ 2023-02-03 23:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096381262
Comment:
check-devel should probably be in checkdepends
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (15 preceding siblings ...)
2023-02-03 23:37 ` paper42
@ 2023-02-03 23:37 ` paper42
2023-02-03 23:37 ` paper42
` (15 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: paper42 @ 2023-02-03 23:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 226 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096381088
Comment:
```suggestion
hostmakedepends="pkg-config flex glib-devel wayland-devel"
```
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (16 preceding siblings ...)
2023-02-03 23:37 ` paper42
@ 2023-02-03 23:37 ` paper42
2023-02-03 23:37 ` paper42
` (14 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: paper42 @ 2023-02-03 23:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096382626
Comment:
I think we should just make it conflict with rofi, but I am not really interested in merging this
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (17 preceding siblings ...)
2023-02-03 23:37 ` paper42
@ 2023-02-03 23:37 ` paper42
2023-02-03 23:43 ` classabbyamp
` (13 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: paper42 @ 2023-02-03 23:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096380804
Comment:
why does this fork depend on the original rofi?
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (18 preceding siblings ...)
2023-02-03 23:37 ` paper42
@ 2023-02-03 23:43 ` classabbyamp
2023-02-06 18:41 ` [PR PATCH] [Updated] " subnut
` (12 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: classabbyamp @ 2023-02-03 23:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 337 bytes --]
New review comment by classabbyamp on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1096385753
Comment:
> I am not really interested in merging this
same here, i don't see a reason in packaging a fork when several alternatives/clones to rofi that support wayland are already in the repos
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (19 preceding siblings ...)
2023-02-03 23:43 ` classabbyamp
@ 2023-02-06 18:41 ` subnut
2023-02-06 18:43 ` [PR REVIEW] " subnut
` (11 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 18:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rofi-wayland
https://github.com/void-linux/void-packages/pull/42064
New package: rofi-wayland-1.7.5+wayland1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rofi-wayland-42064.patch --]
[-- Type: text/x-diff, Size: 7162 bytes --]
From 851392a67c52459812512738f4f8bc25b91940c1 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 4 Feb 2023 00:55:57 +0530
Subject: [PATCH] New package: rofi-wayland-1.7.5+wayland1
---
.../patches/fix-libnkutils-test.patch | 18 +++
.../rofi-wayland/patches/wayland-suffix.patch | 142 ++++++++++++++++++
srcpkgs/rofi-wayland/template | 39 +++++
3 files changed, 199 insertions(+)
create mode 100644 srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch
create mode 100644 srcpkgs/rofi-wayland/template
diff --git a/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
new file mode 100644
index 000000000000..350e7b6abbcf
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
@@ -0,0 +1,18 @@
+Fix for GLib 2.73.1 %e time format
+https://github.com/sardemff7/libnkutils/issues/4
+https://github.com/GNOME/glib/commit/7074122f308b7b3402fba250f2010778fdad6eff
+
+--- a/subprojects/libnkutils/tests/format-string.c
++++ b/subprojects/libnkutils/tests/format-string.c
+@@ -677,7 +677,11 @@ static const struct {
+ { .name = "timestamp", .content = "1519910048" },
+ { .name = NULL }
+ },
++#if GLIB_CHECK_VERSION(2,73,1)
++ .result = "Thu Mar \u20071 13:14:08 2018"
++#else /* ! GLIB_CHECK_VERSION(2,73,1) */
+ .result = "Thu Mar 1 13:14:08 2018"
++#endif /* ! GLIB_CHECK_VERSION(2,73,1) */
+ }
+ },
+ {
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
new file mode 100644
index 000000000000..1e7a0059bb01
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
@@ -0,0 +1,142 @@
+--- a/script/rofi-sensible-terminal-wayland
++++ b/script/rofi-sensible-terminal-wayland
+@@ -15,4 +15,4 @@
+ fi
+ done
+
+-rofi -e "Failed to find a suitable terminal"
++rofi-wayland -e "Failed to find a suitable terminal"
+--- a/script/rofi-theme-selector-wayland
++++ b/script/rofi-theme-selector-wayland
+@@ -3,7 +3,7 @@
+ # This code is released in public domain by Dave Davenport <qball@gmpclient.org>
+ #
+
+-ROFI=$(which rofi)
++ROFI=$(which rofi-wayland)
+ SED=$(which sed)
+ MKTEMP=$(which mktemp)
+
+--- a/data/rofi-theme-selector-wayland.desktop
++++ b/data/rofi-theme-selector-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi-theme-selector
+-Name=Rofi Theme Selector
+-Icon=rofi
++Exec=rofi-theme-selector-wayland
++Name=Rofi Theme Selector (Wayland)
++Icon=rofi-wayland
+--- a/data/rofi-wayland.desktop
++++ b/data/rofi-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi -show
+-Name=Rofi
+-Icon=rofi
++Exec=rofi-wayland -show
++Name=Rofi (Wayland)
++Icon=rofi-wayland
+--- a/meson.build
++++ b/meson.build
+@@ -141,30 +141,21 @@
+ deps += nk.get_variable('libnkutils')
+ deps += nk.get_variable('libnkutils_bindings')
+
+-install_headers([
+- 'include/mode.h',
+- 'include/mode-private.h',
+- 'include/helper.h',
+- 'include/rofi-types.h',
+- 'include/rofi-icon-fetcher.h'
+- ],
+- subdir: meson.project_name(),
+-)
+ install_data(
+- 'script/rofi-sensible-terminal',
+- 'script/rofi-theme-selector',
++ 'script/rofi-theme-selector-wayland',
+ install_dir: join_paths(get_option('prefix'), get_option('bindir'))
+ )
+
+ install_data(
+- 'data/rofi-theme-selector.desktop',
+- 'data/rofi.desktop',
++ 'data/rofi-theme-selector-wayland.desktop',
++ 'data/rofi-wayland.desktop',
+ install_dir: desktop_install_dir
+ )
+ install_data(
+- 'data/rofi.svg',
++ 'data/rofi-wayland.svg',
++ 'data/rofi-wayland.png',
+ install_dir: icondir
+ )
+
+ flex = generator(find_program('flex'),
+ output: '@BASENAME@.c',
+@@ -296,7 +283,7 @@
+ gnome = import('gnome')
+ default_theme = gnome.compile_resources('resources', files('resources/resources.xml'))
+
+-rofi = executable('rofi', rofi_sources + [
++rofi = executable('rofi-wayland', rofi_sources + [
+ theme_lexer,
+ theme_parser,
+ default_theme,
+@@ -307,49 +294,8 @@
+
+ subdir('doc')
+ install_man(
+- 'doc/rofi.1',
+- 'doc/rofi-theme-selector.1',
+- 'doc/rofi-sensible-terminal.1',
+- 'doc/rofi-script.5',
+- 'doc/rofi-theme.5',
+- 'doc/rofi-debugging.5',
+- 'doc/rofi-dmenu.5',
+- 'doc/rofi-keys.5',
+-)
+-
+-install_data(
+- 'themes/Adapta-Nokto.rasi',
+- 'themes/Arc.rasi',
+- 'themes/Arc-Dark.rasi',
+- 'themes/DarkBlue.rasi',
+- 'themes/Indego.rasi',
+- 'themes/Monokai.rasi',
+- 'themes/Paper.rasi',
+- 'themes/android_notification.rasi',
+- 'themes/arthur.rasi',
+- 'themes/blue.rasi',
+- 'themes/c64.rasi',
+- 'themes/dmenu.rasi',
+- 'themes/docu.rasi',
+- 'themes/glue_pro_blue.rasi',
+- 'themes/gruvbox-common.rasi',
+- 'themes/gruvbox-dark-hard.rasi',
+- 'themes/gruvbox-dark-soft.rasi',
+- 'themes/gruvbox-dark.rasi',
+- 'themes/gruvbox-light-hard.rasi',
+- 'themes/gruvbox-light-soft.rasi',
+- 'themes/gruvbox-light.rasi',
+- 'themes/lb.rasi',
+- 'themes/paper-float.rasi',
+- 'themes/purple.rasi',
+- 'themes/sidebar.rasi',
+- 'themes/sidebar-v2.rasi',
+- 'themes/solarized.rasi',
+- 'themes/solarized_alternate.rasi',
+- 'themes/fancy.rasi',
+- 'themes/iggy.rasi',
+- 'themes/iggy.jpg',
+- install_dir: themedir
++ 'doc/rofi-wayland.1',
++ 'doc/rofi-theme-selector-wayland.1',
+ )
+
+ pkg = import('pkgconfig')
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..45857ff39b40
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,39 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.5+wayland1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config flex glib-devel wayland-devel"
+makedepends="libglib-devel cairo-devel pango-devel libxkbcommon-devel
+ gdk-pixbuf-devel wayland-devel libmpdclient-devel libnl3-devel libxcb-devel
+ xcb-util-devel xcb-util-wm-devel xcb-util-cursor-devel
+ startup-notification-devel wayland-protocols alsa-lib-devel"
+depends="rofi>=${version%+*} bash which sed"
+short_desc="Window switcher, run dialog and dmenu replacement - Wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://github.com/lbonn/rofi"
+changelog="https://raw.githubusercontent.com/lbonn/rofi/wayland/Changelog"
+distfiles="https://github.com/lbonn/rofi/releases/download/${version%%+*}%2B${version##*+}/rofi-${version}.tar.gz"
+checksum=4b7b5de0606e91380861dce6f2b894bebf63b2031c8746fd4096f72576ce541a
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ makedepends+=" check-devel"
+fi
+
+post_extract() {
+ for f in script/rofi-*; do
+ mv $f "$f-wayland"
+ done
+ for f in data/*; do
+ mv $f "${f%.*}-wayland.${f##*.}"
+ done
+ for f in doc/*.?; do
+ mv $f ${f%.?}-wayland.${f##*.}
+ done
+}
+
+post_install() {
+ vlicense COPYING
+ rm -rf $DESTDIR/usr/lib/pkgconfig
+}
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (20 preceding siblings ...)
2023-02-06 18:41 ` [PR PATCH] [Updated] " subnut
@ 2023-02-06 18:43 ` subnut
2023-02-06 18:44 ` subnut
` (10 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 18:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 189 bytes --]
New review comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1097782511
Comment:
check-devel is needed during compilation.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (21 preceding siblings ...)
2023-02-06 18:43 ` [PR REVIEW] " subnut
@ 2023-02-06 18:44 ` subnut
2023-02-06 18:47 ` subnut
` (9 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 18:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 275 bytes --]
New review comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1097783187
Comment:
Those alternatives and clones don't support the plugins that have been specifically written for rofi. (rofi-emoji, for example.)
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (22 preceding siblings ...)
2023-02-06 18:44 ` subnut
@ 2023-02-06 18:47 ` subnut
2023-02-06 18:48 ` subnut
` (8 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 18:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 369 bytes --]
New review comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1097785911
Comment:
This package only provides two binaries (rofi-wayland and rofi-theme-selector-wayland) and their corresponding .desktop, icon, and man pages. Everything else needed and related to rofi is provided by the main rofi package.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (23 preceding siblings ...)
2023-02-06 18:47 ` subnut
@ 2023-02-06 18:48 ` subnut
2023-02-06 18:49 ` paper42
` (7 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 18:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 311 bytes --]
New review comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1097786867
Comment:
i.e. the mentality behind this package is that this package complements the main rofi package. It only provides what isn't already there in the main rofi package.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (24 preceding siblings ...)
2023-02-06 18:48 ` subnut
@ 2023-02-06 18:49 ` paper42
2023-02-06 18:52 ` paper42
` (6 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: paper42 @ 2023-02-06 18:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 240 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1097788294
Comment:
During compilation only if tests are enabled, right? In that case it can be in checkdepends.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (25 preceding siblings ...)
2023-02-06 18:49 ` paper42
@ 2023-02-06 18:52 ` paper42
2023-02-06 18:57 ` [PR PATCH] [Updated] " subnut
` (5 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: paper42 @ 2023-02-06 18:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 343 bytes --]
New review comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1097790865
Comment:
I see, do you still need to run rofi-wayland instead of rofi when you want it to use the rofi with wayland support? If that's the case, then scripts that call rofi will just call the xorg rofi...
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (26 preceding siblings ...)
2023-02-06 18:52 ` paper42
@ 2023-02-06 18:57 ` subnut
2023-02-06 19:34 ` [PR REVIEW] " subnut
` (4 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rofi-wayland
https://github.com/void-linux/void-packages/pull/42064
New package: rofi-wayland-1.7.5+wayland1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rofi-wayland-42064.patch --]
[-- Type: text/x-diff, Size: 7162 bytes --]
From d9ce500977f8901ec495110b1c7da9fec0ecde20 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 4 Feb 2023 00:55:57 +0530
Subject: [PATCH] New package: rofi-wayland-1.7.5+wayland1
---
.../patches/fix-libnkutils-test.patch | 18 +++
.../rofi-wayland/patches/wayland-suffix.patch | 142 ++++++++++++++++++
srcpkgs/rofi-wayland/template | 39 +++++
3 files changed, 199 insertions(+)
create mode 100644 srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch
create mode 100644 srcpkgs/rofi-wayland/template
diff --git a/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
new file mode 100644
index 000000000000..350e7b6abbcf
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
@@ -0,0 +1,18 @@
+Fix for GLib 2.73.1 %e time format
+https://github.com/sardemff7/libnkutils/issues/4
+https://github.com/GNOME/glib/commit/7074122f308b7b3402fba250f2010778fdad6eff
+
+--- a/subprojects/libnkutils/tests/format-string.c
++++ b/subprojects/libnkutils/tests/format-string.c
+@@ -677,7 +677,11 @@ static const struct {
+ { .name = "timestamp", .content = "1519910048" },
+ { .name = NULL }
+ },
++#if GLIB_CHECK_VERSION(2,73,1)
++ .result = "Thu Mar \u20071 13:14:08 2018"
++#else /* ! GLIB_CHECK_VERSION(2,73,1) */
+ .result = "Thu Mar 1 13:14:08 2018"
++#endif /* ! GLIB_CHECK_VERSION(2,73,1) */
+ }
+ },
+ {
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
new file mode 100644
index 000000000000..1e7a0059bb01
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
@@ -0,0 +1,142 @@
+--- a/script/rofi-sensible-terminal-wayland
++++ b/script/rofi-sensible-terminal-wayland
+@@ -15,4 +15,4 @@
+ fi
+ done
+
+-rofi -e "Failed to find a suitable terminal"
++rofi-wayland -e "Failed to find a suitable terminal"
+--- a/script/rofi-theme-selector-wayland
++++ b/script/rofi-theme-selector-wayland
+@@ -3,7 +3,7 @@
+ # This code is released in public domain by Dave Davenport <qball@gmpclient.org>
+ #
+
+-ROFI=$(which rofi)
++ROFI=$(which rofi-wayland)
+ SED=$(which sed)
+ MKTEMP=$(which mktemp)
+
+--- a/data/rofi-theme-selector-wayland.desktop
++++ b/data/rofi-theme-selector-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi-theme-selector
+-Name=Rofi Theme Selector
+-Icon=rofi
++Exec=rofi-theme-selector-wayland
++Name=Rofi Theme Selector (Wayland)
++Icon=rofi-wayland
+--- a/data/rofi-wayland.desktop
++++ b/data/rofi-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi -show
+-Name=Rofi
+-Icon=rofi
++Exec=rofi-wayland -show
++Name=Rofi (Wayland)
++Icon=rofi-wayland
+--- a/meson.build
++++ b/meson.build
+@@ -141,30 +141,21 @@
+ deps += nk.get_variable('libnkutils')
+ deps += nk.get_variable('libnkutils_bindings')
+
+-install_headers([
+- 'include/mode.h',
+- 'include/mode-private.h',
+- 'include/helper.h',
+- 'include/rofi-types.h',
+- 'include/rofi-icon-fetcher.h'
+- ],
+- subdir: meson.project_name(),
+-)
+ install_data(
+- 'script/rofi-sensible-terminal',
+- 'script/rofi-theme-selector',
++ 'script/rofi-theme-selector-wayland',
+ install_dir: join_paths(get_option('prefix'), get_option('bindir'))
+ )
+
+ install_data(
+- 'data/rofi-theme-selector.desktop',
+- 'data/rofi.desktop',
++ 'data/rofi-theme-selector-wayland.desktop',
++ 'data/rofi-wayland.desktop',
+ install_dir: desktop_install_dir
+ )
+ install_data(
+- 'data/rofi.svg',
++ 'data/rofi-wayland.svg',
++ 'data/rofi-wayland.png',
+ install_dir: icondir
+ )
+
+ flex = generator(find_program('flex'),
+ output: '@BASENAME@.c',
+@@ -296,7 +283,7 @@
+ gnome = import('gnome')
+ default_theme = gnome.compile_resources('resources', files('resources/resources.xml'))
+
+-rofi = executable('rofi', rofi_sources + [
++rofi = executable('rofi-wayland', rofi_sources + [
+ theme_lexer,
+ theme_parser,
+ default_theme,
+@@ -307,49 +294,8 @@
+
+ subdir('doc')
+ install_man(
+- 'doc/rofi.1',
+- 'doc/rofi-theme-selector.1',
+- 'doc/rofi-sensible-terminal.1',
+- 'doc/rofi-script.5',
+- 'doc/rofi-theme.5',
+- 'doc/rofi-debugging.5',
+- 'doc/rofi-dmenu.5',
+- 'doc/rofi-keys.5',
+-)
+-
+-install_data(
+- 'themes/Adapta-Nokto.rasi',
+- 'themes/Arc.rasi',
+- 'themes/Arc-Dark.rasi',
+- 'themes/DarkBlue.rasi',
+- 'themes/Indego.rasi',
+- 'themes/Monokai.rasi',
+- 'themes/Paper.rasi',
+- 'themes/android_notification.rasi',
+- 'themes/arthur.rasi',
+- 'themes/blue.rasi',
+- 'themes/c64.rasi',
+- 'themes/dmenu.rasi',
+- 'themes/docu.rasi',
+- 'themes/glue_pro_blue.rasi',
+- 'themes/gruvbox-common.rasi',
+- 'themes/gruvbox-dark-hard.rasi',
+- 'themes/gruvbox-dark-soft.rasi',
+- 'themes/gruvbox-dark.rasi',
+- 'themes/gruvbox-light-hard.rasi',
+- 'themes/gruvbox-light-soft.rasi',
+- 'themes/gruvbox-light.rasi',
+- 'themes/lb.rasi',
+- 'themes/paper-float.rasi',
+- 'themes/purple.rasi',
+- 'themes/sidebar.rasi',
+- 'themes/sidebar-v2.rasi',
+- 'themes/solarized.rasi',
+- 'themes/solarized_alternate.rasi',
+- 'themes/fancy.rasi',
+- 'themes/iggy.rasi',
+- 'themes/iggy.jpg',
+- install_dir: themedir
++ 'doc/rofi-wayland.1',
++ 'doc/rofi-theme-selector-wayland.1',
+ )
+
+ pkg = import('pkgconfig')
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..6ed8426c0cf6
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,39 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.5+wayland1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config flex glib-devel wayland-devel"
+makedepends="libglib-devel cairo-devel pango-devel libxkbcommon-devel
+ gdk-pixbuf-devel wayland-devel libmpdclient-devel libnl3-devel
+ libxcb-devel xcb-util-devel xcb-util-wm-devel xcb-util-cursor-devel
+ startup-notification-devel wayland-protocols alsa-lib-devel"
+depends="rofi>=${version%+*} bash which sed"
+short_desc="Window switcher, run dialog and dmenu replacement - Wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://github.com/lbonn/rofi"
+changelog="https://raw.githubusercontent.com/lbonn/rofi/wayland/Changelog"
+distfiles="https://github.com/lbonn/rofi/releases/download/${version%%+*}%2B${version##*+}/rofi-${version}.tar.gz"
+checksum=4b7b5de0606e91380861dce6f2b894bebf63b2031c8746fd4096f72576ce541a
+
+if [ "$XBPS_CHECK_PKGS" ]; then
+ makedepends+=" check-devel"
+fi
+
+post_extract() {
+ for f in script/rofi-*; do
+ mv $f "$f-wayland"
+ done
+ for f in data/*; do
+ mv $f "${f%.*}-wayland.${f##*.}"
+ done
+ for f in doc/*.?; do
+ mv $f ${f%.?}-wayland.${f##*.}
+ done
+}
+
+post_install() {
+ vlicense COPYING
+ rm -rf $DESTDIR/usr/lib/pkgconfig
+}
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (27 preceding siblings ...)
2023-02-06 18:57 ` [PR PATCH] [Updated] " subnut
@ 2023-02-06 19:34 ` subnut
2023-02-06 19:36 ` [PR PATCH] [Updated] " subnut
` (3 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 19:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 361 bytes --]
New review comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1097834323
Comment:
> scripts that call rofi will just call the xorg rofi
Good point... I hadn't thought about that at all.....
(imma draft this PR now and think about this later. Got an exam coming up :slightly_smiling_face:)
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (28 preceding siblings ...)
2023-02-06 19:34 ` [PR REVIEW] " subnut
@ 2023-02-06 19:36 ` subnut
2023-02-06 19:37 ` [PR REVIEW] " subnut
` (2 subsequent siblings)
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 19:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]
There is an updated pull request by subnut against master on the void-packages repository
https://github.com/subnut/void-packages rofi-wayland
https://github.com/void-linux/void-packages/pull/42064
New package: rofi-wayland-1.7.5+wayland1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rofi-wayland-42064.patch --]
[-- Type: text/x-diff, Size: 7121 bytes --]
From afac65057e4115678449e35e268ed5f0415bba74 Mon Sep 17 00:00:00 2001
From: Subhaditya Nath <sn03.general@gmail.com>
Date: Sat, 4 Feb 2023 00:55:57 +0530
Subject: [PATCH] New package: rofi-wayland-1.7.5+wayland1
---
.../patches/fix-libnkutils-test.patch | 18 +++
.../rofi-wayland/patches/wayland-suffix.patch | 142 ++++++++++++++++++
srcpkgs/rofi-wayland/template | 36 +++++
3 files changed, 196 insertions(+)
create mode 100644 srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
create mode 100644 srcpkgs/rofi-wayland/patches/wayland-suffix.patch
create mode 100644 srcpkgs/rofi-wayland/template
diff --git a/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
new file mode 100644
index 000000000000..350e7b6abbcf
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
@@ -0,0 +1,18 @@
+Fix for GLib 2.73.1 %e time format
+https://github.com/sardemff7/libnkutils/issues/4
+https://github.com/GNOME/glib/commit/7074122f308b7b3402fba250f2010778fdad6eff
+
+--- a/subprojects/libnkutils/tests/format-string.c
++++ b/subprojects/libnkutils/tests/format-string.c
+@@ -677,7 +677,11 @@ static const struct {
+ { .name = "timestamp", .content = "1519910048" },
+ { .name = NULL }
+ },
++#if GLIB_CHECK_VERSION(2,73,1)
++ .result = "Thu Mar \u20071 13:14:08 2018"
++#else /* ! GLIB_CHECK_VERSION(2,73,1) */
+ .result = "Thu Mar 1 13:14:08 2018"
++#endif /* ! GLIB_CHECK_VERSION(2,73,1) */
+ }
+ },
+ {
diff --git a/srcpkgs/rofi-wayland/patches/wayland-suffix.patch b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
new file mode 100644
index 000000000000..1e7a0059bb01
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/wayland-suffix.patch
@@ -0,0 +1,142 @@
+--- a/script/rofi-sensible-terminal-wayland
++++ b/script/rofi-sensible-terminal-wayland
+@@ -15,4 +15,4 @@
+ fi
+ done
+
+-rofi -e "Failed to find a suitable terminal"
++rofi-wayland -e "Failed to find a suitable terminal"
+--- a/script/rofi-theme-selector-wayland
++++ b/script/rofi-theme-selector-wayland
+@@ -3,7 +3,7 @@
+ # This code is released in public domain by Dave Davenport <qball@gmpclient.org>
+ #
+
+-ROFI=$(which rofi)
++ROFI=$(which rofi-wayland)
+ SED=$(which sed)
+ MKTEMP=$(which mktemp)
+
+--- a/data/rofi-theme-selector-wayland.desktop
++++ b/data/rofi-theme-selector-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi-theme-selector
+-Name=Rofi Theme Selector
+-Icon=rofi
++Exec=rofi-theme-selector-wayland
++Name=Rofi Theme Selector (Wayland)
++Icon=rofi-wayland
+--- a/data/rofi-wayland.desktop
++++ b/data/rofi-wayland.desktop
+@@ -3,6 +3,6 @@
+ Version=1.0
+ Type=Application
+ Terminal=false
+-Exec=rofi -show
+-Name=Rofi
+-Icon=rofi
++Exec=rofi-wayland -show
++Name=Rofi (Wayland)
++Icon=rofi-wayland
+--- a/meson.build
++++ b/meson.build
+@@ -141,30 +141,21 @@
+ deps += nk.get_variable('libnkutils')
+ deps += nk.get_variable('libnkutils_bindings')
+
+-install_headers([
+- 'include/mode.h',
+- 'include/mode-private.h',
+- 'include/helper.h',
+- 'include/rofi-types.h',
+- 'include/rofi-icon-fetcher.h'
+- ],
+- subdir: meson.project_name(),
+-)
+ install_data(
+- 'script/rofi-sensible-terminal',
+- 'script/rofi-theme-selector',
++ 'script/rofi-theme-selector-wayland',
+ install_dir: join_paths(get_option('prefix'), get_option('bindir'))
+ )
+
+ install_data(
+- 'data/rofi-theme-selector.desktop',
+- 'data/rofi.desktop',
++ 'data/rofi-theme-selector-wayland.desktop',
++ 'data/rofi-wayland.desktop',
+ install_dir: desktop_install_dir
+ )
+ install_data(
+- 'data/rofi.svg',
++ 'data/rofi-wayland.svg',
++ 'data/rofi-wayland.png',
+ install_dir: icondir
+ )
+
+ flex = generator(find_program('flex'),
+ output: '@BASENAME@.c',
+@@ -296,7 +283,7 @@
+ gnome = import('gnome')
+ default_theme = gnome.compile_resources('resources', files('resources/resources.xml'))
+
+-rofi = executable('rofi', rofi_sources + [
++rofi = executable('rofi-wayland', rofi_sources + [
+ theme_lexer,
+ theme_parser,
+ default_theme,
+@@ -307,49 +294,8 @@
+
+ subdir('doc')
+ install_man(
+- 'doc/rofi.1',
+- 'doc/rofi-theme-selector.1',
+- 'doc/rofi-sensible-terminal.1',
+- 'doc/rofi-script.5',
+- 'doc/rofi-theme.5',
+- 'doc/rofi-debugging.5',
+- 'doc/rofi-dmenu.5',
+- 'doc/rofi-keys.5',
+-)
+-
+-install_data(
+- 'themes/Adapta-Nokto.rasi',
+- 'themes/Arc.rasi',
+- 'themes/Arc-Dark.rasi',
+- 'themes/DarkBlue.rasi',
+- 'themes/Indego.rasi',
+- 'themes/Monokai.rasi',
+- 'themes/Paper.rasi',
+- 'themes/android_notification.rasi',
+- 'themes/arthur.rasi',
+- 'themes/blue.rasi',
+- 'themes/c64.rasi',
+- 'themes/dmenu.rasi',
+- 'themes/docu.rasi',
+- 'themes/glue_pro_blue.rasi',
+- 'themes/gruvbox-common.rasi',
+- 'themes/gruvbox-dark-hard.rasi',
+- 'themes/gruvbox-dark-soft.rasi',
+- 'themes/gruvbox-dark.rasi',
+- 'themes/gruvbox-light-hard.rasi',
+- 'themes/gruvbox-light-soft.rasi',
+- 'themes/gruvbox-light.rasi',
+- 'themes/lb.rasi',
+- 'themes/paper-float.rasi',
+- 'themes/purple.rasi',
+- 'themes/sidebar.rasi',
+- 'themes/sidebar-v2.rasi',
+- 'themes/solarized.rasi',
+- 'themes/solarized_alternate.rasi',
+- 'themes/fancy.rasi',
+- 'themes/iggy.rasi',
+- 'themes/iggy.jpg',
+- install_dir: themedir
++ 'doc/rofi-wayland.1',
++ 'doc/rofi-theme-selector-wayland.1',
+ )
+
+ pkg = import('pkgconfig')
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..75df5fe87e88
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,36 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.5+wayland1
+revision=1
+build_style=meson
+hostmakedepends="pkg-config flex glib-devel wayland-devel"
+makedepends="libglib-devel cairo-devel pango-devel libxkbcommon-devel
+ gdk-pixbuf-devel wayland-devel libmpdclient-devel libnl3-devel
+ libxcb-devel xcb-util-devel xcb-util-wm-devel xcb-util-cursor-devel
+ startup-notification-devel wayland-protocols alsa-lib-devel"
+checkdepends="check-devel"
+depends="rofi>=${version%+*} bash which sed"
+short_desc="Window switcher, run dialog and dmenu replacement - Wayland"
+maintainer="Subhaditya Nath <sn03.general@gmail.com>"
+license="MIT"
+homepage="https://github.com/lbonn/rofi"
+changelog="https://raw.githubusercontent.com/lbonn/rofi/wayland/Changelog"
+distfiles="https://github.com/lbonn/rofi/releases/download/${version%%+*}%2B${version##*+}/rofi-${version}.tar.gz"
+checksum=4b7b5de0606e91380861dce6f2b894bebf63b2031c8746fd4096f72576ce541a
+
+post_extract() {
+ for f in script/rofi-*; do
+ mv $f "$f-wayland"
+ done
+ for f in data/*; do
+ mv $f "${f%.*}-wayland.${f##*.}"
+ done
+ for f in doc/*.?; do
+ mv $f ${f%.?}-wayland.${f##*.}
+ done
+}
+
+post_install() {
+ vlicense COPYING
+ rm -rf $DESTDIR/usr/lib/pkgconfig
+}
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR REVIEW] New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (29 preceding siblings ...)
2023-02-06 19:36 ` [PR PATCH] [Updated] " subnut
@ 2023-02-06 19:37 ` subnut
2023-05-08 1:53 ` github-actions
2023-05-22 1:57 ` [PR PATCH] [Closed]: " github-actions
32 siblings, 0 replies; 37+ messages in thread
From: subnut @ 2023-02-06 19:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 190 bytes --]
New review comment by subnut on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#discussion_r1097836938
Comment:
I guess I could look into xbps-alternatives
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (30 preceding siblings ...)
2023-02-06 19:37 ` [PR REVIEW] " subnut
@ 2023-05-08 1:53 ` github-actions
2023-05-22 1:57 ` [PR PATCH] [Closed]: " github-actions
32 siblings, 0 replies; 37+ messages in thread
From: github-actions @ 2023-05-08 1:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/42064#issuecomment-1537627710
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 37+ messages in thread
* Re: [PR PATCH] [Closed]: New package: rofi-wayland-1.7.5+wayland1
2023-02-03 20:36 [PR PATCH] New package: rofi-wayland-1.7.5+wayland1 subnut
` (31 preceding siblings ...)
2023-05-08 1:53 ` github-actions
@ 2023-05-22 1:57 ` github-actions
32 siblings, 0 replies; 37+ messages in thread
From: github-actions @ 2023-05-22 1:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1102 bytes --]
There's a closed pull request on the void-packages repository
New package: rofi-wayland-1.7.5+wayland1
https://github.com/void-linux/void-packages/pull/42064
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
<!--
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 37+ messages in thread