From e2fe00eba3a293311451a4b1f96eaa0fd3bab61b Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Thu, 12 Jul 2012 13:29:17 +0200
Subject: fdo#51278 make reportbuilder work again

squash of three master branch commits:
 - fix oxt manifest
 - fix jar manifest
 - bump version to force update of package cache
---
 reportbuilder/Extension_reportbuilder.mk |  1 +
 reportbuilder/Jar_reportbuilder.mk       | 38 ++++++++++++++++++++++++++++++--
 reportbuilder/util/description.xml       |  2 +-
 reportbuilder/util/manifest.mf           |  2 ++
 reportbuilder/util/manifest.xml          | 31 ++++++++++++++++++++++++++
 5 files changed, 71 insertions(+), 3 deletions(-)
 create mode 100644 reportbuilder/util/manifest.mf

diff --git a/reportbuilder/Extension_reportbuilder.mk b/reportbuilder/Extension_reportbuilder.mk
index 22cd0fb0cc87..649a961bfc77 100644
--- a/reportbuilder/Extension_reportbuilder.mk
+++ b/reportbuilder/Extension_reportbuilder.mk
@@ -77,6 +77,7 @@ $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice
 ))
 
 $(eval $(call gb_Extension_add_files,report-builder,registry/data/org/openoffice/Office/UI,\
+	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/Controller.xcu) \
 	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu) \
 	$(call gb_XcuDataTarget_get_target,reportbuilder/registry/data/org/openoffice/Office/UI/ReportCommands.xcu) \
 ))
diff --git a/reportbuilder/Jar_reportbuilder.mk b/reportbuilder/Jar_reportbuilder.mk
index c74397fc190c..1f7159de153c 100644
--- a/reportbuilder/Jar_reportbuilder.mk
+++ b/reportbuilder/Jar_reportbuilder.mk
@@ -25,8 +25,6 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-# TODO: fix manifest
-
 $(eval $(call gb_Jar_Jar,sun-report-builder))
 
 $(eval $(call gb_Jar_use_jars,sun-report-builder,\
@@ -52,6 +50,42 @@ $(eval $(call gb_Jar_use_externals,sun-report-builder,\
 	sac \
 ))
 
+$(eval $(call gb_Jar_set_jarclasspath,sun-report-builder,\
+	$(if $(filter YES,$(SYSTEM_APACHE_COMMONS)),\
+		$(call gb_Helper_make_url,$(COMMONS_LOGGING_JAR)),\
+		commons-logging-1.1.1.jar \
+	) \
+	$(if $(filter YES,$(SYSTEM_JFREEREPORT)),\
+		$(foreach jar,\
+			$(FLUTE_JAR) \
+			$(JFREEREPORT_JAR) \
+			$(LIBBASE_JAR) \
+			$(LIBFONTS_JAR) \
+			$(LIBFORMULA_JAR) \
+			$(LIBLAYOUT_JAR) \
+			$(LIBLOADER_JAR) \
+			$(LIBREPOSITORY_JAR) \
+			$(LIBSERIALIZER_JAR) \
+			$(LIBXML_JAR) \
+			$(SAC_JAR) \
+			,$(call gb_Helper_make_url,$(jar)) \
+		),\
+		flow-engine-0.9.4.jar \
+		flute-1.1.6.jar \
+		libbase-1.1.6.jar \
+		libfonts-1.1.6.jar \
+		libformula-1.1.7.jar \
+		liblayout-0.2.10.jar \
+		libloader-1.1.6.jar \
+		librepository-1.1.6.jar \
+		libserializer-1.1.6.jar \
+		libxml-1.1.7.jar \
+		sac.jar \
+	) \
+))
+
+$(eval $(call gb_Jar_set_manifest,sun-report-builder,$(SRCDIR)/reportbuilder/util/manifest.mf))
+
 $(eval $(call gb_Jar_set_packageroot,sun-report-builder,com))
 
 $(eval $(call gb_Jar_add_sourcefiles,sun-report-builder,\
diff --git a/reportbuilder/util/description.xml b/reportbuilder/util/description.xml
index 131793ac90a9..13e1c720aa50 100644
--- a/reportbuilder/util/description.xml
+++ b/reportbuilder/util/description.xml
@@ -5,7 +5,7 @@
   <display-name>
     <name lang="en-US">Report Builder</name>
   </display-name>
-  <version value="1.2.2"/>
+  <version value="1.2.3"/>
   <identifier value="com.sun.reportdesigner"/>
   <dependencies>
     <OpenOffice.org-minimal-version value="3.2" d:name="OpenOffice.org 3.2"/>
diff --git a/reportbuilder/util/manifest.mf b/reportbuilder/util/manifest.mf
new file mode 100644
index 000000000000..fb497ae71494
--- /dev/null
+++ b/reportbuilder/util/manifest.mf
@@ -0,0 +1,2 @@
+RegistrationClassName: com.sun.star.report.pentaho.SOReportJobFactory
+UNO-Type-Path: 
diff --git a/reportbuilder/util/manifest.xml b/reportbuilder/util/manifest.xml
index cf92064bd463..30b9f6c31a08 100644
--- a/reportbuilder/util/manifest.xml
+++ b/reportbuilder/util/manifest.xml
@@ -3,3 +3,34 @@
 <manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components"
                       manifest:full-path="components.rdb"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/Accelerators.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/DataAccess.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/Embedding.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/ExtendedColorScheme.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/Paths.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/ReportDesign.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/UI/Controller.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/UI/DbReportWindowState.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Office/UI/ReportCommands.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/Setup.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/TypeDetection/Filter.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
+                      manifest:full-path="registry/data/org/openoffice/TypeDetection/Types.xcu"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+                      manifest:full-path="registry/schema/org/openoffice/Office/ReportDesign.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+                      manifest:full-path="registry/schema/org/openoffice/Office/UI/DbReportWindowState.xcs"/>
+ <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
+                      manifest:full-path="registry/schema/org/openoffice/Office/UI/ReportCommands.xcs"/>
+</manifest:manifest>
-- 
cgit