zbar-npapi.patch

   1 diff -urNp -x '*.orig' zbar-0.23.90.org/configure.ac zbar-0.23.90/configure.ac
   2 --- zbar-0.23.90.org/configure.ac       2021-03-02 23:13:39.976344894 +0100
   3 +++ zbar-0.23.90/configure.ac   2021-03-02 23:13:40.129677725 +0100
   4 @@ -485,8 +485,8 @@ AC_ARG_WITH([npapi],
   5    [with_npapi="no"])
   6
   7  AS_IF([test "x$with_npapi" != "xno"],
   8 -  [PKG_CHECK_MODULES([NPAPI], [firefox-plugin])
   9 -   NPAPI_VERSION=`$PKG_CONFIG firefox-plugin --modversion`
  10 +  [PKG_CHECK_MODULES([NPAPI], [mozilla-plugin])
  11 +   NPAPI_VERSION=`$PKG_CONFIG mozilla-plugin --modversion`
  12     AC_MSG_NOTICE([using firefox-plugin version $NPAPI_VERSION])])
  13
  14  AM_CONDITIONAL([HAVE_NPAPI], [test "x$with_npapi" = "xyes"])
  15 diff -urNp -x '*.orig' zbar-0.23.90.org/plugin/Makefile.am.inc zbar-0.23.90/plugin/Makefile.am.inc
  16 --- zbar-0.23.90.org/plugin/Makefile.am.inc     2021-02-13 10:39:00.000000000 +0100
  17 +++ zbar-0.23.90/plugin/Makefile.am.inc 2021-03-02 23:13:40.129677725 +0100
  18 @@ -1,5 +1,5 @@
  19  lib_LTLIBRARIES += plugin/libzbarplugin.la
  20  plugin_libzbarplugin_la_SOURCES = \
  21     plugin/plugin.c
  22 -plugin_libzbarplugin_la_CPPFLAGS = $(MOZILLA_CFLAGS) $(AM_CPPFLAGS)
  23 -plugin_libzbarplugin_la_LDFLAGS = $(MOZILLA_LIBS) $(AM_LDFLAGS)
  24 +plugin_libzbarplugin_la_CPPFLAGS = $(NPAPI_CFLAGS) $(AM_CPPFLAGS)
  25 +plugin_libzbarplugin_la_LDFLAGS = $(NPAPI_LIBS) $(AM_LDFLAGS)