ooo-build r13244 - in trunk: . bin bin/piece patches/dev300

From: pmladek svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13244 - in trunk: . bin bin/piece patches/dev300
Date: Wed, 16 Jul 2008 09:54:59 +0000 (UTC)
Author: pmladek
Date: Wed Jul 16 09:54:59 2008
New Revision: 13244
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13244&view=rev

Log:
2008-07-16  Petr Mladek  <pmladek suse cz>

	* patches/dev300/build-ant-1.6.diff, patches/dev300/apply: bin
	  dependency on ant-1.7.0 (i#90830)

	* patches/dev300/libxmlsec-system-nss.diff, patches/dev300/apply:
	  (SLED10 only) add back the fix for the broken system nss and nspr
	  on SLED10 (i#69368, n#195272)

	* bin/package-ooo: allow the non-split build for SLED10

	* bin/unpack: exit on unpack-l10n error



Added:
   trunk/patches/dev300/build-ant-1.6.diff
   trunk/patches/dev300/libxmlsec-system-nss.diff
Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/bin/piece/Makefile.am
   trunk/bin/unpack
   trunk/patches/dev300/apply

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Wed Jul 16 09:54:59 2008
@@ -629,7 +629,7 @@
 	
 	for lang in `echo $OOO_LANGS_LIST | sed -e s/-/_/g`; do
 		lang_lists=
-		if test "$VENDORNAME" = "Mandriva" -o "$VENDORNAME" = "Novell" ; then
+		if test "$VENDORNAME" = "Mandriva" -o \( "$VENDORNAME" = "Novell" -a "$SPLIT_APP_MODULES" = "YES" \) ; then
 			test -f gid_Module_Langpack_Basis_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Basis_$lang" || :
 			test -f gid_Module_Langpack_Brand_$lang     && lang_lists="$lang_lists  gid_Module_Langpack_Brand_$lang" || :
 			test -f gid_Module_Langpack_Resource_$lang  && lang_lists="$lang_lists  gid_Module_Langpack_Resource_$lang" || :
@@ -663,6 +663,11 @@
 
 	done
 
+	if test -f $BUILDDIR/lang_en_US_list.txt -a "$VENDORNAME" = "Novell" -a "$SPLIT_APP_MODULES" != "YES" ; then
+	    cat $BUILDDIR/lang_en_US_list.txt >>$BUILDDIR/common_list.txt
+	    rm $BUILDDIR/lang_en_US_list.txt
+	fi
+
 	if test -f gid_Module_Root_SDK ; then
 	    cp gid_Module_Root_SDK $BUILDDIR/sdk_list.txt
 	fi

Modified: trunk/bin/piece/Makefile.am
==============================================================================
--- trunk/bin/piece/Makefile.am	(original)
+++ trunk/bin/piece/Makefile.am	Wed Jul 16 09:54:59 2008
@@ -1,5 +1,6 @@
 EXTRA_DIST = \
 	sys-setup \
+	unpack-l10n \
 	${wildcard env-*} \
 	${wildcard build-*} \
 	${wildcard install-*}

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Wed Jul 16 09:54:59 2008
@@ -539,7 +539,7 @@
     $GNUCP -a $SRCDIR/$GRAPHITE_SRC $GRAPHITE_DEST || exit 1;
 fi
 
-$TOOLSDIR/bin/piece/unpack-l10n $TOOLSDIR $OOBUILDDIR
+$TOOLSDIR/bin/piece/unpack-l10n $TOOLSDIR $OOBUILDDIR || exit 1;
 
 echo "Installing bibliography overwrides";
 $GNUTAR xjf $SRCDIR/biblio.tar.bz2 -C $OOBUILDDIR/extras/source/database

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul 16 09:54:59 2008
@@ -56,7 +56,7 @@
 SUSE-9.2  : NovellBase
 SUSE-9.3  : NovellBase
 SUSE-10.0 : NovellBase
-SUSE-10.1 : NovellBase, BerkeleyDB43
+SUSE-10.1 : NovellBase, BerkeleyDB43, BrokenSystemNSS
 SUSE-10.2 : NovellBase, BerkeleyDB43, EMFPlus
 SUSE-10.3 : NovellBase, BerkeleyDB43, EMFPlus
 SUSE-11.0 : NovellBase, BerkeleyDB43, Gcc43, EMFPlus, CairoFonts
@@ -399,6 +399,11 @@
 [ swextFixes >= dev300-m24 >= beb300-m3 ]
 wiki-publisher-no-license.diff
 
+[ swextFixes ]
+
+# allow build with ant-1.6
+build-ant-1.6.diff, i#90830, pmladek
+
 [ Fixes < dev300-m24 < beb300-m3 ]
 # let sd accept uri-list drop, n#183719
 sd-accept-uri-list-drop.diff, n#183719, rodo
@@ -973,6 +978,11 @@
 # we need a good plan before, though ;-)
 #FIXME dev300-m10: split-icons-search-usr-share.diff, n#296502, pmladek
 
+[ BrokenSystemNSS ]
+
+# fix build with system libnss installed apart from mozilla
+# strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
+libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 [ BuildBits ]
 novell-win32-agfa-monotype-fonts.diff, tml

Added: trunk/patches/dev300/build-ant-1.6.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/build-ant-1.6.diff	Wed Jul 16 09:54:59 2008
@@ -0,0 +1,30 @@
+--- config_office/configure.in.old	2008-07-15 11:55:31.000000000 +0200
++++ config_office/configure.in	2008-07-15 16:41:53.000000000 +0200
+@@ -6090,10 +6090,6 @@ else
+   fi
+ 
+   ant_minver=1.6.0
+-  # update for more extensions...
+-  if test "$ENABLE_MEDIAWIKI" = "YES"; then
+-    ant_minver=1.7.0
+-  fi
+   ant_minminor1=`echo $ant_minver | cut -d"." -f2`
+ 
+   AC_MSG_CHECKING([whether ant is >= $ant_minver])
+--- swext/mediawiki/build.xml.old	2008-07-15 11:55:31.000000000 +0200
++++ swext/mediawiki/build.xml	2008-07-15 16:39:54.000000000 +0200
+@@ -140,10 +140,10 @@
+             <fileset dir="${out}/misc/${target}/package_tmp" casesensitive="yes"/>
+             <fileset dir="${dist}" includes="${target}.jar" casesensitive="yes"/>
+             <fileset dir="." includes="images/**,templates/**" casesensitive="yes"/>
+-            <file file="${commons-codec-jar}"/>
+-            <file file="${commons-httpclient-jar}"/>
+-            <file file="${commons-lang-jar}"/>
+-            <file file="${commons-logging-jar}"/>
++            <fileset file="${commons-codec-jar}" casesensitive="yes"/>
++            <fileset file="${commons-httpclient-jar}" casesensitive="yes"/>
++            <fileset file="${commons-lang-jar}" casesensitive="yes"/>
++            <fileset file="${commons-logging-jar}" casesensitive="yes"/>
+             <zipfileset dir="src" includes="uno-extension-manifest.xml" casesensitive="yes" fullpath="META-INF/manifest.xml"/>
+             <zipfileset dir="dialogs" includes="**/*.xdl,**/*.xba,**/*.xlb" casesensitive="yes" prefix="WikiEditor"/>
+             <zipfileset dir="src" includes="THIRDPARTYLICENSEREADME.html" casesensitive="yes" prefix="license"/>

Added: trunk/patches/dev300/libxmlsec-system-nss.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/libxmlsec-system-nss.diff	Wed Jul 16 09:54:59 2008
@@ -0,0 +1,93 @@
+--- libxmlsec/xmlsec1-1.2.6.patch.old	2008-07-15 11:55:05.000000000 +0200
++++ libxmlsec/xmlsec1-1.2.6.patch	2008-07-15 16:54:38.000000000 +0200
+@@ -470,23 +470,23 @@
+     else
+        PKG_CONFIG_MIN_VERSION=0.9.0
+        if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-!         echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" >&5
+-! echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
++!         echo "$as_me:$LINENO: checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" >&5
++! echo $ECHO_N "checking for nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION... $ECHO_C" >&6
+   
+-!         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION" ; then
++!         if $PKG_CONFIG --exists "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION" ; then
+               echo "$as_me:$LINENO: result: yes" >&5
+   echo "${ECHO_T}yes" >&6
+               succeeded=yes
+   
+               echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
+   echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
+-!             NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++!             NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+               echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
+   echo "${ECHO_T}$NSS_CFLAGS" >&6
+   
+               echo "$as_me:$LINENO: checking NSS_LIBS" >&5
+   echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
+-!             NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++!             NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+               echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+   echo "${ECHO_T}$NSS_LIBS" >&6
+           else
+@@ -503,7 +503,7 @@
+               NSS_LIBS=""
+               ## If we have a custom action on failure, don't print errors, but
+               ## do set a variable so people can do so.
+-!             NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION"`
++!             NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $MOZILLA_MIN_VERSION nss >= $MOZILLA_MIN_VERSION"`
+   
+           fi
+   
+@@ -570,23 +570,23 @@
+ +   else
+ +      PKG_CONFIG_MIN_VERSION=0.9.0
+ +      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+-+         echo "$as_me:$LINENO: checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" >&5
+-+ echo $ECHO_N "checking for nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION... $ECHO_C" >&6
+++         echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION" >&5
+++ echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION... $ECHO_C" >&6
+ + 
+-+         if $PKG_CONFIG --exists "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION" ; then
+++         if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION" ; then
+ +             echo "$as_me:$LINENO: result: yes" >&5
+ + echo "${ECHO_T}yes" >&6
+ +             succeeded=yes
+ + 
+ +             echo "$as_me:$LINENO: checking NSS_CFLAGS" >&5
+ + echo $ECHO_N "checking NSS_CFLAGS... $ECHO_C" >&6
+-+             NSS_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
+++             NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION"`
+ +             echo "$as_me:$LINENO: result: $NSS_CFLAGS" >&5
+ + echo "${ECHO_T}$NSS_CFLAGS" >&6
+ + 
+ +             echo "$as_me:$LINENO: checking NSS_LIBS" >&5
+ + echo $ECHO_N "checking NSS_LIBS... $ECHO_C" >&6
+-+             NSS_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
+++             NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION"`
+ +             echo "$as_me:$LINENO: result: $NSS_LIBS" >&5
+ + echo "${ECHO_T}$NSS_LIBS" >&6
+ +         else
+@@ -594,7 +594,7 @@
+ +             NSS_LIBS=""
+ +             ## If we have a custom action on failure, don't print errors, but
+ +             ## do set a variable so people can do so.
+-+             NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION"`
+++             NSS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZ_FLAVOUR-nspr >= $NSPR_MIN_VERSION $MOZ_FLAVOUR-nss >= $NSS_MIN_VERSION"`
+ + 
+ +         fi
+ + 
+@@ -2743,12 +2743,12 @@
+       AC_MSG_RESULT(no)
+       NSS_FOUND="without"
+   elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z" -a "z$PKG_CONFIG_ENABLED" = "zyes" ; then
+-!     PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
++!     PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
+   	[NSS_FOUND=yes],
+   	[NSS_FOUND=no])
+ +     AC_MSG_RESULT($NSS_FOUND)
+ +     if test "z$NSS_FOUND" = "zno" ; then 
+-+         PKG_CHECK_MODULES(NSS, nspr >= $NSPR_MIN_VERSION nss >= $NSS_MIN_VERSION,
+++         PKG_CHECK_MODULES(NSS, $MOZ_FLAVOUR-nspr >= $MOZILLA_MIN_VERSION $MOZ_FLAVOUR-nss >= $MOZILLA_MIN_VERSION,
+ + 	    [NSS_FOUND=yes],
+ + 	    [NSS_FOUND=no])
+ +         AC_MSG_RESULT($NSS_FOUND)
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]