commit libgda for openSUSE:Factory
Hello community, here is the log from the commit of package libgda for openSUSE:Factory checked in at 2019-05-03 22:43:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgda (Old) and /work/SRC/openSUSE:Factory/.libgda.new.5148 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgda" Fri May 3 22:43:37 2019 rev:86 rq:693275 version:5.2.8 Changes: -------- --- /work/SRC/openSUSE:Factory/libgda/libgda.changes 2018-11-19 23:30:33.767289569 +0100 +++ /work/SRC/openSUSE:Factory/.libgda.new.5148/libgda.changes 2019-05-03 22:43:39.471397002 +0200 @@ -1,0 +2,48 @@ +Wed Apr 10 09:37:19 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org> + +- Update to version 5.2.8 (bsc#1128934): + + Fix a typo on sv translation + + Please note: releases 5.2.6 and 5.2.7 were unable to be + published at downdload.gnome.org +- Changes from version 5.2.4: + + SQLite provider uses system installed one by default + + Revome build's date from documentation + + introspection: removed system install in favor of --prefix + + Fixed compilation on MacOS + + All Vala bindings and Vala extensions are built by default + using --enable-vala, added --disable* switch to disable some or + all of them + + Fixes on outdated unit tests + + Removed unused Vala extensions + + GdaConnection has removed the use of g_object_weak_*, improving + multi-threading behaviour + + Prepared statements now use GWeakRef for weak references + + GdaDataPivot use instance providers and locking + + GdaVConnectionDataModel use GRecMutex + + Updated SQLite to 3.8.11.1 + + Fix SQLCipher build by embedding source code for 3.4.2 version + + Fix SQLCipher disabling + + Updated GObject Introspection annotations + + Fix Doc generation + + Bugs corrected: #787685 #789382 #761560 #761529 #760420 #761424 + #754263 #754208 + + Corrected HTML output containing <SCRIPT> tag + + Correct some truncated help strings + + Don't use (deprecated) g_thread_supported() + + MySQL meta data: fixed case where schema is incomplete in MySQL + database + + Allow introspection for gda_sql_builder_add_cond_v() + + SQLite: handle WITHOUT ROWID without any error + + Updated translations. +- Rebase libgda-5.2.4-nojavah.patch: most of it was merged in time + for 5.2.8, except one chunk. +- Drop libgda-utf.patch: no longer required. +- Add libgda-no-libgee.patch: do not require libgee, taken from + upstream git. +- Add libgda-enable-gdaui-gi.patch: Fix configure handling of + --enable-gdaui-gi, taken from git. +- Add libgda-no-pg_config.patch: Don't use pg_config, but rather + pkgconfig: libgda does not build a postgresql server module. +- Pass --with-postgres to configure: ensure to build pgsql support. + +------------------------------------------------------------------- Old: ---- libgda-5.2.4.tar.xz libgda-utf.patch New: ---- libgda-5.2.8.tar.xz libgda-enable-gdaui-gi.patch libgda-no-libgee.patch libgda-no-pg_config.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgda.spec ++++++ --- /var/tmp/diff_new_pack.mU4Y30/_old 2019-05-03 22:43:41.795401895 +0200 +++ /var/tmp/diff_new_pack.mU4Y30/_new 2019-05-03 22:43:41.823401954 +0200 @@ -1,7 +1,7 @@ # # spec file for package libgda # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: libgda -Version: 5.2.4 +Version: 5.2.8 Release: 0 # FIXME: add bdb sql BuildRequires when available Summary: GNU Data Access (GDA) Library @@ -35,8 +35,12 @@ Patch4: libgda-jre10.patch # PATCH-FIX-OPENSUSE libgda-5.2.4-nojavah.patch fstrba@suse.com -- Fix build with JRE 10 (not sent upstream, as it's way too hackish) Patch5: libgda-5.2.4-nojavah.patch -# PATCH-FIX-OPENSUSE libgda-utf.patch dimstar@opensuse.org -- Remove some UTF chars from headers, which messes with glib-mkenums inside OBS (needs more debug) -Patch500: libgda-utf.patch +# PATCH-FIx-UPSTREAM libgda-no-libgee.patch dimstar@opensuse.org -- Drop obsolete libgee dependency, taken from git +Patch6: libgda-no-libgee.patch +# PATCH-FIX-UPSTREAM libgda-no-pg_config.patch dimstar@opensuse.org -- Don't use pg_config to find postgresql. Patch not directly applicable as-is upstream, but fixed in master +Patch7: libgda-no-pg_config.patch +# PATCH-FIx-UPSTREAM libgda-enable-gdaui-gi.patch dimstar@opensuse.org -- Fix --enable-gdaui-gi configure parameter, taken from git +Patch8: libgda-enable-gdaui-gi.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: db-devel @@ -377,7 +381,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch500 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 %build autoreconf -fi @@ -414,6 +420,7 @@ --disable-static \ --enable-binreloc \ --enable-default-binary \ + --with-postgres \ --with-libdir-name=%{_lib} \ --enable-gda-gi \ --enable-gdaui-gi \ @@ -551,6 +558,7 @@ %{_libdir}/pkgconfig/*-5.0.pc %{_datadir}/gir-1.0/*.gir %{_datadir}/vala/vapi/libgda-5.0.vapi +%{_datadir}/vala/vapi/libgda-ui-5.0.vapi # demo %{_bindir}/gdaui-demo-5.0 %{_datadir}/libgda-5.0/demo/ ++++++ libgda-5.2.4-nojavah.patch ++++++ --- /var/tmp/diff_new_pack.mU4Y30/_old 2019-05-03 22:43:42.059402451 +0200 +++ /var/tmp/diff_new_pack.mU4Y30/_new 2019-05-03 22:43:42.059402451 +0200 @@ -1,12 +1,20 @@ ---- libgda-5.2.4/m4/java.m4 2018-01-08 13:12:26.228444544 +0100 -+++ libgda-5.2.4/m4/java.m4 2018-01-08 13:13:52.932444872 +0100 -@@ -111,13 +111,11 @@ - AC_MSG_CHECKING([if all java programs are found]) - AC_PATH_PROGS(JAVA_PROG,java,,${JAVA_PATH}) - AC_PATH_PROGS(JAVAC,javac,,${JAVA_PATH}) -- AC_PATH_PROGS(JAVAH,javah,,${JAVA_PATH}) - AC_PATH_PROGS(JAR,jar,,${JAVA_PATH}) - +From 10d43ce6aea0a041a776445783b4e1ca09651f57 Mon Sep 17 00:00:00 2001 +From: Kalev Lember <klember@redhat.com> +Date: Tue, 4 Dec 2018 16:20:24 +0100 +Subject: [PATCH] JDBC: Drop unneeded JAVAH variable check + +Commit b8d0997 dropped javah detection from java.m4, but left in a JAVAH +variable check which broke the build, as nothing ever sets the variable +any more. +--- + m4/java.m4 | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/m4/java.m4 b/m4/java.m4 +index f4e64e9af..e659a1bec 100644 +--- a/m4/java.m4 ++++ b/m4/java.m4 +@@ -116,7 +116,6 @@ m4_define([_JAVA_CHECK_INTERNAL], have_all_java=yes if test -z "$JAVA_PROG"; then have_all_java=no; fi if test -z "$JAVAC"; then have_all_java=no; fi @@ -14,22 +22,4 @@ if test -z "$JAR"; then have_all_java=no; fi if test ${have_all_java} = no; then AC_MSG_WARN([one or more Java tools are missing (JRE is not sufficient)]) ---- libgda-5.2.4/providers/jdbc/Makefile.am 2018-01-08 13:12:26.180444544 +0100 -+++ libgda-5.2.4/providers/jdbc/Makefile.am 2018-01-08 13:16:14.224008270 +0100 -@@ -76,7 +76,6 @@ - CLEANFILES = $(resources) - - $(jni_headers): $(jdbcprov_classes) -- $(JAVAH) -classpath . -d $(builddir) -force `basename $@ | sed -e 's/\.h$$//'` - - jdbcprov_jar = gdaprovider-5.0.jar - jdbcprov_sources = \ -@@ -91,7 +90,7 @@ - jdbcprov_DATA = $(jdbcprov_jar) - - GdaJConnection.class: $(jdbcprov_sources) -- $(JAVAC) -cp . $(JFLAGS) -d $(top_builddir)/providers/jdbc $^ -+ $(JAVAC) -cp . $(JFLAGS) -d $(top_builddir)/providers/jdbc -h $(builddir) $^ - - $(jdbcprov_jar): $(jdbcprov_classes) - $(JAR) cfm $(jdbcprov_jar) $(top_srcdir)/providers/jdbc/MANIFEST.MF *.class + ++++++ libgda-5.2.4.tar.xz -> libgda-5.2.8.tar.xz ++++++ /work/SRC/openSUSE:Factory/libgda/libgda-5.2.4.tar.xz /work/SRC/openSUSE:Factory/.libgda.new.5148/libgda-5.2.8.tar.xz differ: char 25, line 1 ++++++ libgda-enable-gdaui-gi.patch ++++++
From bde0933ee733e2c0aa4eeec5833e7fb54f1d2acf Mon Sep 17 00:00:00 2001 From: Daniel Espinosa Ortiz <esodan@gmail.com> Date: Fri, 8 Feb 2019 13:51:51 -0600 Subject: [PATCH] fix behavior of --enable-gdaui-gi
--- configure.ac | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0990e1b96..ce761503b 100644 --- a/configure.ac +++ b/configure.ac @@ -475,7 +475,16 @@ GOBJECT_INTROSPECTION_CHECK([1.30.0]) AC_ARG_ENABLE([gdaui-gi], AS_HELP_STRING([--disable-gdaui-gi[=@<:@yes/no@:>@]], [Disable GObject Introspection for libgda-ui [default=no]]), - [disable_gdaui_gi=yes],[disable_gdaui_gi=no]) + [ + if test x$enableval = xyes + then + disable_gdaui_gi=no + else + disable_gdaui_gi=yes + fi + ],[ + disable_gdaui_gi=no + ]) if test x$found_introspection != xyes then ++++++ libgda-no-libgee.patch ++++++
From f535606c75f5fc6111fc09fc83b5d75f2c9a4a97 Mon Sep 17 00:00:00 2001 From: Daniel Espinosa Ortiz <esodan@gmail.com> Date: Fri, 8 Feb 2019 13:28:53 -0600 Subject: [PATCH] Removed unused libgee dependency
Fix issue #159 --- configure.ac | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) Index: libgda-5.2.8/configure.ac =================================================================== --- libgda-5.2.8.orig/configure.ac +++ libgda-5.2.8/configure.ac @@ -529,17 +529,6 @@ fi AM_CONDITIONAL(ENABLE_GDAUI_VALA, test x$disable_gdaui_vala != xyes) -dnl Check for libgee -found_gee="xyes" -GEE_REQUIRED="0.8.0" -PKG_CHECK_MODULES(GEE, gee-0.8 >= $GEE_REQUIRED,[],found_gee=no) -AC_SUBST(GEE_CFLAGS) -AC_SUBST(GEE_LIBS) - -if test "x$disable_vala_ext" != "xyes" -a "x$found_gee" = "xno" -then - AC_MSG_ERROR([Vala Extensions (Utility GObject clases written in Vala) is requested but GEE library development is not present]) -fi dnl ****************************** dnl Checks for libcrypto ++++++ libgda-no-pg_config.patch ++++++ Index: libgda-5.2.8/m4/postgresql.m4 =================================================================== --- libgda-5.2.8.orig/m4/postgresql.m4 +++ libgda-5.2.8/m4/postgresql.m4 @@ -1,40 +1,25 @@ dnl -*- mode: autoconf -*- -dnl Copyright 2010 Vivien Malerba +dnl Copyright 2019 Dominique Leuenberger dnl dnl SYNOPSIS dnl dnl POSTGRES_CHECK([libdirname]) dnl -dnl [libdirname]: defaults to "lib". Can be overridden by the --with-postgres-libdir-name option +dnl [libdirname]: IGNORED: I was simply too lazy to rewrite all of it dnl dnl DESCRIPTION dnl -dnl This macro tries to find the PostgreSQL libraries and header files +dnl This macro tries to find the PostgreSQL using pkg-config libpq dnl dnl It defines two options: -dnl --with-postgres=yes/no/<directory> -dnl --with-postgres-libdir-name=<dir. name> +dnl --with-postgres=yes/no dnl -dnl If the 1st option is "yes" then the macro tries to use pg_config to locate -dnl the PostgreSQL package, and if it fails, it tries in several well known directories +dnl If the 1st option is "yes" then the macro tries to use pgk-config to locate +dnl the PostgreSQL package dnl dnl If the 1st option is "no" then the macro does not attempt at locating the dnl postgresql package dnl -dnl If the 1st option is a directory name, then the macro tries to locate the postgresql package -dnl in the specified directory. -dnl -dnl If the macro has to try to locate the postgresql package in one or more directories, it will -dnl try to locate the header files in $dir/include and the library files in $dir/lib, unless -dnl the second option is used to specify a directory name to be used instead of "lib" (for -dnl example lib64). -dnl -dnl USED VARIABLES -dnl -dnl $linklibext: contains the library suffix (like ".so"). If not specified ".so" is used. -dnl $platform_win32: contains "yes" on Windows platforms. If not specified, assumes "no" -dnl -dnl dnl DEFINED VARIABLES dnl dnl This macro always calls: @@ -61,122 +46,14 @@ m4_define([_POSTGRES_CHECK_INTERNAL], AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first AC_BEFORE([LT_INIT],[$0])dnl setup libtool first - pg_loclibdir=$1 - if test "x$pg_loclibdir" = x - then - if test "x$platform_win32" = xyes - then - pg_loclibdir=bin - else - pg_loclibdir=lib - fi - fi - - # determine if PostgreSQL should be searched for - # and use pg_config if the "yes" option is used - postgres_found=no - try_postgres=true - pkgpostgres=no - POSTGRES_LIBS="" - postgres_test_dir="" - AC_ARG_WITH(postgres, - AS_HELP_STRING([--with-postgres[=@<:@yes/no/<directory>@:>@]], - [Locate PostgreSQL files]),[ - if test $withval = no - then - try_postgres=false - elif test $withval != yes - then - postgres_test_dir=$withval - fi]) - AC_ARG_WITH(postgres-libdir-name, - AS_HELP_STRING([--with-postgres-libdir-name[=@<:@<dir. name>@:>@]], - [Locate PostgreSQL library file, related to the PostgreSQL prefix specified from --with-postgres]), - [pg_loclibdir=$withval]) + AC_ARG_WITH([postgres], AS_HELP_STRING([--with-postgres], [Build with the GTK+ interface])) # try with the default available pg_config - if test $try_postgres = true -a "x$postgres_test_dir" = x - then - AC_PATH_PROGS(PG_CONFIG, pg_config) - if test "x$PG_CONFIG" != x - then - pkgpostgres=yes - POSTGRES_CFLAGS="-I`$PG_CONFIG --includedir`" - POSTGRES_LIBS="-L`$PG_CONFIG --libdir` -lpq" - else - postgres_test_dir="/usr /usr/local /opt/gnome" - fi - fi - - # try to locate pg_config in places in $postgres_test_dir - if test $try_postgres = true - then - if test $pkgpostgres = no - then - if test "x$linklibext" = x - then - postgres_libext=".so" - else - postgres_libext=".dll" - fi - if test $platform_win32 = yes - then - for d in $postgres_test_dir - do - AC_MSG_CHECKING([checking for PostgreSQL files in $d]) - echo "looking for $d/include/libpq-fe.h -a -f $d/$pg_loclibdir/libpq$postgres_libext" - if test -a $d/include/libpq-fe.h -a -f $d/$pg_loclibdir/libpq$postgres_libext - then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -I$d/include" - save_LIBS="$LIBS" - LIBS="$LIBS -L$d/$pg_loclibdir -lpq" - AC_LINK_IFELSE([AC_LANG_SOURCE([ -#include <libpq-fe.h> -int main() { - printf("%p", PQconnectdb); - return 0; -} -])], - postgres_found=yes) - CFLAGS="$save_CFLAGS" - LIBS="$save_LIBS" - if test "x$postgres_found" = xyes - then - AC_MSG_RESULT([found]) - POSTGRES_CFLAGS=-I$d/include - POSTGRES_LIBS="-L$d/$pg_loclibdir -lpq" - break - fi - AC_MSG_RESULT([files found but are not useable]) - else - AC_MSG_RESULT([not found]) - fi - done - else - for d in $postgres_test_dir - do - AC_MSG_NOTICE([checking for pg_config tool in $d]) - AC_PATH_PROGS(PG_CONFIG, pg_config,,[$d/bin]) - if test "x$PG_CONFIG" != x - then - pkgpostgres=yes - POSTGRES_CFLAGS="-I`$PG_CONFIG --includedir`" - POSTGRES_LIBS="-L`$PG_CONFIG --libdir` -lpq" - break; - fi - done - fi - fi - if test "x$POSTGRES_LIBS" = x - then - AC_MSG_NOTICE([POSTGRESQL backend not used]) - else - postgres_found=yes - fi - fi + AS_IF([test "x$with_postgres" = "xyes"], [ + PKG_CHECK_MODULES([POSTGRES], [libpq], postgres_found=true, postgres_found=false) + ]) - AM_CONDITIONAL(POSTGRES,[test "$postgres_found" = "yes"]) + AM_CONDITIONAL(POSTGRES,[test "$postgres_found" = "true"]) AC_SUBST(POSTGRES_LIBS) AC_SUBST(POSTGRES_CFLAGS) ])
participants (1)
-
root