[PATCH] do not patch extensions sources if they are disabled
Petr Mladek
pmladek at suse.cz
Wed Aug 18 02:28:24 PDT 2010
* patches/dev300/framework-extra-job-config.diff: always used
* patches/dev300/framework-extra-job-config-sdext.diff: used with --enable-extensions
* patches/dev300/redirect-extensions.diff: always used
* patches/dev300/redirect-extensions-reportbuilder.diff: used with --enable-extensions
* patches/dev300/apply: mention the new diffs under [ ExtensionFixes ]
---
patches/dev300/apply | 10 +++++++---
.../dev300/framework-extra-job-config-sdext.diff | 14 ++++++++++++++
patches/dev300/framework-extra-job-config.diff | 14 --------------
.../dev300/redirect-extensions-reportbuilder.diff | 11 +++++++++++
patches/dev300/redirect-extensions.diff | 11 -----------
5 files changed, 32 insertions(+), 28 deletions(-)
create mode 100644 patches/dev300/framework-extra-job-config-sdext.diff
create mode 100644 patches/dev300/redirect-extensions-reportbuilder.diff
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 7cc7fb8..76f16ae 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -371,6 +371,7 @@ offapi-typecheck-whitelist.diff, thorsten
redirect-extensions.diff
[ ExtensionFixes ]
+redirect-extensions-reportbuilder.diff
reportdesigner-no-license.diff
presenterscreen-no-license.diff
presentation-minimizer-no-license.diff
@@ -3198,13 +3199,16 @@ ppt-customshape-shading-fix.diff, i#102797, thorsten
# fix saving tempfiles when locking is not supported
unotools-tempfile-nonlocking.diff, n#560877, i#107511, jholesov
-# fix framework to no longer pull presenter screen for all apps
-framework-extra-job-config.diff, i#107568, thorsten
-
# make dlopen-ed libs to use the global namespace for symbol
# resolution
dlopen-global-symbols.diff, thorsten
+# fix framework to no longer pull presenter screen for all apps
+framework-extra-job-config.diff, i#107568, thorsten
+
+[ ExtensionFixes ]
+framework-extra-job-config-sdext.diff, i#107568, thorsten
+
[ BuildBits ]
# build the extra extensions when enabled
postprocess-extra-extensions.diff, i#123456, pmladek
diff --git a/patches/dev300/framework-extra-job-config-sdext.diff b/patches/dev300/framework-extra-job-config-sdext.diff
new file mode 100644
index 0000000..f5d700e
--- /dev/null
+++ b/patches/dev300/framework-extra-job-config-sdext.diff
@@ -0,0 +1,14 @@
+diff --git sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
+index ba74332..1241a72 100644
+--- sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
++++ sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
+@@ -5,6 +5,9 @@
+ <prop oor:name="Service">
+ <value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value>
+ </prop>
++ <prop oor:name="Context">
++ <value>com.sun.star.presentation.PresentationDocument</value>
++ </prop>
+ </node>
+ </node>
+ <node oor:name="Events">
diff --git a/patches/dev300/framework-extra-job-config.diff b/patches/dev300/framework-extra-job-config.diff
index d26784b..96ca965 100644
--- a/patches/dev300/framework-extra-job-config.diff
+++ b/patches/dev300/framework-extra-job-config.diff
@@ -335,20 +335,6 @@ index a9b4cdc..d270fae 100644
<group oor:name="Arguments" oor:extensible="true">
<info>
<desc>Can be filled with any argument, which is under control of the job component.</desc>
-diff --git sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
-index ba74332..1241a72 100644
---- sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
-+++ sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
-@@ -5,6 +5,9 @@
- <prop oor:name="Service">
- <value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value>
- </prop>
-+ <prop oor:name="Context">
-+ <value>com.sun.star.presentation.PresentationDocument</value>
-+ </prop>
- </node>
- </node>
- <node oor:name="Events">
--
1.7.0.1
diff --git a/patches/dev300/redirect-extensions-reportbuilder.diff b/patches/dev300/redirect-extensions-reportbuilder.diff
new file mode 100644
index 0000000..bfe297d
--- /dev/null
+++ b/patches/dev300/redirect-extensions-reportbuilder.diff
@@ -0,0 +1,11 @@
+--- reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs.old 2010-07-22 13:08:24.000000000 +0200
++++ reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs 2010-07-29 14:58:55.000000000 +0200
+@@ -52,7 +52,7 @@
+ <author>LLA</author>
+ <desc>Direct download URL to the Oracle(tm) Report Builder extension.</desc>
+ </info>
+- <value>http://extensions.services.openoffice.org</value>
++ <value>http://extensions.go-oo.org</value>
+ </prop>
+ <prop oor:name="Name" oor:type="xs:string">
+ <info>
diff --git a/patches/dev300/redirect-extensions.diff b/patches/dev300/redirect-extensions.diff
index bc4bcc1..f3f7430 100644
--- a/patches/dev300/redirect-extensions.diff
+++ b/patches/dev300/redirect-extensions.diff
@@ -159,17 +159,6 @@
</prop>
</node>
</oor:component-data>
---- reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs.old 2010-07-22 13:08:24.000000000 +0200
-+++ reportbuilder/registry/schema/org/openoffice/Office/ReportDesign.xcs 2010-07-29 14:58:55.000000000 +0200
-@@ -52,7 +52,7 @@
- <author>LLA</author>
- <desc>Direct download URL to the Oracle(tm) Report Builder extension.</desc>
- </info>
-- <value>http://extensions.services.openoffice.org</value>
-+ <value>http://extensions.go-oo.org</value>
- </prop>
- <prop oor:name="Name" oor:type="xs:string">
- <info>
--- svtools/source/contnr/templwin.cxx.old 2010-07-22 13:49:22.000000000 +0200
+++ svtools/source/contnr/templwin.cxx 2010-07-29 14:58:55.000000000 +0200
@@ -1745,7 +1745,7 @@ void SvtDocumentTemplateDialog::InitImpl
--
1.7.2.1.544.ga752d.dirty
--HlL+5n6rz5pIUxbD--
More information about the ooo-build
mailing list