ooo-build r15481 - in trunk: . bin patches/cairo patches/dev300

[strba svn gnome org]

Author: strba
Date: Fri Mar  6 08:59:03 2009
New Revision: 15481
URL: http://svn.gnome.org/viewvc/ooo-build?rev=15481&view=rev

Log:
remove obsolete cairo patches + fix some minor sillies with the pixman build + make install should work even when --with-srcdir was specified

Added:
   trunk/patches/dev300/cairo-pixman-makefile-mk.diff
   trunk/patches/dev300/internal-cairo-configure.diff
Removed:
   trunk/patches/cairo/cairo-cairo-1-4-10-diff.diff
   trunk/patches/cairo/cairo-makefile-mk.diff
   trunk/patches/cairo/cairo-prj-build-lst.diff
   trunk/patches/cairo/cairo-prj-d-lst.diff
Modified:
   trunk/ChangeLog
   trunk/bin/build-galleries
   trunk/bin/package-ooo
   trunk/patches/dev300/apply

Modified: trunk/bin/build-galleries
==============================================================================
--- trunk/bin/build-galleries	(original)
+++ trunk/bin/build-galleries	Fri Mar  6 08:59:03 2009
@@ -161,7 +161,7 @@
     # galleries.txt filelist is generated. This way we can detect problems
     # via the RPM check for installed but unpackaged files
     echo "Adding Novell specific Draft.jpg to Backgrounds gallery..."
-    cp "$SRCDIR/Draft.jpg" "$GAL_DIR/www-back/" || exit 1;
+    cp "$TOOLSDIR/src/Draft.jpg" "$GAL_DIR/www-back/" || exit 1;
     chmod a+r $GAL_DIR/www-back/Draft.jpg
     # make sure that the existing galleries can be modified
     chmod u+rw $GAL_DIR/sg*.???

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Fri Mar  6 08:59:03 2009
@@ -459,7 +459,7 @@
 
 if echo "$DISTRO" | grep -q "GoOo"; then
 	for file in about intro ; do
-		cp $SRCDIR/open${file}_go-oo.bmp \
+		cp $TOOLSDIR/src/open${file}_go-oo.bmp \
 			$OOINSTDIR/program/${file}.bmp
 	done
 fi

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Fri Mar  6 08:59:03 2009
@@ -124,17 +124,17 @@
 NovellWin32: NovellLikeWin32
 NovellWin32ISO: NovellLikeWin32
 # go-oo.org Win32
-GoOoWin32: NovellLikeWin32, UnstableLibwpd, GoOoSplash
+GoOoWin32: NovellLikeWin32, GoOoSplash
 # Mac OS X
 MacOSX : MacOSXCommon, MacOSXOnly
-GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions, UnstableLibwpd, GoOoSplash
+GoOoMacOSX : MacOSXCommon, MacOSXOnly, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions, GoOoSplash
 # Pardus
 Pardus2007: PardusOnly, LinuxCommon, NotDebian
 Pardus2008: PardusOnly, LinuxCommon, NotDebian, Gcc43
 # Solaris
 Solaris: NovellBase, UnstableExtensions
 # Universal Upstream-like packages
-GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions, UnstableLibwpd, GoOoSplash
+GoOoLinux: NovellBase, NovellOnly, NovellOnlyExtensionFixes, CustomUserConfig, CalcSolver, IntegrateExtensions, GoOoSplash
 # OxygenOffice Professional
 OxygenOfficeLinuxCommon :	Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
 	      			LinuxOnly, SystemBits, \
@@ -2741,10 +2741,8 @@
 
 
 [ InternalCairo ]
-cairo-prj-d-lst.diff
-cairo-prj-build-lst.diff
-cairo-cairo-1-4-10-diff.diff
-cairo-makefile-mk.diff
+cairo-pixman-makefile-mk.diff
+internal-cairo-configure.diff
 
 
 [ WWInProgress ]

Added: trunk/patches/dev300/cairo-pixman-makefile-mk.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/cairo-pixman-makefile-mk.diff	Fri Mar  6 08:59:03 2009
@@ -0,0 +1,11 @@
+--- cairo/pixman/makefile.mk	2009-03-05 10:22:54.000000000 +0100
++++ cairo/pixman/makefile.mk	2009-03-05 10:23:25.000000000 +0100
+@@ -135,7 +135,7 @@
+ OUT2LIB+=pixman$/release$/*.lib
+ .ENDIF
+ .ELSE
+-OUT2LIB+=pixman$/.libs$/libpixman-1.so
++OUT2LIB+=pixman$/.libs$/libpixman-1.so*
+ .ENDIF
+ 
+ # --- Targets ------------------------------------------------------

Added: trunk/patches/dev300/internal-cairo-configure.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/internal-cairo-configure.diff	Fri Mar  6 08:59:03 2009
@@ -0,0 +1,14 @@
+--- configure.in	2009-03-05 09:34:31.000000000 +0100
++++ configure.in	2009-03-05 09:35:02.000000000 +0100
+@@ -5585,10 +5585,7 @@
+            fi
+         else
+            BUILD_TYPE="$BUILD_TYPE CAIRO"
+-	   dnl === compiler fails on pixman with 64bit architectures...===
+-	   if test "$build_cpu" != "x86_64"; then
+-	      BUILD_PIXMAN=YES
+-	   fi
++           BUILD_PIXMAN=YES
+            AC_MSG_RESULT([internal])	   
+         fi
+     else