./packages/openofficeorg/3.2/unstable r1932: add patch from issue 110747 to fix the plugin on 64bit archs
------------------------------------------------------------
revno: 1932
committer: Rene Engelhard <rene@debian.org>
branch nick: unstable
timestamp: Mon 2010-04-12 02:18:14 +0200
message:
add patch from issue 110747 to fix the plugin on 64bit archs
added:
patches/nsplugin-long.diff
modified:
changelog
control
patches/series
rules
=== modified file 'changelog'
--- a/changelog 2010-04-11 23:15:07 +0000
+++ b/changelog 2010-04-12 00:18:14 +0000
@@ -9,6 +9,8 @@
(closes: #576842)
* debian/patches/nsplugin-path-handle-relative-symlinks.diff: add patch
from upstream to handle relative symlinks (closes: #570452)
+ * debian/patches/nsplugin-long.diff: add patch from issue 110747 to fix
+ the plugin on 64bit archs
* debian/rules, debian/shlibs.*: fix shlib-dependencies to not depend
on the kdelibs5 transitional package anymore when built with KDE 4.4
@@ -27,7 +29,7 @@
Do the same for -filter-binfilter to make it have orrect Pre-Depends:
again
- -- Rene Engelhard <rene@debian.org> Mon, 12 Apr 2010 01:05:47 +0200
+ -- Rene Engelhard <rene@debian.org> Mon, 12 Apr 2010 01:27:46 +0200
openoffice.org (1:3.2.0-6) unstable; urgency=low
=== modified file 'control'
--- a/control 2010-04-11 23:15:07 +0000
+++ b/control 2010-04-12 00:18:14 +0000
@@ -3441,7 +3441,7 @@
Package: mozilla-openoffice.org
Section: net
-Architecture: i386 mips mipsel powerpc s390 armel hppa sparc
+Architecture: i386 m68k mips mipsel powerpc s390 alpha amd64 armel hppa ia64 ppc64 s390x sparc
Enhances: iceape-browser,
iceweasel,
mozilla-browser,
=== added file 'patches/nsplugin-long.diff'
--- a/patches/nsplugin-long.diff 1970-01-01 00:00:00 +0000
+++ b/patches/nsplugin-long.diff 2010-04-12 00:18:14 +0000
@@ -0,0 +1,26 @@
+--- openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply-old 2010-04-12 01:24:01.000000000 +0200
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/apply 2010-04-12 01:24:40.000000000 +0200
+@@ -424,6 +424,8 @@
+
+ # more intelligent nsplugin seeking
+ nsplugin-path.diff, i#49590, michael
++# .. and fix 64bit archs
++plugin.long.diff, i#110747, cmc
+
+ # sd printing fixes
+ printing-bugfix-254573.diff, n#254573, rodo
+--- /dev/null 2010-04-09 01:40:42.816645442 +0200
++++ openoffice.org-3.2.0/ooo-build-3-2-0-10/patches/dev300/plugin.long.diff 2010-04-12 01:23:02.000000000 +0200
+@@ -0,0 +1,12 @@
++diff -r 4495864f1d5b extensions/source/nsplugin/source/so_main.cxx
++--- extensions/source/nsplugin/source/so_main.cxx Fri Apr 09 10:22:18 2010 +0100
+++++ extensions/source/nsplugin/source/so_main.cxx Sat Apr 10 14:42:04 2010 +0100
++@@ -126,7 +126,7 @@
++ return -1;
++ }
++
++-int find_cur_node(sal_Int32 cur_id)
+++int find_cur_node(long cur_id)
++ {
++ for(int i=0; i<MAX_NODE_NUM; i++)
++ {
=== modified file 'patches/series'
--- a/patches/series 2010-04-08 21:27:36 +0000
+++ b/patches/series 2010-04-12 00:18:14 +0000
@@ -3,4 +3,5 @@
cws-linuxaxp01.diff
fix-system-redland.diff
system-mysqlcpp.diff
+nsplugin-long.diff
nsplugin-path-handle-relative-symlinks.diff
=== modified file 'rules'
--- a/rules 2010-04-12 00:09:47 +0000
+++ b/rules 2010-04-12 00:18:14 +0000
@@ -496,7 +496,7 @@
endif
ifeq "$(PACKAGE_NPSOPLUGIN)" "y"
-OOO_NPSOPLUGIN_ARCHS = $(filter-out $(OOO_64BIT_ARCHS),$(OOO_MOZILLA_ARCHS))
+OOO_NPSOPLUGIN_ARCHS = $(OOO_ARCHS)
else
OOO_NPSOPLUGIN_ARCHS=
endif
Reply to: