./packages/openofficeorg/3.2.1/experimental r1982: work around extensions build failure (MOZ_PLUGIN is set to libxul but it should be mozilla)...
------------------------------------------------------------
revno: 1982
committer: Rene Engelhard <rene@debian.org>
branch nick: debian
timestamp: Thu 2010-05-13 22:18:32 +0200
message:
work around extensions build failure (MOZ_PLUGIN is set to libxul but it should be mozilla)...
added:
patches/extensions-mozilla-plugin-pc-if-libxul.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-05-11 22:54:27 +0000
+++ b/changelog 2010-05-13 20:18:32 +0000
@@ -15,7 +15,7 @@
- make grep -v for RID_STR_EXTENSION_NOT_PRESENT stricter so that
we don't catch dbumiscres.src
- -- Rene Engelhard <rene@debian.org> Wed, 12 May 2010 00:51:07 +0200
+ -- Rene Engelhard <rene@debian.org> Thu, 13 May 2010 19:21:34 +0200
openoffice.org (1:3.2.1~rc1-1) experimental; 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-13 20:18:32 +0000
@@ -0,0 +1,35 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 916afff..1d3731c 100644
+--- openoffice.org-3.2.1~rc1/ooo-build-3-2-1-1/patches/dev300/apply
++++ openoffice.org-3.2.1~rc1/ooo-build-3-2-1-1/patches/dev300/apply
+@@ -447,6 +447,9 @@
+ # fix mozilla plugin on 64bit archs
+ plugin.long.diff, i#110747, cmc
+
++[ DebianBaseOnly and TemporaryHacks ]
++extensions-mozilla-plugin-pc-if-libxul.diff
++
+ [ Fixes ]
+ # printf arguments cleanup
+ buildfix-fmtargs.diff, cabral
+--- /dev/null 2010-05-02 17:01:50.016998199 +0200
++++ openoffice.org-3.2.1~rc1/ooo-build-3-2-1-1/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-12 13:09:31 +0000
+++ b/patches/series 2010-05-13 20:18:32 +0000
@@ -1,1 +1,2 @@
installer-logfile-check-ignore-fakeroot.diff
+extensions-mozilla-plugin-pc-if-libxul.diff
Reply to: