GNOME.org
 

ooo-build r12113 - in trunk: . bin patches/dev300 patches/src680

Author: rengelhard
Date: Sat Apr  5 19:39:43 2008
New Revision: 12113
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12113&view=rev

Log:
2008-04-05  Rene Engelhard <rene debian org>

        * patches/src680/sdext-no-license.diff: move ...
        * patches/src680/presentation-minimizer-no-license.diff: ... here
        * patches/src680/apply,
          patches/dev300/apply: adapt for above
        * patches/src680/apply,
          patches/dev300/apply,
          patches/dev300/wiki-publisher-no-license.diff,
          patches/dev300/presenterscreen-no-license.diff,
          patches/dev300/pdfimport-no-license.diff: new stuff for
          the new extensions in m6
        * patches/src680/apply: move ooo85470.workspace.cairotext01.diff into
          CairFonts section. Remove it from the individual distro sections.
        * bin/ooinstall: only run install-dicts when $path/share/dict/ooo
          present
        * bin/package-ooo: fix if for SUSE to not match on all other distros


Added:
   trunk/patches/dev300/pdfimport-no-license.diff
   trunk/patches/dev300/presenterscreen-no-license.diff
   trunk/patches/dev300/wiki-publisher-no-license.diff
   trunk/patches/src680/presentation-minimizer-no-license.diff
      - copied unchanged from r12021, /trunk/patches/src680/sdext-no-license.diff
Removed:
   trunk/patches/src680/sdext-no-license.diff
Modified:
   trunk/ChangeLog
   trunk/bin/ooinstall
   trunk/bin/package-ooo
   trunk/patches/dev300/apply
   trunk/patches/src680/apply

Modified: trunk/bin/ooinstall
==============================================================================
--- trunk/bin/ooinstall	(original)
+++ trunk/bin/ooinstall	Sat Apr  5 19:39:43 2008
@@ -172,9 +172,11 @@
     `$configure_vars{SOLARENV}/bin/linkoo $path $configure_vars{SRC_ROOT}`;
 }
 
+if ( -e "$path/share/dict/ooo" ) {
 print "Installing extra dictionaries...\n";
-system ("cd $setup_vars{TOOLSDIR}/bin ; " .
-       	"sh ./install-dictionaries $path/share/dict/ooo") && die "Failed to install dictionaries: $!";
+	system ("cd $setup_vars{TOOLSDIR}/bin ; " .
+       		"sh ./install-dictionaries $path/share/dict/ooo") && die "Failed to install dictionaries: $!";
+}
 
 print "Building galleries...\n";
 system ("cd $setup_vars{TOOLSDIR}/bin ; " .

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Sat Apr  5 19:39:43 2008
@@ -431,7 +431,7 @@
     chmod go-w $OOINSTDIR/sdk/settings/component.uno.map
 fi
 
-if test "$DISTRO" = "SUSE" || ! echo "$DISTRO" | grep -q "SUSE-10" ; then
+if test "$DISTRO" = "SUSE" || echo "$DISTRO" | grep -q "SUSE-11" ; then
     # branding stuff for openSUSE >= 11.0 and SLED >= 11
     mkdir -p $DATADIR/$OOOINSTALLDIRNAME/program
     echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME" >$BUILDDIR/upstream_branding_list.txt

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Sat Apr  5 19:39:43 2008
@@ -315,11 +315,13 @@
 #and still want to have the cairo canvas working
 x11_extensions-new-xrender-headers.diff
 
-sdext-no-license.diff
-
-# no bogus license question when registering this extension
+# no bogus license question when registering these extensions
 reportdesigner-no-license.diff
-
+presentation-minimizer-no-license.diff
+[ FixesNotForUpstream >= dev300-m6 ]
+presenterscreen-no-license.diff
+wiki-publisher-no-license.diff
+pdfimport-no-license.diff
 
 [ Fixes ]
 # sd printing fixes

Added: trunk/patches/dev300/pdfimport-no-license.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/pdfimport-no-license.diff	Sat Apr  5 19:39:43 2008
@@ -0,0 +1,68 @@
+Index: source/pdfimport/makefile.mk
+===================================================================
+RCS file: /cvs/framework/filter/source/pdfimport/makefile.mk,v
+retrieving revision 1.1.4.2
+diff -u -u -r1.1.4.2 makefile.mk
+--- filter/source/pdfimport/makefile.mk	23 Jan 2008 15:16:32 -0000	1.1.4.2
++++ filter/source/pdfimport/makefile.mk	5 Apr 2008 14:26:25 -0000
+@@ -87,12 +87,6 @@
+ 
+ DESCRIPTION:=$(MISC)$/pdfimport$/description.xml
+ 
+-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
+-PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/pdfimport$/registration$/license_$i.txt)
+-.ELSE
+-PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/pdfimport$/registration$/LICENSE_$i)
+-.ENDIF
+-
+ CONVERTER_FILE= \
+     $(MISC)$/pdfimport$/xpdfimport$(EXECPOST) \
+ 
+@@ -115,7 +109,7 @@
+ COMPONENT_LIBRARY= \
+     $(MISC)$/pdfimport$/$(SHL1TARGET)$(DLLPOST)
+ 
+-ZIP1DEPS=		$(PACKLICS) $(DESCRIPTION) $(COMPONENT_MANIFEST) $(COMPONENT_FILES) $(CONVERTER_FILE) $(COMPONENT_LIBRARY) $(COMPONENT_DIALOGS) makefile.mk
++ZIP1DEPS=		$(DESCRIPTION) $(COMPONENT_MANIFEST) $(COMPONENT_FILES) $(CONVERTER_FILE) $(COMPONENT_LIBRARY) $(COMPONENT_DIALOGS) makefile.mk
+ ZIP1TARGET=		pdfimport
+ ZIP1DIR=		$(MISC)$/pdfimport
+ ZIP1EXT=		.oxt
+@@ -143,10 +137,6 @@
+ 	@@-$(MKDIRHIER) $(@:d)
+     $(COPY) $< $@
+ 
+-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+-	@@-$(MKDIRHIER) $(@:d)
+-	$(GNUCOPY) $< $@
+-
+ $(MISC)$/pdfimport$/%.xcu : config$/%.xcu
+ 	@@-$(MKDIRHIER) $(@:d)
+ 	$(GNUCOPY) $< $@
+@@ -156,10 +146,5 @@
+ .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
+ $(DESCRIPTION) $(PHONYDESC) : config$/$$(@:f)
+ 	@@-$(MKDIRHIER) $(@:d)
+-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
+-	$(PERL) $(SOLARENV)$/bin$/licinserter.pl $< registration/license_xxx.txt $(MISC)/description.tmp
+-.ELSE	
+-	$(PERL) $(SOLARENV)$/bin$/licinserter.pl $< registration/LICENSE_xxx $(MISC)/description.tmp
+-.ENDIF	
+ 	$(SED) -e " s/IDENT_PLACEHOLDER/$(PDFI_IMPLEMENTATION_IDENTIFIER)/" $(MISC)/description.tmp > $@ 
+ 	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
+Index: source/pdfimport/config/description.xml
+===================================================================
+RCS file: /cvs/framework/filter/source/pdfimport/config/description.xml,v
+retrieving revision 1.1.4.2
+diff -u -u -r1.1.4.2 description.xml
+--- filter/source/pdfimport/config/description.xml	23 Jan 2008 15:16:33 -0000	1.1.4.2
++++ filter/source/pdfimport/config/description.xml	5 Apr 2008 14:26:25 -0000
+@@ -7,9 +7,4 @@
+ 	<dependencies>
+ 		<OpenOffice.org-minimal-version value="2.3" d:name="OpenOffice.org 2.3"/>
+ 	</dependencies>
+-	<registration>
+-        <simple-license accept-by="admin" default-license-id="lic-en-US">
+-            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+-        </simple-license>
+-    </registration>
+ </description>

Added: trunk/patches/dev300/presenterscreen-no-license.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/presenterscreen-no-license.diff	Sat Apr  5 19:39:43 2008
@@ -0,0 +1,72 @@
+Index: description.xml
+===================================================================
+RCS file: /cvs/graphics/sdext/source/presenter/Attic/description.xml,v
+retrieving revision 1.1.2.3
+diff -u -u -r1.1.2.3 description.xml
+--- sdext/source/presenter/description.xml	7 Jan 2008 14:13:37 -0000	1.1.2.3
++++ sdext/source/presenter/description.xml	3 Apr 2008 10:41:58 -0000
+@@ -9,11 +9,5 @@
+     <OpenOffice.org-minimal-version value="2.3" dep:name="OpenOffice.org 2.3"/>
+   </dependencies>
+     
+-  <registration>
+-      <simple-license accept-by="admin" default-license-id="lic-en-US">
+-        <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+-      </simple-license>
+-  </registration>
+-
+   <version value="0.1"/>
+ </description>
+Index: makefile.mk
+===================================================================
+RCS file: /cvs/graphics/sdext/source/presenter/Attic/makefile.mk,v
+retrieving revision 1.1.2.13
+diff -u -u -r1.1.2.13 makefile.mk
+--- sdext/source/presenter/makefile.mk	2 Apr 2008 15:07:13 -0000	1.1.2.13
++++ sdext/source/presenter/makefile.mk	3 Apr 2008 10:41:59 -0000
+@@ -103,13 +103,6 @@
+ 
+ DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml
+ 
+-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
+-PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/registry$/license_$i)
+-.ELSE
+-PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/registry$/LICENSE_$i)
+-.ENDIF
+-
+-
+ # --- Library -----------------------------------
+ 
+ SHL1TARGET=		$(TARGET).uno
+@@ -187,7 +180,6 @@
+ 	$(MISC)$/$(TARGET)$/$(TARGET).uno$(DLLPOST)
+ 
+ ZIP1DEPS=					\
+-	$(PACKLICS) 			\
+ 	$(DESCRIPTION)			\
+ 	$(COMPONENT_MANIFEST)	\
+ 	$(COMPONENT_FILES)		\
+@@ -224,23 +216,12 @@
+ 	@-$(MKDIRHIER) $(@:d)
+     +$(COPY) $< $@
+ 
+-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
+-$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
+-	@@-$(MKDIRHIER) $(@:d)
+-	$(GNUCOPY) $< $@
+-.ELSE
+-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+-	@@-$(MKDIRHIER) $(@:d)
+-	$(GNUCOPY) $< $@
+-.ENDIF
+-
+ .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+ .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
+ PHONYDESC=.PHONY
+ .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
+ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
+ 	@@-$(MKDIRHIER) $(@:d)
+-	$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml registry/LICENSE_xxx $@
+ 	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
+ 
+ .ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"

Added: trunk/patches/dev300/wiki-publisher-no-license.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/wiki-publisher-no-license.diff	Sat Apr  5 19:39:43 2008
@@ -0,0 +1,62 @@
+Index: makefile.mk
+===================================================================
+RCS file: /cvs/sw/swext/mediawiki/src/makefile.mk,v
+retrieving revision 1.1
+diff -u -u -r1.1 makefile.mk
+--- swext/mediawiki/src/makefile.mk	28 Feb 2008 11:36:32 -0000	1.1
++++ swext/mediawiki/src/makefile.mk	3 Apr 2008 10:44:57 -0000
+@@ -46,27 +46,11 @@
+ 
+ DESCRIPTION:=$(MISC)$/$(TARGET)$/description.xml
+ 
+-# .IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
+-# PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/license_$i)
+-# .ELSE
+-PACKLICS:=$(foreach,i,$(alllangiso) $(MISC)$/$(TARGET)$/license$/LICENSE_$i)
+-# .ENDIF
+-
+ common_build_zip=
+ 
+ .INCLUDE : target.mk
+ 
+-.IF "$(GUI)" == "WIN" || "$(GUI)" == "WNT"
+-$(PACKLICS) : $(SOLARBINDIR)$/osl$/license$$(@:b:s/_/./:e:s/./_/)$$(@:e).txt
+-	@@-$(MKDIRHIER) $(@:d)
+-	$(GNUCOPY) $< $@
+-.ELSE
+-$(PACKLICS) : $(SOLARBINDIR)$/osl$/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+-	@@-$(MKDIRHIER) $(@:d)
+-	$(GNUCOPY) $< $@
+-.ENDIF
+-
+-ALLTAR: $(PACKLICS) $(DESCRIPTION)
++ALLTAR: $(DESCRIPTION)
+ 
+ .INCLUDE .IGNORE : $(MISC)$/$(TARGET)_lang_track.mk
+ .IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
+@@ -74,6 +58,5 @@
+ .ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
+ $(DESCRIPTION) $(PHONYDESC) : $$(@:f)
+ 	@@-$(MKDIRHIER) $(@:d)
+-	$(PERL) $(SOLARENV)$/bin$/licinserter.pl description.xml license/LICENSE_xxx $@
+ 	@echo LAST_WITH_LANG=$(WITH_LANG) > $(MISC)$/$(TARGET)_lang_track.mk
+ 
+Index: description.xml
+===================================================================
+RCS file: /cvs/sw/swext/mediawiki/src/description.xml,v
+retrieving revision 1.15
+diff -u -u -r1.15 description.xml
+--- swext/mediawiki/src/description.xml	1 Apr 2008 09:30:13 -0000	1.15
++++ swext/mediawiki/src/description.xml	3 Apr 2008 10:46:00 -0000
+@@ -5,11 +5,6 @@
+     <display-name>
+         <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
+     </display-name>
+-	<registration>
+-        <simple-license accept-by="user" default-license-id="lic-en-US">
+-            <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
+-        </simple-license>
+-    </registration>
+ 	<dependencies>
+ 		<OpenOffice.org-minimal-version value="2.4" d:name="OpenOffice.org 2.4 or StarOffice 8 Update 10"/>
+ 	</dependencies>

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Sat Apr  5 19:39:43 2008
@@ -36,7 +36,7 @@
 # Sdk patches: a special distro; applied only when building with the sdk tarball unpacked
 Sdk : SdkFixes
 #Localize
-Localize : 
+Localize :
 # Novell
 NovellBase : LinuxCommon, NovellOnly, NovellOnlyUnix, \
 	     NotDebian, Lockdown, CalcSolver, Split, Shrink, \
@@ -345,10 +345,10 @@
 #and still want to have the cairo canvas working
 x11_extensions-new-xrender-headers.diff
 
-sdext-no-license.diff
 
-# no bogus license question when registering this extension
+# no bogus license question when registering these extensions
 reportdesigner-no-license.diff
+presentation-minimizer-no-license.diff
 
 
 [ Fixes ]
@@ -1279,8 +1279,6 @@
 gentooexperimental-gnujre.diff
 # test system libxmlsec
 system-xmlsec.diff
-# help LCD displays
-ooo85470.workspace.cairotext01.diff, ccheney
 
 [ GentooOnly ]
 SectionOwner => aprosky
@@ -1744,7 +1742,6 @@
 system-lpsolve-rpath.diff, rengelha
 #gccXXXXX.solenv.javaregistration.diff
 ubuntu-mstopdf.diff, ccheney
-ooo85470.workspace.cairotext01.diff, ccheney
 
 [ FedoraFixes ]
 ooo64508.vcl.honourfontconfighinting.diff
@@ -1759,9 +1756,11 @@
 ooo61812.svx.a11ycrash.diff
 
 
-# needs Gtk2.0 >= 2.10 and cairo
 [ CairoFonts ]
+# needs Gtk2.0 >= 2.10 and cairo, so this is on the own section
 ooo59127.vcl.honourcairofont.diff
+# help LCD displays
+ooo85470.workspace.cairotext01.diff, ccheney
 
 
 [ GStreamer ]
@@ -2133,8 +2132,6 @@
 ooop-win32-installer-branding.diff
 #Update URL added to the OxygenOffice
 ooop-update-URL.diff
-# help LCD displays
-ooo85470.workspace.cairotext01.diff, ccheney
 
 [ OxygenOfficeExtras ]
 # Adding new items to extras module
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]