Date: Friday, January 11, 2019 @ 12:00:28 Author: heftig Revision: 343610
5.2.8+7+ga5355eb42-1 Modified: libgda/trunk/PKGBUILD Deleted: libgda/trunk/0001-Convert-files-to-Unicode.patch libgda/trunk/glib-2.54-ftbfs-2.patch libgda/trunk/glib-2.54-ftbfs.patch libgda/trunk/java.patch -------------------------------------+ 0001-Convert-files-to-Unicode.patch | 83 --------------------------- PKGBUILD | 48 +++++---------- glib-2.54-ftbfs-2.patch | 11 --- glib-2.54-ftbfs.patch | 103 ---------------------------------- java.patch | 36 ----------- 5 files changed, 16 insertions(+), 265 deletions(-) Deleted: 0001-Convert-files-to-Unicode.patch =================================================================== --- 0001-Convert-files-to-Unicode.patch 2019-01-11 10:52:20 UTC (rev 343609) +++ 0001-Convert-files-to-Unicode.patch 2019-01-11 12:00:28 UTC (rev 343610) @@ -1,83 +0,0 @@ -From b611c805b3a2248e2f4f85f993f96c13a05b4730 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <[email protected]> -Date: Mon, 17 Jul 2017 22:37:50 +0100 -Subject: Convert files to Unicode - -These header files have mixed encoding, and makes various tools choke on -them. ---- - libgda/gda-connection.h | 2 +- - libgda/sql-parser/gda-sql-statement.h | 2 +- - libgda/sql-parser/gda-statement-struct-delete.h | 2 +- - libgda/sql-parser/gda-statement-struct-unknown.h | 2 +- - libgda/sql-parser/gda-statement-struct-util.h | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libgda/gda-connection.h b/libgda/gda-connection.h -index 94d1b27b5..19ca63fc3 100644 ---- a/libgda/gda-connection.h -+++ b/libgda/gda-connection.h -@@ -6,7 +6,7 @@ - * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <[email protected]> - * Copyright (C) 2003 Filip Van Raemdonck <[email protected]> - * Copyright (C) 2004 - 2005 Alan Knowles <[email protected]> -- * Copyright (C) 2004 Jos� Mar�a Casanova Crespo <[email protected]> -+ * Copyright (C) 2004 José María Casanova Crespo <[email protected]> - * Copyright (C) 2005 - 2009 Bas Driessen <[email protected]> - * Copyright (C) 2006 - 2008 Murray Cumming <[email protected]> - * Copyright (C) 2007 Leonardo Boshell <[email protected]> -diff --git a/libgda/sql-parser/gda-sql-statement.h b/libgda/sql-parser/gda-sql-statement.h -index 0ba1f9edc..8783ca8a1 100644 ---- a/libgda/sql-parser/gda-sql-statement.h -+++ b/libgda/sql-parser/gda-sql-statement.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <[email protected]> - * Copyright (C) 2000 - 2002 Rodrigo Moya <[email protected]> -- * Copyright (C) 2001 Carlos Perell� Mar�n <[email protected]> -+ * Copyright (C) 2001 Carlos Perelló Marín <[email protected]> - * Copyright (C) 2001 - 2011 Vivien Malerba <[email protected]> - * Copyright (C) 2002 Gonzalo Paniagua Javier <[email protected]> - * Copyright (C) 2011 Murray Cumming <[email protected]> -diff --git a/libgda/sql-parser/gda-statement-struct-delete.h b/libgda/sql-parser/gda-statement-struct-delete.h -index cab8b9dad..2e51c5eae 100644 ---- a/libgda/sql-parser/gda-statement-struct-delete.h -+++ b/libgda/sql-parser/gda-statement-struct-delete.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2005 Dan Winship <[email protected]> - * Copyright (C) 2005 - 2011 Vivien Malerba <[email protected]> -- * Copyright (C) 2005 �lvaro Pe�a <[email protected]> -+ * Copyright (C) 2005 Álvaro Peña <[email protected]> - * Copyright (C) 2007 Armin Burgmeier <[email protected]> - * Copyright (C) 2007 - 2009 Murray Cumming <[email protected]> - * -diff --git a/libgda/sql-parser/gda-statement-struct-unknown.h b/libgda/sql-parser/gda-statement-struct-unknown.h -index 5c530d4d9..e0aaf945f 100644 ---- a/libgda/sql-parser/gda-statement-struct-unknown.h -+++ b/libgda/sql-parser/gda-statement-struct-unknown.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <[email protected]> - * Copyright (C) 2000 - 2002 Rodrigo Moya <[email protected]> -- * Copyright (C) 2001 Carlos Perell� Mar�n <[email protected]> -+ * Copyright (C) 2001 Carlos Perelló Marín <[email protected]> - * Copyright (C) 2001 - 2011 Vivien Malerba <[email protected]> - * Copyright (C) 2002 Gonzalo Paniagua Javier <[email protected]> - * Copyright (C) 2009 Murray Cumming <[email protected]> -diff --git a/libgda/sql-parser/gda-statement-struct-util.h b/libgda/sql-parser/gda-statement-struct-util.h -index cd4596281..252d6edcc 100644 ---- a/libgda/sql-parser/gda-statement-struct-util.h -+++ b/libgda/sql-parser/gda-statement-struct-util.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2005 Dan Winship <[email protected]> - * Copyright (C) 2005 - 2011 Vivien Malerba <[email protected]> -- * Copyright (C) 2005 �lvaro Pe�a <[email protected]> -+ * Copyright (C) 2005 Álvaro Peña <[email protected]> - * Copyright (C) 2007 - 2009 Murray Cumming <[email protected]> - * - * This library is free software; you can redistribute it and/or --- -2.11.0 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-01-11 10:52:20 UTC (rev 343609) +++ PKGBUILD 2019-01-11 12:00:28 UTC (rev 343610) @@ -2,28 +2,20 @@ # Contributor: Tobias Kieslich <[email protected]> pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres}) -pkgver=5.2.4+39+g3f70d4fce -pkgrel=2 +pkgver=5.2.8+7+ga5355eb42 +pkgrel=1 pkgdesc="Database access library" url="http://www.gnome-db.org/"; arch=(x86_64) license=(GPL) -depends=(gtksourceview3 libxslt python2 libsecret graphviz goocanvas iso-codes) +depends=(gtksourceview3 libxslt python2 libsecret graphviz goocanvas iso-codes libgee openssl) makedepends=(glade libmariadbclient postgresql-libs libfbclient jdk8-openjdk intltool gobject-introspection gtk-doc vala itstool gnome-common git) -_commit=3f70d4fced92d5fe7134c77b78e0730ce2945cc5 # LIBGDA_5.2 +_commit=a5355eb42addc49a4dd63a8cc7d0367a09a5e60b # LIBGDA_5.2 source=("git+https://gitlab.gnome.org/GNOME/libgda.git#commit=$_commit"; - fix-crash.diff - java.patch - 0001-Convert-files-to-Unicode.patch - glib-2.54-ftbfs.patch - glib-2.54-ftbfs-2.patch) + fix-crash.diff) sha256sums=('SKIP' - '7eab1c7f5c11a87ce7a3e47c5c9058595f14c0b601daa6e0a32d797b708d97ba' - 'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22' - '2e25ee9ca86b3767485b26b19317e5188641e2dbfa6202bb204b16e332cca3a4' - '73f65147b1d7d3b78982c9ac562816e855db1b20d7ff346d9fd1ecb013864afc' - 'b26c715c142b3f7fb4c3f67496a2b184bbf3332eee6dbf421499f785c2e36f0f') + '7eab1c7f5c11a87ce7a3e47c5c9058595f14c0b601daa6e0a32d797b708d97ba') _apiver=5.0 @@ -36,16 +28,8 @@ mkdir providers cd $pkgname - - patch -Np1 -i ../java.patch - patch -Np1 -i ../0001-Convert-files-to-Unicode.patch - patch -Np1 -i ../glib-2.54-ftbfs.patch - patch -Np1 -i ../glib-2.54-ftbfs-2.patch patch -Np1 -i ../fix-crash.diff - javac getsp.java - find -name '*.py' -exec sed -i '1s/python$/&2/' {} + - NOCONFIGURE=1 ./autogen.sh } @@ -54,9 +38,7 @@ ./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.42 \ - --enable-gtk-doc --disable-crypto + --enable-vala --enable-gtk-doc sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool make } @@ -71,10 +53,12 @@ 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 \ + mkdir -p providers + local provider + 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 @@ -87,7 +71,7 @@ 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/libgda-${1}-$_apiver.pc "$pkgdir/usr/lib/pkgconfig" mv providers/${1}_specs_*.xml "$pkgdir/usr/share/libgda-$_apiver" } @@ -102,8 +86,8 @@ 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" + mv providers/gda-list-jdbc-providers-$_apiver "$pkgdir/usr/bin" + mv providers/gdaprovider-$_apiver.jar "$pkgdir/usr/lib/libgda-$_apiver/providers" } package_libgda-mysql() { Deleted: glib-2.54-ftbfs-2.patch =================================================================== --- glib-2.54-ftbfs-2.patch 2019-01-11 10:52:20 UTC (rev 343609) +++ glib-2.54-ftbfs-2.patch 2019-01-11 12:00:28 UTC (rev 343610) @@ -1,11 +0,0 @@ ---- a/libgda-ui/gdaui-easy.h 2017-10-08 21:17:30.203226827 +0000 -+++ b/libgda-ui/gdaui-easy.h 2017-10-08 21:19:38.143497887 +0000 -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <[email protected]> - * Copyright (C) 2000 - 2002 Rodrigo Moya <[email protected]> -- * Copyright (C) 2001 Carlos Perell� Mar�n <[email protected]> -+ * Copyright (C) 2001 Carlos Perelló Marín <[email protected]> - * Copyright (C) 2001 - 2011 Vivien Malerba <[email protected]> - * Copyright (C) 2002 Gonzalo Paniagua Javier <[email protected]> - * Deleted: glib-2.54-ftbfs.patch =================================================================== --- glib-2.54-ftbfs.patch 2019-01-11 10:52:20 UTC (rev 343609) +++ glib-2.54-ftbfs.patch 2019-01-11 12:00:28 UTC (rev 343610) @@ -1,103 +0,0 @@ -Description: Fix FTBFS with glib 2.54 - glib-mkenums now expects input files to be UTF-8, - fix the encoding of libgnomeui/gnome-scores.h -Author: Adrian Bunk <[email protected]> - ---- libgda5-5.2.4.orig/libgda/gda-column.h -+++ libgda5-5.2.4/libgda/gda-column.h -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2005 - 2011 Vivien Malerba <[email protected]> -- * Copyright (C) 2005 �lvaro Pe�a <[email protected]> -+ * Copyright (C) 2005 Álvaro Peña <[email protected]> - * Copyright (C) 2008 Przemysław Grzegorczyk <[email protected]> - * - * This library is free software; you can redistribute it and/or ---- libgda5-5.2.4.orig/libgda/gda-data-model-extra.h -+++ libgda5-5.2.4/libgda/gda-data-model-extra.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2001 Carlos Perell� Mar�n <[email protected]> -+ * Copyright (C) 2001 Carlos Perelló Marín <[email protected]> - * Copyright (C) 2001 - 2003 Rodrigo Moya <[email protected]> - * Copyright (C) 2001 - 2011 Vivien Malerba <[email protected]> - * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <[email protected]> ---- libgda5-5.2.4.orig/libgda/gda-data-model-iter-extra.h -+++ libgda5-5.2.4/libgda/gda-data-model-iter-extra.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <[email protected]> - * Copyright (C) 2000 - 2002 Rodrigo Moya <[email protected]> -- * Copyright (C) 2001 Carlos Perell� Mar�n <[email protected]> -+ * Copyright (C) 2001 Carlos Perelló Marín <[email protected]> - * Copyright (C) 2001 - 2011 Vivien Malerba <[email protected]> - * Copyright (C) 2002 Gonzalo Paniagua Javier <[email protected]> - * ---- libgda5-5.2.4.orig/libgda/gda-data-model.h -+++ libgda5-5.2.4/libgda/gda-data-model.h -@@ -4,7 +4,7 @@ - * Copyright (C) 2003 Laurent Sansonetti <[email protected]> - * Copyright (C) 2005 Dan Winship <[email protected]> - * Copyright (C) 2005 - 2012 Vivien Malerba <[email protected]> -- * Copyright (C) 2005 �lvaro Pe�a <[email protected]> -+ * Copyright (C) 2005 Álvaro Peña <[email protected]> - * Copyright (C) 2007 Murray Cumming <[email protected]> - * Copyright (C) 2011 Daniel Espinosa <[email protected]> - * ---- libgda5-5.2.4.orig/libgda/gda-mutex.h -+++ libgda5-5.2.4/libgda/gda-mutex.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <[email protected]> - * Copyright (C) 2000 - 2002 Rodrigo Moya <[email protected]> -- * Copyright (C) 2001 Carlos Perell� Mar�n <[email protected]> -+ * Copyright (C) 2001 Carlos Perelló Marín <[email protected]> - * Copyright (C) 2001 - 2013 Vivien Malerba <[email protected]> - * Copyright (C) 2002 Gonzalo Paniagua Javier <[email protected]> - * ---- libgda5-5.2.4.orig/libgda/gda-row.h -+++ libgda5-5.2.4/libgda/gda-row.h -@@ -3,10 +3,10 @@ - * Copyright (C) 2001 - 2011 Vivien Malerba <[email protected]> - * Copyright (C) 2002 Gonzalo Paniagua Javier <[email protected]> - * Copyright (C) 2003 Laurent Sansonetti <[email protected]> -- * Copyright (C) 2003 Xabier Rodr�guez Calvar <[email protected]> -+ * Copyright (C) 2003 Xabier Rodríguez Calvar <[email protected]> - * Copyright (C) 2004 Paisa Seeluangsawat <[email protected]> - * Copyright (C) 2005 Bas Driessen <[email protected]> -- * Copyright (C) 2005 �lvaro Pe�a <[email protected]> -+ * Copyright (C) 2005 Álvaro Peña <[email protected]> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public ---- libgda5-5.2.4.orig/libgda/gda-server-provider-private.h -+++ libgda5-5.2.4/libgda/gda-server-provider-private.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2005 Dan Winship <[email protected]> - * Copyright (C) 2005 - 2011 Vivien Malerba <[email protected]> -- * Copyright (C) 2005 �lvaro Pe�a <[email protected]> -+ * Copyright (C) 2005 Álvaro Peña <[email protected]> - * Copyright (C) 2007 Murray Cumming <[email protected]> - * - * This library is free software; you can redistribute it and/or ---- libgda5-5.2.4.orig/libgda/gda-util.h -+++ libgda5-5.2.4/libgda/gda-util.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <[email protected]> - * Copyright (C) 2000 - 2002 Rodrigo Moya <[email protected]> -- * Copyright (C) 2001 Carlos Perell� Mar�n <[email protected]> -+ * Copyright (C) 2001 Carlos Perelló Marín <[email protected]> - * Copyright (C) 2001 - 2013 Vivien Malerba <[email protected]> - * Copyright (C) 2002 Gonzalo Paniagua Javier <[email protected]> - * Copyright (C) 2006 - 2007 Murray Cumming <[email protected]> ---- libgda5-5.2.4.orig/libgda/libgda-global-variables.h -+++ libgda5-5.2.4/libgda/libgda-global-variables.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2001 Carlos Perell� Mar�n <[email protected]> -+ * Copyright (C) 2001 Carlos Perelló Marín <[email protected]> - * Copyright (C) 2001 - 2003 Rodrigo Moya <[email protected]> - * Copyright (C) 2001 - 2011 Vivien Malerba <[email protected]> - * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <[email protected]> Deleted: java.patch =================================================================== --- java.patch 2019-01-11 10:52:20 UTC (rev 343609) +++ java.patch 2019-01-11 12:00:28 UTC (rev 343610) @@ -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"
