GNOME.org
 

ooo-build r14584 - in branches/opensuse-11-1: . patches/dev300

Author: tml
Date: Mon Nov 24 12:39:31 2008
New Revision: 14584
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14584&view=rev

Log:
2008-11-24  Tor Lillqvist  <tml novell com>

	* patches/dev300/apply: Make ooo300-m9 the oldest (and presumably
	also newest) supported milestone. Drop conditionals that would
	select patches for ooo300 milestones earlier than ooo300-m9 or for
	dev300 milestones.



Modified:
   branches/opensuse-11-1/ChangeLog
   branches/opensuse-11-1/patches/dev300/apply

Modified: branches/opensuse-11-1/patches/dev300/apply
==============================================================================
--- branches/opensuse-11-1/patches/dev300/apply	(original)
+++ branches/opensuse-11-1/patches/dev300/apply	Mon Nov 24 12:39:31 2008
@@ -7,7 +7,8 @@
 
 PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../scsolver:../lwp
 
-OLDEST_SUPPORTED=dev300-m28 ooo300-m0
+# Here in this opensuse-11-1 branch we only support ooo300
+OLDEST_SUPPORTED=ooo300-m9
 
 # -------- Functional sub-sets --------
 Common : PreprocessPatches, BuildBits, TemporaryHacks, FixesNotForUpstream, \
@@ -166,18 +167,11 @@
 # add accelerator to the OK and Cancel buttons.
 ok-cancel-btn-add-accel.diff, kohei
 
-[ TemporaryHacks < dev300-m29 < ooo300-m1  ]
-
-# Detect MSVS9 if available
-msvs9-temporary-fix-m28.diff, i#88945, tml
-
-[ TemporaryHacks >= dev300-m29 >= ooo300-m1  ]
+[ TemporaryHacks ]
 
 # Detect MSVS9 if available
 msvs9-temporary-fix.diff, i#88945, i#93332, tml
 
-[ TemporaryHacks ]
-
 # fix the smoketest
 smoketest-fix.diff, michael, i#84720
 
@@ -335,10 +329,6 @@
 # JDKs too
 buildfix-qadevOOo-java-encoding.diff, brosenk
 
-[ GCJ < ooo300-m2 < dev300-m30 ]
-# Seems that bug #69026 is back
-gcj-workaround-serializer.diff
-
 # Fixes that were not accepted up-stream, but are still useful
 [ FixesNotForUpstream ]
 # Make debugging nicer under unix
@@ -349,29 +339,15 @@
 # make menu layout prettier
 vcl-menu-fixes.diff, i#67123, michael
 
-[ FixesNotForUpstream < dev300-m31 < ooo300-m5 ]
-# Tell the desktop we support the VFS
-uses-vfs-m30.diff, i#43504, michael
-[ FixesNotForUpstream >= dev300-m31 >= ooo300-m5 ]
 # Tell the desktop we support the VFS
 uses-vfs.diff, i#43504, michael
 
-[ FixesNotForUpstream < dev300-m30 ]
 # add mozilla certificate dir detection to soffice
 soffice-detect-mozilla-certificates.diff
 
-[ FixesNotForUpstream <= dev300-m30 <= ooo300-m3 ]
-redirect-extensions-m30.diff
-[ FixesNotForUpstream > dev300-m30 > ooo300-m3 <= dev300-m31 <= ooo300-m8 ]
-redirect-extensions-m8.diff
-[ FixesNotForUpstream > dev300-m31 > ooo300-m8 ]
 # re-direct to plugins via http://extensions.go-oo.org/
 redirect-extensions.diff
 
-[ BuildBits >= ooo300-m4 < ooo300-m7 ]
-reportdesign-useless-jfreereport-dep.diff
-
-[ FixesNotForUpstream ]
 #upload a new libwpd + fix an exception with condensed paragraphs
 libwpd.diff, fridrich
 writerperfect-nocondensedparagraphs.diff, fridrich
@@ -388,27 +364,11 @@
 # no bogus license question when registering these extensions
 #solenv-no-extension-license.diff
 
-[ FixesNotForUpstream < ooo300-m4 ]
-reportdesigner-no-license-m3.diff
-[ FixesNotForUpstream < ooo300-m6 ]
-reportdesigner-no-license-m5.diff
-
-[ ExtensionFixes >= ooo300-m6 ]
-reportdesigner-no-license.diff
 [ ExtensionFixes ]
+reportdesigner-no-license.diff
 presentation-minimizer-no-license.diff
 presenterscreen-no-license.diff
-
-[ FixesNotForUpstream < ooo300-m3 ]
-pdfimport-no-license-m2.diff
-
-[ FixesNotForUpstream >= ooo300-m3 < ooo300-m6 ]
-pdfimport-no-license-m5.diff
-
-[ ExtensionFixes >= ooo300-m6 ]
 pdfimport-no-license.diff
-
-[ ExtensionFixes ]
 wiki-publisher-no-license.diff
 build-java-target-extensions.diff, i#93115, pmladek
 
@@ -426,19 +386,10 @@
 build-ant-1.6.diff, i#90830, pmladek
 
 # FIXME: Was fixed in m1 as masterfix. I'd bet it will be in m30, too, but...
-[ Fixes >= dev300-m30 >= ooo300-m1 ]
+[ Fixes ]
 # more intelligent nsplugin seeking
 nsplugin-path.diff, i#49590, michael
-[ Fixes < dev300-m30 < ooo300-m1 ]
-# more intelligent nsplugin seeking
-nsplugin-path-m28.diff, i#49590, michael
-
-[ 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
 
@@ -560,10 +511,6 @@
 
 scripting-framework-user-path.diff, i#93994
 
-[ Fixes < dev300-m31 < ooo300-m5 ]
-# fixes the realpath buffer size to avoid crash when detecting soffice path
-cppuhelper-findsofficepath-realpath-buffer-size.diff, i#93393, pmladek
-
 [ TemporaryHacks ]
 xmloff-field-patch.diff, flr, n#248354
 
@@ -580,12 +527,9 @@
 # make OOo work under SELinux
 ooo80816.selinux.bridges.diff, i#80816
 
-
 [ Win32Only ]
-
 accept-underscores-in-hostnames.diff, n#182422, tml
 
-
 [ WebDAVUpstream ]
 SectionOwner => jholesov
 SectionIssue => i#29152
@@ -609,7 +553,6 @@
 # fix saving files on Novell teaming via WebDaV
 webdav-locking-local-temp-file.diff, bnc#440514, kendy
 
-
 [ GnomeVFS ]
 # gnome-vfs locking implementation
 # it was not committed up-stream yet because up-stream uses so old gnome-vfs
@@ -621,13 +564,9 @@
 # (up-stream does not like it, because it adds dependency to VCL in URE)
 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 ]
+[ QuickStarter ]
 unxsplash-rework.diff, i#60696, michael/jholesov
 
-[ QuickStarter ]
 # fix the systray quickstarter
 sfx2-quickstarter-fix.diff, i#88382, michael
 
@@ -859,9 +798,6 @@
 # Pivot cache field import fix.
 calc-dp-pivotcache-fix.diff, n#433658, i#96326, kohei
 
-[ CalcFixes < ooo300-m3 ]
-# Fix a regression on filtering by page field.
-calc-fix-datapilot-date-filter.diff, i#90022, kohei
 
 [ LinuxOnly ]
 # accelerate linking, by extreme cunning i#63927
@@ -947,8 +883,6 @@
 # Fix the system default fpicker
 default-system-fpicker.diff, michael
 
-[ NotDebian ]
-
 # Disable the printer properties which are unused#583
 # related issue: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=353595
 # also last comment in: https://bugzilla.novell.com/show_bug.cgi?id=83925
@@ -971,18 +905,11 @@
 # Swap the delete and backspace key bindings but leave the menus alone.
 sc-default-delete-backspace-key.diff, i#17965, kohei
 
-[ CustomUserConfig < dev300-m29 < ooo300-m1 ]
-
-# migrate keyboard shortcuts & reset character set for CSV import dialog.
-desktop-config-migration-m28.diff n#367160, n#376473, kohei
-
-[ CustomUserConfig >= dev300-m29 >= ooo300-m1 ]
+[ CustomUserConfig ]
 
 # migrate keyboard shortcuts & reset character set for CSV import dialog.
 desktop-config-migration.diff n#367160, n#376473, n#421070, kohei/jholesov
 
-[ CustomUserConfig ]
-
 # To make CSV Text Import settings persistent.
 sc-preserve-imp-opts.diff, i#3687, muthusub
 
@@ -1011,14 +938,10 @@
 reportdesign-mention-package.diff, rengelha
 
 
-[ DebianOnly >= dev300-m20 >= ooo300-m1]
+[ DebianOnly ]
 SectionOwner => rengelha
 # fix the splash progressbar colors
 debian-splash.diff
-[ DebianOnly < dev300-m30 < ooo300-m1 ]
-SectionOwner => rengelha
-# fix the splash progressbar colors
-debian-splash-m29.diff
 
 [ DroplineGNOMEOnly ]
 SectionOwner => DropLine
@@ -1078,19 +1001,9 @@
 libxmlsec-system-nss.diff, i#69368, n#195272, pmladek
 
 
-[ BuildBits < dev300-m39 < ooo300-m1 ]
-# fix the --enable-reportdesign configure check to work
-buildfix-enable-reportdesign-check.diff, i#87518, pmladek
-
-# fix evo2 driver build
-buildfix-connectivity-evoab2.diff, i#91025, pmladek
-
-[ BuildBits <= dev300-m30 <= ooo300-m3 ]
-novell-win32-agfa-monotype-fonts-m30.diff, tml
-[ BuildBits > dev300-m30 > ooo300-m3 ]
+[ BuildBits ]
 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
@@ -1135,9 +1048,6 @@
 [ Gcc43 ]
 # gcc 4.3 requires #include <string.h> for strdup, memcmp etc.
 buildfix-bridges-strdup-header.diff, i#89762, kohei
-[ Gcc43 < dev300-m30 < ooo300-m3 ]
-buildfix-filter-memcmp-header.diff, i#89803, kohei
-[ Gcc43 >= dev300-m30 >= ooo300-m3 ]
 buildfix-sdext-memcmp-header.diff, i#89803, kohei
 
 [ Java14 ]
@@ -1162,19 +1072,8 @@
 novell-win32-vrb-branding.diff, n#191913, i#68817
 novell-win32-registry-branding.diff, n#191913
 
-[ NovellOnlyWin32 < dev300m30 < ooo300-m2 ]
-SectionOwner => tml
 
-win32-prebuilt-writingaids-zip-m1.diff
-win32-prebuilt-writingaids-zip-scp2-m1.diff
-
-[ NovellOnlyWin32 >= dev300m30 >= ooo300-m2 < ooo300-m3]
-SectionOwner => tml
-
-win32-prebuilt-writingaids-zip-m2.diff
-win32-prebuilt-writingaids-zip-scp2-m2.diff
-
-[ NovellOnlyWin32 >= dev300m30 >= ooo300-m3 ]
+[ NovellOnlyWin32 ]
 SectionOwner => tml
 
 win32-prebuilt-writingaids-zip.diff
@@ -1288,9 +1187,6 @@
 # do not pack any potential .orig files with ppds
 psprint_config-no-orig.diff, jholesov
 
-[ BuildBits < ooo300-m7 ]
-lucene-no-java.diff
-
 [ DebianOnly ]
 seamonkey-is-iceape.diff
 
@@ -1325,11 +1221,6 @@
 sfx2-badscript.diff, i#67976
 
 
-[ BuildBits < ooo300-m2 < dev300-m30 ]
-# add automatical detection of serializer.jar into the configure
-# add it to classpath on one more place
-xalan-serializer-jar-more.diff, pmladek
-
 [ BuildBits ]
 # work around http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22392
 svx-customshapes-NOOPTFILES.diff, martink
@@ -1503,19 +1394,8 @@
 mozilla-buildlibs-win32.diff, i#58741, davidf
 # This enables building scsolver on Win32
 boost-patch.diff, tml
-
-[ Win32Only < dev300-m29 < ooo300-m1 ]
-
-# Multi-language installer stuff
-win32-multi-lang-installer-m28.diff, i#66062, i#88638, i#88639, tml
-
-[ Win32Only >= dev300-m29 >= ooo300-m1 ]
-
 # Multi-language installer stuff
 win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
-
-[ Win32Only ]
-
 # fixes for visual studio express 2005 ( ooo-build only )
 2005-express-stl-remove.diff, noelpwer, i#71404
 
@@ -1801,10 +1681,6 @@
 # fix window.SplitRow issue
 vba-window-api-fix.diff, Fong
 
-[ VBAObjects < ooo300-m3 ]
-bytearray-string-fix.diff, i#91911, Fong
-
-
 [ Features ]
 # Pre- and postprocessing capabilities for loading and saving.
 sfx2-pre-and-postprocess-during-save-load.diff, i#71939, florian
@@ -2067,11 +1943,7 @@
 gstreamer-sd.diff
 gstreamer-scp2.diff
 gstreamer-config-office.diff
-[ GStreamer < ooo300-m7 ]
-gstreamer-slideshow-m6.diff
-[ GStreamer >= ooo300-m7 ]
 gstreamer-slideshow.diff
-[ GStreamer ]
 gstreamer-solenv.diff
 gstreamer-svtools-content-types.diff
 gstreamer-avmedia-file-types.diff
@@ -2102,8 +1974,6 @@
 # warning: comparison with string literal results in unspecified results
 warning-string-comparsion-sw.diff, i#86880, i#86772, pmladek
 
-[ Shrink ]
-
 # don't export trivial strings in svtools, increases linking time, bloats size
 svtools-dont-extern-sRTF-sHTML.diff, i#86772, jholesov
 
@@ -2135,10 +2005,7 @@
 # much improved text import
 svg-import-textimport.diff, thorsten
 
-[ NovellOnlyWin32  < dev300m30 < ooo300-m2 ]
-novell-win32-msi-patchability-m1.diff, tml
-
-[ NovellOnlyWin32  >= dev300m30 >= ooo300-m2 ]
+[ NovellOnlyWin32 ]
 novell-win32-msi-patchability.diff, tml
 
 [ MacOSXOnly ]
@@ -2178,7 +2045,7 @@
 wmf-pattern-brush.diff, n#232232, rodo
 
 
-[ LayoutDialogs < dev300-m29 >= ooo300-m0 ]
+[ LayoutDialogs ]
 SectionOwner => jannieuw
 
 cws-layoutdialogs-offapi.diff
@@ -2187,16 +2054,8 @@
 cws-layoutdialogs-sw.diff
 cws-layoutdialogs-toolkit.diff
 cws-layoutdialogs-toolkit-remove-paragraph.diff
-
-[ LayoutDialogs < dev300-m29 < ooo300-m0 ]
-cws-layoutdialogs-transex3.diff
-[ LayoutDialogs < dev300-m0 >= ooo300-m1 ]
 cws-layoutdialogs-transex3-ooo300.diff
 
-[ LayoutDialogs ]
-# make it build with dev300-m19 - Janneke, please check :-)
-#buildfix-layoutdialogs-transex3.diff
-
 # use old style widgets as plugin in a layout dialog
 layout-plugin-toolkit.diff
 
@@ -2403,15 +2262,10 @@
 debian-system-jfreereport.diff
 [ DebianBaseSystemApacheCommons ]
 debian-system-apache-commons.diff
-[ DebianBaseSystemLucene >= dev300-m30 >= ooo300-m1 ]
+[ DebianBaseSystemLucene ]
 debian-system-lucene.diff
-[ DebianBaseSystemLucene < dev300-m30 < ooo300-m1 ]
-debian-system-lucene-m29.diff
-
-[ DebianBaseOnly >= dev300-m30 >= ooo300-m1 ]
+[ DebianBaseOnly ]
 configures-explicit-arch.diff
-[ DebianBaseOnly < dev300-m30 < ooo300-m1 ]
-configures-explicit-arch-m29.diff
 
 [ Fixes ]
 svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
@@ -2441,7 +2295,6 @@
 
 linkwarn-svtools-miscopts-bits.diff, n#348149, thorsten
 
-[ LinkWarningDlg ]
 linkwarn-officecfg-disable-msgbox.diff, n#348149, thorsten
 linkwarn-svx-warning-dlg.diff, n#348149, thorsten
 linkwarn-sd-no-dnd-links.diff, n#348149, thorsten
@@ -2452,11 +2305,6 @@
 scp2_extensions.diff
 extensions_configure.diff
 extensions_packinfo.diff
-
-[ IntegrateExtensions < ooo300-m2 ]
-extensions_deliver-m2.diff
-
-[ IntegrateExtensions >= ooo300-m2 ]
 extensions_deliver.diff
 
 
@@ -2621,30 +2469,14 @@
 [ Fixes ]
 cppcanvas-fix-roundcorners.diff, rodo
 slideshow-media-control.diff, i#91250, thorsten
-
-[ Fixes < dev300-m29 < ooo300-m1 ]
-vcl-linking-randr.diff, i#90809, n#398244, thorsten
-vcl-gtk-slideshow-crash.diff, i#91496, thorsten
-
-[ Fixes ]
 sd-macro-nudges.diff, i#91249, n#188199, thorsten
-
 sd-more-title-styles.diff, i#23221, thorsten
 officecfg-bighandles-default.diff, thorsten
-
-[ Fixes < dev300-m29 < ooo300-m1 ]
-config_office-msvc-compat-m28.diff, i#93332, thorsten
-
-[ Fixes >= dev300-m29 >= ooo300-m1]
 config_office-msvc-compat.diff, i#93332, 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
-
-[ Fixes ]
 xmlsecurity-disable-moz.diff, thorsten
 solenv-paths.diff, caolan
 cairocanvas-colorspace-fix.diff, thorsten
@@ -2692,10 +2524,7 @@
 libwps-testing.diff
 writerperfect-testing.diff
 
-[ PieceBits <= dev300-m30 <= ooo300-m3 ]
-# zipintro is not kind to us ...
-piece-desktop-m30.diff
-[ PieceBits > dev300-m30 > ooo300-m3 ]
+[ PieceBits ]
 # zipintro is not kind to us ...
 piece-desktop.diff
 
@@ -2761,23 +2590,11 @@
 # See what breaks if we build with more optimizations
 testing-more-optimizations-ark.diff
 
-[ Fixes <= dev300-m30 <= ooo300-m3 ]
-win32-mergemodule-pm-m30.diff, i#93065, tml
-[ Fixes > dev300-m30 > ooo300-m3 < ooo300-m6 ]
-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
-pdfimport-lax-restrictions-m29.diff, i#90468, thorsten
-[ Fixes == dev300-m30 == ooo300-m3 ]
-pdfimport-system-poppler-m30.diff, i#92920, cmc
-pdfimport-lax-restrictions.diff, i#90468, thorsten
-[ ExtensionFixes >= dev300-m31 >= ooo300-m4 ]
+[ ExtensionFixes ]
 pdfimport-system-poppler.diff, i#92920, cmc
 pdfimport-lax-restrictions.diff, i#90468, thorsten
 
@@ -2853,10 +2670,7 @@
 # Fuzzing work n#228555
 crash-sot.diff, i#94845, michael
 
-[ ImpressFontSize ]
-[ Fixes <= dev300-m30 <= ooo300-m3 ]
-cws-impressfontsize-m30.diff, i#8824, cl
-[ Fixes > dev300-m30 > ooo300-m3 ]
+[ Fixes ]
 cws-impressfontsize.diff, i#8824, cl
 
 [ UnusedMethodsRemoval ]
@@ -2892,12 +2706,8 @@
 # fix problem with calling private and protected members in layout code
 sfx2-privateprotectedpublic.diff
 
-# stop font updatess crashing OO.o - to be merged up-stream
-# soon, hence < m28
-[ CairoFonts < dev300-m28 >= ooo300-m9 ]
+[ CairoFonts ]
 psprint.defconfig_changes.diff, n#436441, flr
-[ CairoFonts < dev300-m28 < ooo300-m9 ]
-psprint.defconfig_changes-m7.diff, n#436441, flr
 
 [ NestedTables ]
 SectionOwner => jholesov
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]