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

[tml svn gnome org]

Author: tml
Date: Wed Dec 10 16:14:15 2008
New Revision: 14812
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14812&view=rev

Log:
2008-12-10  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Make OLDEST_SUPPORTED=dev300-m36 and
	remove sections for earlier milestones.



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

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Wed Dec 10 16:14:15 2008
@@ -7,7 +7,7 @@
 
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../scsolver:../lwp
 
-OLDEST_SUPPORTED=dev300-m35
+OLDEST_SUPPORTED=dev300-m36
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -279,9 +279,6 @@
 # insert Chinese forbidden characters at start or end of line into i18npool module
 cjk-insert-forbidden-characters-into-i18npool.diff, Amelia Wang
 
-[ CJK < dev300-m36 ]
-i92072-textgrid-fix.diff, i#92072, Fong
-
 #[ CJKTemporaryHacks ]
 # the following patch is disabled temporary.
 # default value of tab stop for Chinese version
@@ -441,19 +438,11 @@
 
 mailmerge-ssl-ehlo.diff, i#76655, deb#5074448
 
-[ Fixes == dev300-m35 ]
-
-connectivity-patch-i96331.diff, i#96331
-
 [ LinuxOnly ]
 # fix that allows OOo to work with a standard (unpatched) libjpeg,
 jpegc.c.diff, i#80674, n#272574, flr
 
 
-[ Fixes < dev300-m36 ]
-# handle hyperlinks to files better
-sw-hyperlinks-relative.diff, n#405712, i#91522, jholesov
-
 [ Fixes ]
 # process relative SMB paths (in hyperlinks) correctly
 tools-urlobj-smb-scheme-patch.diff, n#261623, flr
@@ -473,11 +462,6 @@
 #document ( containing macros ) crashing
 save-doc-withembedded-doc-with-vba-crash.diff, n#339946, i#83632, noelpwer
 
-[ Fixes < dev300-m36 ]
-# prevent some array out of bounds in ww8 exporter
-sw-source-filter-ww8-wrtw8nds-out_of_bounds.diff, n#391197, i#91396, fridrich
-
-[ Fixes ]
 localize-pl-cygwin-paths.diff, tml
 
 [ Fixes < dev300-m37 ]
@@ -551,10 +535,7 @@
 ooo80816.selinux.bridges.diff, i#80816
 
 
-[ Win32Only < dev300-m36 ]
-accept-underscores-in-hostnames-m35.diff, n#182422, tml
-
-[ Win32Only >= dev300-m36 ]
+[ Win32Only ]
 accept-underscores-in-hostnames.diff, n#182422, tml
 
 
@@ -642,13 +623,7 @@
 # Allows to edit a csv data source after a mail merge
 sw-remove-csv-lock.diff, i#85133, mloiseleur
 
-[ WriterFixes < dev300-m36 ]
-# Provides a great speed-up for a mail merge operation : 7x faster
-# It seems possible that this patch breaks mail merge, see
-# bnc#447047.  Let's not risk it.
-#sw-mailmerge-faster-m35.diff, i#40827, mloiseleur
-
-[ WriterFixes >= dev300-m36 ]
+[ WriterFixes ]
 # Provides a great speed-up for a mail merge operation : 7x faster
 sw-mailmerge-faster.diff, i#40827, mloiseleur
 
@@ -924,18 +899,12 @@
 [ PopupRemoval ]
 # Remove unnecessary popups that might show up during startup.
 
-[ PopupRemoval < dev300-m36 ]
-# remove updater code that is only relevant for the upstream version.
-sfx2-remove-check-update-on-fileload-m35.diff, kohei
-
-[ PopupRemoval >= dev300-m36 ]
 # remove updater code that is only relevant for the upstream version.
 # FIXME 2008-11-28: kohei, please check what has happened to the
 # affected code in dev300-m36, at least the file
 # sfx2/source/dialog/newerverwarn.cxx is not there any longer
 #sfx2-remove-check-update-on-fileload.diff, kohei
 
-[ PopupRemoval ]
 # prevent the registration dialog from showing up on startup.
 desktop-disable-startup-registration.diff, kohei
 
@@ -1104,14 +1073,6 @@
 # actually add mozilla includes
 extensions-missing-MOZ_INC.diff, i#96912
 
-[ BuildBits < dev300-m36 ]
-# fixes parallel build
-svtools-build-dep.diff, i#94339, pmladek
-
-# do not allow to enable GIO and GNOME VFS at once
-config_office-gio-vs-gnome-vfs.diff, i#95713, pmladek
-
-[ BuildBits ]
 # call g_type_init() before using GIO;
 # avoid crash when using GIO in non-GNOME Window manager
 ucb-gio-gnome-init.diff, i#96170, n#442678, mmeeks
@@ -1143,7 +1104,7 @@
 novell-win32-vrb-branding.diff, n#191913, i#68817
 novell-win32-registry-branding.diff, n#191913
 
-[ NovellOnlyWin32 >= dev300m30 >= ooo300-m3 ]
+[ NovellOnlyWin32 ]
 SectionOwner => tml
 
 win32-prebuilt-writingaids-zip.diff
@@ -1272,11 +1233,6 @@
 # bind all those function / named relocations locally
 speed-symbolic-functions.diff, i#85679, pmladek
 
-[ BuildBits < dev300-m36 ]
-# fix configure.in
-config_office-liblayout-libfonts-m35.diff
-
-[ BuildBits >= dev300-m36 ]
 # fix configure.in
 config_office-liblayout-libfonts.diff
 
@@ -1454,14 +1410,7 @@
 lwp-filter-component.diff, i#11215, noelpwer
 # Integrate cws ooo11lotusfilter for WordPro filter
 cws-ooo11lotusfilter-lwp-filter-component.diff, Fong
-
-[ Lwp < dev300-m36 ]
-cws-ooo11lotusfilter-lwp-filter-m35.diff, Fong
-
-[ Lwp >= dev300-m36 ]
 cws-ooo11lotusfilter-lwp-filter.diff, Fong
-
-[ Lwp ]
 cws-ooo11lotusfilter-lwp-xfilter.diff, Fong
 # avoid warning: control reaches end of non-void function
 warning-return-values-lotuswordpro.diff, pmladek
@@ -1660,19 +1609,11 @@
 # import graphic for image control
 controls-with-images-import.diff, Fong
 
-[ VBAObjects < dev300-m36 ]
-#use of form control models in userforms/dialogs, additionally
-#enables use of document embedded images in image control for
-#userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
-enhanced-form-userform-controls-m35.diff, noelpwer
-
-[ VBAObjects >= dev300-m36 ]
 #use of form control models in userforms/dialogs, additionally
 #enables use of document embedded images in image control for
 #userforms/dialogs ( note: depends on controls-with-images-in-document.diff )
 enhanced-form-userform-controls.diff, noelpwer
 
-[ VBAObjects ]
 # object module support... getting there
 ObjectModule.diff
 # userform ( depends on ObjectModule.diff )
@@ -1764,9 +1705,6 @@
 vba-word-support.diff, Fong
 vba-word-executable-option.diff, Fong
 
-[ VBAObjects < dev300-m36 ]
-patch_i92329.diff, i#92329
-
 [ VBAUntested ]
 SectionOwner => noelpwer
 vba-basic-null.diff i#85349, jjiao
@@ -1793,15 +1731,9 @@
 vba-window-api-fix.diff, Fong
 
 
-[ Features < dev300-m36 ]
-# Pre- and postprocessing capabilities for loading and saving.
-sfx2-pre-and-postprocess-during-save-load-m35.diff, i#71939, florian
-
-[ Features >= dev300-m36 ]
+[ Features ]
 # Pre- and postprocessing capabilities for loading and saving.
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
-
-[ Features ]
 sfx2-pre-and-postprocess-crash-fix.diff, n#270544, rodo
 # hack to ignore writerfilter if odf-converter is present
 odf-converter-ignore-writerfilter.diff, n#348471, jholesov
@@ -2521,10 +2453,6 @@
 sd-view-zoom-fix.diff, n#380013, i#88939, thorsten
 sd-inplace-deselection-fix.diff, i#89283, n#384506, thorsten
 
-[ Fixes < dev300-m36 ]
-svx-hatched-textmove.diff, n#384563, i#89661, thorsten
-
-[ Fixes ]
 sd-custom-show-fix.diff, n#355638, i#90145, thorsten
 
 # hyperlink issue with numeric slide names in Impress
@@ -2564,11 +2492,7 @@
 internal-mesa-headers-mesa.diff, fridrich
 
 
-[ Lockdown < dev300-m36 ]
-# Disable UI [toolbars, menus] customization
-ui-desktop-integration-m35.diff, michael
-
-[ Lockdown >= dev300-m36 ]
+[ Lockdown ]
 # Disable UI [toolbars, menus] customization
 ui-desktop-integration.diff, michael
 
@@ -2607,13 +2531,8 @@
 
 sw-source-filter-ww8-continous-section-break-fix.diff, n#405071, i#91395, fridrich
 
-[ Fixes < dev300-m36 ]
-sw-ww8-fieldandcharstyle-m35.diff, n#414471, i#93105, fridrich
-
-[ Fixes >= dev300-m36 ]
 sw-ww8-fieldandcharstyle.diff, n#414471, i#93105, fridrich
 
-[ Fixes ]
 unoxml-boost-workaround.diff, thorsten
 
 sw-updateindex-crash.diff, n#388069, fridrich
@@ -2728,16 +2647,8 @@
 [ NovellOnlyWin32 ]
 i92372.diff, i#92372, n#353143, tml
 
-[ SystemBuildBits < dev300-m36 ]
-no-latex-filter-without-writer2latex.diff, i#93520
-
 [ Fixes ]
 #sw-import-TOC.diff ,n#404254, Amelia Wang
-
-[ Fixes < dev300-m36 ]
-gnome-fpicker-main-thread.diff, i#93366, cmc
-
-[ Fixes ]
 jurt-jnilib-deliver.diff, i#93516, thorsten
 solenv-silent-mac-build.diff, thorsten
 sdext-presenterview-thread-suicide.diff, n#425072, thorsten
@@ -2752,17 +2663,9 @@
 sal-disable-backtrace.diff, thorsten
 [ Fixes < dev300-m38 ]
 valgrind-fix-warnings.diff, i#95197, thorsten
-[ Fixes < dev300-m36 ]
-cws-impress163-sd.diff, thorsten
-# FIXME 2008-11-26:
-#cws-impress163-svx.diff, thorsten
-cws-impress163-slideshow.diff, thorsten
 [ Fixes ]
 # FIXME 2008-11-26:
 #sw-invert-border-spacing.diff, n#391591, flr
-[ Fixes < dev300-m36 ]
-cppcanvas-axial-gradient-fix.diff, i#95341, thorsten
-[ Fixes ]
 cws-impress162-sd.diff, i#94193, thorsten
 cws-impress162-canvas.diff, i#94193, thorsten
 cws-impress162-slideshow.diff, i#94193, thorsten
@@ -2807,14 +2710,9 @@
 mingw-build-without-stlport-stlport.diff, i#95203, jholesov
 
 
-[ Fuzz < dev300-m36 ]
-# Fuzzing work n#228555
-crash-sot.diff, i#94845, michael
-
 [ Fixes ]
 cws-impressfontsize.diff, i#8824, cl
 
-[ Fixes ]
 # Drop the lame and misleading tooltips for the icon on the desktop
 # and in the Start Menu on Windows
 win32-tooltips.diff, tml
@@ -2823,11 +2721,6 @@
 # FIXME 2008-11-26: already in?
 #warning-spin-button.diff, i#95554, michael
 
-[ Fixes < dev300-m36 ]
-# disable gnome-vfs bits if we are not building with it enabled
-crash-gvfs.diff, i#95689, michael
-
-[ Fixes ]
 # openjdk contains rhino.jar. breaks the build...
 buildfix-openjdk-6-no-rhino.diff