CWS changehid: resync to m89

14 files changed, 84 insertions, 26 deletions

diff --git a/cppunit/ldflags.patch b/cppunit/ldflags.patch
index cecd69a4b5ee..ee8d5ed897ce 100644
--- a/cppunit/ldflags.patch
+++ b/cppunit/ldflags.patch
@@ -1,10 +1,11 @@
---- misc/cppunit-1.12.1/src/cppunit/Makefile.am	Wed Feb 20 06:36:38 2008
-+++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.am	Mon May  3 17:00:41 2010
-@@ -63,5 +63,6 @@
+--- misc/cppunit-1.12.1/src/cppunit/Makefile.in	2008-02-20 06:59:55.000000000 +0100
++++ misc/build/cppunit-1.12.1/src/cppunit/Makefile.in	2010-06-21 17:01:38.324370072 +0200
+@@ -300,7 +300,7 @@
  
- libcppunit_la_LDFLAGS= \
+ libcppunit_la_LDFLAGS = \
   -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 - -release $(LT_RELEASE)
-+ -release $(LT_RELEASE) \
-+ @LIBADD_DL@
++ -release $(LT_RELEASE) $(LIBADD_DL)
+ 
+ all: all-am
  
diff --git a/cppunit/makefile.mk b/cppunit/makefile.mk
index f50f4aadc164..9441e9219483 100644
--- a/cppunit/makefile.mk
+++ b/cppunit/makefile.mk
@@ -97,7 +97,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
     LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
     LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
 
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit
@@ -172,7 +172,7 @@ CONFIGURE_FLAGS = --prefix=$(shell cd $(PACKAGE_DIR) && \
     LDFLAGS='$(LDFLAGS) $(OOO_STLPORT_LDFLAGS)' \
     LIBS='$(OOO_STLPORT_LIBS) $(MY_LIBS)'
 
-BUILD_ACTION = $(GNUMAKE)
+BUILD_ACTION = $(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_FLAGS = install
 
 OUTDIR2INC = ooo-install/include/cppunit
diff --git a/hsqldb/patches/i96823.patch b/hsqldb/patches/i96823.patch
index 9803bc619e47..bea4a2b7e4f5 100644
--- a/hsqldb/patches/i96823.patch
+++ b/hsqldb/patches/i96823.patch
@@ -11,7 +11,7 @@
              case COUNT :
                  buf.append(' ').append(Token.T_COUNT).append('(');
 -                break;
-+                return buf.toString();
++                if ( "(*)".equals(left))buf.append('*');else   buf.append(left);   buf.append(')');   return buf.toString();
  
              case SUM :
                  buf.append(' ').append(Token.T_SUM).append('(');
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index f1aa3806a17c..b733398c3c8d 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -74,7 +74,7 @@ BUILD_ACTION=make hyph_en_US.dic
 @all:
     echo "Nothing to do here."
 .ELSE
-BUILD_ACTION=make && make check
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 OUT2INC += hyphen.h 
 .ENDIF
 
diff --git a/libegg/source/eggtrayicon.c b/libegg/source/eggtrayicon.c
index 603e66fbc99d..a03bbd00b9ea 100644
--- a/libegg/source/eggtrayicon.c
+++ b/libegg/source/eggtrayicon.c
@@ -230,10 +230,11 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_
 {
   EggTrayIcon *icon = user_data;
   XEvent *xev = (XEvent *)xevent;
+  (void)event;
 
   if (xev->xany.type == ClientMessage &&
       xev->xclient.message_type == icon->manager_atom &&
-      xev->xclient.data.l[1] == icon->selection_atom)
+      (Atom)(xev->xclient.data.l[1]) == icon->selection_atom)
     {
       egg_tray_icon_update_manager_window (icon, TRUE);
     }
@@ -383,6 +384,7 @@ egg_tray_icon_manager_window_destroyed (EggTrayIcon *icon)
 static gboolean
 transparent_expose_event (GtkWidget *widget, GdkEventExpose *event, gpointer user_data)
 {
+  (void)user_data;
   gdk_window_clear_area (widget->window, event->area.x, event->area.y,
              event->area.width, event->area.height);
   return FALSE;
@@ -392,6 +394,8 @@ static void
 make_transparent_again (GtkWidget *widget, GtkStyle *previous_style,
             gpointer user_data)
 {
+  (void)previous_style;
+  (void)user_data;
   gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
 }
 
@@ -401,6 +405,7 @@ make_transparent (GtkWidget *widget, gpointer user_data)
   if (GTK_WIDGET_NO_WINDOW (widget) || GTK_WIDGET_APP_PAINTABLE (widget))
     return;
 
+  (void)user_data;
   gtk_widget_set_app_paintable (widget, TRUE);
   gtk_widget_set_double_buffered (widget, FALSE);
   gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
diff --git a/libtextcat/makefile.mk b/libtextcat/makefile.mk
index 01a2a6eadc36..f14a69bd5113 100644
--- a/libtextcat/makefile.mk
+++ b/libtextcat/makefile.mk
@@ -30,6 +30,12 @@ PRJ=.
 PRJNAME=libtextcat
 TARGET=libtextcat
 
+.IF "$(SYSTEM_LIBTEXTCAT)" == "YES"
+all:
+        @echo "An already available installation of libtextcat should exist on your system."
+        @echo "Therefore the version provided here does not need to be built in addition."
+.ENDIF
+
 # --- Settings -----------------------------------------------------
 
 .INCLUDE :	settings.mk
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk
index 9b7ea1b0aa08..f721db3148a4 100644
--- a/libxmlsec/makefile.mk
+++ b/libxmlsec/makefile.mk
@@ -48,6 +48,7 @@ TARFILE_NAME=$(PRJNAME)-$(XMLSEC1VERSION)
 TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
 
 #xmlsec1-configure.patch: Set up the build. Straightforward configuration
+#xmlsec1-configure-libxml-libxslt.patch: empty "$with_libxml" prepends /bin :-(
 #xmlsec1-olderlibxml2.patch: Allow build against older libxml2, for macosx
 #xmlsec1-nssdisablecallbacks.patch: Disable use of smime3 so don't need to package it
 #xmlsec1-customkeymanage.patch: Could we do this alternatively outside xmlsec
@@ -57,6 +58,7 @@ TARFILE_MD5=1f24ab1d39f4a51faf22244c94a6203f
 #xmlsec1-mingw-customkeymanage-addmscrypto.patch builds the custom keymanager on mingw
 PATCH_FILES=\
    xmlsec1-configure.patch \
+   xmlsec1-configure-libxml-libxslt.patch \
    xmlsec1-olderlibxml2.patch \
    xmlsec1-nssdisablecallbacks.patch \
    xmlsec1-customkeymanage.patch \
@@ -102,7 +104,7 @@ CONFIGURE_FLAGS=--with-libxslt=no --with-openssl=no --with-gnutls=no --with-mozi
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .ELSE
 CONFIGURE_DIR=win32
@@ -143,10 +145,6 @@ xmlsec_LDFLAGS+=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 xmlsec_LDFLAGS+=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
 .ENDIF			# "$(OS)$(COM)"=="SOLARISC52"
 
-.IF "$(OS)$(COM)"=="LINUXGCC"
-xmlsec_LDFLAGS+=-Wl,-z,noexecstack
-.ENDIF
-
 LDFLAGS:=$(xmlsec_LDFLAGS)
 .EXPORT: LDFLAGS
 
@@ -166,7 +164,7 @@ CONFIGURE_FLAGS=--with-pic --disable-shared --disable-crypto-dl --with-libxslt=n
 .IF "$(SYSTEM_MOZILLA)" != "YES"
 CONFIGURE_FLAGS+=--enable-pkgconfig=no
 .ENDIF
-BUILD_ACTION=$(GNUMAKE)
+BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 BUILD_DIR=$(CONFIGURE_DIR)
 .ENDIF
 
diff --git a/libxmlsec/xmlsec1-configure-libxml-libxslt.patch b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
new file mode 100644
index 000000000000..fdf39ad19554
--- /dev/null
+++ b/libxmlsec/xmlsec1-configure-libxml-libxslt.patch
@@ -0,0 +1,40 @@
+--- misc/xmlsec1-1.2.14/configure	Wed Jun 30 11:55:36 2010
++++ misc/build/xmlsec1-1.2.14/configure	Wed Jun 30 11:57:28 2010
+@@ -12077,7 +12077,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxml/bin:$PATH"
++as_dummy="$with_libxml${with_libxml:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+   IFS=$as_save_IFS
+@@ -12258,7 +12258,7 @@
+   ;;
+   *)
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-as_dummy="$with_libxslt/bin:$PATH"
++as_dummy="$with_libxslt${with_libxslt:+/bin:}$PATH"
+ for as_dir in $as_dummy
+ do
+   IFS=$as_save_IFS
+--- misc/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:55:37 2010
++++ misc/build/xmlsec1-1.2.14/configure.in	Wed Jun 30 11:53:55 2010
+@@ -231,7 +231,7 @@
+ if test "z$LIBXML_FOUND" = "zno" ; then
+     if test "z$with_libxml" != "zyes" ; then
+ 	AC_PATH_PROG([LIBXML_CONFIG], [$LIBXML_CONFIG], [],
+-		     [$with_libxml/bin:$PATH])
++		     [$with_libxml${with_libxml:+/bin:}$PATH])
+     fi
+     AC_MSG_CHECKING([libxml2 $LIBXML_CONFIG ])
+     if ! LIBXML_VERSION=`$LIBXML_CONFIG --version 2>/dev/null`; then
+@@ -296,7 +296,7 @@
+ if test "z$LIBXSLT_FOUND" = "zno" ; then
+     if test "z$with_libxslt" != "zyes" ; then
+ 	AC_PATH_PROG([LIBXSLT_CONFIG], [$LIBXSLT_CONFIG], [],
+-		     [$with_libxslt/bin:$PATH])
++		     [$with_libxslt${with_libxslt:+/bin:}:$PATH])
+     fi
+     AC_MSG_CHECKING(for libxslt libraries >= $LIBXSLT_MIN_VERSION) 
+     if ! LIBXSLT_VERSION=`$LIBXSLT_CONFIG --version 2>/dev/null`; then
diff --git a/mythes/makefile.mk b/mythes/makefile.mk
index 0aa8f2fdc6fe..f373a5d16262 100644
--- a/mythes/makefile.mk
+++ b/mythes/makefile.mk
@@ -47,6 +47,8 @@ PATCH_FILES=mythes-1.2.0-vanilla-th-gen-idx.patch \
 .IF "$(GUI)"=="UNX"
 CONFIGURE_DIR=$(BUILD_DIR)
 
+.IF "$(SYSTEM_MYTHES)" != "YES"
+
 .IF "$(SYSTEM_HUNSPELL)" != "YES"
 HUNSPELL_CFLAGS +:= -I$(SOLARINCDIR)$/hunspell
 HUNSPELL_LIBS +:= -L$(SOLARLIBDIR) -lhunspell-1.2
@@ -74,14 +76,9 @@ CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
 CONFIGURE_FLAGS+=CFLAGS='$(LCL_CONFIGURE_CFLAGS)'
 .ENDIF
 
-.IF "$(SYSTEM_MYTHES)" == "YES"
-@all:
-    echo "Nothing to do here."
-.ELSE
 BUILD_ACTION=make
 OUT2INC += mythes.hxx
 .ENDIF
-
 .ENDIF # "$(GUI)"=="UNX"
 
 
diff --git a/np_sdk/prj/build.lst b/np_sdk/prj/build.lst
index 01dbd7b0095b..7aa9a6d88a1e 100644
--- a/np_sdk/prj/build.lst
+++ b/np_sdk/prj/build.lst
@@ -1,3 +1,3 @@
-np  np_sdk : soltools	NULL
+np  np_sdk : soltools stlport NULL
 np	np_sdk			usr1	-	all	np_sdk NULL
 np	np_sdk\mozsrc	nmake	-	all	np_mozsrc NULL
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index abd10061ff5c..449ebce2cae1 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -10,6 +10,17 @@
  "nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
  "nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
  
+--- misc/build/openssl-0.9.8o/Makefile.org	2010-01-27 17:06:36.000000000 +0100
++++ misc/build/openssl-0.9.8o/Makefile.org	2010-09-20 09:24:00.000000000 +0100
+@@ -199,7 +199,7 @@
+ 
+ BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
+ 		CC='${CC}' CFLAG='${CFLAG}' 			\
+-		AS='${CC}' ASFLAG='${CFLAG} -c'			\
++		AS='${CC}' ASFLAG='${CFLAG} -c -Wa,--noexecstack'	\
+ 		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
+ 		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)'	\
+ 		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
 --- misc/openssl-0.9.8o/config	2009-02-16 09:43:41.000000000 +0100
 +++ misc/build/openssl-0.9.8o/config	2009-03-30 08:59:09.588448000 +0200
 @@ -399,27 +399,21 @@
diff --git a/redland/raptor/makefile.mk b/redland/raptor/makefile.mk
index 62d4f704d0e4..b67f6ef314ce 100644
--- a/redland/raptor/makefile.mk
+++ b/redland/raptor/makefile.mk
@@ -93,7 +93,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
 .ELSE # "WNT"
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
diff --git a/redland/rasqal/makefile.mk b/redland/rasqal/makefile.mk
index efe099c88049..66fca99d1600 100644
--- a/redland/rasqal/makefile.mk
+++ b/redland/rasqal/makefile.mk
@@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/src
 .ELSE # "WNT"
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'
diff --git a/redland/redland/makefile.mk b/redland/redland/makefile.mk
index 3db7c0559d2e..20b1210dd2f9 100644
--- a/redland/redland/makefile.mk
+++ b/redland/redland/makefile.mk
@@ -89,7 +89,7 @@ BUILD_DIR=$(CONFIGURE_DIR)$/librdf
 .ELSE # "WNT"
 
 .IF "$(OS)$(COM)"=="LINUXGCC" || "$(OS)$(COM)"=="FREEBSDGCC"
-LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec -Wl,-z,noexecstack
+LDFLAGS:=-Wl,-rpath,'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib' -Wl,-noinhibit-exec
 .ENDIF                  # "$(OS)$(COM)"=="LINUXGCC"
 .IF "$(OS)$(COM)"=="SOLARISC52"
 LDFLAGS:=-Wl,-R'$$$$ORIGIN:$$$$ORIGIN/../ure-link/lib'