[gentoo-commits] repo/proj/guru:master commit in: media-gfx/glimpse/files/, media-gfx/glimpse/

[Andrew Ammerlaan]

commit: 9d729c22ab514c19c3d809a13a434a7cf8ba59d2
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Wed Apr 21 19:17:44 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Apr 21 19:28:03 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9d729c22

media-gfx/glimpse: Disable failing tests.

Closes: https://bugs.gentoo.org/784410
Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 .../glimpse-0.2.0_disable-failing-tests.patch  | 29 ++
 media-gfx/glimpse/glimpse-0.2.0.ebuild |  1 +
 2 files changed, 30 insertions(+)

diff --git a/media-gfx/glimpse/files/glimpse-0.2.0_disable-failing-tests.patch 
b/media-gfx/glimpse/files/glimpse-0.2.0_disable-failing-tests.patch
new file mode 100644
index 0..b74d7b809
--- /dev/null
+++ b/media-gfx/glimpse/files/glimpse-0.2.0_disable-failing-tests.patch
@@ -0,0 +1,29 @@
+From f82733908da155f598cfec46d132c3121d793030 Mon Sep 17 00:00:00 2001
+From: tastytea 
+Date: Wed, 21 Apr 2021 20:50:29 +0200
+Subject: [PATCH] Disable failing tests.
+
+---
+ app/tests/Makefile.am | 4 
+ 1 file changed, 4 deletions(-)
+
+diff --git a/app/tests/Makefile.am b/app/tests/Makefile.am
+index d4203358d0..54c51e8dc4 100644
+--- a/app/tests/Makefile.am
 b/app/tests/Makefile.am
+@@ -31,12 +31,8 @@ endif
+ TESTS = \
+   test-core   \
+   test-gimpidtable\
+-  test-save-and-export\
+   test-session-2-8-compatibility-multi-window \
+   test-session-2-8-compatibility-single-window\
+-  test-single-window-mode \
+-  test-tools  \
+-  test-ui \
+   test-xcf
+ 
+ EXTRA_PROGRAMS = $(TESTS)
+-- 
+2.26.3
+

diff --git a/media-gfx/glimpse/glimpse-0.2.0.ebuild 
b/media-gfx/glimpse/glimpse-0.2.0.ebuild
index 107b98422..ca55db498 100644
--- a/media-gfx/glimpse/glimpse-0.2.0.ebuild
+++ b/media-gfx/glimpse/glimpse-0.2.0.ebuild
@@ -94,6 +94,7 @@ DOCS=( "AUTHORS" "HACKING.md" "NEWS" "README.md" )
 PATCHES=(
"${FILESDIR}/${PN}-0.2.0_fix_test-appdata.patch" # Bug 685210, bug 
#691070
"${FILESDIR}/${PN}-0.2.0_fix_autoconf-2.70.patch" # Bug #776679
+   "${FILESDIR}/${PN}-0.2.0_disable-failing-tests.patch" # Bug #784410
 )
 
 src_prepare() {

[gentoo-commits] repo/proj/guru:master commit in: media-gfx/glimpse/files/, media-gfx/glimpse/

[Andrew Ammerlaan]

commit: 71febc0ec7dbd8c32c8a0425f30b37d583f98cc6
Author: Ronny (tastytea) Gutbrod  tastytea  de>
AuthorDate: Wed Mar 17 10:48:09 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Mar 17 10:48:09 2021 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=71febc0e

media-gfx/glimpse: Fix configure error with autoconf-2.70.

Closes: https://bugs.gentoo.org/776679

Signed-off-by: Ronny (tastytea) Gutbrod  tastytea.de>

 .../files/glimpse-0.2.0_fix_autoconf-2.70.patch| 58 ++
 media-gfx/glimpse/glimpse-0.2.0.ebuild |  4 +-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/media-gfx/glimpse/files/glimpse-0.2.0_fix_autoconf-2.70.patch 
b/media-gfx/glimpse/files/glimpse-0.2.0_fix_autoconf-2.70.patch
new file mode 100644
index ..732cd938
--- /dev/null
+++ b/media-gfx/glimpse/files/glimpse-0.2.0_fix_autoconf-2.70.patch
@@ -0,0 +1,58 @@
+From cebeb90a87105cd6e35bcb357d53cc04c828ca21 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich 
+Date: Sun, 25 Oct 2020 18:09:21 +
+Subject: [PATCH] configure.ac: fix `--with-linux-input` handling with upcoming
+ autoconf-2.70
+
+Upcoming autoconf-2.70 exposes deficiency in configure.ac:
+
+```
+$ autoconf-2.70_beta2 && ./configure --host=x86_64-pc-linux-gnu
+./configure: line 1430: 5: Bad file descriptor
+checking whether  is declared... ./configure: line 1432: ${+y}: bad
+```
+
+It happens because macros are called with parameters using insufficient 
quoting.
+
+More details at 
https://lists.gnu.org/archive/html/bug-autoconf/2020-10/msg00027.html
+
+The fix only amends `--with-linux-input`. Other cases of underquoting
+will need to be handled separately.
+
+Fix-by: Zack Weinberg
+Signed-off-by: Sergei Trofimovich 
+---
+ configure.ac | 17 -
+ 1 file changed, 8 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 96312f706e..63b85be07a 100644
+--- a/configure.ac
 b/configure.ac
+@@ -2135,15 +2135,14 @@ fi
+ AC_ARG_WITH(linux-input, [  --without-linux-input   don't build linux input 
event controller module])
+ 
+ have_linux_input="no (linux input support disabled)"
+-if test "x$with_linux_input" != "xno"; then
+-  AC_CHECK_HEADER(linux/input.h,
+-  AC_CHECK_DECL(KEY_OK,
+-  have_linux_input=yes,
+-  have_linux_input="no (needs Linux 2.6)",
+-  [#include ]))
+-fi
+-
+-AM_CONDITIONAL(HAVE_LINUX_INPUT, test "x$have_linux_input" = xyes)
++AS_IF([test "x$with_linux_input" != "xno"],
++  [AC_CHECK_HEADER([linux/input.h],
++[AC_CHECK_DECL([KEY_OK],
++   [have_linux_input=yes],
++   [have_linux_input="no (needs Linux 2.6)"],
++   [#include ])])])
++
++AM_CONDITIONAL([HAVE_LINUX_INPUT], [test "x$have_linux_input" = xyes])
+ 
+ 
+ ###
+-- 
+GitLab
+

diff --git a/media-gfx/glimpse/glimpse-0.2.0.ebuild 
b/media-gfx/glimpse/glimpse-0.2.0.ebuild
index 0057314e..47f619d2 100644
--- a/media-gfx/glimpse/glimpse-0.2.0.ebuild
+++ b/media-gfx/glimpse/glimpse-0.2.0.ebuild
@@ -91,9 +91,9 @@ BDEPEND="
 
 DOCS=( "AUTHORS" "HACKING.md" "NEWS" "README.md" )
 
-# Bug 685210 (and duplicate bug #691070)
 PATCHES=(
-   "${FILESDIR}/${PN}-0.2_fix_test-appdata.patch"
+   "${FILESDIR}/${PN}-0.2_fix_test-appdata.patch" # Bug 685210, bug #691070
+   "${FILESDIR}/${PN}-0.2.0_fix_autoconf-2.70.patch" # Bug #776679
 )
 
 src_prepare() {