gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

media-gfx/zbar: remove unused patches

Browse Source 
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
2024-10-12 19:47:35 +02:00
committed by Conrad Kostecki
parent 1f988edb41
commit ee2b4de83d
3 changed files with 0 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
media-gfx/zbar/files/zbar-0.23.90-fix-gtk-default.patch
View File

@@ -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])

18
media-gfx/zbar/files/zbar-0.23.90-fix-qt5x11extras-detect.patch
View File

@@ -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],,

30
media-gfx/zbar/files/zbar-0.23.92-py311-set-size.patch
View File

@@ -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);