GNOME.org
 

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

Author: pmladek
Date: Mon Sep  1 17:26:20 2008
New Revision: 13746
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13746&view=rev

Log:
2008-09-01  Petr Mladek  <pmladek suse cz>

	* patches/dev300/novell-win32-agfa-monotype-fonts-m30.diff:
	* patches/dev300/novell-win32-agfa-monotype-fonts.diff:
	* patches/dev300/pdfimport-system-poppler-m30.diff:
	* patches/dev300/pdfimport-system-poppler.diff:
	* patches/dev300/win32-mergemodule-pm-m30.diff:
	* patches/dev300/win32-mergemodule-pm.diff:
	* patches/dev300/unxsplash-rework-m30.diff:
	* patches/dev300/unxsplash-rework.diff:
	* patches/dev300/apply: udpate for ooo300-m4:



Added:
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts-m30.diff
      - copied unchanged from r13743, /trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
   trunk/patches/dev300/pdfimport-system-poppler-m30.diff   (props changed)
      - copied unchanged from r13744, /trunk/patches/dev300/pdfimport-system-poppler.diff
   trunk/patches/dev300/unxsplash-rework-m30.diff
      - copied unchanged from r13743, /trunk/patches/dev300/unxsplash-rework.diff
   trunk/patches/dev300/win32-mergemodule-pm-m30.diff   (props changed)
      - copied unchanged from r13744, /trunk/patches/dev300/win32-mergemodule-pm.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/novell-win32-agfa-monotype-fonts.diff
   trunk/patches/dev300/pdfimport-system-poppler.diff
   trunk/patches/dev300/unxsplash-rework.diff
   trunk/patches/dev300/win32-mergemodule-pm.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Mon Sep  1 17:26:20 2008
@@ -258,9 +258,6 @@
 # don't lstat() that much while creating absolute URLs
 speed-sal-fewer-lstats.diff, i#89730, jholesov
 
-# support msvc 2008 express in oowintool
-buildfix-msvc2008-express.diff, i#93332, jholesov
-
 # fix build when PATH is set to something like /bin:"C:\blah\bleh":/ugh
 # (happened to me with DirectX SDK)
 buildfix-directx-path.diff, i#93333, jholesov
@@ -395,14 +392,15 @@
 # more intelligent nsplugin seeking
 nsplugin-path-m28.diff, i#49590, michael
 
-[ Fixes ]
-# sd printing fixes
-printing-bugfix-254573.diff, n#254573, rodo
+[ Fixes < dev300-m31 < ooo300-m4 ]
 sd-builddep.diff, i#92662, michael
-
 # fix parallel build in desktop
 desktop-builddep.diff, i#92818, michael
 
+[ Fixes ]
+# sd printing fixes
+printing-bugfix-254573.diff, n#254573, rodo
+
 # use basic (advanced) shapes for rectangle/ellipse on draw/impress's toolbars. make shapes wrap words by default, n#171052, rodo
 sd-toolbar-advanced-shapes.diff, n#171052, rodo
 svx-shapes-default-word-wrap-enable.diff, n#171052, rodo
@@ -548,13 +546,15 @@
 gnome-vfs-late-init.diff, i#84137, jholesov
 
 
+[ QuickStarter <= dev300-m30 <= ooo300-m3 ]
+unxsplash-rework-m30.diff, i#60696, michael/jholesov
+[ QuickStarter > dev300-m30 > ooo300-m3 ]
+unxsplash-rework.diff, i#60696, michael/jholesov
+
 [ QuickStarter ]
 # fix the systray quickstarter
 sfx2-quickstarter-fix.diff, i#88382, michael
 
-# External splash screen implementation / 2nd time accelerator
-unxsplash-rework.diff, i#60696, michael/jholesov
-
 # FIXME: unxsplash-rework needs this function which was removed in m13
 # due to being unused. fix properly.
 hack-readd-GetStringParam.diff
@@ -975,9 +975,12 @@
 # fix evo2 driver build
 buildfix-connectivity-evoab2.diff, i#91025, pmladek
 
-[ BuildBits ]
+[ BuildBits <= dev300-m30 <= ooo300-m3 ]
+novell-win32-agfa-monotype-fonts-m30.diff, tml
+[ BuildBits > dev300-m30 > ooo300-m3 ]
 novell-win32-agfa-monotype-fonts.diff, tml
 
+[ BuildBits ]
 # allow to define java target, so the build is usable with the JVM 1.5
 # even when it is built with JDK 1.6
 build-java-target.diff, i#93115, pmladek
@@ -2464,6 +2467,9 @@
 [ Fixes >= dev300-m29 >= ooo300-m1]
 config_office-msvc-compat.diff, thorsten
 
+# support msvc 2008 express in oowintool
+buildfix-msvc2008-express.diff, i#93332, jholesov
+
 [ Fixes < dev300-m29 < ooo300-m1 ]
 config_office-disable-atl.diff, thorsten
 
@@ -2565,14 +2571,20 @@
 # See what breaks if we build with more optimizations
 testing-more-optimizations-ark.diff
 
-[ Fixes ]
+[ Fixes <= dev300-m30 <= ooo300-m3 ]
+win32-mergemodule-pm-m30.diff, tml
+[ Fixes > dev300-m30 > ooo300-m3 ]
 win32-mergemodule-pm.diff, tml
+
+[ Fixes ]
 svtools-update-ole.diff, n#411855, thorsten
 vcl-logical-bmp-size.diff, i#92902, thorsten
 
 [ Fixes < dev300-m30 < ooo300-m3 ]
 pdfimport-system-poppler-m29.diff, i#92920, cmc
-[ Fixes >= dev300-m30 >= ooo300-m3 ]
+[ Fixes == dev300-m30 == ooo300-m3 ]
+pdfimport-system-poppler-m30.diff, i#92920, cmc
+[ Fixes >= dev300-m31 >= ooo300-m4 ]
 pdfimport-system-poppler.diff, i#92920, cmc
 
 [ NovellOnlyWin32 ]

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	Mon Sep  1 17:26:20 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 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	::	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 SDEXT:sdext SWEXT:swext writerfilter oox REPORTBUILDER:reportbuilder 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 SDEXT:sdext SWEXT:swext writerfilter oox REPORTBUILDER:reportbuilder NULL
  po	postprocess			    	usr1	-	all	po_mkout NULL
  po	postprocess\checkxml		nmake	-	all	po_checkxml NULL
  po	postprocess\checkdeliver	nmake	-	all	po_checkdlv NULL

Modified: trunk/patches/dev300/pdfimport-system-poppler.diff
==============================================================================
--- trunk/patches/dev300/pdfimport-system-poppler.diff	(original)
+++ trunk/patches/dev300/pdfimport-system-poppler.diff	Mon Sep  1 17:26:20 2008
@@ -10,39 +10,49 @@
  AC_ARG_WITH(system-db,
  [  --with-system-db        Use berkeley db already on system
  ],,)
-@@ -5470,13 +5473,31 @@
+@@ -5387,20 +5387,33 @@ AC_SUBST(ENABLE_PRESENTER_SCREEN)
+ 
  AC_MSG_CHECKING([whether to build the PDF Import extension])
- if test -z "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
-   AC_MSG_RESULT([yes])
--  BUILD_TYPE="$BUILD_TYPE XPDF"
-   ENABLE_PDFIMPORT=YES
-+
-+  dnl ===================================================================
-+  dnl Check for system poppler
-+  dnl ===================================================================
-+  AC_MSG_CHECKING([which pdf backend to use])
-+  if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
-+  	test "$with_system_poppler" != "no"; then
+ if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
+-  AC_MSG_RESULT([yes])
+-  AC_MSG_CHECKING([for xpdf module])
+-   if test -d ../xpdf; then
+-	AC_MSG_RESULT([OK])
++   AC_MSG_RESULT([yes])
++   AC_MSG_CHECKING([which pdf backend to use])
++   if test -n "$with_system_poppler" -o -n "$with_system_libs" && \
++	test "$with_system_poppler" != "no"; then
 +      AC_MSG_RESULT([external])
 +      SYSTEM_POPPLER=YES
 +      PKG_CHECK_MODULES( POPPLER, poppler >= 0.8.0 )
-+  else
+    else
+-	AC_MSG_ERROR([not existing. get it (or Extensions3)])
 +      AC_MSG_RESULT([internal])
 +      SYSTEM_POPPLER=NO
++      AC_MSG_CHECKING([for xpdf module])
++      if test -d ../xpdf; then
++	 AC_MSG_RESULT([OK])
++      else
++	 AC_MSG_ERROR([not existing. get it (or Extensions3)])
++      fi
 +      BUILD_TYPE="$BUILD_TYPE XPDF"
-+  fi
-+
+    fi
+-  BUILD_TYPE="$BUILD_TYPE XPDF"
+-  ENABLE_PDFIMPORT=YES
++   ENABLE_PDFIMPORT=YES
  else
-   AC_MSG_RESULT([no])
-   ENABLE_PDFIMPORT=NO
+-  AC_MSG_RESULT([no])
+-  ENABLE_PDFIMPORT=NO
++   AC_MSG_RESULT([no])
++   ENABLE_PDFIMPORT=NO
  fi
  AC_SUBST(ENABLE_PDFIMPORT)
 +AC_SUBST(SYSTEM_POPPLER)
 +AC_SUBST(POPPLER_CFLAGS)
 +AC_SUBST(POPPLER_LIBS)
  
- AC_MSG_CHECKING([whether to build the MediaWiki Editor extension])
- if test -z "$enable_mediawiki" -a "$enable_mediawiki" != "no" && test "$WITH_JAVA" != "no"; then
+ if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
+    AC_MSG_CHECKING([for sdext module])
 --- config_office/set_soenv.in	31 Jul 2008 13:53:05 -0000	1.196
 +++ config_office/set_soenv.in	19 Aug 2008 13:33:05 -0000
 @@ -1998,6 +1998,9 @@

Modified: trunk/patches/dev300/unxsplash-rework.diff
==============================================================================
--- trunk/patches/dev300/unxsplash-rework.diff	(original)
+++ trunk/patches/dev300/unxsplash-rework.diff	Mon Sep  1 17:26:20 2008
@@ -15,9 +15,9 @@
 --- desktop/prj/build.lst
 +++ desktop/prj/build.lst
 @@ -14,6 +14,8 @@ dt	desktop\win32\source\setup				nmake	-	w	dt_setup dt_inc NULL
- dt	desktop\win32\source\applauncher		nmake	-	w	dt_applauncher dt_inc NULL
  dt	desktop\win32\source\applauncher\ooo	nmake	-	w	dt_applauncher_ooo dt_applauncher.w dt_inc NULL
  dt	desktop\os2\source\applauncher			nmake	-	p	dt_applauncher dt_inc NULL
+ dt	desktop\unx\source\officeloader		nmake	-	u	dt_officeloader_unx dt_inc NULL
 +dt	desktop\unx\source			nmake	-	u	dt_uwrapper	dt_inc NULL
 +dt	desktop\unx\splash			nmake	-	u	dt_usplash	dt_inc NULL
  dt	desktop\source\pagein					nmake	-	u	dt_pagein dt_inc NULL
@@ -27,17 +27,17 @@
  dt	desktop\source\deployment\registry\help			nmake	-	all	dt_dp_registry_help dt_inc NULL
  dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
  dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
--dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_migr NULL
-+dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_migr NULL
+-dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr NULL
++dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr NULL
  dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
 diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
 index ebfc739..b550b26 100644
 --- desktop/prj/d.lst
 +++ desktop/prj/d.lst
 @@ -7,6 +7,7 @@ mkdir: %_DEST%\bin%_EXT%\remote2
- ..\%__SRC%\bin\soffice.bin %_DEST%\bin%_EXT%\soffice.bin
  ..\%__SRC%\bin\officeloader.exe %_DEST%\bin%_EXT%\soffice.exe
  ..\%__SRC%\bin\soffice %_DEST%\bin%_EXT%\soffice.bin
+ ..\%__SRC%\bin\officeloader %_DEST%\bin%_EXT%\soffice
 +..\%__SRC%\bin\oosplash %_DEST%\bin%_EXT%\oosplash.bin
  ..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin
  ..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe

Modified: trunk/patches/dev300/win32-mergemodule-pm.diff
==============================================================================
--- trunk/patches/dev300/win32-mergemodule-pm.diff	(original)
+++ trunk/patches/dev300/win32-mergemodule-pm.diff	Mon Sep  1 17:26:20 2008
@@ -27,8 +27,8 @@
  
  		my $systemcall = "";
  		if ( $^O =~ /cygwin/i ) {
--			my $localunpackdir = $unpackdir;
--			$localunpackdir =~ s/\//\\\\/g;
+-			my $localunpackdir = qx{cygpath -w "$unpackdir"};
+-			$localunpackdir =~ s/\\/\\\\/g;
 +			my $localunpackdir = qx(cygpath -m "$unpackdir");
 +			chomp $localunpackdir;
  			$systemcall = $expandfile . " " . $cabfilename . " -F:\\\* " . $localunpackdir;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]