#
# The format of this file is:
#

# -------- Options --------

PATCHPATH=.:../src680:../evo2:../64bit

# -------- Functional sub-sets --------
Common : BuildBits, ParallelMake, TemporaryHacks, Fixes, \
	 Defaults, Features, VCL, SystemMozilla, Misc, \
	 Icons, Fpickers, i18n \
	 VBABits, Evo2
LinuxCommon : Common, LinuxOnly, CWSBackports
Win32Common : Common
# Novell
NLDBase : NLDOnly, LinuxCommon, NovellOnly, NovellOnlyUnix
SUSEBase : SUSEOnly, LinuxCommon, NovellOnly, NovellOnlyUnix
#NLD64 : NLDBase, 64bit, JDK150 - java modules cannot register on AMD64 atm, let's disable it
NLD64 : NLDBase, 64bit
NLD : NLDBase
SUSE : SUSEBase
# Debian
DebianBase : DebianOnly, LinuxCommon
Debian : DebianBase
Debian64 : DebianBase, 64bit
# Ark Linux
Ark: LinuxCommon, ArkOnly
# www.pld-linux.org
PLDBase: LinuxCommon
PLD: PLDBase
PLD64: PLDBase, 64bit
# Win32
Win32 : Win32Common, NovellOnly, NovellOnlyWin32

# -------- [ Tag ], patch sets --------

[ TemporaryHacks ]
# Ugly hack to fix compilation of svtools with system jpeg #37002
buildfix-system-jpeg.diff
# Temporary disable mozab FIXME no IZ, fix that together with --system-mozilla
buildfix-disable-mozab.diff
# De Sun-ify the recovery report dialog - FIXME file up-stream
# recovery-report.diff - FIXME
# A really ugly vcl hack while we sort our icons out #39358
vcl-alpha-fix.diff
# Make libidn compile on sane Linux systems #40006
buildfix-curl-libidn.diff
# quote filename that can include 'C#' in the filename #43561
buildfix-odk-quoting.diff
# usage of fprintf without including stdio.h #43560
buildfix-jvmfwk-stdio.diff
# Add custom build version bits #41391
build-versioning.diff
# Don't do a package phase if we disable EPM #42265, CWS kendy02
no-epm-no-package.diff
# fix the gpc warning #42409, CWS kendy02
gpc-warning.diff
# fix build with non-interactive shell, without tty input, #42418
# it is a backport from src680_m74 until a correct solution is found
buildfix-odk-non-interactive-build.diff
# Stop scp2 re-building frequently #42566
scp2-rebuild.diff
# Fix filter build without java #42125
filter-nojava.diff
# Crystal iconset does not get industrial fallback #42760, CWS kendy02
packimages-respect-alternative.diff
# Fix build in libxmlsec #43079, CWS systemmozilla
buildfix-libxmlsec.diff
# Additional system python fixes #41994, CWS systempython2
cws-systempython2.diff
# Fix size of check boxes #41741, CWS vcl36
cws-vcl36-checkboxes.diff
# update libwpd, CWS libwpdupgrade
cws-libwpdupgrade.diff
# The odk has a horribly slow & buggy build & we don't package it
odk-disable.diff

[ Fixes ]
# Disable the printer properties which are unused IZ#14036, n#583
printer-properties-disable.diff
# Make debugging nicer under unix #35336
debug-bits.diff
# The world need not see that I can't spell #21440
sd-export-no-spell-check.diff
# get interactivity right during slow updates #42221
vcl-gtk-yield.diff
# Fix mind-mangled evo. addressbook path #26309
evo-addrbook.diff
# make menu layout prettier #17937
vcl-menu-fixes.diff
# File->New->Spreadsheet freezes on some versions of GCC # FIXME: shres
svx-freeze-fix.diff
# update pyuno docs from www.oo.o
pyuno-update-docs.diff
# Fix doc load crasher X#64030 - still in src680-m55
sw-import-crash.diff
# Fix impress spellcheck #32320
crash-sd-spellcheck.diff
# Make the scroll-wheel / page popup more sane #20826
gui-sw-scroll.diff
# Re-size over-large icons to 24x24 - #15208
sfx2-toolbox-size.diff
# disable font management dialog in padmin
padmin-nofontconfig.diff
# Improve the web bullet export / export to png not gif. #23353
sd-export-html-theme.diff
sd-export-html.diff
sd-export-html-translations.diff
sd-export-html-descr.diff
# A potential trouble-spot #38037
jvmfwk-eintr.diff
# configure some Japanese fonts used on Novell products
# (patch by Mike Fabian mfabian@suse.de)
novell-cjk-fonts.diff
# fix gtk+ / XIM - forward-port #38671
#
# FIXME - disabled for now cf. cws-vcl36 backport
# 
# xim-fixes.diff
# xim-fixes3.diff
# <ctrl> +/‑ to insert/delete a complete line in calc (X#62530) #38108
calc-new-acceleration.diff
# Send e-mail in MS format as attachment (X#62200)
# ms-interoperability-email-attachment-as-xls-ppt.diff 
# Escape should cancel the print preview X#67133 #35777
sw-escape-print-preview.diff
sc-escape-print-preview.diff
# adds to Autofilter Empty-NonEmpty options bxc #62165 Issue#35578
sc-autofilter-empty-nonempty.diff
# Improves the standard filter options and menu. bxc #62187 #62495 Issue#35579
sc-standard-filter-options.diff
# Hides the filtered rows when height of rows are changed bxc #62161 Issue #35581
sc-filter-hide-filteredrows.diff
# allows not to delete nonfiltered rows while deleting the filtered ones bxc #62186 Issue 35582
sc-no-delete-filteredrows.diff
# Autofill doesnt fill filtered rows bxc 62499
sc-filters-fill-fix.diff
# Provision for dynamic range in data pilot issue #23658 bxc 62522
sc-datapilot-dynamic-range.diff
# Provision for data-pilot to give autoformat Issue #37388 bxc #62162
sc-datapilot-autoformat.diff
# Make SAL compile on Linux systems that use NPTL without compat hacks
# (pthread_kill_other_threads_np is dead)
sal-compile-with-nptl.diff
# don't bloat the toolbars beyond belief #41833
vcl-toolbox-height.diff
# fix +/- key syms #42077
vcl-keys.diff
# Don't barf if rpm 4.4.x is used
rpm-4.4-compat.diff
#  BXC 62488 : Allows insertion of rows by shifting down
sc-paste-insert-rows.diff
# Fix KDE VCL compilation with gcc visibility #41591
kde-visibility.diff
# Fix for datapilot crash when clicking outside dialog
sc-datapilot-crash-fix.diff
# Fix for datapilot crash on remote databases
sc-dp-database-crash.diff
# Fix for autotriming of autofilter choices bxc 65945 Issue FIXME
sc-autofilter-autotrim-choices.diff
# Take DESKTOP_LAUNCH into account in File->Send->Document as E-mail #42841, CWS kendy03
shell-senddoc-desktop-launch.diff
# fix conditional deps again #43314
cws-mmeeks05.diff
# fix alpha in gallery #43341
gallery-icons.diff
# Replace usability numb Zoom dialog with a Combo Box
zoom-combobox.diff
# Protect generic URIs from overly zealous absolutizer #43485
url-relative.diff
# Tell the desktop we want URIs & we support the VFS #43504
uses-vfs.diff
# Stop impress wizard crashing n#66187, i#43546
crash-sd-wizard.diff
# Fix crash-on-exit snafu #43549
crash-vcl-gtk-exit.diff
# Improve gtk nwf toolbar toggle button rendering. #43720, In vcl37
vcl-nwf-gtk-toggle-toolitems.diff
# Make template document open / creation synchronous i#43741
crash-template.diff
# Gnome 2.6 has totally different authentication (sigh)
vfs-2.6-auth.diff

[ LinuxOnly ]
# Optimize linkage of some xmlhelp libraries # FIXME: shres
xmlhelp-optimize-linkage.diff
# Modify the fpicker makefile causing problems in the win32 build
fpicker-common-build.diff

[ XineramaPIC ]
# use libXinerama_pic.a on all archs
xinerama-pic-on-all-archs.diff


[ Misc ]
# Make the default writer bullet larger i#10549
# sw-default-bullet.diff
# Insert symbol defaults to the Symbol font - not a random one #15512
gui-sw-insert-symbol.diff
# Address data source ordering X#62860
addrbk-datasrc-ordering.diff
# Add an ooo-build version in ProductExtension - FIXME - improve & add to configure.
version-strike.diff
# Try to get the font mapping right
gui-metric-fonts.diff
# Describe the metric compatible fonts for export mappings
gui-metric-fonts-descr.diff
# Some of the new help & other icons we need #FIXME copy OOO_1_1_incons 
# gui-new-icons.diff - SMALL REGRESSION
# Make the delete key happy again in starcalc #17965 - wontfix [!]
gui-sc-delete.diff
# Autodetect HAVE_GCC_VISIBILITY_FEATURE -- it's currently used but never
# set
detect-gcc-visibility.diff
#Review comments implemented for #34909
dbaccess-evo-changes.diff
# E-mail attachment file name append with "_1" X#67684 #35780
email-attachment-underscore-zero.diff
# removing multimedia menu's X66608
remove-default-multimedia-menu.diff

[ NovellOnlyUnix ]
# Use bug buddy
bug-buddy.diff
# save everything to ~/Documents by default
default-save-path.diff
# Help Support page
help-support.diff
# mark the files in share/template/<lang>/wizard/bitmap as lang specific
build-wizard-bitmap-scp.diff
# change user config dir name from ~/.openoffice.org1.9.milestone to ~/.ooo-2.0-pre
scp2-user-config-ooo-2-0-pre.diff

[ NovellOnlyWin32 ]
filebug-support.diff

[ i18n ]
# shrink exported ISO_8859_2 & MS_1250 html
# most people will use UTF-8 and never see this, #19514
html-8bit-export-shrink.diff

# ( mmp@oo.o deals with defaults apparently )
[ Defaults ]
# stop the user having to fight ooimpress constantly #35338
capitalization.diff
# default to large icons in the toolbar
gui-toolbox-large-icons.diff
# Use nicer colors for the charts X#64359
sc-default-color-modify.diff
# make tri-state toolbars less confusing #35563
gui-toolbox-tristate.diff
# default to anti-alias at point size of 1 point
default-font-aasize.diff
# set default font size to 10pt #35565
default-font-size.diff
# don't use any slow / nasty X fonts #35641
default-no-x-fonts.diff
# use more normal hinting parameters #35714
default-glyph-light.diff
# Dramatically improve MS import / export cf. #8276 et. al.
default-ms-filter-convert.diff
# improve keybindings #35738
default-keybindings.diff
# use pair kerning in new documents #35873
default-pairkerning-on.diff
# Optimal Page Wrap should be default for graphics insertion (X#59831) #38108
writer-default-as-optimal-page-wrap.diff

#
# Controversial bits - no use filing up-stream
#
# pestering people serves no useful purpose
default-no-registration.diff
# automatically do any migration we can, with no wizard
default-no-startup-wizard.diff
# don't throw up the style dialog on 1st run
default-no-style-dialog.diff
# no Help->registration dialog by default
default-no-registration-menu.diff
# Use the Gnome VFS on KDE as well if it's there (better than nothing)
vfs-kde-too.diff
# Trade speed for reliability with valgrind
valgrind-alloc.diff

[ Features ]
# Make cut and paste nicer #15509
sc-paste-dialog.diff
# Save as menuitem for image context menus in impress #13816
# sd-save-image-context-menu.diff - FIXME - Raul working on this.
# Make insensitive toolbar icons look far nicer #35555
gui-insensitive.diff

[ BuildBits ]
# do an optimizing link
build-optimized-link.diff
# do not build extras for icu, workaround for http://bugs.debian.org/210608
icu-build-no-extras.diff
# package all libcurl related files if the internal one is used, #41883
scp-add-libcurl.diff
# do not have GnomeVfs module listed in two file lists, #42525
scp-gnomevfs-only-once.diff

# fix installation with --disable-binfilter, #43457
# it is a hunk from patches/src680-m79/cws-buildcond02.diff that was not send
# upstream
scp2-binfilter.diff

# allows to do not pack libstdc++ and libgcc_s; #42902
system-stdlibs.diff

# Fix missing __cxa_guard_acquire/__cxa_guard_release - #34676 (for FC3)
sal-cxa-guard.diff
# do not pack any potential .orig files with ppds
psprint_config-no-orig.diff
# Fix ODK Java bits
odk-java-wizpanel.diff
# add possibility to set ARCH_FLAGS when building libnas
nas-use-arch-flags.diff
# fix build with GNOME 2.9.91, #42718, CWS kendy03
buildfix-gnome-2.9.91.diff

[ ParallelMake ]
# Fixes for distributed building (with icecream) #35627
parallel-solenv-target-mk.diff
parallel-solenv-tg_sdi-mk.diff
# 3 more makefiles in sysui are seriously broken #35628
parallel-sysui-makefiles.diff

# Fix/workaround race condition with .REMOVE rule #16752
parallel-dmake-dont-remove.diff

[ VCL ]
# Don't let the splash screen take over #23609
no-splash-takeover.diff

# Cleanup of old kdeint pieces - part of #36763
# FIXME: #36763 is marked as fixed; create a new issue for this
cleanup-vcl-kdeint.diff

# Implementation of KDE/Qt NWF toolbars and menus
# FIXME Not ready for upstreaming yet, crashes on exit for some styles
vcl-nwf-toolbars.diff
vcl-nwf-menus.diff
vcl-nwf-kde-toolbars-menus.diff

# Ask the theme for the size of checkboxes and radiobuttons in KDE #43392, CWS kendy04
vcl-nwf-kde-checkboxes.diff

# Use nwf for menu item check boxes instead of ugly symbols
vcl-nwf-menu-checkmarks.diff

[ SystemMozilla ]
#
# Snarfed from Caolan, unknown status.
# http://people.redhat.com/caolanm/SRC680_m58
#
system-mozilla-config_office.diff
system-mozilla-connectivity.diff
system-mozilla-extensions.diff
system-mozilla-libxmlsec.diff
system-mozilla-scp2.diff
system-mozilla-xmlsecurity.diff
system-mozilla-xmlsecurity-libnss.diff
# FIXME: this is an UGLY hack.
# It sets LD_LIBRARY_PATH in soffice wrapper to system mozilla (only
# the SUSE specific path /opt/mozilla/lib
system-mozilla-desktop.diff
# Teach linkoo about the evil under the sun:
linkoo-moz-hack.diff

[ Icons ]
# Installation & appearance of multiple icon sets (Industrial and Crystal) #36518
icons-vcl-according-to-desktop.diff
icons-xmlhelp-according-to-desktop.diff
# Theme & add alpha to the WM icons #41225
wm-icons.diff

[ Fpickers ]
# Out-of-process implementation of KDE fpicker
# FIXME: No IZ number for this, because it is necessary to do it internal first
fpicker-kde-service.diff
fpicker-kde-dialog.diff
# Let the KDE and Gtk+ fpickers build and install FIXME IZ number
fpicker-common-scp2.diff
# Show "Use OpenOffice.org dialogs" check box only if the system fpicker is
# available (better implementation) FIXME IZ number
fpicker-show-checkbox.diff
# add in an extra combobox to make filter selection easier i#10545, i#66075
fpicker-fixes.diff
# fix for the gtk critical error n#66349
fpicker-gnome-crash-fix.diff
# temportary fix to enable filter detection to work properly i#10545
sfx2-fpicker-gnome-filter-fix.diff
# fix for the fpicker hanging on accessible desktop
fpicker-accessibility-fix.diff
# fix for the fpicker crashing in the Euro converter n#67124
# fpicker-euro-converter-fix.diff

[ Evo2 ]

# evolution addressbook driver version 2 #34909
connectivity-source-drivers-evoab1-5-dataaccess-xcu.diff
connectivity-source-drivers-evoab1-5-evoab1-5-map.diff
connectivity-source-drivers-evoab1-5-evoab-xml.diff
connectivity-source-drivers-evoab1-5-makefile-mk.diff
connectivity-source-drivers-evoab1-5-nconnection-cxx.diff
connectivity-source-drivers-evoab1-5-nconnection-hxx.diff
connectivity-source-drivers-evoab1-5-ndatabasemetadata-cxx.diff
connectivity-source-drivers-evoab1-5-ndatabasemetadata-hxx.diff
connectivity-source-drivers-evoab1-5-ndebug-cxx.diff
connectivity-source-drivers-evoab1-5-ndebug-hxx.diff
connectivity-source-drivers-evoab1-5-ndriver-cxx.diff
connectivity-source-drivers-evoab1-5-ndriver-hxx.diff
connectivity-source-drivers-evoab1-5-npreparedstatement-cxx.diff
connectivity-source-drivers-evoab1-5-npreparedstatement-hxx.diff
connectivity-source-drivers-evoab1-5-nresultset-cxx.diff
connectivity-source-drivers-evoab1-5-nresultset-hxx.diff
connectivity-source-drivers-evoab1-5-nresultsetmetadata-cxx.diff
connectivity-source-drivers-evoab1-5-nresultsetmetadata-hxx.diff
connectivity-source-drivers-evoab1-5-nservices-cxx.diff
connectivity-source-drivers-evoab1-5-nstatement-cxx.diff
connectivity-source-drivers-evoab1-5-nstatement-hxx.diff
connectivity-source-drivers-evoab1-5-ncatalog-cxx.diff
connectivity-source-drivers-evoab1-5-ncatalog-hxx.diff
connectivity-source-drivers-evoab1-5-ntables-cxx.diff
connectivity-source-drivers-evoab1-5-ntables-hxx.diff
evoab2_prj.diff
evoab2_scp.diff
connectivity-source-drivers-evoab1-5-EApi-cxx.diff
connectivity-source-drivers-evoab1-5-EApi-h.diff
# Evolution in wizards -> addressbook X#66214
wizard-evo-local.diff
[ QPro ]
# Quattro Pro 6.0 import filter: IZ #41688
formel-hxx.diff
qpro-build.diff
qpro-detect.diff
qproform-hxx.diff
frmbase-cxx.diff
qpro-cxx.diff
qproform-cxx.diff
qpro-hxx.diff

[ Win32Common ]
# 2 more makefiles in sysui are seriously broken #35628
# parallel-python-makefile_mk.diff # looks to be upstream
# Work around G/W mail component crasher bug #34264
win32-gw-send-mail.diff
# use bin/oowintool for the win32 configure stage
win32-msvs-2003-configure.diff
# Minor build fixes for win32
win32-build-fixes.diff
# This is a pretty nasty IE problem #19510
# win32-activex-disable.diff # commented out as it breaks instsetoo_native

[ VBABits ]
# Alt-F11 does something useful #29138
vba-keybinding-f11.diff
# Parse (& ignore) 'Attribute' statements #37347
vba-attribute.diff
# Add foreach statement - #33807
vba-foreach.diff
# Prefer interoperability over marginal compatibility
default-vba-compatible.diff
vba-not-comments.diff

[ NLDOnly ]
# Push fonts into the ps stream always
pushfont-psstream.diff
                                                                                                                            
# in case the system is panicing; registry/data/org/openoffice/VCL.xcu is
# not installed or broken; used for example if OOo is installed from an
# installation set by ./install --interactive
gui-font-paranoid-fallback.diff

[ NLDOnly ]
# some branding action cf. doc/splash.txt
nld-splash.diff

[ SUSEOnly ]
# some branding action cf. doc/splash.txt
suse-splash.diff

[ ArkOnly ]
# Ark Linux splits Qt into qt-mt and qt-base-mt so text mode apps etc.
# can use Qt base functionality without linking in the whole GUI.
# vclplug needs to add -lqt-base-mt here.
ark-handle-split-qt.diff
# If /usr/bin/java is a gcj wrapper, javadoc doesn't exist -- and
# configure shouldn't barf.
missing-javadoc-nonfatal.diff
# Don't barf with "unresolved symbol PL_InitArenaPool" whenever something
# links to libnss3
libxmlsec-nssckbi.diff

[ RedhatOnly ]
# Some palette loving
redhat-standard-colors.diff

[ 64bit ]
#
# NOTE: 64 bit OOo is work in progress!
#

# The following is a result of:
#   cvs -d :pserver:anoncvs@anoncvs.services.openoffice.org:/cvs checkout -r cws_src680_ooo64bit02 OpenOffice
#   for I in * ; do cvs -d :pserver:anoncvs@anoncvs.services.openoffice.org:/cvs diff -N -r CWS_SRC680_OOO64BIT02_ANCHOR -r cws_src680_ooo64bit02 $I > $I.diff ; done
# (and a bin/cvsclean)
64bit-basegfx.diff
64bit-basic.diff
#64bit-binfilter.diff
64bit-boost.diff
64bit-bridges.diff
#64bit-canvas.diff
64bit-comphelper.diff
64bit-configmgr.diff
64bit-connectivity.diff
#64bit-cppcanvas.diff
64bit-cppu.diff
64bit-cppuhelper.diff
#64bit-dbaccess.diff
64bit-desktop.diff
64bit-extensions.diff
64bit-extras.diff
64bit-framework.diff
64bit-goodies.diff
64bit-idlc.diff
64bit-i18npool.diff
64bit-jvmfwk.diff
64bit-nas.diff
64bit-psprint.diff
64bit-rdbmaker.diff
64bit-registry.diff
#64bit-rsc.diff
64bit-sal.diff
64bit-sc.diff
#64bit-setup2.diff
64bit-sfx2.diff
64bit-sch.diff
64bit-solenv.diff
64bit-so3.diff
64bit-starmath.diff
64bit-stlport.diff
64bit-stoc.diff
64bit-store.diff
64bit-svtools.diff
64bit-svx.diff
64bit-sw.diff
64bit-toolkit.diff
64bit-tools.diff
64bit-vcl.diff
64bit-vos.diff
64bit-xmloff.diff

# Additional build fixes that need upstreaming to ooo64bit02
buildfix-64bit-automation.diff
buildfix-64bit-basic.diff
buildfix-64bit-canvas.diff
buildfix-64bit-chart2.diff
buildfix-64bit-config_office.diff
buildfix-64bit-cppcanvas.diff
buildfix-64bit-dbaccess.diff
buildfix-64bit-extensions.diff
buildfix-64bit-filter.diff
buildfix-64bit-framework.diff
# TODO file to IZ
buildfix-64bit-rsc.diff
buildfix-64bit-sc.diff
buildfix-64bit-sch.diff
buildfix-64bit-sd.diff
buildfix-64bit-sfx2.diff
buildfix-64bit-solenv.diff
buildfix-64bit-starmath.diff
buildfix-64bit-svtools.diff
buildfix-64bit-svx.diff
buildfix-64bit-sw.diff
buildfix-64bit-tools.diff
buildfix-64bit-vcl.diff
buildfix-64bit-xmloff.diff

# Other build fixes
buildfix-64bit-system-jpeg.diff

# res32bit related fixes
# TODO file to IZ
buildfix-64bit-padmin-res32bit.diff
buildfix-64bit-extensions-res32bit.diff

# 64-bit related fixes for run-time
# Correct reading of resources IZ#40338
#fix-64bit-tools.diff
# Fix crash while initializing fontconfig
fix-64bit-psprint.diff

# Fix ambiguous invocations of Min()/Max()/Abs() when OOo with 64 bit patches
# is built on 32 bit platforms
buildfix-64bit-on-32bit-systems.diff

[ JDK150 ]
# You need 64bit java, e.g. JDK 1.5.0 for AMD64:
#   http://java.sun.com/j2se/1.5.0/download.jsp
# This JDK needs
#   ln -s motif21/libmawt.so /usr/java/jdk1.5.0_01/jre/lib/amd64/libmawt.so
# to let OOo compile well
#
# FIXME No IZ for this one yet
buildfix-jdk150-berkeleydb.diff
buildfix-jdk150-jurt.diff
buildfix-jdk150-jvmfwk.diff
buildfix-jdk150-qadevOOo.diff
buildfix-jdk150-rhino.diff
buildfix-jdk150-sandbox.diff
buildfix-jdk150-scripting.diff
buildfix-jdk150-sj2.diff
buildfix-jdk150-xmerge.diff
buildfix-jdk150-xmlhelp.diff
buildfix-jdk150-XmlSearch.diff
