./packages/openofficeorg/3.2/unstable r1991: merge mozilla build hack from 3.2.1 branch
------------------------------------------------------------
revno: 1991
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Thu 2010-05-20 19:34:30 +0200
message:
merge mozilla build hack from 3.2.1 branch
added:
patches/extensions-mozilla-plugin-pc-if-libxul.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-05-19 18:53:28 +0000
+++ b/changelog 2010-05-20 17:34:30 +0000
@@ -10,6 +10,8 @@
master to fix graphical bullets on 64bit archs
* debian/patches/file-locking-conditional-cifs.diff: also add cifs to the
locking conditionals in soffice.sh
+ * debian/patches/extensions-mozilla-plugin-pc-if-libxul.diff: fix plugin
+ build failure, somehow OOo sets the wrong $MOZ_FLAVOUR for xulrunner 1.9
* debian/rules:
- re-enable extensions on armel
@@ -25,7 +27,7 @@
debian/openoffice.org-{filter-binfilter,evolution,kab}.bug-script.in:
fix component bug scripts and add the kab one
- -- Rene Engelhard <rene@debian.org> Wed, 19 May 2010 20:50:53 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 20 May 2010 19:33:30 +0200
openoffice.org (1:3.2.0-9) unstable; urgency=low
=== added file 'patches/extensions-mozilla-plugin-pc-if-libxul.diff'
--- a/patches/extensions-mozilla-plugin-pc-if-libxul.diff 1970-01-01 00:00:00 +0000
+++ b/patches/extensions-mozilla-plugin-pc-if-libxul.diff 2010-05-20 17:34:30 +0000
@@ -0,0 +1,36 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 916afff..1d3731c 100644
+--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply
+@@ -427,6 +427,10 @@
+ # .. and fix 64bit archs
+ plugin.long.diff, i#110747, cmc
+
++[ DebianBaseOnly and TemporaryHacks ]
++extensions-mozilla-plugin-pc-if-libxul.diff
++
++[ Fixes ]
+ # sd printing fixes
+ printing-bugfix-254573.diff, n#254573, rodo
+
+--- /dev/null 2010-05-02 17:01:50.016998199 +0200
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/extensions-mozilla-plugin-pc-if-libxul.diff 2010-05-13 19:02:36.000000000 +0200
+@@ -0,0 +1,18 @@
++diff --git a/extensions/source/plugin/util/makefile.pmk b/extensions/source/plugin/util/makefile.pmk
++--- extensions/source/plugin/util/makefile.pmk
+++++ extensions/source/plugin/util/makefile.pmk
++@@ -30,8 +30,14 @@
++
++ .IF "$(SYSTEM_MOZILLA)" == "YES"
++ CFLAGS+=-DSYSTEM_MOZILLA
+++# for libxul (newer xulrunners) the .pc file is mozilla-plugin, libxul-plugin
+++# doesn't exist
+++.IF "$(MOZ_FLAVOUR)" == "libxul"
+++PKGCONFIG_MODULES+=mozilla-plugin
+++.ELSE
++ PKGCONFIG_MODULES+=$(MOZ_FLAVOUR)-plugin
++ .ENDIF
+++.ENDIF
++
++ .IF "$(GUIBASE)" == "unx" && "$(ENABLE_GTK)" == "TRUE"
++ CDEFS+=-DENABLE_GTK
=== modified file 'patches/series'
--- a/patches/series 2010-05-19 18:53:28 +0000
+++ b/patches/series 2010-05-20 17:34:30 +0000
@@ -12,3 +12,4 @@
do-not-delete-dbumiscres.src-resources.diff
sw-64bit-Size-mismatch.diff
file-locking-conditional-cifs.diff
+extensions-mozilla-plugin-pc-if-libxul.diff
Reply to: