summaryrefslogtreecommitdiff
path: root/redland/redland
diff options
context:
space:
mode:
authorMichael Stahl <mst@openoffice.org>2010-04-28 17:52:28 +0200
committerMichael Stahl <mst@openoffice.org>2010-04-28 17:52:28 +0200
commit2e52d38c5049efede9ecd4633f81c8d207a28546 (patch)
tree379ed78a277ea514ed02897a3697a6c5e2ef5df2 /redland/redland
parente9ea5449b353b867486c4a5250e846c3da35bf68 (diff)
parentbdb13254f79131f8ac2568079367c910c8fc551a (diff)
merge DEV300_m77
Diffstat (limited to 'redland/redland')
-rw-r--r--redland/redland/makefile.mk5
-rw-r--r--redland/redland/redland-1.0.8.patch.ooo_build22
-rw-r--r--redland/redland/redland2.map2
3 files changed, 26 insertions, 3 deletions
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 6c95f3712f0e..d6acd4d8ea4d 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -47,6 +47,7 @@ all:
REDLANDVERSION=1.0.8
TARFILE_NAME=redland-$(REDLANDVERSION)
+TARFILE_MD5=ca66e26082cab8bb817185a116db809b
ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h
@@ -54,8 +55,8 @@ OOO_PATCH_FILES= \
$(TARFILE_NAME).patch.legal \
$(TARFILE_NAME).patch.autotools \
$(TARFILE_NAME).patch.dmake \
- $(TARFILE_NAME).patch.win32 \
-
+ $(TARFILE_NAME).patch.ooo_build \
+ $(TARFILE_NAME).patch.win32
PATCH_FILES=$(OOO_PATCH_FILES) \
diff --git a/redland/redland/redland-1.0.8.patch.ooo_build b/redland/redland/redland-1.0.8.patch.ooo_build
new file mode 100644
index 000000000000..805a88d49ea2
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.ooo_build
@@ -0,0 +1,22 @@
+--- misc/redland-1.0.8/Makefile.am 2010-02-12 08:47:40.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.am 2010-02-12 08:47:51.000000000 +0000
+@@ -48,7 +48,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS=@LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS=@LOCAL_SUBDIRS@ librdf examples demos docs data
+
+ EXTRA_DIST=ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+--- misc/redland-1.0.8/Makefile.in 2010-02-12 08:47:39.000000000 +0000
++++ misc/build/redland-1.0.8/Makefile.in 2010-02-12 08:47:55.000000000 +0000
+@@ -283,7 +283,7 @@
+ # to ensure that the raptor and rasqal subdirectories are called
+ # as CONFIG_SUBDIR directories.
+ #
+-SUBDIRS = @LOCAL_SUBDIRS@ librdf examples utils demos docs data
++SUBDIRS = @LOCAL_SUBDIRS@ librdf examples demos docs data
+ EXTRA_DIST = ChangeLog ChangeLog.1 ChangeLog.2 ChangeLog.3 ChangeLog.4 \
+ ChangeLog.5 ChangeLog.6 ChangeLog.7 \
+ README NEWS LICENSE.txt TODO \
diff --git a/redland/redland/redland2.map b/redland/redland/redland2.map
index 660f80a0b8a4..5798f461684b 100644
--- a/redland/redland/redland2.map
+++ b/redland/redland/redland2.map
@@ -1,4 +1,4 @@
-REDLAND2 {
+UDK_3_0_0 {
global:
GetVersionInfo;
librdf_get_concept_resource_by_index;