[Libreoffice-commits] .: patches/dev300 patches/evo2

[Petr Mladek]

 patches/dev300/apply                    |   13 +++----------
 patches/evo2/Makefile.am                |    1 -
 patches/evo2/buildfix-evo1-vs-evo2.diff |   30 ------------------------------
 3 files changed, 3 insertions(+), 41 deletions(-)

New commits:
commit 9aa19d941c5441d02c2b0d40f3e3dd01dc9c1240
Author: Petr Mladek <pmladek at suse.cz>
Date:   Wed Mar 30 19:59:18 2011 +0200

    pushed buildfix-evo1-vs-evo2.diff into git
    
    removed empty evo2 patch directory and AddressBooks section

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 5c4e36d..c8c1568 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4,7 +4,7 @@
 
 # -------- Options --------
 
-PATCHPATH=.:../evo2:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
+PATCHPATH=.:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql
 
 # might be space separated list to support more MWS
 OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
@@ -22,7 +22,7 @@ Common : BuildBits, TemporaryHacks, FixesNotForUpstream, \
 
 LinuxCommon : Common, Defaults, FontConfigTemporaryHacks, \
 	      FedoraLinuxOnlyFixes, LinuxOnly, msaccess, \
-	      CliMonoCommon, Mono, MonoComp, AddressBooks, QuickStarter, KDE4, Netbook, \
+	      CliMonoCommon, Mono, MonoComp, QuickStarter, KDE4, Netbook, \
 	      GlobalNSPluginSupport
 MacOSXCommon : Common, Defaults
 Win32Common : Common, Defaults, Win32Only, CliMonoCommon, CliComponent
@@ -120,7 +120,7 @@ Pardus2008: PardusOnly, LinuxCommon
 Solaris: NovellBase, UnstableExtensions
 # OxygenOffice Professional
 OxygenOfficeLinuxCommon :	Common, Defaults,  FontConfigTemporaryHacks, LinuxOnly, \
-				msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, AddressBooks, QuickStarter, KDE4,\
+				msaccess, OpenGLTransitions, CliMonoCommon, Mono, MonoComp, QuickStarter, KDE4,\
 				Netbook, GlobalNSPluginSupport
 OxygenOfficeMacOSXCommon :	Common, Defaults
 OxygenOfficeWin32Common :	Common, Defaults, Win32Only, CliMonoCommon, CliComponent
@@ -569,13 +569,6 @@ system-python-uno-path.diff, i#97629
 liberation_packaging_fix.diff, kami
 #liberation_making_fix.diff, kami
 
-[ AddressBooks ]
-# build either the driver for Evolution 1.x or 2.x
-# they produce the same binary and configuration, so they can't be built at once
-# I think that the Evolution 1.x address book is obsolete anyway
-buildfix-evo1-vs-evo2.diff, bnc#496902, i#101439, pmladek
-
-
 [ DebianBaseOnly ]
 # add JDK paths for MySQL, PostgreSQL, JTDS
 jdbc-driver-classpaths-debian.diff
diff --git a/patches/evo2/Makefile.am b/patches/evo2/Makefile.am
deleted file mode 100644
index 0b280d2..0000000
--- a/patches/evo2/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = $(wildcard *.diff)
diff --git a/patches/evo2/buildfix-evo1-vs-evo2.diff b/patches/evo2/buildfix-evo1-vs-evo2.diff
deleted file mode 100644
index 491e406..0000000
--- a/patches/evo2/buildfix-evo1-vs-evo2.diff
+++ /dev/null
@@ -1,30 +0,0 @@
----
- connectivity/source/drivers/evoab/makefile.mk |    6 ++++++
- 1 files changed, 6 insertions(+), 0 deletions(-)
-
-diff --git connectivity/source/drivers/evoab/makefile.mk connectivity/source/drivers/evoab/makefile.mk
-index c1dbc21..538990f 100644
---- connectivity/source/drivers/evoab/makefile.mk
-+++ connectivity/source/drivers/evoab/makefile.mk
-@@ -32,6 +32,11 @@ TARGET=evoab
- 
- VISIBILITY_HIDDEN=TRUE
- 
-+.IF "$(ENABLE_EVOAB2)"=="TRUE"
-+dummy:
-+    @echo "Evolution 1.x Addressbook build disabled in favour of Evolution 2.x Addressbook"
-+.ELSE
-+
- # --- Settings ----------------------------------
- .IF "$(DBGUTIL_OJ)"!=""
- ENVCFLAGS+=/FR$(SLO)$/
-@@ -100,5 +105,6 @@ DEF1NAME=	$(SHL1TARGET)
- dummy:
-     @echo "Nothing to build for GUI $(GUI)"
- .ENDIF
-+.ENDIF
- # --- Targets ----------------------------------
- .INCLUDE : $(PRJ)$/target.pmk
--- 
-1.7.0.1
-