ooo-build r13251 - in trunk: . bin patches/dev300

From: rengelhard svn gnome org
To: svn-commits-list gnome org
Subject: ooo-build r13251 - in trunk: . bin patches/dev300
Date: Wed, 16 Jul 2008 15:51:11 +0000 (UTC)
Author: rengelhard
Date: Wed Jul 16 15:51:11 2008
New Revision: 13251
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13251&view=rev

Log:
2008-07-16  Rene Engelhard  <rene debian org>

        * patches/dev300/apply: disable EMFPlus for Debian, broken atm
        * bin/unpack: don't extract $OOO_SDK_OO_TARBALL in SPLIT mode
        * patches/dev300/novell-win32-agfa-monotype-fonts-m24.diff,
          patches/dev300/novell-win32-agfa-monotype-fonts.diff,
          patches/dev300/configures-explicit-arch-m24.diff,
          patches/dev300/configures-explicit-arch.diff: first dev300-m25 stuff


Added:
   trunk/patches/dev300/configures-explicit-arch-m24.diff   (props changed)
      - copied unchanged from r13245, /trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts-m24.diff
      - copied unchanged from r13245, /trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
Modified:
   trunk/ChangeLog
   trunk/bin/unpack
   trunk/patches/dev300/apply
   trunk/patches/dev300/configures-explicit-arch.diff
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff

Modified: trunk/bin/unpack
==============================================================================
--- trunk/bin/unpack	(original)
+++ trunk/bin/unpack	Wed Jul 16 15:51:11 2008
@@ -196,10 +196,12 @@
    echo "Unpacking $OOO_LANG_TARBALL..."
     ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_LANG_TARBALL | $GNUTAR xpf - )
 fi
-# -sdk_oo source
-if test -f $SRCDIR/$OOO_SDK_OO_TARBALL; then
-   echo "Unpacking $OOO_SDK_OO_TARBALL"
-    ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_SDK_OO_TARBALL | $GNUTAR xpf - )
+if test "z$SPLIT" != "z"; then
+  # -sdk_oo source
+  if test -f $SRCDIR/$OOO_SDK_OO_TARBALL; then
+     echo "Unpacking $OOO_SDK_OO_TARBALL"
+      ($OOO_DECOMPRESS_CMD $SRCDIR/$OOO_SDK_OO_TARBALL | $GNUTAR xpf - )
+  fi
 fi
 
 if test "$ENABLE_CCACHE" = "yes" ; then

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Jul 16 15:51:11 2008
@@ -64,7 +64,7 @@
 SUSE-reduced:NovellBase,BerkeleyDB43, ReducedDefaults
 # Debian
 DebianBase : LinuxCommon, DebianBaseOnly, Lockdown, GCCSTL, BerkeleyDB43, Split, PostgreSQL
-Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts, Gcc43, EMFPlus
+Debian : DebianBase, DebianOnly, DebianSidOnly, Debian32Only, CairoFonts, Gcc43
 DebianEtch : DebianBase, DebianOnly, DebianEtchOnly, Debian32Only
 # Ubuntu
 UbuntuBased : DebianBase, UbuntuOnly
@@ -983,8 +983,10 @@
 # strictly required on SL10.1/SLED10 where the xulrunner-nss.pc is broken
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
-[ BuildBits ]
+[ BuildBits >= dev300-m24 ]
 novell-win32-agfa-monotype-fonts.diff, tml
+[ BuildBits < dev300-m24 ]
+novell-win32-agfa-monotype-fonts-m23.diff, tml
 
 [ BuildBits <= dev300-m21 ]
 # allow to define java target, so the build is usable with the JVM 1.4
@@ -1140,13 +1142,14 @@
 # add missing #include <stdio.h> in autodoc, breaks when building with STLport5
 #autodoc-add-missing-stdio-h.diff, rengelha
 
+# Workaround for compile failure with glibc 2.4's langinfo.h
+i18nutil-glibc-braindamage-workaround.diff, brosenk
+
+[ BuildBits < dev300-m25 ]
 # changes the SDK gid module name to gid_Module_Root_SDK, so the generated list
 # of files does not conflict with the main package, i#64802
 sdk-gid-module-name.diff, pmladek, i#64802
 
-# Workaround for compile failure with glibc 2.4's langinfo.h
-i18nutil-glibc-braindamage-workaround.diff, brosenk
-
 # do not pack any potential .orig files with ppds
 [ CWSBackports >= dev300-m22 < beb300-m0 ]
 psprint_config-no-orig.diff, jholesov
@@ -2240,8 +2243,12 @@
 debian-system-jfreereport-m21.diff
 [ DebianBaseOnly ]
 debian-system-apache-commons.diff
+
 # FIXME: does this need more for DEV300s new external modules?
+[ DebianBaseOnly >= dev300-m25 ]
 configures-explicit-arch.diff
+[ DebianBaseOnly < dev300-m25 ]
+configures-explicit-arch-m24.diff
 
 [ DebianBaseOnly >= dev300-m22 ]
 #debian-system-lucene.diff

Modified: trunk/patches/dev300/configures-explicit-arch.diff
==============================================================================
--- trunk/patches/dev300/configures-explicit-arch.diff	(original)
+++ trunk/patches/dev300/configures-explicit-arch.diff	Wed Jul 16 15:51:11 2008
@@ -201,12 +201,12 @@
 diff -u -u -r1.10.6.1 makefile.mk
 --- libxslt/makefile.mk	2 Jan 2008 17:28:49 -0000	1.10.6.1
 +++ libxslt/makefile.mk	11 Apr 2008 07:54:08 -0000
-@@ -97,7 +97,7 @@
+@@ -102,7 +102,7 @@
  .ENDIF                  # "$(COMNAME)"=="sunpro5"
  CONFIGURE_DIR=
  CONFIGURE_ACTION=.$/configure
--CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes CFLAGS="$(xslt_CFLAGS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB)
-+CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) CFLAGS="$(xslt_CFLAGS)" LIBXML2LIB=$(LIBXML2LIB) ZLIB3RDLIB=$(ZLIB3RDLIB)
+-CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes
++CONFIGURE_FLAGS=--enable-ipv6=no --without-crypto --without-python --enable-static=no --with-sax1=yes --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
  BUILD_ACTION=chmod 777 xslt-config && $(GNUMAKE)
  BUILD_FLAGS+= -j$(EXTMAXPROCESS)
  BUILD_DIR=$(CONFIGURE_DIR)

Modified: trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
==============================================================================
--- trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff	(original)
+++ trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff	Wed Jul 16 15:51:11 2008
@@ -160,8 +160,8 @@
 --- postprocess/prj/build.lst	2005-11-23 05:56:34.703125000 +0200
 +++ postprocess/prj/build.lst	2005-11-23 05:56:48.812500000 +0200
 @@ -1,4 +1,4 @@
--po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTDESIGN:reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
-+po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd ODK:sdk_oo setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTDESIGN:reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
+-po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTDESIGN:reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
++po	postprocess	::	accessibility automation basctl bean fondu BINFILTER:binfilter chart2 configmgr CRASHREP:crashrep dbaccess desktop dtrans embeddedobj embedserv EPM:epm eventattacher extensions extras fileaccess filter forms fpicker helpcontent2 hwpfilter io JAVAINSTALLER2:javainstaller2 lingucomponent MATHMLDTD:MathMLDTD MSFONTEXTRACT:msfontextract ODK:odk officecfg package padmin psprint_config remotebridges sc scaddins sccomp scp2 scripting sd setup_native slideshow starmath sw sysui testshl2 testtools ucb UnoControls unoxml ure wizards xmerge xmlsecurity BITSTREAM_VERA_FONTS:bitstream_vera_fonts AGFA_MONOTYPE_FONTS:agfa_monotype_fonts DICTIONARIES:dictionaries OOo:pyuno OOo:readlicense_oo SO:top unodevtools JFREEREPORT:jfreereport REPORTDESIGN:reportdesign SDEXT:sdext SWEXT:swext writerfilter oox NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
  po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]