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

[strba svn gnome org]

Author: strba
Date: Mon May 19 13:39:58 2008
New Revision: 12590
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12590&view=rev

Log:
make the glib2 patches apply anew. Let us see whether it works :-)

Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/external-package-glib2.diff
   trunk/patches/dev300/scp2-package-glib2.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon May 19 13:39:58 2008
@@ -2246,9 +2246,9 @@
 
 
 [ Glib2 ]
-#external-package-glib2.diff
-#scp2-package-glib2.diff
-#setup_native-package-glib2.diff
+external-package-glib2.diff
+scp2-package-glib2.diff
+setup_native-package-glib2.diff
 
 [ Fixes ]
 fix-ppt-linespacing-import-export.diff, n#355302, rodo

Modified: trunk/patches/dev300/external-package-glib2.diff
==============================================================================
--- trunk/patches/dev300/external-package-glib2.diff	(original)
+++ trunk/patches/dev300/external-package-glib2.diff	Mon May 19 13:39:58 2008
@@ -1,12 +1,13 @@
 --- external/prj/build.lst	2007-11-01 22:22:02.000000000 +0100
 +++ external/prj/build.lst	2007-11-01 22:27:24.000000000 +0100
-@@ -3,4 +3,5 @@
+@@ -3,5 +3,6 @@
  el	external\glibc		nmake	-	all	el_glibc NULL
  el	external\gpc		nmake	-	all	el_gpc NULL
  el	external\gcc3_specific	nmake	-	u	el_gcc3 NULL
 -el	external\mingwheaders		nmake	-	w	el_mingwheaders NULL
 +el	external\glib2		nmake	-	u	el_glib2 NULL
 +el	external\mingwheaders	nmake	-	w	el_mingwheaders NULL
+ el      external\cairo          nmake   -       all     el_cairo NULL
 --- external/prj/d.lst	2007-11-01 22:22:02.000000000 +0100
 +++ external/prj/d.lst	2007-11-01 22:25:36.000000000 +0100
 @@ -30,6 +30,11 @@

Modified: trunk/patches/dev300/scp2-package-glib2.diff
==============================================================================
--- trunk/patches/dev300/scp2-package-glib2.diff	(original)
+++ trunk/patches/dev300/scp2-package-glib2.diff	Mon May 19 13:39:58 2008
@@ -1,12 +1,12 @@
 --- scp2/prj/build.lst	2007-11-07 10:33:28.000000000 +0100
 +++ scp2/prj/build.lst	2007-11-07 11:13:56.000000000 +0100
 @@ -25,4 +25,5 @@
- cp    scp2\source\ure             nmake    -    all    cp_ure cp_langmacros NULL
- cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros NULL
- cp    scp2\source\ooo_wo_ure      nmake    -    all    cp_ooo_wo_ure cp_langmacros NULL
--cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure NULL
+ cp    scp2\source\xsltfilter      nmake    -    all    cp_xsltfilter cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\winexplorerext  nmake    -    all    cp_winexplorerext cp_langmacros cp_langtemplates NULL
+ cp    scp2\source\onlineupdate    nmake    -    all    cp_update cp_langmacros cp_langtemplates NULL
+-cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update NULL
 +cp    scp2\source\glib2           nmake    -    all    cp_glib2 cp_langmacros NULL
-+cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_ure cp_sdkoo cp_update cp_ooo_wo_ure cp_glib2 NULL
++cp    scp2\util                   nmake    -    all    cp_util cp_activex cp_binfilter cp_calc cp_canvas cp_crashrep cp_draw cp_gnome cp_graphicfilter cp_impress cp_javafilter cp_kde cp_layout cp_lingu cp_math cp_ooo cp_python cp_quickstart cp_testtool cp_writer cp_base cp_xsltfilter cp_winexplorerext cp_sdkoo cp_update cp_glib2 NULL
 --- /dev/null	2007-05-04 12:54:36.000000000 +0200
 +++ scp2/source/glib2/file_glib2.scp	2007-11-07 11:21:40.000000000 +0100
 @@ -0,0 +1,70 @@