Date: Sunday, March 14, 2021 @ 23:49:40 Author: heftig Revision: 891360
archrelease: copy trunk to community-staging-x86_64 Added: libgda/repos/community-staging-x86_64/ libgda/repos/community-staging-x86_64/0001-Use-single-header-with-GtkSource.patch (from rev 891359, libgda/trunk/0001-Use-single-header-with-GtkSource.patch) libgda/repos/community-staging-x86_64/0002-Use-goocanvas-3.0.patch (from rev 891359, libgda/trunk/0002-Use-goocanvas-3.0.patch) libgda/repos/community-staging-x86_64/PKGBUILD (from rev 891359, libgda/trunk/PKGBUILD) ---------------------------------------------+ 0001-Use-single-header-with-GtkSource.patch | 118 ++++++++++++++++++++++++++ 0002-Use-goocanvas-3.0.patch | 67 ++++++++++++++ PKGBUILD | 114 +++++++++++++++++++++++++ 3 files changed, 299 insertions(+) Copied: libgda/repos/community-staging-x86_64/0001-Use-single-header-with-GtkSource.patch (from rev 891359, libgda/trunk/0001-Use-single-header-with-GtkSource.patch) =================================================================== --- community-staging-x86_64/0001-Use-single-header-with-GtkSource.patch (rev 0) +++ community-staging-x86_64/0001-Use-single-header-with-GtkSource.patch 2021-03-14 23:49:40 UTC (rev 891360) @@ -0,0 +1,118 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Corentin=20No=C3=ABl?= <coren...@elementary.io> +Date: Wed, 4 Apr 2018 22:51:50 +0100 +Subject: [PATCH] Use single header with GtkSource + +--- + libgda-ui/data-entries/plugins/gdaui-entry-text.c | 10 +--------- + libgda-ui/data-entries/plugins/libmain.c | 10 +--------- + tools/browser/data-manager/data-favorite-selector.c | 10 +--------- + tools/browser/data-manager/xml-spec-editor.c | 10 +--------- + tools/browser/query-exec/query-editor.c | 10 +--------- + 5 files changed, 5 insertions(+), 45 deletions(-) + +diff --git a/libgda-ui/data-entries/plugins/gdaui-entry-text.c b/libgda-ui/data-entries/plugins/gdaui-entry-text.c +index e359820eb..b483128a4 100644 +--- a/libgda-ui/data-entries/plugins/gdaui-entry-text.c ++++ b/libgda-ui/data-entries/plugins/gdaui-entry-text.c +@@ -25,15 +25,7 @@ + #include <libgda/gda-blob-op.h> + + #ifdef HAVE_GTKSOURCEVIEW +- #ifdef GTK_DISABLE_SINGLE_INCLUDES +- #undef GTK_DISABLE_SINGLE_INCLUDES +- #endif +- +- #include <gtksourceview/gtksourceview.h> +- #include <gtksourceview/gtksourcelanguagemanager.h> +- #include <gtksourceview/gtksourcebuffer.h> +- #include <gtksourceview/gtksourcestyleschememanager.h> +- #include <gtksourceview/gtksourcestylescheme.h> ++ #include <gtksourceview/gtksource.h> + #endif + #define LANGUAGE_SQL "gda-sql" + +diff --git a/libgda-ui/data-entries/plugins/libmain.c b/libgda-ui/data-entries/plugins/libmain.c +index a30c2db2c..c3a0f8f53 100644 +--- a/libgda-ui/data-entries/plugins/libmain.c ++++ b/libgda-ui/data-entries/plugins/libmain.c +@@ -39,15 +39,7 @@ + #endif + + #ifdef HAVE_GTKSOURCEVIEW +- #ifdef GTK_DISABLE_SINGLE_INCLUDES +- #undef GTK_DISABLE_SINGLE_INCLUDES +- #endif +- +- #include <gtksourceview/gtksourceview.h> +- #include <gtksourceview/gtksourcelanguagemanager.h> +- #include <gtksourceview/gtksourcebuffer.h> +- #include <gtksourceview/gtksourcestyleschememanager.h> +- #include <gtksourceview/gtksourcestylescheme.h> ++ #include <gtksourceview/gtksource.h> + #endif + + static GdauiDataEntry *plugin_entry_filesel_create_func (GdaDataHandler *handler, GType type, const gchar *options); +diff --git a/tools/browser/data-manager/data-favorite-selector.c b/tools/browser/data-manager/data-favorite-selector.c +index d472fd5f6..815204d64 100644 +--- a/tools/browser/data-manager/data-favorite-selector.c ++++ b/tools/browser/data-manager/data-favorite-selector.c +@@ -33,15 +33,7 @@ + #include <libgda-ui/internal/popup-container.h> + + #ifdef HAVE_GTKSOURCEVIEW +- #ifdef GTK_DISABLE_SINGLE_INCLUDES +- #undef GTK_DISABLE_SINGLE_INCLUDES +- #endif +- +- #include <gtksourceview/gtksourceview.h> +- #include <gtksourceview/gtksourcelanguagemanager.h> +- #include <gtksourceview/gtksourcebuffer.h> +- #include <gtksourceview/gtksourcestyleschememanager.h> +- #include <gtksourceview/gtksourcestylescheme.h> ++ #include <gtksourceview/gtksource.h> + #endif + + struct _DataFavoriteSelectorPrivate { +diff --git a/tools/browser/data-manager/xml-spec-editor.c b/tools/browser/data-manager/xml-spec-editor.c +index f4b893a00..b337d107c 100644 +--- a/tools/browser/data-manager/xml-spec-editor.c ++++ b/tools/browser/data-manager/xml-spec-editor.c +@@ -28,15 +28,7 @@ + #include <libgda/gda-debug-macros.h> + + #ifdef HAVE_GTKSOURCEVIEW +-#ifdef GTK_DISABLE_SINGLE_INCLUDES +-#undef GTK_DISABLE_SINGLE_INCLUDES +-#endif +- +-#include <gtksourceview/gtksourceview.h> +-#include <gtksourceview/gtksourcelanguagemanager.h> +-#include <gtksourceview/gtksourcebuffer.h> +-#include <gtksourceview/gtksourcestyleschememanager.h> +-#include <gtksourceview/gtksourcestylescheme.h> ++#include <gtksourceview/gtksource.h> + #endif + + struct _XmlSpecEditorPrivate { +diff --git a/tools/browser/query-exec/query-editor.c b/tools/browser/query-exec/query-editor.c +index 061aefb9d..7cb9923ac 100644 +--- a/tools/browser/query-exec/query-editor.c ++++ b/tools/browser/query-exec/query-editor.c +@@ -22,15 +22,7 @@ + #include <string.h> + #include <gdk/gdkkeysyms.h> + #ifdef HAVE_GTKSOURCEVIEW +- #ifdef GTK_DISABLE_SINGLE_INCLUDES +- #undef GTK_DISABLE_SINGLE_INCLUDES +- #endif +- +- #include <gtksourceview/gtksourceview.h> +- #include <gtksourceview/gtksourcelanguagemanager.h> +- #include <gtksourceview/gtksourcebuffer.h> +- #include <gtksourceview/gtksourcestyleschememanager.h> +- #include <gtksourceview/gtksourcestylescheme.h> ++ #include <gtksourceview/gtksource.h> + #endif + #include "query-editor.h" + #include <binreloc/gda-binreloc.h> Copied: libgda/repos/community-staging-x86_64/0002-Use-goocanvas-3.0.patch (from rev 891359, libgda/trunk/0002-Use-goocanvas-3.0.patch) =================================================================== --- community-staging-x86_64/0002-Use-goocanvas-3.0.patch (rev 0) +++ community-staging-x86_64/0002-Use-goocanvas-3.0.patch 2021-03-14 23:49:40 UTC (rev 891360) @@ -0,0 +1,67 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com> +Date: Sun, 14 Mar 2021 23:41:28 +0000 +Subject: [PATCH] Use goocanvas-3.0 + +--- + configure.ac | 2 +- + tools/browser/canvas/browser-canvas-text.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index b9e973617..fd03152ea 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -240,7 +240,7 @@ then + + if test "$with_goo" = "auto" -o "$with_goo" = "yes" + then +- PKG_CHECK_MODULES(GOOCANVAS, "goocanvas-2.0", [ ++ PKG_CHECK_MODULES(GOOCANVAS, "goocanvas-3.0", [ + AC_DEFINE(HAVE_GOOCANVAS, [1], [GooCanvas support enabled]) + have_goocanvas=yes], [ + if test "$with_goo" = "yes" +diff --git a/tools/browser/canvas/browser-canvas-text.c b/tools/browser/canvas/browser-canvas-text.c +index 644bca9a8..4f0649443 100644 +--- a/tools/browser/canvas/browser-canvas-text.c ++++ b/tools/browser/canvas/browser-canvas-text.c +@@ -231,7 +231,7 @@ browser_canvas_text_set_property (GObject *object, + const gchar *cstr = NULL; + gchar *str; + gdouble size = 0; +- gboolean bool = FALSE; ++ gboolean abool = FALSE; + + ct = BROWSER_CANVAS_TEXT (object); + +@@ -269,25 +269,25 @@ browser_canvas_text_set_property (GObject *object, + ct->priv->highlight_color = g_strdup (BROWSER_CANVAS_ENTITY_COLOR); + break; + case PROP_UNDERLINE: +- bool = g_value_get_boolean (value); +- ct->priv->underline = bool; ++ abool = g_value_get_boolean (value); ++ ct->priv->underline = abool; + adjust_text_pango_attributes (ct); + if (ct->priv->text_item) { +- if (bool) { ++ if (abool) { + str = g_strdup_printf ("<u>%s</u>", ct->priv->text); + g_object_set (G_OBJECT (ct->priv->text_item), + "text", str, + "use-markup", TRUE, NULL); + g_free (str); + } + else + g_object_set (G_OBJECT (ct->priv->text_item), + "text", ct->priv->text, + "use-markup", FALSE, NULL); + } + case PROP_BOLD: +- bool = g_value_get_boolean (value); +- ct->priv->bold = bool; ++ abool = g_value_get_boolean (value); ++ ct->priv->bold = abool; + adjust_text_pango_attributes (ct); + break; + default: Copied: libgda/repos/community-staging-x86_64/PKGBUILD (from rev 891359, libgda/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2021-03-14 23:49:40 UTC (rev 891360) @@ -0,0 +1,114 @@ +# Contributor: tobias <tob...@archlinux.org> +# Contributor: Tobias Kieslich <tob...@justdreams.de> + +pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres}) +pkgver=5.2.10 +pkgrel=2 +pkgdesc="Database access library" +url="https://www.gnome-db.org/" +arch=(x86_64) +license=(GPL) +depends=(gtksourceview3 libxslt python libsecret graphviz goocanvas iso-codes libgee openssl) +makedepends=(glade mariadb-libs postgresql-libs libfbclient jdk8-openjdk intltool + gobject-introspection gtk-doc vala itstool gnome-common git) +_commit=85a2532df64698306fd3be324bb2052fb1b80fd3 # tags/LIBGDA_5_2_10^0 +source=("git+https://gitlab.gnome.org/GNOME/libgda.git#commit=$_commit" + 0001-Use-single-header-with-GtkSource.patch + 0002-Use-goocanvas-3.0.patch) +sha256sums=('SKIP' + '104594a6034b041d87c1129b0b5544c8899393d66a6a0fb7a8b55f7fcb77e560' + '81ab26fd12f7174e880815f6aa624c24821b1f9c7f386ae566293df7f041b25b') + +_apiver=5.0 + +pkgver() { + cd $pkgname + git describe --tags | sed 's/^LIBGDA_//;s/_/./g;s/-/+/g' +} + +prepare() { + mkdir providers + + cd $pkgname + + # Remove conflicting typedef + git revert -n e1aea5ffb3fd9b49ad8c0dc01a915b47de3dc3d2 + + # Fix use of gtksourceview headers + git apply -3 ../0001-Use-single-header-with-GtkSource.patch + + # Port to goocanvas-3.0 + git apply -3 ../0002-Use-goocanvas-3.0.patch + + NOCONFIGURE=1 ./autogen.sh +} + +build() { + cd $pkgname + CFLAGS+=" -Wno-deprecated-declarations" + ./configure --prefix=/usr --sysconfdir=/etc --disable-static \ + --with-bdb=/usr --with-bdb-libdir-name=lib \ + --enable-json --enable-system-sqlite --enable-binreloc \ + --enable-vala --enable-gtk-doc + 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 + + 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 + + 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}-$_apiver.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 mariadb-libs) + _packageprovider mysql +} + +package_libgda-postgres() { + pkgdesc="libgda provider for PostgreSQL" + depends=(libgda postgresql-libs) + _packageprovider postgres +}