1 |
commit: 21481b475595cb9affd1c6b87b648321378c9547 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 27 16:33:03 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 16:33:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21481b47 |
7 |
|
8 |
media-gfx/zbar: add nonbash patch to 0.23-r1 |
9 |
|
10 |
Thanks-to: Klaus Ethgen <Klaus+gentoo <AT> Ethgen.de> |
11 |
Closes: https://bugs.gentoo.org/769716 |
12 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
13 |
|
14 |
media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch | 120 ++++++++++++++++++++++++ |
15 |
media-gfx/zbar/zbar-0.23-r1.ebuild | 1 + |
16 |
2 files changed, 121 insertions(+) |
17 |
|
18 |
diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..1206a209d45 |
21 |
--- /dev/null |
22 |
+++ b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch |
23 |
@@ -0,0 +1,120 @@ |
24 |
+https://bugs.gentoo.org/769716 |
25 |
+ |
26 |
+From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001 |
27 |
+From: Klaus Ethgen <Klaus@××××××.de> |
28 |
+Date: Sun, 7 Feb 2021 14:22:52 +0100 |
29 |
+Subject: [PATCH] =?iso8859-1?q?Configure-Patch=20f=FCr=20nicht-bash?= |
30 |
+MIME-Version: 1.0 |
31 |
+Content-Type: text/plain; charset=iso8859-1 |
32 |
+Content-Transfer-Encoding: 8bit |
33 |
+ |
34 |
+--- |
35 |
+ configure.ac | 26 +++++++++++++------------- |
36 |
+ 1 file changed, 13 insertions(+), 13 deletions(-) |
37 |
+ |
38 |
+diff --git a/configure.ac b/configure.ac |
39 |
+index c2b7819..f6224a1 100644 |
40 |
+--- a/configure.ac |
41 |
++++ b/configure.ac |
42 |
+@@ -489,7 +489,7 @@ AC_ARG_WITH([gtk], |
43 |
+ AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal]) |
44 |
+ AC_ARG_VAR([GTK_VERSION_MAJOR]) |
45 |
+ |
46 |
+-AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"], |
47 |
++AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"], |
48 |
+ [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], |
49 |
+ [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` |
50 |
+ GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion` |
51 |
+@@ -501,7 +501,7 @@ AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"], |
52 |
+ ]) |
53 |
+ ]) |
54 |
+ |
55 |
+-AS_IF([test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"], |
56 |
++AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"], |
57 |
+ [PKG_CHECK_MODULES([GTK2], [gtk+-2.0], |
58 |
+ [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` |
59 |
+ GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion` |
60 |
+@@ -550,11 +550,11 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)]) |
61 |
+ AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)]) |
62 |
+ |
63 |
+ AS_IF([test -z "$PYTHON"], |
64 |
+- [AS_IF([test "x$with_python" == "xauto"], |
65 |
++ [AS_IF([test "x$with_python" = "xauto"], |
66 |
+ [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])], |
67 |
+- [AS_IF([test "x$with_python" == "xpython3"], |
68 |
++ [AS_IF([test "x$with_python" = "xpython3"], |
69 |
+ [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])], |
70 |
+- [AS_IF([test "x$with_python" == "xpython2"], |
71 |
++ [AS_IF([test "x$with_python" = "xpython2"], |
72 |
+ [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])], |
73 |
+ [with_python="no"]) |
74 |
+ ]) |
75 |
+@@ -608,7 +608,7 @@ AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"]) |
76 |
+ |
77 |
+ dnl GObject Introspection (GIR) |
78 |
+ |
79 |
+-AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"], |
80 |
++AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"], |
81 |
+ [m4_ifdef([GOBJECT_INTROSPECTION_CHECK], |
82 |
+ [GOBJECT_INTROSPECTION_CHECK([0.6.7]) |
83 |
+ AS_IF([test "x$found_introspection" = "xyes"], |
84 |
+@@ -696,7 +696,7 @@ AC_ARG_WITH([java], |
85 |
+ [], |
86 |
+ [with_java="check"]) |
87 |
+ |
88 |
+-JAVAC=${JAVAC/ecj/ecj -1.5} |
89 |
++JAVAC="$(echo $JAVAC | sed 's/ecj/ecj -1.5/')" |
90 |
+ |
91 |
+ # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to |
92 |
+ # look strictly at the $JAVA_HOME in order to avoid mixing different versions |
93 |
+@@ -707,13 +707,13 @@ AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"]) |
94 |
+ |
95 |
+ AC_ARG_VAR([JAR], [location of Java archive tool]) |
96 |
+ AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH]) |
97 |
+-AS_IF([test "x$JAR" == "x:"], [have_java="no"]) |
98 |
++AS_IF([test "x$JAR" = "x:"], [have_java="no"]) |
99 |
+ |
100 |
+ AC_ARG_VAR([JAVA], [location of Java application launcher]) |
101 |
+ AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH]) |
102 |
+ |
103 |
+ AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)]) |
104 |
+-AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."]) |
105 |
++AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."]) |
106 |
+ |
107 |
+ dnl Search for Java unit test library |
108 |
+ AS_IF([test -z "$JUNIT_HOME"], |
109 |
+@@ -850,7 +850,7 @@ echo "GTK --with-gtk=$with_gtk Gtk${GTK_VERSION}" |
110 |
+ echo "GObject introspection --with-gir=$with_gir" |
111 |
+ echo "Qt --with-qt=$with_qt Qt${QT_VERSION}" |
112 |
+ echo "Java --with-java=$with_java" |
113 |
+-AS_IF([test "x$win32" == "xno"], |
114 |
++AS_IF([test "x$win32" = "xno"], |
115 |
+ [echo "Dbus --with-dbus=$with_dbus"]) |
116 |
+ AS_IF([test "x$have_GM" = "xyes"], |
117 |
+ [echo "GraphicsMagick --with-graphicsmagick=yes"], |
118 |
+@@ -873,13 +873,13 @@ AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"], |
119 |
+ [echo " => the zbarimg file scanner will *NOT* be built"]) |
120 |
+ AS_IF([test "x$have_GM" = "xyes"], |
121 |
+ [echo " => ImageMagick is preferred, as GraphicsMagick doesn't support https"]) |
122 |
+-AS_IF([test "x$with_gtk" == "xno"], |
123 |
++AS_IF([test "x$with_gtk" = "xno"], |
124 |
+ [echo " => GTK support will *NOT* be built"]) |
125 |
+ AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"], |
126 |
+ [echo " => the Python 2 GTK widget wrapper will *NOT* be built"]) |
127 |
+ AS_IF([test "x$with_qt" != "xyes"], |
128 |
+ [echo " => the Qt widget will *NOT* be built"]) |
129 |
+-AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ], |
130 |
++AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ], |
131 |
+ [echo " => Building a static Qt library"]) |
132 |
+ AS_IF([test "x$with_java" != "xyes"], |
133 |
+ [echo " => the Java interface will *NOT* be built"]) |
134 |
+@@ -888,5 +888,5 @@ AS_IF([test "x$with_java_unit" != "xyes"], |
135 |
+ #echo "NPAPI Plugin --with-npapi=$with_npapi" |
136 |
+ #AS_IF([test "x$with_mozilla" != "xyes"], |
137 |
+ # [echo " => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"]) |
138 |
+-AS_IF([test "x$enable_pdf417" == "xyes"], |
139 |
++AS_IF([test "x$enable_pdf417" = "xyes"], |
140 |
+ [echo " => the pdf417 code support is incomplete!"]) |
141 |
+-- |
142 |
+2.30.0 |
143 |
+ |
144 |
|
145 |
diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild |
146 |
index 6330b914ce1..d51457a9e1d 100644 |
147 |
--- a/media-gfx/zbar/zbar-0.23-r1.ebuild |
148 |
+++ b/media-gfx/zbar/zbar-0.23-r1.ebuild |
149 |
@@ -78,6 +78,7 @@ BDEPEND=" |
150 |
|
151 |
PATCHES=( |
152 |
"${FILESDIR}/${PN}-0.10-errors.patch" |
153 |
+ "${FILESDIR}/${PN}-0.23-r1-nonbash.patch" |
154 |
"${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch" |
155 |
"${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch" |
156 |
"${FILESDIR}/${P}_fix_python_detect.patch" |