gentoo resync : 12.05.2022

6 files changed, 0 insertions, 236 deletions

diff --git a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch b/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
deleted file mode 100644
index be9547ead111..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1-autoconf-2.70.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/mchehab/zbar/commit/89e7900d85dd54ef351a7ed582aec6a5a5d7fa37
-https://bugs.gentoo.org/775656
-
-From 89e7900d85dd54ef351a7ed582aec6a5a5d7fa37 Mon Sep 17 00:00:00 2001
-From: Boyuan Yang <byang@debian.org>
-Date: Thu, 31 Dec 2020 12:56:26 -0500
-Subject: [PATCH] configure.ac: Fix quote issue (autoconf 2.70 compat)
-
-One of the AS_IF() macro was not properly quoted. This commit
-fixes that issue.
-
-This patch closes: #132 (fixes this bug report).
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index df0220a8..db4bc902 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -656,7 +656,7 @@ AS_IF([test "x$with_qt" != "xno"],
- 					    [with_qt="no"])])])
- 
- AS_IF([test "x$with_qt" != "xno"],
--   AS_IF([test "x$with_qt5" != "xno"],
-+   [AS_IF([test "x$with_qt5" != "xno"],
-     [AC_CHECK_PROGS(MOC, [moc-qt5 moc])
-      AC_MSG_NOTICE([using moc from $MOC])
-      QT_VERSION=`$PKG_CONFIG Qt5Gui --modversion`
-@@ -672,7 +672,7 @@ dnl -fPIC has no effect on Windows and breaks windres
-      QT_VERSION=`$PKG_CONFIG QtGui --modversion`
-      AC_MSG_NOTICE([using Qt version $QT_VERSION])
-      qt_pkgconfig_file="zbar-qt.pc"
--     ]))
-+     ])])
- 
- AM_CONDITIONAL([HAVE_QT], [test "x$with_qt" = "xyes"])
- 
diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch
deleted file mode 100644
index 62993a8b2b25..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_fix_leftover_on_shell_compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8e74a2e223bd40e8cf95ac2580df56ac8500a859 Mon Sep 17 00:00:00 2001
-From: Boyuan Yang <byang@debian.org>
-Date: Wed, 22 Apr 2020 10:29:39 -0400
-Subject: [PATCH] configure.ac: Fix leftover on shell compatibility
-
-Uses "=" instead of "==" in string comparision for POSIX
-compatibility.  This is a leftover of previous similar fix.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 105da09..df0220a 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -845,7 +845,7 @@ dnl summary log
- echo ""
- echo "please verify that the detected configuration matches your expectations:"
- echo "------------------------------------------------------------------------"
--AS_IF([test "x$USE_NLS" == "xyes"],
-+AS_IF([test "x$USE_NLS" = "xyes"],
-   [echo    "gettext                $USE_NLS"]
- )
- AS_IF([test "x$win32" != "xno"],
diff --git a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch b/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch
deleted file mode 100644
index 3f538c81138f..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_fix_unittest.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2020-04-21 00:09:21.000000000 +0300
-+++ b/configure.ac	2020-04-23 16:53:06.654339488 +0300
-@@ -336,6 +336,14 @@
-   AC_SUBST(DBUS_CONFDIR)
- ])
- 
-+dnl zbarimg tests
-+AC_ARG_WITH([zbarimg_tests],
-+  [AS_HELP_STRING([--without-zbarimg-tests],
-+    [disable tests for zbarimg])],
-+  [],
-+  [with_zbarimg_tests="yes"])
-+AM_CONDITIONAL([HAVE_ZBARIMG_TESTS], [test "x$with_zbarimg_tests" = "xyes"])
-+
- dnl libjpeg
- AC_ARG_WITH([jpeg],
-   [AS_HELP_STRING([--without-jpeg],
-@@ -724,25 +732,12 @@
- 
- AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)])
- AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."])
-+AC_SUBST(CLASSPATH)
- 
--dnl Search for Java unit test library
--AS_IF([test -z "$JUNIT_HOME"],
--      [JUNIT_HOME="/usr/share/java"])
--
--AS_IF([test -f "$JUNIT_HOME/junit4.jar"],
--      [JUNIT="$JUNIT_HOME/junit4.jar"],
--      [AS_IF([test -f "$JUNIT_HOME/junit.jar"],
--	    [JUNIT="$JUNIT_HOME/junit.jar"])])
--
--AS_IF([test "x$JUNIT" != "x"],
--      [AS_IF([test -f "/usr/share/java/hamcrest/all.jar"],
--	     [CLASSPATH="$JUNIT:/usr/share/java/hamcrest/all.jar:$CLASSPATH"
--              AC_SUBST(CLASSPATH)
--              with_java_unit="yes"])],
--      [AS_IF([test -f "/usr/share/java/hamcrest-all.jar"],
--             [CLASSPATH="$JUNIT:/usr/share/java/hamcrest-all.jar:$CLASSPATH"
--              AC_SUBST(CLASSPATH)
--              with_java_unit="yes"])])
-+AC_ARG_WITH([java_unit],
-+  [AS_HELP_STRING([--without-java-unit],
-+    [Enable java unittest])],
-+  [with_java_unit="yes"])
- 
- AM_CONDITIONAL([HAVE_JAVA_UNIT], [test "x$with_java_unit" = "xyes"])
- 
-@@ -905,6 +900,8 @@
-   [echo "        => the Java interface will *NOT* be built"])
- AS_IF([test "x$with_java_unit" != "xyes"],
-   [echo "        => the Java unit test will *NOT* be enabled"])
-+AS_IF([test "x$with_zbarimg_tests" != "xyes"],
-+  [echo "        => zbarimg tests will *NOT* be enabled"])
- #echo "NPAPI Plugin     --with-npapi=$with_npapi"
- #AS_IF([test "x$with_mozilla" != "xyes"],
- #  [echo "       => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"])
-diff -ur a/test/Makefile.am.inc b/test/Makefile.am.inc
---- a/test/Makefile.am.inc	2020-04-21 00:09:21.000000000 +0300
-+++ b/test/Makefile.am.inc	2020-04-23 17:03:07.819999370 +0300
-@@ -91,11 +91,16 @@
- regress-decoder: test/test_decode
- 	@abs_top_builddir@/test/test_decode -q -n 100000
- 
-+if HAVE_ZBARIMG_TESTS
- check-images-py: zbarimg/zbarimg
- 	@PYTHON@ @abs_top_srcdir@/test/barcodetest.py
- 
- check-images: zbarimg/zbarimg
- 	@abs_top_builddir@/test/test_examples.sh
-+else
-+check-images-py:
-+check-images:
-+endif
- 
- check-convert: test/test_convert
- 	@abs_top_srcdir@/test/test_convert
diff --git a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
deleted file mode 100644
index 916dee61d431..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://github.com/mchehab/zbar/pull/115
---- a/zbarcam/zbarcam.c
-+++ b/zbarcam/zbarcam.c
-@@ -37,6 +37,7 @@
- #ifdef ENABLE_NLS
- #include "../zbar/gettext.h"
- # include <libintl.h>
-+# include <locale.h>
- # define _(string) gettext(string)
- #else
- # define _(string) string
---- a/zbarimg/zbarimg.c
-+++ b/zbarimg/zbarimg.c
-@@ -42,6 +42,7 @@
- #ifdef ENABLE_NLS
- #include "../zbar/gettext.h"
- # include <libintl.h>
-+# include <locale.h>
- # define _(string) gettext(string)
- #else
- # define _(string) string
--- 
-2.26.2
diff --git a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch b/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
deleted file mode 100644
index 8d4d821426d2..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.1_python_tp_print.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 938d39716488b545b92c28f48acc94a7b8fc9138 Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-Date: Tue, 28 Jul 2020 10:27:30 +0200
-Subject: [PATCH] python: enum: make it compatible with Python 3.9
-
-As reported by:
-	https://github.com/mchehab/zbar/issues/92
-
-python bindings don't build with Python 3.9, because it is
-using tp_print, which has been silently ignored since Python
-3.0, according with[1]:
-
-	"The tp_print slot of PyTypeObject has been removed.
-	 It was used for printing objects to files in Python 2.7
-	 and before.
-	 Since Python 3.0, it has been ignored and unused."
-
-[1] https://docs.python.org/3.9/whatsnew/3.9.html#id3
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- python/enum.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/python/enum.c b/python/enum.c
-index a1135531..dfe1b1ef 100644
---- a/python/enum.c
-+++ b/python/enum.c
-@@ -76,6 +76,8 @@ enumitem_str (zbarEnumItem *self)
-     return(self->name);
- }
- 
-+#if PY_MAJOR_VERSION < 3
-+/* tp_print was dropped on Python 3.9 */
- static int
- enumitem_print (zbarEnumItem *self,
-                 FILE *fp,
-@@ -83,6 +85,7 @@ enumitem_print (zbarEnumItem *self,
- {
-     return(self->name->ob_type->tp_print(self->name, fp, flags));
- }
-+#endif
- 
- static PyObject*
- enumitem_repr (zbarEnumItem *self)
-@@ -115,7 +118,9 @@ PyTypeObject zbarEnumItem_Type = {
-     .tp_new         = (newfunc)enumitem_new,
-     .tp_dealloc     = (destructor)enumitem_dealloc,
-     .tp_str         = (reprfunc)enumitem_str,
-+#if PY_MAJOR_VERSION < 3
-     .tp_print       = (printfunc)enumitem_print,
-+#endif
-     .tp_repr        = (reprfunc)enumitem_repr,
- };
- 
diff --git a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch b/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
deleted file mode 100644
index 7692db41e0da..000000000000
--- a/media-gfx/zbar/files/zbar-0.23_fix_Qt5X11Extras_detect.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -ur a/configure.ac b/configure.ac
---- a/configure.ac	2019-05-23 23:37:12.000000000 +0300
-+++ b/configure.ac	2020-01-22 12:27:14.190755156 +0300
-@@ -638,13 +638,9 @@
- 
- AC_ARG_VAR([MOC], [full path to Qt moc program])
- 
--AS_IF([test "x$have_x" = "xyes"],
--      [qt_extra="Qt5X11Extras >= 5.0"],
--      [qt_extra=""])
--
- AS_IF([test "x$with_qt" != "xno"],
-       [PKG_CHECK_MODULES([QT],
--		         [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 $qt_extra],,
-+		         [Qt5Core >= 5 Qt5Gui >= 5 Qt5Widgets >= 5.0 Qt5X11Extras >= 5.0],,
- 		         [with_qt5 = "no"
- 		          PKG_CHECK_MODULES([QT],
- 					    [QtCore >= 4 QtGui >= 4],,