ooo-build r12368 - in trunk: . patches/dev300

[tml svn gnome org]

Author: tml
Date: Tue Apr 29 08:49:13 2008
New Revision: 12368
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12368&view=rev

Log:
2008-04-29  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Drop the Win32-specific cairo diffs, and
	the cairocanvas set which didn't contain anything else.



Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Apr 29 08:49:13 2008
@@ -19,7 +19,7 @@
 
 LinuxCommon : Common, LayoutDialogs, Defaults, TangoIcons, FontConfigTemporaryHacks, \
 	      FedoraFixes, LinuxOnly, SystemBits, \
-	      cairocanvas, msaccess, OpenGLTransitions, InternalMesaHeaders, \
+	      msaccess, OpenGLTransitions, InternalMesaHeaders, \
 	      Fpickers, Mono, AddressBooks, QuickStarter
 MacOSXCommon : Common, Defaults, TangoIcons, SystemBits
 Win32Common : Common, Defaults, TangoIcons, \
@@ -102,7 +102,7 @@
 # translate.org.za
 translate-org-za-linux: translate-org-za-common, LinuxCommon, Common, Lockdown
 translate-org-za-win32: translate-org-za-common, Win32Common, Common
-NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, cairocanvas, Fpickers, CustomUserConfig
+NovellLikeWin32: Win32Common, NovellOnly, NovellOnlyWin32, Lockdown, Fpickers, CustomUserConfig
 # Novell
 NovellWin32: NovellLikeWin32
 NovellWin32ISO: NovellLikeWin32
@@ -120,7 +120,7 @@
 # OxygenOffice Professional
 OxygenOfficeLinuxCommon :	Common, EMFPlus, LayoutDialogs, FontConfigTemporaryHacks, \
 	      			FedoraFixes, LinuxOnly, SystemBits, \
-	      			cairocanvas, msaccess, OpenGLTransitions, \
+	      			msaccess, OpenGLTransitions, \
 	      			Fpickers, Mono, AddressBooks, QuickStarter, IntegrateExtensions
 OxygenOfficeMacOSXCommon :	Common, SystemBits, IntegrateExtensions
 OxygenOfficeWin32Common :	Common, Win32Only, NotDebian, IntegrateExtensions
@@ -1584,17 +1584,6 @@
 #debian-gccXXXXX.solenv.javaregistration.diff
 
 
-[ cairocanvas ]
-# build local cairo on Win32 (if enabled)
-cairo-prj-build-lst.diff, i#70519, tml
-cairo-prj-d-lst.diff, i#70519, tml
-cairo-makefile-mk.diff, i#70519, tml
-#FIXME dev300-m10: cairo-config_office-configure-in.diff, i#70519, tml
-cairo-cairo-1-4-10-diff.diff, i#70519, tml
-
-# Additional diffs for cairocanvas on Win32
-#FIXME dev300-m10: cairo-canvas-win32.diff, i#70519, n#300398, tml
-
 [ OpenGLTransitions ]
 transogl-transitions-slideshow.diff
 transogl-transitions-sd.diff