[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300 patches/postgresql

[Petr Mladek]

 patches/dev300/apply                        |    1 
 patches/postgresql/sdbc-postgresql-oxt.diff |   76 ++++++++++++++++++++++++++++
 2 files changed, 77 insertions(+)

New commits:
commit 3528adc6c2c8225887774a5aab7881115a7172bd
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Nov 26 19:58:44 2010 +0100

    pack postgresql driver as .oxt instead of .zip

diff --git a/patches/dev300/apply b/patches/dev300/apply
index cce9df3..329b880 100755
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1471,6 +1471,7 @@ sdbc-postgresql-build-lst.diff
 connectivity-workben-postgresql.diff
 gcc-4.3-postgresql.diff
 sdbc-postgresql-config_office.diff
+sdbc-postgresql-oxt.diff
 
 [ KDE4 ]
 # Further fixes on top of existing kde4 support
diff --git a/patches/postgresql/sdbc-postgresql-oxt.diff b/patches/postgresql/sdbc-postgresql-oxt.diff
new file mode 100644
index 0000000..61ca717
--- /dev/null
+++ b/patches/postgresql/sdbc-postgresql-oxt.diff
@@ -0,0 +1,76 @@
+--- connectivity/source/drivers/postgresql/manifest.xml.old	2010-11-26 19:01:13.000000000 +0100
++++ connectivity/source/drivers/postgresql/manifest.xml	2010-11-25 21:18:03.000000000 +0100
+@@ -0,0 +1,12 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
++<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
++  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
++                       manifest:full-path="postgresql-sdbc-impl.uno.so"/>
++  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
++                       manifest:full-path="postgresql-sdbc.uno.so"/>
++  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
++                       manifest:full-path="DataAccess.xcu"/>
++  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
++                       manifest:full-path="postgresql.xcu"/>
++</manifest:manifest>
+--- connectivity/source/drivers/postgresql/description.xml.old	2010-11-26 19:01:26.000000000 +0100
++++ connectivity/source/drivers/postgresql/description.xml	2010-11-26 18:59:36.000000000 +0100
+@@ -0,0 +1,14 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<description xmlns="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dep="http://openoffice.org/extensions/description/2006">
++    <version value="0.7.6.a" />
++    <identifier value="postgresql-sdbc" />
++    <display-name>
++        <name lang="en-US">Postgresql-SDBC Driver</name>
++    </display-name>
++    <dependencies>
++        <OpenOffice.org-minimal-version value="3.0" dep:name="OpenOffice.org 3.0"/>
++    </dependencies>
++    <publisher>
++        <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
++    </publisher>
++</description>
+--- connectivity/source/drivers/postgresql/makefile.mk.old	2010-11-19 22:21:03.000000000 +0100
++++ connectivity/source/drivers/postgresql/makefile.mk	2010-11-26 19:54:38.000000000 +0100
+@@ -176,7 +176,7 @@ SHL2VERSIONMAP=$(SOLARENV)$/src$/compone
+ SLOFILES=       $(LIB1OBJFILES) $(LIB2OBJFILES)
+ 
+ 
+-DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO).zip
++DRIVERNAME=postgresql-sdbc-$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO).oxt
+ ALLTAR : $(DLLDEST)$/$(DRIVERNAME)
+ 
+ # --- Targets ------------------------------------------------------
+@@ -191,8 +191,9 @@ INI_EXT=.ini
+ $(DLLDEST)$/$(SHL1TARGET)$(INI_EXT): $(SHL1TARGET)
+     +cp $? $@
+ 
+-
+ $(DLLDEST)$/$(DRIVERNAME): \
++        $(DLLDEST)$/META-INF$/manifest.xml \
++        $(DLLDEST)$/description.xml \
+         $(DLLDEST)$/DataAccess.xcu \
+         $(DLLDEST)$/postgresql.xcu \
+         $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
+@@ -200,12 +201,21 @@ $(DLLDEST)$/$(DRIVERNAME): \
+         $(DLLDEST)$/$(SHL1TARGET)$(INI_EXT)
+     +cd $(DLLDEST) && \
+         zip -r  $(DRIVERNAME) \
++            META-INF$/manifest.xml \
+             $(SHL1TARGET)$(DLLPOST) \
+             $(SHL2TARGET)$(DLLPOST) \
+             $(SHL1TARGET)$(INI_EXT) \
++            description.xml \
+             DataAccess.xcu \
+             postgresql.xcu
+ 
++$(DLLDEST)$/META-INF$/manifest.xml : manifest.xml
++    -mkdir -p $(DLLDEST)$/META-INF
++    +cp $? $@
++
++$(DLLDEST)$/description.xml : description.xml
++    +cp $? $@
++
+ $(DLLDEST)$/postgresql.xcu : postgresql.xcu
+     -rm -f $@
+     cat postgresql.xcu > $@