GNOME.org
 

ooo-build r12374 - in branches/ooo-build-2-4: . doc patches/src680

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

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

	* doc/AUTOGEN.NovellWin32ISO.sh: Drop --enable-cairo.

	* patches/src680/apply: Drop the Win32-specific cairo diffs.



Modified:
   branches/ooo-build-2-4/ChangeLog
   branches/ooo-build-2-4/doc/AUTOGEN.NovellWin32ISO.sh
   branches/ooo-build-2-4/patches/src680/apply

Modified: branches/ooo-build-2-4/doc/AUTOGEN.NovellWin32ISO.sh
==============================================================================
--- branches/ooo-build-2-4/doc/AUTOGEN.NovellWin32ISO.sh	(original)
+++ branches/ooo-build-2-4/doc/AUTOGEN.NovellWin32ISO.sh	Tue Apr 29 11:48:13 2008
@@ -1 +1 @@
-./autogen.sh --with-distro=NovellWin32ISO --with-lang="af ar be-BY bg bn-IN br ca cs cy da de el en-GB es et fi fr gu-IN he hi-IN hr hu it ja km ko lt lv mk mr-IN nb nl nn pa-IN pl pt-BR pt ru rw sk sl sv ta-IN tr vi xh zh-CN zh-TW zu" --with-poor-help-localizations="af ar be-BY bn-IN bg ca el en-GB fi gu-IN hi-IN hr lt lv mk mr-IN nb nn pt sk sl ta-IN tr xh zu" --enable-cairo
+./autogen.sh --with-distro=NovellWin32ISO --with-lang="af ar be-BY bg bn-IN br ca cs cy da de el en-GB es et fi fr gu-IN he hi-IN hr hu it ja km ko lt lv mk mr-IN nb nl nn pa-IN pl pt-BR pt ru rw sk sl sv ta-IN tr vi xh zh-CN zh-TW zu" --with-poor-help-localizations="af ar be-BY bn-IN bg ca el en-GB fi gu-IN hi-IN hr lt lv mk mr-IN nb nn pt sk sl ta-IN tr xh zu"

Modified: branches/ooo-build-2-4/patches/src680/apply
==============================================================================
--- branches/ooo-build-2-4/patches/src680/apply	(original)
+++ branches/ooo-build-2-4/patches/src680/apply	Tue Apr 29 11:48:13 2008
@@ -1695,16 +1695,8 @@
 
 
 [ 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
-cairo-config_office-configure-in.diff, i#70519, tml
-cairo-cairo-1-4-10-diff.diff, i#70519, tml
 cairo-canvas-use-window-screen.diff, rodo
 
-# Additional diffs for cairocanvas on Win32
-cairo-canvas-win32.diff, i#70519, n#300398, tml
 
 [ OpenGLTransitions ]
 transogl-transitions-slideshow.diff
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]