gentoo auto-resync : 14:10:2024 - 04:04:03

4 files changed, 0 insertions, 86 deletions

diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest
index 6d227f12c0a5..ac84dfa9f858 100644
--- a/media-gfx/zbar/Manifest
+++ b/media-gfx/zbar/Manifest
@@ -1,7 +1,4 @@
-AUX zbar-0.23.90-fix-gtk-default.patch 1222 BLAKE2B 5d7bb46e1d1eafa34c75818bce154dc54528f88140d7959c0e1849c01189dd7e2019d0b1c9b254662c408eee05acc3ccc2f1d26387096745005a34bddae2a2fa SHA512 a7c2f51bde791fbf906a6226af067065dce71efe942d1c26e62ac1005577d05574fb96c4e15ed394b12acec0ca2b225aa4a97c29d59ddb305c2ff076c61fdc48
-AUX zbar-0.23.90-fix-qt5x11extras-detect.patch 641 BLAKE2B ec0b86a83a149ef2a62585ea8a4db088e5fdc63ed28ff57f358b30372dff86b898364e6c0983a689efbbd6a4df82bc9764dc2dedf1f6beb68dcc1852336bce1b SHA512 5ca82734a32d12ac2aa451cba87081f44df46a4a9afc5ff8a60adf59cce30dbdca06866313b1a511c778e690f6e40994f22e868a7a9d098d69e4c62a9b26a004
 AUX zbar-0.23.90-fix-unittest.patch 2711 BLAKE2B 58d1bbebf60bb9533a7c2b40a29afa7e8229b79a925ebcd05e26c3a67c2144173baedc31f0d92d0341c51ccfb3763e95840ce2073012e7b61a0f252287d5d6b4 SHA512 cc5aaef37155ad72d6b72e05c2f53523268e15b84f573117e780e3f39cc4df3981d080558db83d0fb52d2daa47beeaab4f194e4f912e732648ac4c5bc683e11d
-AUX zbar-0.23.92-py311-set-size.patch 1100 BLAKE2B be9b804d7ba1c5c1bae2a20853154da852a6ca1922f9a65f0583ea8d68f76d04e0e009c940417d24539cfb6577e47d8a6ee1d342de1a32b797afd4ebde284560 SHA512 9980027fdda6f995577c15c5c6337a45557802ed534da07208edb20cd99b8575f0c9864f1e48b2f300d973e682e73a0bac105a9eee7429db48224ddbcd15e8d1
 AUX zbar-0.23.93-configure-ac-do-not-use-hardcoded-pkg-config-command.patch 2201 BLAKE2B 618def2024b4b6b3dbfdf298b0c30556a456bfc9e8f0e5bb6515a863e2b33c7603d861602be324b02af68df962f67370ecee7dd76f9a92bb129e1735e0f5b0b1 SHA512 ae3b1123d558d12690651da4ff7e77d5e805f3b2fb5372756cbb50ef18f73c87feee71aada35a2ca889e8f893d60969ed2d7a86c5e54c230902645d458e767e6
 AUX zbar-0.23.93-configure-ac-use-old-way-to-detect-qt5.patch 1177 BLAKE2B 7283d87ad174c746f79a9d0531e10d5285d25d3e22c6dcc375a62377a12a22656483a69e19288e90367eeb7d31e31397c75fc7f75f3a0aede0cdec2e3bc3d317 SHA512 8a69dd84731b95ab4d5d0dc37bd83ecf7fa368e197226f0fb63dcce6dce01ef96682b0e12d06489c602d964eedc2ea69ada04b83fba2ef6c4452ca466a25b037
 AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a655718b952d06ce0ec003bb08bf30979d6c467b2b50e6fb9a6cd06f95230ed4ae55e14599c276f9f41f03677b4d18167c6665c4 SHA512 d24d75f840d84488986cede3378e067ac68d218acac34a8c34888c88611df8f4b1b397cfd5ecfcda82480fd56ea2bada29d8373cc6e93ae8050b84e801c36ca7
diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch
deleted file mode 100644
index b1316243dd24..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 468f6bda627d683b3f40dbaf242c158409666f7e Mon Sep 17 00:00:00 2001
-From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-Date: Sat, 13 Mar 2021 18:04:57 +0100
-Subject: [PATCH] configure.ac: fix some issues with gtk parameter
-
-By default, it uses Gtk3. Also, the with_gtk set to "no"
-is wrong.
-
-Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
----
- configure.ac | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b6f87531..30a59f72 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -492,7 +492,7 @@ AS_IF([test "x$with_npapi" != "xno"],
- AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"])
- 
- dnl GTK
--dnl For now, defaults to GTK version 2
-+dnl For now, defaults to GTK version 3
- 
- AC_ARG_WITH([gtk],
-   [AS_HELP_STRING([--with-gtk],
-@@ -500,7 +500,7 @@ AC_ARG_WITH([gtk],
-   [AS_IF([test "x$with_gtk" != "xno"   && test "x$with_gtk" != "xauto" &&
-           test "x$with_gtk" != "xgtk2" && test "x$with_gtk" != "xgtk3"],
-          [echo "Invalid value for --with-gtk. Falling back to 'no'"
--          with_gtk="xno"])],
-+          with_gtk="no"])],
-   [with_gtk="auto"])
- 
- AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal])
diff --git a/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch b/media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch
deleted file mode 100644
index e8f6357eb486..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.90-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],,
diff --git a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch b/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch
deleted file mode 100644
index a51193af7777..000000000000
--- a/media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-PR: https://github.com/mchehab/zbar/pull/231
-
-diff --git a/python/enum.c b/python/enum.c
-index ba22ba63..4644509e 100644
---- a/python/enum.c
-+++ b/python/enum.c
-@@ -50,7 +50,11 @@ static zbarEnumItem *enumitem_new(PyTypeObject *type, PyObject *args,
- 
-     /* we assume the "fast path" for a single-digit ints (see longobject.c) */
-     /* this also holds if we get a small_int preallocated long */
-+#if PY_VERSION_HEX >= 0x030900A4
-+    Py_SET_SIZE(&self->val, Py_SIZE(longval));
-+#else
-     Py_SIZE(&self->val) = Py_SIZE(longval);
-+#endif
-     self->val.ob_digit[0] = longval->ob_digit[0];
-     Py_DECREF(longval);
- #else
-@@ -129,7 +133,11 @@ zbarEnumItem *zbarEnumItem_New(PyObject *byname, PyObject *byvalue, int val,
- 
-     /* we assume the "fast path" for a single-digit ints (see longobject.c) */
-     /* this also holds if we get a small_int preallocated long */
-+#if PY_VERSION_HEX >= 0x030900A4
-+    Py_SET_SIZE(&self->val, Py_SIZE(longval));
-+#else
-     Py_SIZE(&self->val) = Py_SIZE(longval);
-+#endif
-     self->val.ob_digit[0] = longval->ob_digit[0];
-     Py_DECREF(longval);
-