[arch-commits] Commit in libgda/trunk (PKGBUILD java.patch vala.patch)
Jan Steffens
heftig at archlinux.org
Sun Jun 14 19:41:49 UTC 2015
Date: Sunday, June 14, 2015 @ 21:41:48
Author: heftig
Revision: 240771
5.2.4
Added:
libgda/trunk/java.patch
libgda/trunk/vala.patch
Modified:
libgda/trunk/PKGBUILD
------------+
PKGBUILD | 111 +++++++++++++++++++++++++++++++++++++++++++++++------------
java.patch | 36 +++++++++++++++++++
vala.patch | 21 +++++++++++
3 files changed, 147 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-06-14 17:44:12 UTC (rev 240770)
+++ PKGBUILD 2015-06-14 19:41:48 UTC (rev 240771)
@@ -2,36 +2,105 @@
# Maintainer: tobias <tobias at archlinux.org>
# Contributor: Tobias Kieslich <tobias at justdreams.de>
-pkgname=libgda
-pkgver=5.2.2
+shopt -s extglob
+
+pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres})
+pkgver=5.2.4
pkgrel=1
-pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
+pkgdesc="Data access library"
arch=(i686 x86_64)
-license=('GPL')
-depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
- 'libmariadbclient' 'postgresql-libs' 'python2' 'libsecret'
- 'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
- 'iso-codes' 'openssl' 'libgcrypt' 'libldap')
-makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala' 'itstool')
-url="http://www.gnome-db.org"
-install=libgda.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4')
+license=(GPL)
+depends=(gtksourceview3 libxslt python2 libsecret graphviz goocanvas iso-codes desktop-file-utils)
+makedepends=(glade libmariadbclient postgresql-libs libfbclient jdk8-openjdk intltool
+ gobject-introspection gtk-doc vala itstool gnome-common)
+url="http://www.gnome-db.org/"
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz
+ java.patch vala.patch)
+sha256sums=('2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e'
+ 'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22'
+ '4dfee4cbd01becf52d9e46f9207882df59fc86a40ca1e39fc260b424ec74d1bd')
+_apiver=5.0
+
prepare() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py
+ mkdir providers
+
+ cd $pkgname-$pkgver
+
+ patch -Np1 -i ../java.patch
+ patch -Np1 -i ../vala.patch
+
+ find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
+
+ javac getsp.java
+ autoreconf -fvi
}
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
+ cd $pkgname-$pkgver
+ ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
--with-bdb=/usr --with-bdb-libdir-name=lib \
- --disable-static --enable-json --enable-gda-gi
+ --enable-json --enable-system-sqlite --enable-binreloc \
+ --enable-gda-gi --enable-gdaui-gi \
+ --enable-vala --enable-gdaui-vala \
+ --enable-gtk-doc
make
}
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+package_libgda() {
+ optdepends=('libgda-firebird: provider for Firebird'
+ 'libgda-jdbc: provider for JDBC'
+ 'libgda-mysql: provider for MySQL'
+ 'libgda-postgres: provider for PostgreSQL')
+ install=libgda.install
+ options+=(emptydirs)
+
+ cd $pkgname-$pkgver
+ 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 libmariadbclient)
+ _packageprovider mysql
+}
+
+package_libgda-postgres() {
+ pkgdesc="libgda provider for PostgreSQL"
+ depends=(libgda postgresql-libs)
+ _packageprovider postgres
+}
Added: java.patch
===================================================================
--- java.patch (rev 0)
+++ java.patch 2015-06-14 19:41:48 UTC (rev 240771)
@@ -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"
Added: vala.patch
===================================================================
--- vala.patch (rev 0)
+++ vala.patch 2015-06-14 19:41:48 UTC (rev 240771)
@@ -0,0 +1,21 @@
+diff -u -r libgda-5.2.4/configure.ac libgda-5.2.4-vala/configure.ac
+--- libgda-5.2.4/configure.ac 2015-06-13 11:07:23.000000000 +0200
++++ libgda-5.2.4-vala/configure.ac 2015-06-14 19:11:36.700984704 +0200
+@@ -547,13 +547,13 @@
+ vala_api="No Vala bindings will be generated"
+ if test "x$enable_vala" = "xyes"
+ then
+- AM_PROG_VALAC([0.26.0])
++ AM_PROG_VALAC([0.28.0])
+ if test "x$VALA_API_VERSION" = "x"
+ then
+- VAPIGEN_CHECK([0.26.0],[0.26],,no)
+- vala_api="0.26 (Default)"
++ VAPIGEN_CHECK([0.28.0],[0.28],,no)
++ vala_api="0.28 (Default)"
+ else
+- VAPIGEN_CHECK([0.26.0],$VALA_API_VERSION,,no)
++ VAPIGEN_CHECK([0.28.0],$VALA_API_VERSION,,no)
+ vala_api=$VALA_API_VERSION
+ fi
+ else
More information about the arch-commits
mailing list