- rediff patches

diff --git a/zbar-link.patch b/zbar-link.patch
index 81041344d94743c1c82fd46be495dddde938e408..55a3da1202b25c870a06b19be413619dbab2faa4 100644 (file)
--- a/zbar-link.patch
+++ b/zbar-link.patch
@@ -1,6 +1,7 @@
---- zbar-0.10/configure.ac.orig        2009-10-23 20:16:44.000000000 +0200
-+++ zbar-0.10/configure.ac     2010-12-31 08:51:29.354118583 +0100
-@@ -198,7 +198,7 @@
+diff -urNp -x '*.orig' zbar-0.23.90.org/configure.ac zbar-0.23.90/configure.ac
+--- zbar-0.23.90.org/configure.ac      2021-03-02 23:13:39.643012652 +0100
++++ zbar-0.23.90/configure.ac  2021-03-02 23:13:39.793012161 +0100
+@@ -277,7 +277,7 @@ configure --without-xshm to disable the
         [with_xshm="yes"],
         [AC_MSG_FAILURE([unable to find XShmQueryVersion in $XSHM_LIBS!
  specify XSHM_LIBS or configure --without-xshm to disable the extension])],
@@ -9,7 +10,7 @@
     ])
  ])
  AM_CONDITIONAL([HAVE_XSHM], [test "x$with_xshm" = "xyes"])
-@@ -226,7 +226,7 @@
+@@ -305,7 +305,7 @@ configure --without-xv to disable the ex
         [with_xv="yes"],
         [AC_MSG_FAILURE([unable to find XvQueryExtension in $XV_LIBS!
  specify XV_LIBS or configure --without-xv to disable the extension])],

diff --git a/zbar-missing-files.patch b/zbar-missing-files.patch
index 738cfa907fa4a60d6d188540aaa20c801e9722c6..3d9d4d7fc1afb3db66de6224a0e310903fd30b94 100644 (file)
--- a/zbar-missing-files.patch
+++ b/zbar-missing-files.patch
@@ -1,5 +1,6 @@
---- zbar-0.23.1/pygtk/zbarpygtk.override.orig  1970-01-01 01:00:00.000000000 +0100
-+++ zbar-0.23.1/pygtk/zbarpygtk.override       2020-09-12 22:11:40.240520389 +0200
+diff -urNp -x '*.orig' zbar-0.23.90.org/pygtk/zbarpygtk.override zbar-0.23.90/pygtk/zbarpygtk.override
+--- zbar-0.23.90.org/pygtk/zbarpygtk.override  1970-01-01 01:00:00.000000000 +0100
++++ zbar-0.23.90/pygtk/zbarpygtk.override      2021-03-02 23:13:40.469676611 +0100
 @@ -0,0 +1,20 @@
 +%%
 +headers

diff --git a/zbar-npapi.patch b/zbar-npapi.patch
index 5091ed4dc31fff78d73a4ddf7310a97f98a13f65..3023f1d51a6c9911c11b7c9c7a6c4d3836b10d37 100644 (file)
--- a/zbar-npapi.patch
+++ b/zbar-npapi.patch
@@ -1,6 +1,7 @@
---- zbar-0.10/configure.ac.orig        2009-10-23 20:16:44.000000000 +0200
-+++ zbar-0.10/configure.ac     2010-12-31 08:51:29.354118583 +0100
-@@ -301,8 +301,8 @@
+diff -urNp -x '*.orig' zbar-0.23.90.org/configure.ac zbar-0.23.90/configure.ac
+--- zbar-0.23.90.org/configure.ac      2021-03-02 23:13:39.976344894 +0100
++++ zbar-0.23.90/configure.ac  2021-03-02 23:13:40.129677725 +0100
+@@ -485,8 +485,8 @@ AC_ARG_WITH([npapi],
    [with_npapi="no"])
  
  AS_IF([test "x$with_npapi" != "xno"],
@@ -11,8 +12,9 @@
     AC_MSG_NOTICE([using firefox-plugin version $NPAPI_VERSION])])
  
  AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"])
---- zbar-0.10/plugin/Makefile.am.inc.orig      2009-10-23 20:16:44.000000000 +0200
-+++ zbar-0.10/plugin/Makefile.am.inc   2010-12-31 09:37:49.426114393 +0100
+diff -urNp -x '*.orig' zbar-0.23.90.org/plugin/Makefile.am.inc zbar-0.23.90/plugin/Makefile.am.inc
+--- zbar-0.23.90.org/plugin/Makefile.am.inc    2021-02-13 10:39:00.000000000 +0100
++++ zbar-0.23.90/plugin/Makefile.am.inc        2021-03-02 23:13:40.129677725 +0100
 @@ -1,5 +1,5 @@
  lib_LTLIBRARIES += plugin/libzbarplugin.la
  plugin_libzbarplugin_la_SOURCES = \

diff --git a/zbar-sh.patch b/zbar-sh.patch
index c2fe15f677981a7f167553b13f3022e6afb449e9..13edf0dc1da238f128ae4659f2b57fc4f34045f0 100644 (file)
--- a/zbar-sh.patch
+++ b/zbar-sh.patch
@@ -1,11 +1,12 @@
---- zbar-0.23/configure.ac.orig        2019-07-24 16:28:37.917511357 +0200
-+++ zbar-0.23/configure.ac     2019-07-24 16:33:05.382729041 +0200
-@@ -693,7 +693,7 @@
+diff -urNp -x '*.orig' zbar-0.23.90.org/configure.ac zbar-0.23.90/configure.ac
+--- zbar-0.23.90.org/configure.ac      2021-02-13 13:56:31.000000000 +0100
++++ zbar-0.23.90/configure.ac  2021-03-02 23:13:39.453013275 +0100
+@@ -728,7 +728,7 @@ AC_ARG_WITH([java],
    [],
    [with_java="check"])
  
 -JAVAC=${JAVAC/ecj/ecj -1.5}
 +JAVAC=$(echo "$JAVAC" | sed -e '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
+ dnl Javah was obsoleted on Java 8 and removed on Java 11. So, we need to
+ dnl look strictly at the $JAVA_HOME in order to avoid mixing different versions