[Libreoffice-commits] .: 5 commits - patches/dev300 patches/postgresql
René Engelhard
rene at kemper.freedesktop.org
Fri Nov 26 11:35:53 PST 2010
patches/dev300/novell-subscription.diff | 4 ++--
patches/postgresql/sdbc-postgresql-oxt.diff | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 8d12f9b93263c8eb67bea42fc2ad90c2b060be46
Merge: 2dd7b0c... c0866df...
Author: Rene Engelhard <rene at debian.org>
Date: Fri Nov 26 20:35:18 2010 +0100
Merge branch 'libreoffice-3-3'
commit c0866df2b9cd3415d3a0af556cad87631af086c9
Author: Rene Engelhard <rene at debian.org>
Date: Mon Nov 15 16:23:23 2010 +0100
remove DataAccess.xcu in PostgreSQL SDBC Driver (i#113494)
diff --git a/patches/postgresql/sdbc-postgresql.diff b/patches/postgresql/sdbc-postgresql.diff
index bdbac28..0b978e3 100644
--- a/patches/postgresql/sdbc-postgresql.diff
+++ b/patches/postgresql/sdbc-postgresql.diff
@@ -1,6 +1,5 @@
---
- .../source/drivers/postgresql/DataAccess.xcu | 16 +
- connectivity/source/drivers/postgresql/makefile.mk | 224 ++
+ connectivity/source/drivers/postgresql/makefile.mk | 214 ++
.../source/drivers/postgresql/postgresql-sdbc.uno | 2 +
.../source/drivers/postgresql/postgresql.xcu | 50 +
.../source/drivers/postgresql/pq_allocator.hxx | 225 ++
@@ -70,8 +69,7 @@
.../source/drivers/postgresql/pq_xview.hxx | 133 ++
.../source/drivers/postgresql/pq_xviews.cxx | 304 +++
.../source/drivers/postgresql/pq_xviews.hxx | 118 ++
- 71 files changed, 21690 insertions(+), 0 deletions(-)
- create mode 100644 connectivity/source/drivers/postgresql/DataAccess.xcu
+ 70 files changed, 21664 insertions(+), 0 deletions(-)
create mode 100644 connectivity/source/drivers/postgresql/makefile.mk
create mode 100644 connectivity/source/drivers/postgresql/postgresql-sdbc.uno
create mode 100644 connectivity/source/drivers/postgresql/postgresql.xcu
@@ -143,35 +141,12 @@
create mode 100644 connectivity/source/drivers/postgresql/pq_xviews.cxx
create mode 100644 connectivity/source/drivers/postgresql/pq_xviews.hxx
-diff --git connectivity/source/drivers/postgresql/DataAccess.xcu connectivity/source/drivers/postgresql/DataAccess.xcu
-new file mode 100644
-index 0000000..6553971
---- /dev/null
-+++ connectivity/source/drivers/postgresql/DataAccess.xcu
-@@ -0,0 +1,16 @@
-+<?xml version="1.0" encoding="UTF-8"?>
-+<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DataAccess" oor:package="org.openoffice.Office">
-+ <node oor:name="UserDefinedDriverSettings">
-+ <node oor:name="Postgresql Driver" oor:op="replace">
-+ <prop oor:name="DriverPageDisplayName">
-+ <value>Postgresql-SDBC Driver V PQ_SDBC_MAJOR.PQ_SDBC_MINOR.PQ_SDBC_MICRO</value>
-+ </prop>
-+ <prop oor:name="DriverTypeDisplayName">
-+ <value>postgresql</value>
-+ </prop>
-+ <prop oor:name="DriverDsnPrefix">
-+ <value>sdbc:postgresql:</value>
-+ </prop>
-+ </node>
-+ </node>
-+</oor:node>
-\ No newline at end of file
diff --git connectivity/source/drivers/postgresql/makefile.mk connectivity/source/drivers/postgresql/makefile.mk
new file mode 100644
index 0000000..1afe9c1
--- /dev/null
+++ connectivity/source/drivers/postgresql/makefile.mk
-@@ -0,0 +1,224 @@
+@@ -0,0 +1,214 @@
+#*************************************************************************
+#
+# $RCSfile: makefile.mk,v $
@@ -367,7 +342,6 @@ index 0000000..1afe9c1
+
+
+$(DLLDEST)$/$(DRIVERNAME): \
-+ $(DLLDEST)$/DataAccess.xcu \
+ $(DLLDEST)$/postgresql.xcu \
+ $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) \
+ $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST) \
@@ -377,21 +351,12 @@ index 0000000..1afe9c1
+ $(SHL1TARGET)$(DLLPOST) \
+ $(SHL2TARGET)$(DLLPOST) \
+ $(SHL1TARGET)$(INI_EXT) \
-+ DataAccess.xcu \
+ postgresql.xcu
+
+$(DLLDEST)$/postgresql.xcu : postgresql.xcu
+ -rm -f $@
+ cat postgresql.xcu > $@
+
-+$(DLLDEST)$/DataAccess.xcu : DataAccess.xcu
-+ -rm -f $@
-+ cat DataAccess.xcu | \
-+ sed s/PQ_SDBC_MAJOR/$(PQ_SDBC_MAJOR)/ | \
-+ sed s/PQ_SDBC_MINOR/$(PQ_SDBC_MINOR)/ | \
-+ sed s/PQ_SDBC_MICRO/$(PQ_SDBC_MICRO)/ > $@
-+
-+
+strip :
+.IF "$(GUI)"!="WNT"
+ strip $(DLLDEST)$/$(SHL1TARGET)$(DLLPOST) $(DLLDEST)$/$(SHL2TARGET)$(DLLPOST)
commit 2398085b8a4463a6ab41a5f1e0010f4ccc162afe
Author: Rene Engelhard <rene at debian.org>
Date: Fri Nov 26 20:29:47 2010 +0100
fix version numbers in patches/postgresql/sdbc-postgresql-oxt.diff
diff --git a/patches/postgresql/sdbc-postgresql-oxt.diff b/patches/postgresql/sdbc-postgresql-oxt.diff
index 61ca717..8aed505 100644
--- a/patches/postgresql/sdbc-postgresql-oxt.diff
+++ b/patches/postgresql/sdbc-postgresql-oxt.diff
@@ -18,13 +18,13 @@
@@ -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" />
++ <version value="0.7.6b" />
+ <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"/>
++ <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
+ </dependencies>
+ <publisher>
+ <name xlink:href="http://www.oracle.com/us/products/applications/open-office" lang="en">Oracle</name>
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 > $@
commit a485655a5103d19fcfe63a0b5a327c51e130511c
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Fri Nov 26 13:50:45 2010 +0200
Make novell-subscription.diff apply again
diff --git a/patches/dev300/novell-subscription.diff b/patches/dev300/novell-subscription.diff
index aa32292..3d05f52 100644
--- a/patches/dev300/novell-subscription.diff
+++ b/patches/dev300/novell-subscription.diff
@@ -19,7 +19,7 @@ index 175867d..2eb3879 100644
+ <value xml:lang="en-US">~Upgrade to Full Version</value>
+ </prop>
+ </node>
- <node oor:name=".uno:Credits" oor:op="replace">
+ <node oor:name=".uno:ShowCredits" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">%PRODUCTNAME Credits...</value>
@@ -5219,6 +5224,14 @@
@@ -42,7 +42,7 @@ index 9000359..69e8e4b 100644
--- sfx2/inc/sfx2/sfxsids.hrc
+++ sfx2/inc/sfx2/sfxsids.hrc
@@ -127,6 +127,11 @@
- #define SID_SHOW_CREDITS (SID_SFX_START + 1684)
+ #define SID_SHOW_CREDITS (SID_SFX_START + 1711)
#define SID_HELP_TUTORIALS (SID_SFX_START + 1695)
+// default id for subscription
More information about the Libreoffice-commits
mailing list