From: ram02z <ram02z@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: rofi-wayland-1.7.2
Date: Wed, 22 Dec 2021 15:37:59 +0100 [thread overview]
Message-ID: <20211222143759.s9BJmbBAO8g_daIhw91eWsJwGJveKZ3Dbt2eP9tn02s@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33578@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1989 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.2
<!-- 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.
I have attempted to keep the dependencies to a minimum, so I would appreciate if anyone testing this can let me know if there are missing dependencies.
<!--
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: 3643 bytes --]
From fa5560977e79cd29e988fb26f39079a822d968cd 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.2
---
.../patches/disable-scrollbar-test.patch | 32 +++++++++++++++++++
.../patches/fix-libnkutils-test.patch | 13 ++++++++
srcpkgs/rofi-wayland/template | 23 +++++++++++++
3 files changed, 68 insertions(+)
create mode 100644 srcpkgs/rofi-wayland/patches/disable-scrollbar-test.patch
create mode 100644 srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
create mode 100644 srcpkgs/rofi-wayland/template
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..9cb6c7fee7ba
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/disable-scrollbar-test.patch
@@ -0,0 +1,32 @@
+Don't run scrollbar test, it fails on x86.
+
+diff --git a/meson.build b/meson.build
+index 6e1105a..f707cd9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -410,24 +410,6 @@
+ 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/css-colors.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/patches/fix-libnkutils-test.patch b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
new file mode 100644
index 000000000000..5c9bce1da207
--- /dev/null
+++ b/srcpkgs/rofi-wayland/patches/fix-libnkutils-test.patch
@@ -0,0 +1,13 @@
+diff --git a/subprojects/libnkutils/tests/format-string.c b/subprojects/libnkutils/tests/format-string.c
+index d00ad2d..cf69b20 100644
+--- a/subprojects/libnkutils/tests/format-string.c
++++ b/subprojects/libnkutils/tests/format-string.c
+@@ -899,7 +899,7 @@ static const struct {
+ .testpath = "/nkutils/name/replace/escaping/forwardslash/3",
+ .data = {
+ .identifier = '$',
+- .source = "${data/a/\\//b/x}",
++ .source = "${data/ab/\\/x}",
+ .data = {
+ { .name = "data", .content = "'ab'" },
+ { .name = NULL }
diff --git a/srcpkgs/rofi-wayland/template b/srcpkgs/rofi-wayland/template
new file mode 100644
index 000000000000..8122f2dcddca
--- /dev/null
+++ b/srcpkgs/rofi-wayland/template
@@ -0,0 +1,23 @@
+# Template file for 'rofi-wayland'
+pkgname=rofi-wayland
+version=1.7.2
+revision=1
+_ver=${version}+wayland1
+wrksrc=rofi-${_ver}
+build_style=meson
+configure_args="-Dxcb=disabled -Dcheck=disabled"
+hostmakedepends="ninja flex bison glib-devel pkg-config wayland-devel"
+makedepends="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=13c9ac16e9940f72e952d65fdaaa41b0fcbd8da483119a9f6b9bea5940ff2118
+replaces="rofi>=0"
+
+post_install() {
+ vlicense COPYING
+}
next prev parent reply other threads:[~2021-12-22 14:38 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 19:46 [PR PATCH] New package: rofi-wayland-1.7.0 ram02z
2021-10-15 19:54 ` [PR PATCH] [Updated] " ram02z
2021-10-15 19:59 ` ram02z
2021-10-15 20:08 ` ram02z
2021-10-15 22:34 ` ram02z
2021-10-15 22:40 ` ram02z
2021-10-17 10:41 ` ram02z
2021-10-17 10:42 ` ram02z
2021-10-17 11:20 ` ram02z
2021-10-17 11:20 ` [PR PATCH] [Updated] " ram02z
2021-11-03 18:58 ` [PR REVIEW] " TinfoilSubmarine
2021-11-03 19:01 ` ram02z
2021-11-03 19:14 ` TinfoilSubmarine
2021-12-21 23:21 ` [PR PATCH] [Updated] " ram02z
2021-12-22 13:21 ` [PR PATCH] [Updated] New package: rofi-wayland-1.7.2 ram02z
2021-12-22 14:37 ` ram02z [this message]
2022-01-30 23:12 ` ram02z
2022-02-01 23:44 ` [PR PATCH] [Updated] New package: rofi-wayland-1.7.3 ram02z
2022-03-03 15:14 ` ram02z
2022-06-08 2:12 ` github-actions
2022-06-08 7:51 ` ram02z
2022-07-18 14:15 ` ahesford
2022-07-18 14:15 ` [PR PATCH] [Closed]: " ahesford
2022-07-18 14:25 ` ram02z
2022-07-18 14:35 ` paper42
2022-07-18 14:50 ` ram02z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211222143759.s9BJmbBAO8g_daIhw91eWsJwGJveKZ3Dbt2eP9tn02s@z \
--to=ram02z@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).