[gentoo-commits] repo/gentoo:master commit in: x11-misc/rofi/files/

2023-01-01 Thread Florian Schmaus 
commit: 202f0335f04d765f2f70a6a5032c4f0a25b42988
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jan  1 13:47:17 2023 +
Commit: Florian Schmaus  gentoo  org>
CommitDate: Sun Jan  1 13:58:39 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=202f0335

x11-misc/rofi: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28923
Signed-off-by: Florian Schmaus  gentoo.org>

 x11-misc/rofi/files/rofi-0.15.12-Werror.patch  | 11 
 .../rofi/files/rofi-1.5.0-gtk-settings-test.patch  | 13 --
 x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch | 30 --
 3 files changed, 54 deletions(-)

diff --git a/x11-misc/rofi/files/rofi-0.15.12-Werror.patch 
b/x11-misc/rofi/files/rofi-0.15.12-Werror.patch
deleted file mode 100644
index 89755ee4d0c5..
--- a/x11-misc/rofi/files/rofi-0.15.12-Werror.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@
- dnl Setup automake to be silent and in foreign mode.
- dnl We want xz distribution
- dnl -
--AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects dist-xz])
-+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects dist-xz])
- AM_SILENT_RULES([yes])
- 
- dnl -

diff --git a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch 
b/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch
deleted file mode 100644
index 82aa264ac29e..
--- a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
 a/subprojects/libnkutils/libnkutils-common.mk
-+++ b/subprojects/libnkutils/libnkutils-common.mk
-@@ -130,8 +130,8 @@
-   %D%/src/gtk-settings.c \
-   %D%/src/nkutils-gtk-settings.h
- 
--_libnkutils_tests += \
--  %D%/tests/gtk-settings.test
-+#_libnkutils_tests += \
-+# %D%/tests/gtk-settings.test
- endif
- 
- if NK_ENABLE_XDG_DE

diff --git a/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch 
b/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
deleted file mode 100644
index d2ac9510d3cb..
--- a/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7e426c597539c1b6f33c34300b84d2074f94c9b6 Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Mon, 4 Jan 2021 22:27:37 +0100
-Subject: [PATCH] configure.ac: Remove argument from AC_PROG_LEX
-
-autoconf-2.70 only accepts "yywrap" and "noyywrap" as arguments to
-AC_PROG_LEX. Calling it with no arguments will trigger the old behavior
-from autoconf-2.69.
-
-Signed-off-by: Lars Wendler 

- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e0968b65..03dc1d2f 100644
 a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@ AH_BOTTOM([#include "gitconfig.h"])
- dnl -
- dnl Lex & Bison language parser.
- dnl -
--AC_PROG_LEX([flex])
-+AC_PROG_LEX
- AC_PROG_YACC
- 
- 
--- 
-2.30.0
-

[gentoo-commits] repo/gentoo:master commit in: x11-misc/rofi/files/, x11-misc/rofi/

2021-01-04 Thread Lars Wendler 
commit: 7e47fbe82f079526433889b021aded8d6c1e57a2
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan  4 21:48:18 2021 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan  4 21:48:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e47fbe8

x11-misc/rofi: Fixed build with ~sys-devel/autoconf-2.70

Closes: https://bugs.gentoo.org/749864
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Lars Wendler  gentoo.org>

 x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch | 30 ++
 x11-misc/rofi/rofi-1.6.1.ebuild| 12 +
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch 
b/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
new file mode 100644
index 000..d2ac9510d3c
--- /dev/null
+++ b/x11-misc/rofi/files/rofi-1.6.1-autoconf-2.70.patch
@@ -0,0 +1,30 @@
+From 7e426c597539c1b6f33c34300b84d2074f94c9b6 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Mon, 4 Jan 2021 22:27:37 +0100
+Subject: [PATCH] configure.ac: Remove argument from AC_PROG_LEX
+
+autoconf-2.70 only accepts "yywrap" and "noyywrap" as arguments to
+AC_PROG_LEX. Calling it with no arguments will trigger the old behavior
+from autoconf-2.69.
+
+Signed-off-by: Lars Wendler 
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index e0968b65..03dc1d2f 100644
+--- a/configure.ac
 b/configure.ac
+@@ -7,7 +7,7 @@ AH_BOTTOM([#include "gitconfig.h"])
+ dnl -
+ dnl Lex & Bison language parser.
+ dnl -
+-AC_PROG_LEX([flex])
++AC_PROG_LEX
+ AC_PROG_YACC
+ 
+ 
+-- 
+2.30.0
+

diff --git a/x11-misc/rofi/rofi-1.6.1.ebuild b/x11-misc/rofi/rofi-1.6.1.ebuild
index 44eda2ab0a9..297c2f078d6 100644
--- a/x11-misc/rofi/rofi-1.6.1.ebuild
+++ b/x11-misc/rofi/rofi-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,19 +41,21 @@ DEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-0.15.12-Werror.patch
"${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
+   "${FILESDIR}"/${PN}-1.6.1-autoconf-2.70.patch
 )
 
 src_prepare() {
default
-
eautoreconf
 }
 
 src_configure() {
tc-export CC
 
-   econf \
-   $(use_enable drun) \
-   $(use_enable test check) \
+   local myeconfargs=(
+   $(use_enable drun)
+   $(use_enable test check)
$(use_enable windowmode)
+   )
+   econf "${myeconfargs[@]}"
 }

[gentoo-commits] repo/gentoo:master commit in: x11-misc/rofi/files/, x11-misc/rofi/

2018-02-05 Thread Jeroen Roovers 
commit: aeaf9c2da9aeda090277b601a840e6f0d1ae4657
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Mon Feb  5 19:43:15 2018 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Mon Feb  5 19:43:32 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeaf9c2d

x11-misc/rofi: Disable gtk-settings.test (bug #646688).

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch | 13 +
 x11-misc/rofi/rofi-1.5.0.ebuild|  1 +
 2 files changed, 14 insertions(+)

diff --git a/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch 
b/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch
new file mode 100644
index 000..82aa264ac29
--- /dev/null
+++ b/x11-misc/rofi/files/rofi-1.5.0-gtk-settings-test.patch
@@ -0,0 +1,13 @@
+--- a/subprojects/libnkutils/libnkutils-common.mk
 b/subprojects/libnkutils/libnkutils-common.mk
+@@ -130,8 +130,8 @@
+   %D%/src/gtk-settings.c \
+   %D%/src/nkutils-gtk-settings.h
+ 
+-_libnkutils_tests += \
+-  %D%/tests/gtk-settings.test
++#_libnkutils_tests += \
++# %D%/tests/gtk-settings.test
+ endif
+ 
+ if NK_ENABLE_XDG_DE

diff --git a/x11-misc/rofi/rofi-1.5.0.ebuild b/x11-misc/rofi/rofi-1.5.0.ebuild
index 29016aeb7d0..b1d04b298f2 100644
--- a/x11-misc/rofi/rofi-1.5.0.ebuild
+++ b/x11-misc/rofi/rofi-1.5.0.ebuild
@@ -36,6 +36,7 @@ DEPEND="
 "
 PATCHES=(
"${FILESDIR}"/${PN}-0.15.12-Werror.patch
+   "${FILESDIR}"/${PN}-1.5.0-gtk-settings-test.patch
 )
 
 src_prepare() {