From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- media-gfx/zbar/Manifest | 6 +- media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch | 120 +++++++++++++++++++++ .../files/zbar-0.23.1_musl_include_locale_h.patch | 23 ++++ media-gfx/zbar/zbar-0.23-r1.ebuild | 1 + media-gfx/zbar/zbar-0.23.1.ebuild | 7 +- 5 files changed, 152 insertions(+), 5 deletions(-) create mode 100644 media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch create mode 100644 media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch (limited to 'media-gfx/zbar') diff --git a/media-gfx/zbar/Manifest b/media-gfx/zbar/Manifest index b5289cb84f46..8cdf1f30b56f 100644 --- a/media-gfx/zbar/Manifest +++ b/media-gfx/zbar/Manifest @@ -1,6 +1,8 @@ AUX zbar-0.10-errors.patch 178 BLAKE2B 588e8d227bf8d7f47346dcc4a9c99ad5b372af5e2788dca09e490473f50b712945b91be16b2a64f99c48019961ce3f9b766e19c22bafee6d6b4ec8f8e3814239 SHA512 0978f9d52bed844448c5a92349806134e4b03bf069307fad2f3944b92b6f1c8dda094574ae4829860263d735ba7d20e71d435308185503634f9e46897479c7f1 +AUX zbar-0.23-r1-nonbash.patch 5528 BLAKE2B f4679013abb66143a5203d861367f51ee8b791addff66347d81622549f954e1bcd54a19695fa4ce8bacbf5aa2fe0a195ec75068ff6b93fa2df0c4f82af9e3d65 SHA512 7705ae4281b92086eda749fb334a59cdc33e79bec0bb9820c78344fcac235b9b3f4314899e8eeeaa44a372adda71f14ec553f3c1c147f57bfe1cba298d3cd0ab AUX zbar-0.23.1_fix_leftover_on_shell_compatibility.patch 877 BLAKE2B 6eb1778024ba3ab0df8bc64ae80987be0e17cd30b692f0e04766fcad3148fe1ce49f52f7ec147d3f22c34754288fe0f9721ffa91e3e78c5b357c167f372f4e5d SHA512 98c203f122811128e091f8cc31f0c92362cc8693e38f5cdd7a48cf6d5ef57889bd6ccf921631a1646214f070c3be2eb78f08c429351bec275f4b550b2e15b122 AUX zbar-0.23.1_fix_unittest.patch 2703 BLAKE2B fcbde8262803be3a009a93d052d6866998ca0a214a64f0c2989ded4925394c3cc78755b539defd0560dbc01e318f12a89b16a6065e028eec58db16d58a8bdcb5 SHA512 cc867bcb92094edb94dc699c0929547dd7bf08f71579605b4817e1068da55e0c2455655e535fc560375c773c158f50a79f77846ef06a3566a0deec22a459e120 +AUX zbar-0.23.1_musl_include_locale_h.patch 512 BLAKE2B 9f675b24aecd0a65ef3a2d41731594c10b1086abbfac649b6eeca1ba873c1b54d8287bebb48b2119aa0638d60228f25714f7a1811f7645930bc003395489ca3e SHA512 6addf046928db5743cc58ec67aad891c199f9d839198181cfbf57912cc0780f53fdac9fa15b25e1ffd17cf0aaf74318094f3283facdff2fa259285a5bc2bb957 AUX zbar-0.23_create_correct_pkconfig_file_for_zbar-qt5.patch 2109 BLAKE2B 8e32a3d0115fe7dc31a8208021659827f959bebbd1a56972765a379e03c7aca704c394d7eecb928f3547b9b42afff6cdaa1e564875bb6a94ac0cdb9a55422fe1 SHA512 dfbbe1caf384dc769d97ecebaf544b81c1fa266c78ca4fa8087673724b3408fe2e77535b60aefe904aa42dd1ed1182676623f98aed565910566c511908b8ecee AUX zbar-0.23_fix_Qt5X11Extras_detect.patch 643 BLAKE2B 27485c866503189670424eaf81a0a9b6aefa284576789ba6533af03cb1af59a2c531f22e09adcc8e2b9b6418f861f8b96a1bf602502d0e863ae9785ac2d336c7 SHA512 ee40586c64ded170e314ee2961588518234e22d9cee9e9a55f994231cd50b120e82225c551c5a2e85988de1c14a5c0baf6303fffea0663e2e4808df3a0c8421a AUX zbar-0.23_fix_detection_of_errors_in_the_v4l_read.patch 1122 BLAKE2B e4330ca4ce75a4659466faa618a99280ad7868aa21d1fe30db837917460cb9fc3594421cb2cb70457813611764c7e976e5ba9acc414be5fa95808f91d995eb0b SHA512 c6d6b3bf93f59f87687e03294742ec7a4803308d7395869d8cccefdb186c69ad429c631f2f4d0c4de0a2dd495f3b99342622d01acb1e823ceb9250380549ca20 @@ -8,6 +10,6 @@ AUX zbar-0.23_fix_python_detect.patch 351 BLAKE2B d5261e9adb3c9b43f1208a41a65571 AUX zbar-0.23_reset_conversion_descriptor_after_close.patch 829 BLAKE2B b39c63a1aa11a79123226ebf91ba0b4d047412b96b12d8ed591e85625c96e3de1fcfd0624b622c4f59c98d4e4e3483c74d6699ae2579a18352d12698b3b0f430 SHA512 c641b83c81c07e850a17672a8ad5a16ab650330ccffcba98d209ed105058cc66664aff76d391803503b6d784daaf2b31d9faad2aa9dd69221598b13187e27dd1 DIST zbar-0.23.1.tar.gz 1019268 BLAKE2B 5aa8725a0945b6f50eb78bb7b8a61e5b46356b18f07e8af778a63d46b94c894d9e827ed71bd89060898ecbdaebc5b4bb6e638939d7bc0dede390f7137770049f SHA512 ae7741cf750a10cf53dc11abcd482c3885507153ee37f6e3364ed5ed72184ebb009560b8c40d8090603a551fb681700a962838a59ce77d005d080ee49fbfa54b DIST zbar-0.23.tar.gz 1301948 BLAKE2B dd74ce44bcb10f8a7cf180b982e5bd82f1f5674540931377d207ab730bb2d080fe222bfc42d4a3d70895ad53b78638e73c2294018b80d30dc28f7e6ecc14c761 SHA512 9737f9dca42c29f92aa1eca5c0808da34f1d16c88c65241c9e3984c487e502f398437e7a707a1edd2c440f784db537ba33ea4008a2d1c1caaf5eea6431b1400b -EBUILD zbar-0.23-r1.ebuild 5028 BLAKE2B 3d91370efb024d92f46e2f173c21e09bd1c5ef0213090f8ce4343b3d86e23b07a81b96443587546df536a15339310ab953dd99b58fbae75fa1e69cf1378e3006 SHA512 8cb2e88fd6795c64ccad9d65cf85a1f7e1482524ccb122ce531f713bbe2fcf53fafe52f0202a48044c1a0331db941b32fc32374b4111ad438f74e83a580e3a1e -EBUILD zbar-0.23.1.ebuild 5239 BLAKE2B 295eef94a50f38f22351d50bcaa5dc58276b32766874c7540efa15ba5fa7d0b8c10b9f09f0dd7db95bd01e83be8767682923e18561ee63d2270f11131a9d3e9f SHA512 7fb1c2d8eef777054107020606a0e3c3106e6864522a29c87a248848220d93cbb7de95f02aee060166cfa032e7106a6108d3ccdd4828ca941ab7705556efbc6c +EBUILD zbar-0.23-r1.ebuild 5071 BLAKE2B 92487f7fd2c94a6bee21827729c0ed4bbbde6c1b552e5da271a96a277d2d1c4d20b0b8baf80b769e89bb65bc9fe0ca0db483342bcbcf0daf466edc82f399dbe3 SHA512 f4d5affd6ea81be0b0aaacd168a0a45c854a49b7aeda4d042aa26eef4e0492ece016c21c7887aad1c1644c0095f04eb94277ba12276b0e1c8e5c4d98f977b4b4 +EBUILD zbar-0.23.1.ebuild 5286 BLAKE2B 8134b9a4418963c437be927b68a087b8d18fd533195dc05892b091038f500d62a86f23540ae81659dffa973abbfd8603a62c3839924f14f17405c48b8c60ff52 SHA512 34b395448f86e886460be4687f144c961779acf1ddbdd4e9c460fd4848543285d8084e1303c6d422263e143877f98b75b4a556899d98236feaaca4791a7f9081 MISC metadata.xml 931 BLAKE2B a8c611d728a6fd0dbc94f333681a5a0ec4fc2bd8529cca7dcebfa8e1774c1d5e069c870baffd29fa033ce0529d2c2cb2ee3a1a54c089b1fd988b0d2c1ce82aae SHA512 c42caef53bc9c8743f8f02f5c96f687b605248a4311efea44777781a85a4b5a31e586cbdd7d85b07a6b2aca8138f5c7238b1f35a37b13741a297e9751731da19 diff --git a/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch new file mode 100644 index 000000000000..1206a209d458 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23-r1-nonbash.patch @@ -0,0 +1,120 @@ +https://bugs.gentoo.org/769716 + +From 4bd586181dde6196cb60602f228c4deb07818989 Mon Sep 17 00:00:00 2001 +From: Klaus Ethgen +Date: Sun, 7 Feb 2021 14:22:52 +0100 +Subject: [PATCH] =?iso8859-1?q?Configure-Patch=20f=FCr=20nicht-bash?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=iso8859-1 +Content-Transfer-Encoding: 8bit + +--- + configure.ac | 26 +++++++++++++------------- + 1 file changed, 13 insertions(+), 13 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c2b7819..f6224a1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -489,7 +489,7 @@ AC_ARG_WITH([gtk], + AC_ARG_VAR([GLIB_GENMARSHAL], [full path to glib-genmarshal]) + AC_ARG_VAR([GTK_VERSION_MAJOR]) + +-AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"], ++AS_IF([test "x$with_gtk" = "xgtk3" || test "x$with_gtk" = "xauto"], + [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], + [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` + GTK_VERSION=`$PKG_CONFIG gtk+-3.0 --modversion` +@@ -501,7 +501,7 @@ AS_IF([test "x$with_gtk" == "xgtk3" || test "x$with_gtk" == "xauto"], + ]) + ]) + +-AS_IF([test "x$with_gtk" == "xgtk2" || test "x$with_gtk" == "xauto"], ++AS_IF([test "x$with_gtk" = "xgtk2" || test "x$with_gtk" = "xauto"], + [PKG_CHECK_MODULES([GTK2], [gtk+-2.0], + [GLIB_GENMARSHAL=`$PKG_CONFIG glib-2.0 --variable=glib_genmarshal` + GTK_VERSION=`$PKG_CONFIG gtk+-2.0 --modversion` +@@ -550,11 +550,11 @@ AC_ARG_VAR([PYGTK_CODEGEN], [full path to pygtk-codegen program (python2 only)]) + AC_ARG_VAR([PYGTK_DEFS], [directory where PyGTK definitions may be found (python2 only)]) + + AS_IF([test -z "$PYTHON"], +- [AS_IF([test "x$with_python" == "xauto"], ++ [AS_IF([test "x$with_python" = "xauto"], + [AC_PATH_PROGS([PYTHON], [python3 python2 python], [:], [$PATH])], +- [AS_IF([test "x$with_python" == "xpython3"], ++ [AS_IF([test "x$with_python" = "xpython3"], + [AC_PATH_PROGS([PYTHON], [python3 python], [:], [$PATH])], +- [AS_IF([test "x$with_python" == "xpython2"], ++ [AS_IF([test "x$with_python" = "xpython2"], + [AC_PATH_PROGS([PYTHON], [python2 python], [:], [$PATH])], + [with_python="no"]) + ]) +@@ -608,7 +608,7 @@ AM_CONDITIONAL([HAVE_PYGTK2], [test "x$with_pygtk2" != "xno"]) + + dnl GObject Introspection (GIR) + +-AS_IF([test "x$with_gir" == "xyes" && test "x$with_gtk" != "xno"], ++AS_IF([test "x$with_gir" = "xyes" && test "x$with_gtk" != "xno"], + [m4_ifdef([GOBJECT_INTROSPECTION_CHECK], + [GOBJECT_INTROSPECTION_CHECK([0.6.7]) + AS_IF([test "x$found_introspection" = "xyes"], +@@ -696,7 +696,7 @@ AC_ARG_WITH([java], + [], + [with_java="check"]) + +-JAVAC=${JAVAC/ecj/ecj -1.5} ++JAVAC="$(echo $JAVAC | sed 's/ecj/ecj -1.5/')" + + # Javah was obsoleted on Java 8 and removed on Java 11. So, we need to + # look strictly at the $JAVA_HOME in order to avoid mixing different versions +@@ -707,13 +707,13 @@ AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"]) + + AC_ARG_VAR([JAR], [location of Java archive tool]) + AC_PATH_PROGS([JAR], [jar], [:], [$JAVA_PATH]) +-AS_IF([test "x$JAR" == "x:"], [have_java="no"]) ++AS_IF([test "x$JAR" = "x:"], [have_java="no"]) + + AC_ARG_VAR([JAVA], [location of Java application launcher]) + AC_PATH_PROGS([JAVA], [java], [/bin/false], [$JAVA_PATH]) + + AC_ARG_VAR([CLASSPATH], [Java class path (include JUnit to run java tests)]) +-AS_IF([test "x$CLASSPATH" == "x"], [CLASSPATH="."]) ++AS_IF([test "x$CLASSPATH" = "x"], [CLASSPATH="."]) + + dnl Search for Java unit test library + AS_IF([test -z "$JUNIT_HOME"], +@@ -850,7 +850,7 @@ echo "GTK --with-gtk=$with_gtk Gtk${GTK_VERSION}" + echo "GObject introspection --with-gir=$with_gir" + echo "Qt --with-qt=$with_qt Qt${QT_VERSION}" + echo "Java --with-java=$with_java" +-AS_IF([test "x$win32" == "xno"], ++AS_IF([test "x$win32" = "xno"], + [echo "Dbus --with-dbus=$with_dbus"]) + AS_IF([test "x$have_GM" = "xyes"], + [echo "GraphicsMagick --with-graphicsmagick=yes"], +@@ -873,13 +873,13 @@ AS_IF([test "x$have_IM" != "xyes" && test "x$have_GM" != "xyes"], + [echo " => the zbarimg file scanner will *NOT* be built"]) + AS_IF([test "x$have_GM" = "xyes"], + [echo " => ImageMagick is preferred, as GraphicsMagick doesn't support https"]) +-AS_IF([test "x$with_gtk" == "xno"], ++AS_IF([test "x$with_gtk" = "xno"], + [echo " => GTK support will *NOT* be built"]) + AS_IF([test "x$with_pygtk2" != "xyes" && test "xPYTHON_VERSION_MAJOR" = "x2"], + [echo " => the Python 2 GTK widget wrapper will *NOT* be built"]) + AS_IF([test "x$with_qt" != "xyes"], + [echo " => the Qt widget will *NOT* be built"]) +-AS_IF([test "x$with_qt" == "xyes" && test "x$enable_static_qt" == "xyes" ], ++AS_IF([test "x$with_qt" = "xyes" && test "x$enable_static_qt" = "xyes" ], + [echo " => Building a static Qt library"]) + AS_IF([test "x$with_java" != "xyes"], + [echo " => the Java interface will *NOT* be built"]) +@@ -888,5 +888,5 @@ AS_IF([test "x$with_java_unit" != "xyes"], + #echo "NPAPI Plugin --with-npapi=$with_npapi" + #AS_IF([test "x$with_mozilla" != "xyes"], + # [echo " => the Mozilla/Firefox/OpenOffice plugin will *NOT* be built"]) +-AS_IF([test "x$enable_pdf417" == "xyes"], ++AS_IF([test "x$enable_pdf417" = "xyes"], + [echo " => the pdf417 code support is incomplete!"]) +-- +2.30.0 + 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 new file mode 100644 index 000000000000..916dee61d431 --- /dev/null +++ b/media-gfx/zbar/files/zbar-0.23.1_musl_include_locale_h.patch @@ -0,0 +1,23 @@ +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 ++# include + # 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 ++# include + # define _(string) gettext(string) + #else + # define _(string) string +-- +2.26.2 diff --git a/media-gfx/zbar/zbar-0.23-r1.ebuild b/media-gfx/zbar/zbar-0.23-r1.ebuild index 6330b914ce1a..d51457a9e1d8 100644 --- a/media-gfx/zbar/zbar-0.23-r1.ebuild +++ b/media-gfx/zbar/zbar-0.23-r1.ebuild @@ -78,6 +78,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${PN}-0.10-errors.patch" + "${FILESDIR}/${PN}-0.23-r1-nonbash.patch" "${FILESDIR}/${P}_create_correct_pkconfig_file_for_zbar-qt5.patch" "${FILESDIR}/${P}_fix_detection_of_errors_in_the_v4l_read.patch" "${FILESDIR}/${P}_fix_python_detect.patch" diff --git a/media-gfx/zbar/zbar-0.23.1.ebuild b/media-gfx/zbar/zbar-0.23.1.ebuild index 6c1c8269865e..2f529efbe041 100644 --- a/media-gfx/zbar/zbar-0.23.1.ebuild +++ b/media-gfx/zbar/zbar-0.23.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{7,8} ) +PYTHON_COMPAT=( python3_{7..9} ) inherit autotools flag-o-matic java-pkg-opt-2 multilib-minimal python-single-r1 virtualx @@ -13,7 +13,7 @@ SRC_URI="https://github.com/mchehab/zbar/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="dbus graphicsmagick gtk +imagemagick introspection java jpeg nls python qt5 static-libs test +threads v4l X xv" REQUIRED_USE=" @@ -83,6 +83,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}_fix_leftover_on_shell_compatibility.patch" "${FILESDIR}/${P}_fix_unittest.patch" + "${FILESDIR}/${P}_musl_include_locale_h.patch" "${FILESDIR}/zbar-0.23_fix_Qt5X11Extras_detect.patch" "${FILESDIR}/zbar-0.23_fix_python_detect.patch" ) -- cgit v1.2.3