i118582: OS/2 port - redland patch by Yuri Dario. While here avoid patching stuff for past legal motivations.

13 files changed, 56 insertions, 104 deletions

diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 82e92b41b2b7..ca3a46235168 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -52,7 +52,6 @@ TARFILE_MD5=284e768eeda0e2898b0d5bf7e26a016e
 ADDITIONAL_FILES=src/makefile.mk src/raptor_config.h
 
 OOO_PATCH_FILES= \
-    $(TARFILE_NAME).patch.legal \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.ooo_build \
     $(TARFILE_NAME).patch.dmake \
@@ -64,7 +63,9 @@ PATCH_FILES=$(OOO_PATCH_FILES)
 
 .IF "$(OS)"=="OS2"
 BUILD_ACTION=dmake
-BUILD_DIR=$(CONFIGURE_DIR)$/src
+BUILD_DIR=$(CONFIGURE_DIR)/src
+ADDITIONAL_FILES+=src/windows.h
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 OOO_PATCH_FILES+=$(TARFILE_NAME).patch.mingw
@@ -136,7 +137,7 @@ BUILD_DIR=$(CONFIGURE_DIR)
 .ENDIF
 
 
-OUT2INC+=src$/raptor.h
+OUT2INC+=src/raptor.h
 
 .IF "$(OS)"=="MACOSX"
 OUT2LIB+=src$/.libs$/libraptor.$(RAPTOR_MAJOR).dylib src$/.libs$/libraptor.dylib
diff --git a/redland/raptor/raptor-1.4.18.patch.dmake b/redland/raptor/raptor-1.4.18.patch.dmake
index b0172754d8f1..3a11607ce06e 100644
--- a/redland/raptor/raptor-1.4.18.patch.dmake
+++ b/redland/raptor/raptor-1.4.18.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:25:51 2008
 +++ misc/build/raptor-1.4.18/src/makefile.mk	Thu Nov  6 15:33:14 2008
-@@ -1,1 +1,119 @@
+@@ -1,1 +1,122 @@
 -dummy
 +#*************************************************************************
 +#
@@ -108,6 +108,9 @@
 +SHL1IMPLIB= lib$(TARGET)
 +
 +#SHL1VERSIONMAP=../service/exports.map
++.IF "$(GUI)"=="OS2"
++SHL1VERSIONMAP=$(PRJ)/raptor/raptor2.map
++.ENDIF
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
 +
diff --git a/redland/raptor/raptor-1.4.18.patch.legal b/redland/raptor/raptor-1.4.18.patch.legal
deleted file mode 100644
index 217b7d154812..000000000000
--- a/redland/raptor/raptor-1.4.18.patch.legal
+++ /dev/null
@@ -1,18 +0,0 @@
---- misc/raptor-1.4.18/LICENSE.txt	Sun Mar 30 06:52:22 2008
-+++ misc/build/raptor-1.4.18/LICENSE.txt	Mon Jun 16 15:55:38 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2000-2008 David Beckett
-    Copyright (C) 2000-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
diff --git a/redland/raptor/raptor-1.4.18.patch.os2 b/redland/raptor/raptor-1.4.18.patch.os2
new file mode 100644
index 000000000000..c424810674b4
--- /dev/null
+++ b/redland/raptor/raptor-1.4.18.patch.os2
@@ -0,0 +1,11 @@
+--- misc/raptor-1.4.18/src/windos.h	Thu Nov  6 15:25:51 2008
++++ misc/build/raptor-1.4.18/src/windows.h	Thu Nov  6 15:33:14 2008
+@@ -1,1 +1,7 @@
+-dummy
++#define BOOL
++#define APIENTRY
++#define HANDLE int
++#define DWORD int
++#define LPVOID void*
++#define TRUE 1
++#define FALSE 0
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index 6f2afc423f71..0ecdf86041ab 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -52,7 +52,6 @@ TARFILE_MD5=fca8706f2c4619e2fa3f8f42f8fc1e9d
 ADDITIONAL_FILES=src/makefile.mk src/rasqal_config.h
 
 OOO_PATCH_FILES= \
-    $(TARFILE_NAME).patch.legal \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.ooo_build \
     $(TARFILE_NAME).patch.dmake \
@@ -64,6 +63,8 @@ PATCH_FILES=$(OOO_PATCH_FILES)
 .IF "$(OS)"=="OS2"
 BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/src
+ADDITIONAL_FILES+=src/windows.h
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 rasqal_CC=$(CC) -mthreads
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
index 6795eb95c43d..db49dccf651a 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:56:45 2008
 +++ misc/build/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:55:09 2008
-@@ -1,1 +1,94 @@
+@@ -1,1 +1,97 @@
 -dummy
 +#*************************************************************************
 +#
@@ -82,6 +82,9 @@
 +SHL1IMPLIB= lib$(TARGET)
 +
 +#SHL1VERSIONMAP=../service/exports.map
++.IF "$(GUI)"=="OS2"
++SHL1VERSIONMAP=$(PRJ)/rasqal/rasqal2.map
++.ENDIF
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
 +
diff --git a/redland/rasqal/rasqal-0.9.16.patch.legal b/redland/rasqal/rasqal-0.9.16.patch.legal
deleted file mode 100644
index 59b125d6b64e..000000000000
--- a/redland/rasqal/rasqal-0.9.16.patch.legal
+++ /dev/null
@@ -1,18 +0,0 @@
---- misc/rasqal-0.9.16/LICENSE.txt	Fri Jun 27 04:24:52 2008
-+++ misc/build/rasqal-0.9.16/LICENSE.txt	Thu Nov  6 12:06:55 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2003-2008 Dave Beckett
-    Copyright (C) 2003-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
diff --git a/redland/rasqal/rasqal-0.9.16.patch.os2 b/redland/rasqal/rasqal-0.9.16.patch.os2
new file mode 100644
index 000000000000..56c82e90b217
--- /dev/null
+++ b/redland/rasqal/rasqal-0.9.16.patch.os2
@@ -0,0 +1,5 @@
+--- misc/rasqal-0.9.16/src/windos.h	Thu Nov  6 15:25:51 2008
++++ misc/build/rasqal-0.9.16/src/windows.h	Thu Nov  6 15:33:14 2008
+@@ -1,1 +1,1 @@
+-dummy
++/* dummy */
diff --git a/redland/rasqal/rasqal2.map b/redland/rasqal/rasqal2.map
index 622043ac984c..82f686f52bfe 100644
--- a/redland/rasqal/rasqal2.map
+++ b/redland/rasqal/rasqal2.map
@@ -46,7 +46,7 @@ rasqal_variable_print;
 rasqal_expression_print;
 rasqal_expression_print_op;
 rasqal_triple_print;
-rasqal_expression_foreach;
+#rasqal_expression_foreach;
 rasqal_expression_visit;
 rasqal_new_expression_from_expression;
 rasqal_triple_get_origin;
@@ -64,8 +64,8 @@ rasqal_home_url_string;
 rasqal_license_string;
 rasqal_copyright_string;
 rasqal_short_copyright_string;
-rasqal_init;
-rasqal_finish;
+#rasqal_init;
+#rasqal_finish;
 rasqal_language_name_check;
 rasqal_query_set_default_generate_bnodeid_parameters;
 rasqal_free_memory;
@@ -76,7 +76,7 @@ rasqal_languages_enumerate;
 rasqal_graph_pattern_add_constraint;
 rasqal_graph_pattern_print;
 rasqal_graph_pattern_add_sub_graph_pattern;
-rasqal_graph_pattern_get_flags;
+#rasqal_graph_pattern_get_flags;
 rasqal_graph_pattern_visit;
 rasqal_graph_pattern_get_constraint;
 rasqal_graph_pattern_get_triple;
@@ -86,7 +86,7 @@ rasqal_graph_pattern_get_index;
 rasqal_graph_pattern_operator_as_string;
 rasqal_graph_pattern_get_operator;
 rasqal_graph_pattern_get_constraint_sequence;
-rasqal_new_floating_literal;
+#rasqal_new_floating_literal;
 rasqal_literal_compare;
 rasqal_literal_equals;
 rasqal_new_double_literal;
@@ -188,7 +188,9 @@ rasqal_query_results_formats_check;
 rasqal_new_query_results_formatter;
 rasqal_new_query_results_formatter_by_mime_type;
 rasqal_query_results_formats_enumerate;
-rasqal_query_results_formats_enumerate_full;
+#rasqal_query_results_formats_enumerate_full;
 rasqal_free_query_results_formatter;
 rasqal_query_results_formatter_get_mime_type;
+rasqal_free_world;
+rasqal_new_world;
 };
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index ac1558475c5e..41309183c512 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -52,7 +52,6 @@ TARFILE_MD5=ca66e26082cab8bb817185a116db809b
 ADDITIONAL_FILES=librdf/makefile.mk librdf/rdf_config.h
 
 OOO_PATCH_FILES= \
-    $(TARFILE_NAME).patch.legal \
     $(TARFILE_NAME).patch.autotools \
     $(TARFILE_NAME).patch.dmake \
     $(TARFILE_NAME).patch.ooo_build \
@@ -64,6 +63,8 @@ PATCH_FILES=$(OOO_PATCH_FILES) \
 .IF "$(OS)"=="OS2"
 BUILD_ACTION=dmake
 BUILD_DIR=$(CONFIGURE_DIR)$/librdf
+ADDITIONAL_FILES+=librdf/windows.h
+OOO_PATCH_FILES+=$(TARFILE_NAME).patch.os2
 .ELIF "$(OS)"=="WNT"
 .IF "$(COM)"=="GCC"
 redland_CC=$(CC) -mthreads
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
index 34ba51d1c29a..96837416d1ed 100644
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
 +++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,111 @@
+@@ -1,1 +1,114 @@
 -dummy
 +#*************************************************************************
 +#
@@ -97,6 +97,9 @@
 +SHL1USE_EXPORTS=name
 +
 +#SHL1VERSIONMAP=../service/exports.map
++.IF "$(GUI)"=="OS2"
++SHL1VERSIONMAP=$(PRJ)/redland/redland2.map
++.ENDIF
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
 +
diff --git a/redland/redland/redland-1.0.8.patch.legal b/redland/redland/redland-1.0.8.patch.legal
deleted file mode 100644
index 9e9a25bef78e..000000000000
--- a/redland/redland/redland-1.0.8.patch.legal
+++ /dev/null
@@ -1,54 +0,0 @@
---- misc/redland-1.0.8/LICENSE.txt	Tue Jul  1 07:55:28 2008
-+++ misc/build/redland-1.0.8/LICENSE.txt	Thu Nov  6 12:44:39 2008
-@@ -76,3 +76,15 @@
-   10. NOTICE
-   11. http://www.dajobe.org/
-   12. http://www.bristol.ac.uk/
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
---- misc/redland-1.0.8/raptor/LICENSE.txt	Sun Mar 30 06:52:22 2008
-+++ misc/build/redland-1.0.8/raptor/LICENSE.txt	Thu Nov  6 12:44:39 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2000-2008 David Beckett
-    Copyright (C) 2000-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
---- misc/redland-1.0.8/rasqal/LICENSE.txt	Fri Jun 27 04:24:52 2008
-+++ misc/build/redland-1.0.8/rasqal/LICENSE.txt	Thu Nov  6 12:44:40 2008
-@@ -60,3 +60,15 @@
- 
-    Copyright (C) 2003-2008 Dave Beckett
-    Copyright (C) 2003-2005 University of Bristol
-+
-+
-+LGPL Disclaimer
-+
-+For the avoidance of doubt, except that if any license choice other 
-+than GPL or LGPL is available it will apply instead, Sun elects to 
-+use only the Lesser General Public License version 2.1 (LGPLv2) at 
-+this time for any software where a choice of LGPL license versions 
-+is made available with the language indicating that LGPLv2.1 or any 
-+later version may be used, or where a choice of which version of the 
-+LGPL is applied is otherwise unspecified.
-+
diff --git a/redland/redland/redland-1.0.8.patch.os2 b/redland/redland/redland-1.0.8.patch.os2
new file mode 100644
index 000000000000..8b079ed46022
--- /dev/null
+++ b/redland/redland/redland-1.0.8.patch.os2
@@ -0,0 +1,12 @@
+--- misc/redland-1.0.8/librdf/windos.h	Thu Nov  6 15:25:51 2008
++++ misc/build/redland-1.0.8/librdf/windows.h	Thu Nov  6 15:33:14 2008
+@@ -1,1 +1,8 @@
+-dummy
++#define BOOL
++#define APIENTRY
++#define HANDLE int
++#define DWORD int
++#define LPVOID void*
++#define TRUE 1
++#define FALSE 0
++typedef unsigned long long __int64;