------------------------------------------------------------
revno: 1906
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2010-04-01 22:32:16 +0200
message:
remove hack again and apply caolans fix
renamed:
patches/redland-remove-patches.diff => patches/fix-system-redland.diff
modified:
changelog
patches/series
rules
patches/fix-system-redland.diff
=== modified file 'changelog'
--- a/changelog 2010-04-01 12:49:05 +0000
+++ b/changelog 2010-04-01 20:32:16 +0000
@@ -8,8 +8,9 @@
* debian/patches/update-mysqlc.diff: "update" MySQL Connector to the
version which (unnannounced) went in to 3.2.1
* debian/patches/cws-linuxaxp01.diff: add alpha port from issue 110145
- * debian/patches/redland-remove-patches.diff: remove redland patches
- allowing to use system-redland (from issue 108911)
+ * debian/patches/fix-system-redland.diff: remove redland patches
+ allowing to use system-redland and reset security preferences (from issues
+ 108911 and 110523)
* debian/patches/branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff:
update ooo-build-3-2 branch
- Fix invalid iterator usage in X11SalGraphics::drawPolyPolygon
@@ -34,7 +35,6 @@
- sort arch lists, patch from Chris Cheney
- install uno.py and unohelper.py for all supported python versions
(closes: #476213)
- - hack around to keep internal libraptor for now due to Issue 110523
* debian/README.Debian-source: update for 3.2, mention new extra compnents
* debian/scripts/vars.alpha: add
* debian/control*.in:
=== renamed file 'patches/redland-remove-patches.diff' =>
'patches/fix-system-redland.diff'
--- a/patches/redland-remove-patches.diff 2010-03-24 09:02:02 +0000
+++ b/patches/fix-system-redland.diff 2010-04-01 20:32:16 +0000
@@ -6,12 +6,13 @@
index 5ad4309..15851fd 100644
--- openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
+++ openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/apply
-@@ -1518,6 +1518,9 @@ psprint-postscript-page-setup.diff, i#65491, n#80448,
jholesov
+@@ -1518,6 +1518,10 @@ psprint-postscript-page-setup.diff, i#65491, n#80448,
jholesov
vcl-bitmap2-negative-height.diff
[ SystemBits ]
-+# remove redland patches; work around libredland bugs
++# remove redland patches; work around librdf/libraptor bugs
+redland-remove-patches.diff, #i108911
++unoxml-reset-secprefs.diff, i#110523
+
# use getopt() and readdir_r() from system glibc
#FIXME src680: system-libc.diff, i#69033, rengelha
@@ -642,3 +643,54 @@
+ throw;
+ }
+ // NB: this takes ownership of the nodes! (which is really ugly)
+--- /dev/null 2010-03-23 19:39:08.172681047 +0100
++++
openoffice.org-3.2.0/ooo-build-3-2-0-9/patches/dev300/unoxml-reset-secprefs.diff
2010-04-01 17:47:22.000000000 +0200
+@@ -0,0 +1,48 @@
++diff -r 21777680017e unoxml/source/rdf/librdf_repository.cxx
++--- unoxml/source/rdf/librdf_repository.cxx Thu Mar 18 17:15:13 2010 +0000
+++++ unoxml/source/rdf/librdf_repository.cxx Thu Apr 01 16:23:56 2010 +0100
++@@ -52,6 +52,7 @@
++ #include <rtl/ustring.hxx>
++
++ #include <librdf.h>
+++#include <libxslt/security.h>
++
++ #include <boost/utility.hpp>
++ #include <boost/shared_ptr.hpp>
++@@ -1887,7 +1888,11 @@
++ m_rRep);
++ }
++ //FIXME logger, digest, features?
+++ xsltSecurityPrefsPtr origprefs = xsltGetDefaultSecurityPrefs();
++ librdf_world_open(pWorld);
+++ xsltSecurityPrefsPtr newprefs = xsltGetDefaultSecurityPrefs();
+++ if (newprefs != origprefs)
+++ xsltSetDefaultSecurityPrefs(origprefs);
++ return pWorld;
++ }
++
++diff -r 21777680017e unoxml/source/rdf/makefile.mk
++--- unoxml/source/rdf/makefile.mk Thu Mar 18 17:15:13 2010 +0000
+++++ unoxml/source/rdf/makefile.mk Thu Apr 01 16:23:56 2010 +0100
++@@ -41,6 +41,13 @@
++ CFLAGS+=-DSYSTEM_REDLAND $(REDLAND_CFLAGS)
++ .ENDIF
++
+++.IF "$(SYSTEM_LIBXSLT)" == "YES"
+++CFLAGS+= $(LIBXSLT_CFLAGS)
+++.ELSE
+++LIBXSLTINCDIR=external$/libxslt
+++CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR)
+++.ENDIF
+++
++ # --- Files --------------------------------------------------------
++ .IF "$(L10N_framework)"==""
++
++@@ -64,6 +71,7 @@
++
++ SHL1STDLIBS= \
++ $(REDLANDLIB) \
+++ $(XSLTLIB) \
++ $(CPPUHELPERLIB) \
++ $(CPPULIB) \
++ $(SALLIB) \
=== modified file 'patches/series'
--- a/patches/series 2010-03-29 15:05:29 +0000
+++ b/patches/series 2010-04-01 20:32:16 +0000
@@ -1,5 +1,5 @@
branch-update-f7b99eb375dea6024a48ca1b41f8bc76c220a38e.diff
update-mysqlc.diff
cws-linuxaxp01.diff
-redland-remove-patches.diff
+fix-system-redland.diff
system-mysqlcpp.diff
=== modified file 'rules'
--- a/rules 2010-04-01 14:14:59 +0000
+++ b/rules 2010-04-01 20:32:16 +0000
@@ -1923,16 +1923,6 @@
cd $(OOO_BUILD_TREE) ; PATH=$(BUILD_PATH)
LD_LIBRARY_PATH=$(BUILD_LD_LIBRARY_PATH) DEFAULT_TO_ENGLISH_FOR_PACKING=1
VERBOSE=true ARCH_FLAGS=$(ARCH_FLAGS) TMP=/tmp $(MAKE)
endif
-ifeq "$(USE_SYSTEM_REDLAND)" "y"
- # some parsers in libraptor break help in OOo. redland/rasqual should
- # be ok. keep libraptor internally and save 2 lib copies instead of
- # none. FIXME: yes, this is fragile...
- cd $(SOURCE_TREE)/redland/raptor && \
- . $(CURDIR)/$(SOURCE_TREE)/*.sh; \
- export SYSTEM_REDLAND=NO; \
- dmake
-endif
-
# apparently setting this here globally doesn't work, so hack around.
# If we don't do this we get loads of harmless, but log-bloating
# warnings
@@ -2863,12 +2853,6 @@
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/services.rdb
-ifeq "$(USE_SYSTEM_REDLAND)" "y"
- # install the internal libraptor
- install -m644 $(SOURCE_TREE)/redland/$(shell . $(SOURCE_TREE)/*.sh;
echo $$OUTPATH$$PROEXT)/lib/libraptor.so.1 \
-
$(PKGDIR)-core/usr/lib/$(OODIRNAME)/basis$(OOVER)/program/libraptor.so.1
-endif
-
for i in $(ARCH_DEP_PACKAGES); do \
if [ -e debian/$$i.bug-script.in ]; then \
cat debian/$$i.bug-script.in \
