ooo-build r13419 - in trunk: . patches/dev300

[rengelhard svn gnome org]

Author: rengelhard
Date: Mon Jul 28 19:10:11 2008
New Revision: 13419
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13419&view=rev

Log:
* patches/dev300/configures-explicit-arch.diff: add redland stuff


Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Jul 28 19:10:11 2008
@@ -2446,7 +2446,7 @@
 linkwarn-svtools-miscopts-bits-m26.diff
 
 [ LinkWarningDlg > dev300-m26]
-linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
+#linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
 
 [ LinkWarningDlg ]
 linkwarn-officecfg-disable-msgbox.diff, n#348149, thorsten
@@ -2625,7 +2625,7 @@
 ui-desktop-integration-m25.diff, michael
 [ Lockdown >= dev300-m26 < beb300-m0 ]
 # Disable UI [toolbars, menus] customization
-ui-desktop-integration.diff, michael
+#ui-desktop-integration.diff, michael
 
 
 [ InternalCairo <= dev300-m21 ]

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Mon Jul 28 19:10:11 2008
@@ -226,3 +226,39 @@
  .IF "$(OS)$(CPU)" == "SOLARISI"
  CONFIGURE_ACTION += --disable-ipv6
  .ENDIF
+diff -urN redland-old/raptor/makefile.mk redland/raptor/makefile.mk
+--- redland-old/raptor/makefile.mk	2008-07-28 21:05:44.000000000 +0200
++++ redland/raptor/makefile.mk	2008-07-28 21:06:10.000000000 +0200
+@@ -104,7 +104,7 @@
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+diff -urN redland-old/rasqal/makefile.mk redland/rasqal/makefile.mk
+--- redland-old/rasqal/makefile.mk	2008-07-28 21:05:44.000000000 +0200
++++ redland/rasqal/makefile.mk	2008-07-28 21:06:27.000000000 +0200
+@@ -104,7 +104,7 @@
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)
+diff -urN redland-old/redland/makefile.mk redland/redland/makefile.mk
+--- redland-old/redland/makefile.mk	2008-07-28 21:05:44.000000000 +0200
++++ redland/redland/makefile.mk	2008-07-28 21:06:44.000000000 +0200
+@@ -108,7 +108,7 @@
+ 
+ CONFIGURE_DIR=
+ CONFIGURE_ACTION=.$/configure PATH="..$/..$/..$/bin:$$PATH"
+-CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml
++CONFIGURE_FLAGS=--disable-static --disable-gtk-doc --with-threads --with-openssl-digests --with-xml-parser=libxml --with-raptor=system --with-rasqual=system --without-bdb --without-sqlite --without-mysql --without-postgresql --without-threestore       --with-regex-library=posix --with-decimal=none --with-www=xml --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+ BUILD_ACTION=$(GNUMAKE)
+ BUILD_FLAGS+= -j$(EXTMAXPROCESS)
+ BUILD_DIR=$(CONFIGURE_DIR)