[libreoffice] 01/01: disable npapi plugin support
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.
commit afd421c95db676e1a76bf11ff09f8f58bc449e66
Author: Rene Engelhard <rene@debian.org>
Date: Sun Dec 13 19:52:51 2015 +0100
disable npapi plugin support
---
changelog | 6 +++++-
control | 2 --
patches/disable-npapi-plugin-support.diff | 28 ++++++++++++++++++++++++++++
patches/series | 1 +
rules | 8 ++++----
5 files changed, 38 insertions(+), 7 deletions(-)
diff --git a/changelog b/changelog
index 855306e..d2a15b5 100644
--- a/changelog
+++ b/changelog
@@ -3,7 +3,11 @@ libreoffice (1:5.1.0~rc1~git20151211-1) UNRELEASED; urgency=medium
* New upstream snapshot
- doesn't link evoab2 to gtk2 anymore (closes: #807640)
- -- Rene Engelhard <rene@debian.org> Mon, 07 Dec 2015 17:47:52 +0100
+ * debian/patches/disable-npapi-plugin-support.diff: as name says,
+ the only serious usecase is the doomed Flash anyway and it's
+ causes a link against gtk2 in -core (closes: #807601)
+
+ -- Rene Engelhard <rene@debian.org> Sat, 12 Dec 2015 17:42:10 +0100
libreoffice (1:5.1.0~beta2-1) experimental; urgency=medium
diff --git a/control b/control
index 2827fec..6398e33 100644
--- a/control
+++ b/control
@@ -135,7 +135,6 @@ Build-Depends: ant (>= 1.7.0) [!mips64],
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
maven-repo-helper,
- npapi-sdk-dev,
opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2) [amd64 i386],
pkg-config,
python3,
@@ -4550,7 +4549,6 @@ Depends: ant (>= 1.7.0),
lp-solve (>= 5.5.0.13-5+b1),
make (>= 3.81-8.2),
maven-repo-helper,
- npapi-sdk-dev,
opencollada-dev (>= 0.1.0~20140703.ddf8f47+dfsg1-2),
pkg-config,
python3,
diff --git a/patches/disable-npapi-plugin-support.diff b/patches/disable-npapi-plugin-support.diff
new file mode 100644
index 0000000..b10ed40
--- /dev/null
+++ b/patches/disable-npapi-plugin-support.diff
@@ -0,0 +1,28 @@
+diff --git a/configure.ac b/configure.ac
+index 9ee77171..dd2ab7f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -9181,21 +9181,9 @@ else
+ fi
+ AC_SUBST(ENABLE_HARFBUZZ)
+
+-dnl ===================================================================
+-dnl Check for NPAPI interface to plug browser plugins into LibreOffice documents
+-dnl ===================================================================
+ AC_MSG_CHECKING([whether to plug browser plugins into LibreOffice documents])
+-# Obviously no such thing on iOS or Android. Also not possible when building
+-# 64-bit OS X code as the plugin code uses QuickTime and Carbon.
+-if test "$_os" != Android -a "$_os" != iOS -a $_os != Darwin -a \
+- "$with_x" != "no" -a "$enable_mpl_subset" != yes
+-then
+- AC_MSG_RESULT([yes])
+- ENABLE_NPAPI_FROM_BROWSER=TRUE
+-else
+- AC_MSG_RESULT([no])
+- ENABLE_NPAPI_FROM_BROWSER=
+-fi
++AC_MSG_RESULT([no])
++ENABLE_NPAPI_FROM_BROWSER=
+ AC_SUBST(ENABLE_NPAPI_FROM_BROWSER)
+
+ AC_MSG_CHECKING([whether to use X11])
diff --git a/patches/series b/patches/series
index d15bf09..54e13cd 100644
--- a/patches/series
+++ b/patches/series
@@ -29,3 +29,4 @@ gcj-no-bitness-check.diff
rsc-no-error-about-unknown-switch.diff
debian-branding.diff
poms.diff
+disable-npapi-plugin-support.diff
diff --git a/rules b/rules
index ff6e2c1..5124083 100755
--- a/rules
+++ b/rules
@@ -396,7 +396,7 @@ ENABLE_GCONF=y
ENABLE_GIO=y
ENABLE_DCONF=y
ENABLE_RANDR=y
-SYSTEM_STUFF += npapi-headers
+#SYSTEM_STUFF += npapi-headers
PACKAGE_BASE=y
ENABLE_GRAPHITE=y
SYSTEM_STUFF += graphite
@@ -1071,9 +1071,9 @@ ifneq (,$(filter nss, $(SYSTEM_STUFF)))
BUILD_DEPS+= , libnss3-dev (>= 3.12.3)
DBG_DBG_SUGGESTS+= , libnss3-dbg
endif
-ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF)))
- BUILD_DEPS+= , npapi-sdk-dev
-endif
+#ifneq (,$(filter npapi-headers, $(SYSTEM_STUFF)))
+# BUILD_DEPS+= , npapi-sdk-dev
+#endif
ifeq "$(USE_UCPP)" "y"
ifneq (,$(filter ucpp, $(SYSTEM_STUFF)))
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
Reply to: