Date: Wednesday, May 31, 2017 @ 08:30:19
Author: foutrelis
Revision: 296893
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
libgda/repos/staging-i686/PKGBUILD
(from rev 296892, libgda/trunk/PKGBUILD)
libgda/repos/staging-i686/java.patch
(from rev 296892, libgda/trunk/java.patch)
libgda/repos/staging-x86_64/PKGBUILD
(from rev 296892, libgda/trunk/PKGBUILD)
libgda/repos/staging-x86_64/java.patch
(from rev 296892, libgda/trunk/java.patch)
Deleted:
libgda/repos/staging-i686/PKGBUILD
libgda/repos/staging-i686/java.patch
libgda/repos/staging-x86_64/PKGBUILD
libgda/repos/staging-x86_64/java.patch
---------------------------+
/PKGBUILD | 216 ++++++++++++++++++++++++++++++++++++++++++++
/java.patch | 72 ++++++++++++++
staging-i686/PKGBUILD | 108 ----------------------
staging-i686/java.patch | 36 -------
staging-x86_64/PKGBUILD | 108 ----------------------
staging-x86_64/java.patch | 36 -------
6 files changed, 288 insertions(+), 288 deletions(-)
Deleted: staging-i686/PKGBUILD
===================================================================
--- staging-i686/PKGBUILD 2017-05-31 08:30:08 UTC (rev 296892)
+++ staging-i686/PKGBUILD 2017-05-31 08:30:19 UTC (rev 296893)
@@ -1,108 +0,0 @@
-# $Id$
-# Contributor: tobias <tob...@archlinux.org>
-# Contributor: Tobias Kieslich <tob...@justdreams.de>
-
-pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres})
-pkgver=5.2.4
-pkgrel=7
-pkgdesc="Database access library"
-url="http://www.gnome-db.org/";
-arch=(i686 x86_64)
-license=(GPL)
-depends=(gtksourceview3 libxslt python2 libsecret graphviz goocanvas iso-codes)
-makedepends=(glade libmariadb postgresql-libs libfbclient jdk8-openjdk intltool
- gobject-introspection gtk-doc vala itstool gnome-common git)
-_commit=2ea3179bad2e414ff6068db2249116eb6e2564a5 # tags/LIBGDA_5_2_4^0
-source=("git+https://git.gnome.org/browse/libgda#commit=$_commit";
- java.patch)
-sha256sums=('SKIP'
- 'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22')
-
-_apiver=5.0
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^LIBGDA_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
- mkdir providers
-
- cd $pkgname
-
- patch -Np1 -i ../java.patch
- javac getsp.java
-
- find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
- --with-bdb=/usr --with-bdb-libdir-name=lib \
- --enable-json --enable-system-sqlite --enable-binreloc \
- --enable-gda-gi --enable-gdaui-gi \
- --enable-vala --enable-gdaui-vala VALA_API_VERSION=0.36 \
- --enable-gtk-doc --disable-crypto
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package_libgda() {
- optdepends=('libgda-firebird: provider for Firebird'
- 'libgda-jdbc: provider for JDBC'
- 'libgda-mysql: provider for MySQL'
- 'libgda-postgres: provider for PostgreSQL')
- options+=(emptydirs)
-
- cd $pkgname
- make DESTDIR="$pkgdir" install
-
- for _provider in firebird jdbc mysql postgres; do
- mv "$pkgdir"/usr/lib/libgda-$_apiver/providers/libgda-${_provider}[-.]*so \
- "$pkgdir"/usr/lib/pkgconfig/libgda-${_provider}-${_apiver}.pc \
- "$pkgdir"/usr/share/libgda-$_apiver/${_provider}_specs_*.xml \
- "$srcdir/providers"
- done
-
- mv "$pkgdir"/usr/lib/libgda-$_apiver/providers/gdaprovider-${_apiver}.jar \
- "$pkgdir"/usr/bin/gda-list-jdbc-providers-${_apiver} \
- "$srcdir/providers"
-}
-
-_packageprovider() {
- install -d "$pkgdir"/usr/lib/{pkgconfig,libgda-$_apiver/providers} \
- "$pkgdir"/usr/share/libgda-$_apiver
- mv providers/libgda-${1}[-.]*so "$pkgdir/usr/lib/libgda-$_apiver/providers"
- mv providers/libgda-${1}-5.0.pc "$pkgdir/usr/lib/pkgconfig"
- mv providers/${1}_specs_*.xml "$pkgdir/usr/share/libgda-$_apiver"
-}
-
-package_libgda-firebird() {
- pkgdesc="libgda provider for Firebird"
- depends=(libgda libfbclient)
- _packageprovider firebird
-}
-
-package_libgda-jdbc() {
- pkgdesc="libgda provider for JDBC"
- depends=(libgda java-environment)
- _packageprovider jdbc
- install -d "$pkgdir/usr/bin"
- mv providers/gda-list-jdbc-providers-${_apiver} "$pkgdir/usr/bin"
- mv providers/gdaprovider-${_apiver}.jar
"$pkgdir/usr/lib/libgda-$_apiver/providers"
-}
-
-package_libgda-mysql() {
- pkgdesc="libgda provider for MySQL"
- depends=(libgda libmariadb)
- _packageprovider mysql
-}
-
-package_libgda-postgres() {
- pkgdesc="libgda provider for PostgreSQL"
- depends=(libgda postgresql-libs)
- _packageprovider postgres
-}
Copied: libgda/repos/staging-i686/PKGBUILD (from rev 296892,
libgda/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2017-05-31 08:30:19 UTC (rev 296893)
@@ -0,0 +1,108 @@
+# $Id$
+# Contributor: tobias <tob...@archlinux.org>
+# Contributor: Tobias Kieslich <tob...@justdreams.de>
+
+pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres})
+pkgver=5.2.4
+pkgrel=8
+pkgdesc="Database access library"
+url="http://www.gnome-db.org/";
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gtksourceview3 libxslt python2 libsecret graphviz goocanvas iso-codes)
+makedepends=(glade libmariadb postgresql-libs libfbclient jdk8-openjdk intltool
+ gobject-introspection gtk-doc vala itstool gnome-common git)
+_commit=2ea3179bad2e414ff6068db2249116eb6e2564a5 # tags/LIBGDA_5_2_4^0
+source=("git+https://git.gnome.org/browse/libgda#commit=$_commit";
+ java.patch)
+sha256sums=('SKIP'
+ 'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22')
+
+_apiver=5.0
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^LIBGDA_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+ mkdir providers
+
+ cd $pkgname
+
+ patch -Np1 -i ../java.patch
+ javac getsp.java
+
+ find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
+ --with-bdb=/usr --with-bdb-libdir-name=lib \
+ --enable-json --enable-system-sqlite --enable-binreloc \
+ --enable-gda-gi --enable-gdaui-gi \
+ --enable-vala --enable-gdaui-vala VALA_API_VERSION=0.36 \
+ --enable-gtk-doc --disable-crypto
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package_libgda() {
+ optdepends=('libgda-firebird: provider for Firebird'
+ 'libgda-jdbc: provider for JDBC'
+ 'libgda-mysql: provider for MySQL'
+ 'libgda-postgres: provider for PostgreSQL')
+ options+=(emptydirs)
+
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+
+ for _provider in firebird jdbc mysql postgres; do
+ mv "$pkgdir"/usr/lib/libgda-$_apiver/providers/libgda-${_provider}[-.]*so \
+ "$pkgdir"/usr/lib/pkgconfig/libgda-${_provider}-${_apiver}.pc \
+ "$pkgdir"/usr/share/libgda-$_apiver/${_provider}_specs_*.xml \
+ "$srcdir/providers"
+ done
+
+ mv "$pkgdir"/usr/lib/libgda-$_apiver/providers/gdaprovider-${_apiver}.jar \
+ "$pkgdir"/usr/bin/gda-list-jdbc-providers-${_apiver} \
+ "$srcdir/providers"
+}
+
+_packageprovider() {
+ install -d "$pkgdir"/usr/lib/{pkgconfig,libgda-$_apiver/providers} \
+ "$pkgdir"/usr/share/libgda-$_apiver
+ mv providers/libgda-${1}[-.]*so "$pkgdir/usr/lib/libgda-$_apiver/providers"
+ mv providers/libgda-${1}-5.0.pc "$pkgdir/usr/lib/pkgconfig"
+ mv providers/${1}_specs_*.xml "$pkgdir/usr/share/libgda-$_apiver"
+}
+
+package_libgda-firebird() {
+ pkgdesc="libgda provider for Firebird"
+ depends=(libgda libfbclient)
+ _packageprovider firebird
+}
+
+package_libgda-jdbc() {
+ pkgdesc="libgda provider for JDBC"
+ depends=(libgda java-environment)
+ _packageprovider jdbc
+ install -d "$pkgdir/usr/bin"
+ mv providers/gda-list-jdbc-providers-${_apiver} "$pkgdir/usr/bin"
+ mv providers/gdaprovider-${_apiver}.jar
"$pkgdir/usr/lib/libgda-$_apiver/providers"
+}
+
+package_libgda-mysql() {
+ pkgdesc="libgda provider for MySQL"
+ depends=(libgda libmariadb)
+ _packageprovider mysql
+}
+
+package_libgda-postgres() {
+ pkgdesc="libgda provider for PostgreSQL"
+ depends=(libgda postgresql-libs)
+ _packageprovider postgres
+}
Deleted: staging-i686/java.patch
===================================================================
--- staging-i686/java.patch 2017-05-31 08:30:08 UTC (rev 296892)
+++ staging-i686/java.patch 2017-05-31 08:30:19 UTC (rev 296893)
@@ -1,36 +0,0 @@
-diff -u -r libgda-5.2.4/getsp.java libgda-5.2.4-java/getsp.java
---- libgda-5.2.4/getsp.java 2014-02-05 21:28:20.000000000 +0100
-+++ libgda-5.2.4-java/getsp.java 2015-06-14 20:27:35.770310228 +0200
-@@ -25,7 +25,7 @@
- while (i<=j) {
- if (i==j || lp.charAt(i)==ps) {
- String lib=lp.substring(k,i);
-- String
suffix="/lib/amd64/server";
-+ String
suffix="/lib/"+System.getProperty("os.arch")+"/server";
- k=i+1;
- if (lib.compareTo(".")!=0)
-
r=(r==null)?(prefix+lib+suffix):(r+" "+prefix+lib+suffix);
-@@ -50,7 +50,7 @@
-
- if (r!=null) System.out.println(r);
- } else if (args[0].compareTo("-ldpath")==0) {
-- String
lp1=System.getProperty("java.home")+"/lib/amd64/server";
-+ String
lp1=System.getProperty("java.home")+"/lib/"+System.getProperty("os.arch")+"/server";
- String
lp2=System.getProperty("java.library.path");
- System.out.println(lp1+":"+lp2);
- }
-diff -u -r libgda-5.2.4/m4/java.m4 libgda-5.2.4-java/m4/java.m4
---- libgda-5.2.4/m4/java.m4 2015-06-13 10:36:25.000000000 +0200
-+++ libgda-5.2.4-java/m4/java.m4 2015-06-14 20:16:59.865581930 +0200
-@@ -175,6 +175,11 @@
- JTYPE="Sun JRE 1.7"
- JFLAGS="-Xlint:unchecked -Xlint:deprecation"
- ;;
-+ JRE1.8.*)
-+ try_java=true
-+ JTYPE="Sun JRE 1.8"
-+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
-+ ;;
- JREgcj-4*)
- try_java=true
- JTYPE="GCJ"
Copied: libgda/repos/staging-i686/java.patch (from rev 296892,
libgda/trunk/java.patch)
===================================================================
--- staging-i686/java.patch (rev 0)
+++ staging-i686/java.patch 2017-05-31 08:30:19 UTC (rev 296893)
@@ -0,0 +1,36 @@
+diff -u -r libgda-5.2.4/getsp.java libgda-5.2.4-java/getsp.java
+--- libgda-5.2.4/getsp.java 2014-02-05 21:28:20.000000000 +0100
++++ libgda-5.2.4-java/getsp.java 2015-06-14 20:27:35.770310228 +0200
+@@ -25,7 +25,7 @@
+ while (i<=j) {
+ if (i==j || lp.charAt(i)==ps) {
+ String lib=lp.substring(k,i);
+- String
suffix="/lib/amd64/server";
++ String
suffix="/lib/"+System.getProperty("os.arch")+"/server";
+ k=i+1;
+ if (lib.compareTo(".")!=0)
+
r=(r==null)?(prefix+lib+suffix):(r+" "+prefix+lib+suffix);
+@@ -50,7 +50,7 @@
+
+ if (r!=null) System.out.println(r);
+ } else if (args[0].compareTo("-ldpath")==0) {
+- String
lp1=System.getProperty("java.home")+"/lib/amd64/server";
++ String
lp1=System.getProperty("java.home")+"/lib/"+System.getProperty("os.arch")+"/server";
+ String
lp2=System.getProperty("java.library.path");
+ System.out.println(lp1+":"+lp2);
+ }
+diff -u -r libgda-5.2.4/m4/java.m4 libgda-5.2.4-java/m4/java.m4
+--- libgda-5.2.4/m4/java.m4 2015-06-13 10:36:25.000000000 +0200
++++ libgda-5.2.4-java/m4/java.m4 2015-06-14 20:16:59.865581930 +0200
+@@ -175,6 +175,11 @@
+ JTYPE="Sun JRE 1.7"
+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
+ ;;
++ JRE1.8.*)
++ try_java=true
++ JTYPE="Sun JRE 1.8"
++ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
++ ;;
+ JREgcj-4*)
+ try_java=true
+ JTYPE="GCJ"
Deleted: staging-x86_64/PKGBUILD
===================================================================
--- staging-x86_64/PKGBUILD 2017-05-31 08:30:08 UTC (rev 296892)
+++ staging-x86_64/PKGBUILD 2017-05-31 08:30:19 UTC (rev 296893)
@@ -1,108 +0,0 @@
-# $Id$
-# Contributor: tobias <tob...@archlinux.org>
-# Contributor: Tobias Kieslich <tob...@justdreams.de>
-
-pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres})
-pkgver=5.2.4
-pkgrel=7
-pkgdesc="Database access library"
-url="http://www.gnome-db.org/";
-arch=(i686 x86_64)
-license=(GPL)
-depends=(gtksourceview3 libxslt python2 libsecret graphviz goocanvas iso-codes)
-makedepends=(glade libmariadb postgresql-libs libfbclient jdk8-openjdk intltool
- gobject-introspection gtk-doc vala itstool gnome-common git)
-_commit=2ea3179bad2e414ff6068db2249116eb6e2564a5 # tags/LIBGDA_5_2_4^0
-source=("git+https://git.gnome.org/browse/libgda#commit=$_commit";
- java.patch)
-sha256sums=('SKIP'
- 'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22')
-
-_apiver=5.0
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^LIBGDA_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
- mkdir providers
-
- cd $pkgname
-
- patch -Np1 -i ../java.patch
- javac getsp.java
-
- find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
-
- NOCONFIGURE=1 ./autogen.sh
-}
-
-build() {
- cd $pkgname
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
- --with-bdb=/usr --with-bdb-libdir-name=lib \
- --enable-json --enable-system-sqlite --enable-binreloc \
- --enable-gda-gi --enable-gdaui-gi \
- --enable-vala --enable-gdaui-vala VALA_API_VERSION=0.36 \
- --enable-gtk-doc --disable-crypto
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package_libgda() {
- optdepends=('libgda-firebird: provider for Firebird'
- 'libgda-jdbc: provider for JDBC'
- 'libgda-mysql: provider for MySQL'
- 'libgda-postgres: provider for PostgreSQL')
- options+=(emptydirs)
-
- cd $pkgname
- make DESTDIR="$pkgdir" install
-
- for _provider in firebird jdbc mysql postgres; do
- mv "$pkgdir"/usr/lib/libgda-$_apiver/providers/libgda-${_provider}[-.]*so \
- "$pkgdir"/usr/lib/pkgconfig/libgda-${_provider}-${_apiver}.pc \
- "$pkgdir"/usr/share/libgda-$_apiver/${_provider}_specs_*.xml \
- "$srcdir/providers"
- done
-
- mv "$pkgdir"/usr/lib/libgda-$_apiver/providers/gdaprovider-${_apiver}.jar \
- "$pkgdir"/usr/bin/gda-list-jdbc-providers-${_apiver} \
- "$srcdir/providers"
-}
-
-_packageprovider() {
- install -d "$pkgdir"/usr/lib/{pkgconfig,libgda-$_apiver/providers} \
- "$pkgdir"/usr/share/libgda-$_apiver
- mv providers/libgda-${1}[-.]*so "$pkgdir/usr/lib/libgda-$_apiver/providers"
- mv providers/libgda-${1}-5.0.pc "$pkgdir/usr/lib/pkgconfig"
- mv providers/${1}_specs_*.xml "$pkgdir/usr/share/libgda-$_apiver"
-}
-
-package_libgda-firebird() {
- pkgdesc="libgda provider for Firebird"
- depends=(libgda libfbclient)
- _packageprovider firebird
-}
-
-package_libgda-jdbc() {
- pkgdesc="libgda provider for JDBC"
- depends=(libgda java-environment)
- _packageprovider jdbc
- install -d "$pkgdir/usr/bin"
- mv providers/gda-list-jdbc-providers-${_apiver} "$pkgdir/usr/bin"
- mv providers/gdaprovider-${_apiver}.jar
"$pkgdir/usr/lib/libgda-$_apiver/providers"
-}
-
-package_libgda-mysql() {
- pkgdesc="libgda provider for MySQL"
- depends=(libgda libmariadb)
- _packageprovider mysql
-}
-
-package_libgda-postgres() {
- pkgdesc="libgda provider for PostgreSQL"
- depends=(libgda postgresql-libs)
- _packageprovider postgres
-}
Copied: libgda/repos/staging-x86_64/PKGBUILD (from rev 296892,
libgda/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2017-05-31 08:30:19 UTC (rev 296893)
@@ -0,0 +1,108 @@
+# $Id$
+# Contributor: tobias <tob...@archlinux.org>
+# Contributor: Tobias Kieslich <tob...@justdreams.de>
+
+pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres})
+pkgver=5.2.4
+pkgrel=8
+pkgdesc="Database access library"
+url="http://www.gnome-db.org/";
+arch=(i686 x86_64)
+license=(GPL)
+depends=(gtksourceview3 libxslt python2 libsecret graphviz goocanvas iso-codes)
+makedepends=(glade libmariadb postgresql-libs libfbclient jdk8-openjdk intltool
+ gobject-introspection gtk-doc vala itstool gnome-common git)
+_commit=2ea3179bad2e414ff6068db2249116eb6e2564a5 # tags/LIBGDA_5_2_4^0
+source=("git+https://git.gnome.org/browse/libgda#commit=$_commit";
+ java.patch)
+sha256sums=('SKIP'
+ 'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22')
+
+_apiver=5.0
+
+pkgver() {
+ cd $pkgname
+ git describe --tags | sed 's/^LIBGDA_//;s/_/./g;s/-/+/g'
+}
+
+prepare() {
+ mkdir providers
+
+ cd $pkgname
+
+ patch -Np1 -i ../java.patch
+ javac getsp.java
+
+ find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
+
+ NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+ cd $pkgname
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
+ --with-bdb=/usr --with-bdb-libdir-name=lib \
+ --enable-json --enable-system-sqlite --enable-binreloc \
+ --enable-gda-gi --enable-gdaui-gi \
+ --enable-vala --enable-gdaui-vala VALA_API_VERSION=0.36 \
+ --enable-gtk-doc --disable-crypto
+ sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+ make
+}
+
+package_libgda() {
+ optdepends=('libgda-firebird: provider for Firebird'
+ 'libgda-jdbc: provider for JDBC'
+ 'libgda-mysql: provider for MySQL'
+ 'libgda-postgres: provider for PostgreSQL')
+ options+=(emptydirs)
+
+ cd $pkgname
+ make DESTDIR="$pkgdir" install
+
+ for _provider in firebird jdbc mysql postgres; do
+ mv "$pkgdir"/usr/lib/libgda-$_apiver/providers/libgda-${_provider}[-.]*so \
+ "$pkgdir"/usr/lib/pkgconfig/libgda-${_provider}-${_apiver}.pc \
+ "$pkgdir"/usr/share/libgda-$_apiver/${_provider}_specs_*.xml \
+ "$srcdir/providers"
+ done
+
+ mv "$pkgdir"/usr/lib/libgda-$_apiver/providers/gdaprovider-${_apiver}.jar \
+ "$pkgdir"/usr/bin/gda-list-jdbc-providers-${_apiver} \
+ "$srcdir/providers"
+}
+
+_packageprovider() {
+ install -d "$pkgdir"/usr/lib/{pkgconfig,libgda-$_apiver/providers} \
+ "$pkgdir"/usr/share/libgda-$_apiver
+ mv providers/libgda-${1}[-.]*so "$pkgdir/usr/lib/libgda-$_apiver/providers"
+ mv providers/libgda-${1}-5.0.pc "$pkgdir/usr/lib/pkgconfig"
+ mv providers/${1}_specs_*.xml "$pkgdir/usr/share/libgda-$_apiver"
+}
+
+package_libgda-firebird() {
+ pkgdesc="libgda provider for Firebird"
+ depends=(libgda libfbclient)
+ _packageprovider firebird
+}
+
+package_libgda-jdbc() {
+ pkgdesc="libgda provider for JDBC"
+ depends=(libgda java-environment)
+ _packageprovider jdbc
+ install -d "$pkgdir/usr/bin"
+ mv providers/gda-list-jdbc-providers-${_apiver} "$pkgdir/usr/bin"
+ mv providers/gdaprovider-${_apiver}.jar
"$pkgdir/usr/lib/libgda-$_apiver/providers"
+}
+
+package_libgda-mysql() {
+ pkgdesc="libgda provider for MySQL"
+ depends=(libgda libmariadb)
+ _packageprovider mysql
+}
+
+package_libgda-postgres() {
+ pkgdesc="libgda provider for PostgreSQL"
+ depends=(libgda postgresql-libs)
+ _packageprovider postgres
+}
Deleted: staging-x86_64/java.patch
===================================================================
--- staging-x86_64/java.patch 2017-05-31 08:30:08 UTC (rev 296892)
+++ staging-x86_64/java.patch 2017-05-31 08:30:19 UTC (rev 296893)
@@ -1,36 +0,0 @@
-diff -u -r libgda-5.2.4/getsp.java libgda-5.2.4-java/getsp.java
---- libgda-5.2.4/getsp.java 2014-02-05 21:28:20.000000000 +0100
-+++ libgda-5.2.4-java/getsp.java 2015-06-14 20:27:35.770310228 +0200
-@@ -25,7 +25,7 @@
- while (i<=j) {
- if (i==j || lp.charAt(i)==ps) {
- String lib=lp.substring(k,i);
-- String
suffix="/lib/amd64/server";
-+ String
suffix="/lib/"+System.getProperty("os.arch")+"/server";
- k=i+1;
- if (lib.compareTo(".")!=0)
-
r=(r==null)?(prefix+lib+suffix):(r+" "+prefix+lib+suffix);
-@@ -50,7 +50,7 @@
-
- if (r!=null) System.out.println(r);
- } else if (args[0].compareTo("-ldpath")==0) {
-- String
lp1=System.getProperty("java.home")+"/lib/amd64/server";
-+ String
lp1=System.getProperty("java.home")+"/lib/"+System.getProperty("os.arch")+"/server";
- String
lp2=System.getProperty("java.library.path");
- System.out.println(lp1+":"+lp2);
- }
-diff -u -r libgda-5.2.4/m4/java.m4 libgda-5.2.4-java/m4/java.m4
---- libgda-5.2.4/m4/java.m4 2015-06-13 10:36:25.000000000 +0200
-+++ libgda-5.2.4-java/m4/java.m4 2015-06-14 20:16:59.865581930 +0200
-@@ -175,6 +175,11 @@
- JTYPE="Sun JRE 1.7"
- JFLAGS="-Xlint:unchecked -Xlint:deprecation"
- ;;
-+ JRE1.8.*)
-+ try_java=true
-+ JTYPE="Sun JRE 1.8"
-+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
-+ ;;
- JREgcj-4*)
- try_java=true
- JTYPE="GCJ"
Copied: libgda/repos/staging-x86_64/java.patch (from rev 296892,
libgda/trunk/java.patch)
===================================================================
--- staging-x86_64/java.patch (rev 0)
+++ staging-x86_64/java.patch 2017-05-31 08:30:19 UTC (rev 296893)
@@ -0,0 +1,36 @@
+diff -u -r libgda-5.2.4/getsp.java libgda-5.2.4-java/getsp.java
+--- libgda-5.2.4/getsp.java 2014-02-05 21:28:20.000000000 +0100
++++ libgda-5.2.4-java/getsp.java 2015-06-14 20:27:35.770310228 +0200
+@@ -25,7 +25,7 @@
+ while (i<=j) {
+ if (i==j || lp.charAt(i)==ps) {
+ String lib=lp.substring(k,i);
+- String
suffix="/lib/amd64/server";
++ String
suffix="/lib/"+System.getProperty("os.arch")+"/server";
+ k=i+1;
+ if (lib.compareTo(".")!=0)
+
r=(r==null)?(prefix+lib+suffix):(r+" "+prefix+lib+suffix);
+@@ -50,7 +50,7 @@
+
+ if (r!=null) System.out.println(r);
+ } else if (args[0].compareTo("-ldpath")==0) {
+- String
lp1=System.getProperty("java.home")+"/lib/amd64/server";
++ String
lp1=System.getProperty("java.home")+"/lib/"+System.getProperty("os.arch")+"/server";
+ String
lp2=System.getProperty("java.library.path");
+ System.out.println(lp1+":"+lp2);
+ }
+diff -u -r libgda-5.2.4/m4/java.m4 libgda-5.2.4-java/m4/java.m4
+--- libgda-5.2.4/m4/java.m4 2015-06-13 10:36:25.000000000 +0200
++++ libgda-5.2.4-java/m4/java.m4 2015-06-14 20:16:59.865581930 +0200
+@@ -175,6 +175,11 @@
+ JTYPE="Sun JRE 1.7"
+ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
+ ;;
++ JRE1.8.*)
++ try_java=true
++ JTYPE="Sun JRE 1.8"
++ JFLAGS="-Xlint:unchecked -Xlint:deprecation"
++ ;;
+ JREgcj-4*)
+ try_java=true
+ JTYPE="GCJ"
