[Libreoffice-commits] .: configure.in patches/cairo patches/dev300 patches/emf+ patches/Makefile.am patches/README
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Oct 14 12:08:58 PDT 2010
configure.in | 2 --
patches/Makefile.am | 2 +-
patches/README | 7 +------
patches/cairo/Makefile.am | 1 -
patches/cairo/default-cairo-disable.diff | 19 -------------------
patches/dev300/apply | 4 ++--
patches/dev300/debian-default-cairo-disable.diff | 19 +++++++++++++++++++
patches/emf+/Makefile.am | 1 -
8 files changed, 23 insertions(+), 32 deletions(-)
New commits:
commit f585674dcc3ca979eed9b50e203e2ef361fd38d5
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Oct 14 20:05:32 2010 +0100
cleanup misc. floating directories etc.
diff --git a/configure.in b/configure.in
index a3e7684..726b29c 100644
--- a/configure.in
+++ b/configure.in
@@ -1693,10 +1693,8 @@ extensions/Makefile
extensions/tweakconfig/Makefile
patches/apply.pl
patches/Makefile
-patches/cairo/Makefile
patches/dev300/Makefile
patches/evo2/Makefile
-patches/emf+/Makefile
patches/hotfixes/Makefile
patches/vba/Makefile
patches/mono/Makefile
diff --git a/patches/Makefile.am b/patches/Makefile.am
index fb34232..bebd5a1 100644
--- a/patches/Makefile.am
+++ b/patches/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS=64bit cairo dev300 emf+ evo2 hotfixes mono ooxml vba postgresql unittesting
+SUBDIRS=64bit dev300 evo2 hotfixes mono ooxml vba postgresql unittesting
EXTRA_DIST=README apply.pl.in $(wildcard *.diff)
diff --git a/patches/README b/patches/README
index 87e3f5b..982dc18 100644
--- a/patches/README
+++ b/patches/README
@@ -1,6 +1 @@
-These directories hold patches that we auto-apply
-to the build to fix it up before we try to build.
-
-To apply a patch set do (eg.):
-
-./apply.pl ./OOO_1_0_2 /opt/OpenOffice/OOO_1_0_2
+These directories hold vendor patches, that are in the process of being migrated into flat LibreOffice repos.
diff --git a/patches/cairo/Makefile.am b/patches/cairo/Makefile.am
deleted file mode 100644
index 0b280d2..0000000
--- a/patches/cairo/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = $(wildcard *.diff)
diff --git a/patches/cairo/default-cairo-disable.diff b/patches/cairo/default-cairo-disable.diff
deleted file mode 100644
index e5116e9..0000000
--- a/patches/cairo/default-cairo-disable.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: officecfg/registry/data/org/openoffice/VCL.xcu
-===================================================================
-RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
-retrieving revision 1.42
-diff -u -p -u -r1.42 VCL.xcu
---- officecfg/registry/data/org/openoffice/VCL.xcu 21 Jul 2005 14:22:30 -0000 1.42
-+++ officecfg/registry/data/org/openoffice/VCL.xcu 1 Sep 2005 10:29:42 -0000
-@@ -28,6 +28,11 @@
- <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
- <oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <node oor:name="Settings">
-+ <node oor:name="Canvas" oor:op="replace">
-+ <prop oor:name="PreferredServices" oor:type="xs:string" oor:op="replace">
-+ <value>com.sun.star.rendering.VCLCanvas</value>
-+ </prop>
-+ </node>
- <node oor:name="Accessibility" oor:op="replace">
- <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
- <value>false</value>
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 38d9994..aacacd1 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -4,7 +4,7 @@
# -------- Options --------
-PATCHPATH=.:../evo2:../vba:../mono:../64bit:../cairo:../gstreamer:../ooxml:../postgresql:../emf+:../unittesting:../lwp
+PATCHPATH=.:../evo2:../vba:../mono:../64bit:../gstreamer:../ooxml:../postgresql:../unittesting
# might be space separated list to support more MWS
OLDEST_SUPPORTED=ooo330-m7 ooo-build-3.2.98.0 libreoffice-3.2.99.1
@@ -539,7 +539,7 @@ SectionOwner => kohei
[ DebianBaseOnly ]
SectionOwner => rengelha
-default-cairo-disable.diff
+debian-default-cairo-disable.diff
gcj-32bit-runtime-path.diff, i#64888, mklose
# read variables from /etc/openoffice/sofficerc, since /usr/lib/openoffice/sofficerc
# just refers to it
diff --git a/patches/dev300/debian-default-cairo-disable.diff b/patches/dev300/debian-default-cairo-disable.diff
new file mode 100644
index 0000000..e5116e9
--- /dev/null
+++ b/patches/dev300/debian-default-cairo-disable.diff
@@ -0,0 +1,19 @@
+Index: officecfg/registry/data/org/openoffice/VCL.xcu
+===================================================================
+RCS file: /cvs/util/officecfg/registry/data/org/openoffice/VCL.xcu,v
+retrieving revision 1.42
+diff -u -p -u -r1.42 VCL.xcu
+--- officecfg/registry/data/org/openoffice/VCL.xcu 21 Jul 2005 14:22:30 -0000 1.42
++++ officecfg/registry/data/org/openoffice/VCL.xcu 1 Sep 2005 10:29:42 -0000
+@@ -28,6 +28,11 @@
+ <!DOCTYPE oor:component-data SYSTEM "../../../component-update.dtd">
+ <oor:component-data oor:name="VCL" oor:package="org.openoffice" xmlns:oor="http://openoffice.org/2001/registry" xmlns:install="http://openoffice.org/2004/installation" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <node oor:name="Settings">
++ <node oor:name="Canvas" oor:op="replace">
++ <prop oor:name="PreferredServices" oor:type="xs:string" oor:op="replace">
++ <value>com.sun.star.rendering.VCLCanvas</value>
++ </prop>
++ </node>
+ <node oor:name="Accessibility" oor:op="replace">
+ <prop oor:name="EnableATToolSupport" oor:type="xs:string" oor:op="replace">
+ <value>false</value>
diff --git a/patches/emf+/Makefile.am b/patches/emf+/Makefile.am
deleted file mode 100644
index 0b280d2..0000000
--- a/patches/emf+/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = $(wildcard *.diff)
More information about the Libreoffice-commits
mailing list