Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.0

[ram02z <ram02z@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1834 bytes --]

There is an updated pull request by ram02z against master on the void-packages repository

https://github.com/ram02z/void-packages rofi-wayland
https://github.com/void-linux/void-packages/pull/33578

New package: rofi-wayland-1.7.0
<!-- Mark items with [x] where applicable -->

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

Inspired by the alpine package, I have disabled xcb to make it wayland only. See https://github.com/lbonn/rofi/pull/31

An alternative would be to switch the current rofi template to use this fork to allow for wayland support. 

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!-- 
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] 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/33578.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rofi-wayland-33578.patch --]
[-- Type: text/x-diff, Size: 3996 bytes --]

From 6c16fbfc4be344d4c44a63643e21699c53baac3e Mon Sep 17 00:00:00 2001
From: Omar Zeghouani <omarzeghouanii@gmail.com>
Date: Fri, 15 Oct 2021 20:11:35 +0100
Subject: [PATCH] New package: rofi-wayland-1.7.0

---
 ...1-meson-fix-version-in-rofi.pc-again.patch | 24 +++++++++++++++
 .../patches/disable-scrollbar-test.patch      | 30 +++++++++++++++++++
 srcpkgs/rofi-wayland/template                 | 23 ++++++++++++++
 3 files changed, 77 insertions(+)
 create mode 100644 srcpkgs/rofi-wayland/patches/0001-meson-fix-version-in-rofi.pc-again.patch
 create mode 100644 srcpkgs/rofi-wayland/patches/disable-scrollbar-test.patch
 create mode 100644 srcpkgs/rofi-wayland/template

diff --git a/srcpkgs/rofi-wayland/patches/0001-meson-fix-version-in-rofi.pc-again.patch b/srcpkgs/rofi-wayland/patches/0001-meson-fix-version-in-rofi.pc-again.patch
new file mode 100644
index 000000000000..70119411a816
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/0001-meson-fix-version-in-rofi.pc-again.patch
@@ -0,0 +1,24 @@
+From de28766ce014d9cd09c460d520a8a28fbe41fa0d Mon Sep 17 00:00:00 2001
+From: Jakub Jirutka <jakub@jirutka.cz>
+Date: Mon, 4 Oct 2021 00:59:51 +0200
+Subject: [PATCH] [Meson] Fix version in rofi.pc again
+Patch-Source: https://github.com/lbonn/rofi/pull/37
+
+rofi.pc: pkgconf version 1.7.0+wayland1 is invalid
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 604956f11..dfb1af847 100644
+--- a/meson.build
++++ b/meson.build
+@@ -339,7 +339,7 @@ pkg = import('pkgconfig')
+ pkg.generate(
+     filebase: 'rofi',
+     name: 'rofi',
+-    version: meson.project_version().split('-')[0],
++    version: meson.project_version().split('+')[0],
+     description: 'Header files for rofi plugins',
+     variables: [
+         'pluginsdir=@0@'.format(join_paths('${libdir}', meson.project_name())),
diff --git a/srcpkgs/rofi-wayland/patches/disable-scrollbar-test.patch b/srcpkgs/rofi-wayland/patches/disable-scrollbar-test.patch
new file mode 100644
index 000000000000..fd6b00624ffd
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/disable-scrollbar-test.patch
@@ -0,0 +1,30 @@
+Don't run scrollbar test, it fails on i686.
+
+diff --git a/meson.build b/meson.build
+index 6e1105a..f707cd9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -342,23 +342,6 @@ test('box test', executable('box.test', [
+     dependencies: deps,
+ ))
+
+-test('scrollbar test', executable('scrollbar.test', [
+-        'test/scrollbar-test.c',
+-        theme_parser,
+-        theme_lexer,
+-        default_theme,
+-    ],
+-    objects: rofi.extract_objects([
+-        'source/widgets/widget.c',
+-        'source/widgets/scrollbar.c',
+-        'source/theme.c',
+-        'source/rofi-types.c',
+-        'source/css-colors.c',
+-        'config/config.c',
+-    ]),
+-    dependencies: deps,
+-))
+-
+ test('textbox test', executable('textbox.test', [
+         'test/textbox-test.c',
+         theme_parser,
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..88d531a0ca3c
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,23 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.0
+revision=1
+_ver=${version}+wayland1
+wrksrc=rofi-${_ver}
+build_style=meson
+configure_args="-Dxcb=disabled -Dcheck=disabled"
+hostmakedepends="ninja flex bison pkg-config wayland-devel"
+makedepends="glib-devel gdk-pixbuf-devel libxkbcommon-devel pango-devel
+ wayland-protocols wayland-devel"
+checkdepends="check-devel cppcheck xkeyboard-config"
+short_desc="Window switcher, run dialog and dmenu replacement"
+maintainer="Omar Zeghouani <omarzeghouanii@gmail.com>"
+license="MIT"
+homepage="https://github.com/lbonn/rofi"
+distfiles="https://github.com/lbonn/rofi/releases/download/${_ver}/rofi-${_ver}.tar.gz"
+checksum=07892f3f993de3ccc5e3e7705c58a88498216d2a7aaaabb14e29dd2837701691
+replaces="rofi>=0"
+
+post_install() {
+	vlicense COPYING
+}