[arch-commits] Commit in libgda/repos/extra-x86_64 (5 files)
Jan Steffens
heftig at archlinux.org
Mon Nov 9 13:39:45 UTC 2020
Date: Monday, November 9, 2020 @ 13:39:45
Author: heftig
Revision: 399717
archrelease: copy trunk to extra-x86_64
Added:
libgda/repos/extra-x86_64/0001-Use-single-header-with-GtkSource.patch
(from rev 399716, libgda/trunk/0001-Use-single-header-with-GtkSource.patch)
libgda/repos/extra-x86_64/PKGBUILD
(from rev 399716, libgda/trunk/PKGBUILD)
Deleted:
libgda/repos/extra-x86_64/0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch
libgda/repos/extra-x86_64/PKGBUILD
libgda/repos/extra-x86_64/fix-crash.diff
-----------------------------------------------------------------+
0001-Use-single-header-with-GtkSource.patch | 118 +++++
0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch | 68 ---
PKGBUILD | 217 ++++------
fix-crash.diff | 21
4 files changed, 226 insertions(+), 198 deletions(-)
Copied: libgda/repos/extra-x86_64/0001-Use-single-header-with-GtkSource.patch (from rev 399716, libgda/trunk/0001-Use-single-header-with-GtkSource.patch)
===================================================================
--- 0001-Use-single-header-with-GtkSource.patch (rev 0)
+++ 0001-Use-single-header-with-GtkSource.patch 2020-11-09 13:39:45 UTC (rev 399717)
@@ -0,0 +1,118 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin at 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>
Deleted: 0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch
===================================================================
--- 0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch 2020-11-09 13:36:59 UTC (rev 399716)
+++ 0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch 2020-11-09 13:39:45 UTC (rev 399717)
@@ -1,68 +0,0 @@
-diff --git a/libgda-report/RML/gda-report-rml-document.c b/libgda-report/RML/gda-report-rml-document.c
-index 7bb13bc..3f905e5 100644
---- a/libgda-report/RML/gda-report-rml-document.c
-+++ b/libgda-report/RML/gda-report-rml-document.c
-@@ -189,61 +189,11 @@ gda_report_rml_document_new (GdaReportEngine *engine)
- static gboolean
- gda_report_rml_document_run_as_html (GdaReportDocument *doc, const gchar *filename, GError **error)
- {
-- static GMutex init_mutex;
-- static gchar *converter = NULL;
--
-- g_return_val_if_fail (GDA_IS_REPORT_RML_DOCUMENT (doc), FALSE);
-- g_return_val_if_fail (filename && *filename, FALSE);
--
-- g_mutex_lock (&init_mutex);
-- if (!converter) {
-- converter = g_find_program_in_path ("trml2html.py");
-- if (!converter) {
-- converter = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda_trml2html", "trml2html.py", NULL);
-- if (!g_file_test (converter, G_FILE_TEST_IS_EXECUTABLE)) {
-- g_free (converter);
-- converter = NULL;
-- }
-- }
-- if (!converter) {
-- g_set_error (error, 0, 0,
-- _("Could not find the '%s' program"), "trml2html.py");
-- g_mutex_unlock (&init_mutex);
-- return FALSE;
-- }
-- }
-- g_mutex_unlock (&init_mutex);
--
-- return _gda_report_document_run_converter_path (doc, filename, converter, "trml2html", error);
-+ return TRUE;
- }
-
- static gboolean
- gda_report_rml_document_run_as_pdf (GdaReportDocument *doc, const gchar *filename, GError **error)
- {
-- static GMutex init_mutex;
-- static gchar *converter = NULL;
--
-- g_return_val_if_fail (GDA_IS_REPORT_RML_DOCUMENT (doc), FALSE);
-- g_return_val_if_fail (filename && *filename, FALSE);
--
-- g_mutex_lock (&init_mutex);
-- if (!converter) {
-- converter = g_find_program_in_path ("trml2pdf.py");
-- if (!converter) {
-- converter = gda_gbr_get_file_path (GDA_DATA_DIR, LIBGDA_ABI_NAME, "gda_trml2pdf", "trml2pdf.py", NULL);
-- if (!g_file_test (converter, G_FILE_TEST_IS_EXECUTABLE)) {
-- g_free (converter);
-- converter = NULL;
-- }
-- }
-- if (!converter) {
-- g_set_error (error, 0, 0,
-- _("Could not find the '%s' program"), "trml2pdf.py");
-- g_mutex_unlock (&init_mutex);
-- return FALSE;
-- }
-- }
-- g_mutex_unlock (&init_mutex);
--
-- return _gda_report_document_run_converter_path (doc, filename, converter, "trml2pdf", error);
-+ return TRUE;
- }
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-11-09 13:36:59 UTC (rev 399716)
+++ PKGBUILD 2020-11-09 13:39:45 UTC (rev 399717)
@@ -1,109 +0,0 @@
-# Contributor: tobias <tobias at archlinux.org>
-# Contributor: Tobias Kieslich <tobias at justdreams.de>
-
-pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres})
-pkgver=5.2.9
-pkgrel=4
-pkgdesc="Database access library"
-url="https://www.gnome-db.org/"
-arch=(x86_64)
-license=(GPL)
-depends=(gtksourceview3 libxslt 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=295fa78d29eee6dbbc5d07fd6884cb95f48d92e0 # tags/LIBGDA_5_2_9^0
-source=("git+https://gitlab.gnome.org/GNOME/libgda.git#commit=$_commit"
- fix-crash.diff
- 0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch)
-sha256sums=('SKIP'
- '7eab1c7f5c11a87ce7a3e47c5c9058595f14c0b601daa6e0a32d797b708d97ba'
- 'd74a70bd7b8a7750049b123c8fc8e38c9b9c85b51f63c061998cf06b3cfc65af')
-
-_apiver=5.0
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^LIBGDA_//;s/_/./g;s/-/+/g'
-}
-
-prepare() {
- mkdir providers
-
- cd $pkgname
- patch -Np1 -i ../fix-crash.diff
- # remove converter functionality that relies on eight-year-old python2 scripts/taken from Fedora
- patch -Np1 -i ../0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch
- 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-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"
-
- # remove eight-year-old python2 report converter scripts
- rm -r "$pkgdir"/usr/share/libgda-5.0/gda_trml2{html,pdf}
-}
-
-_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
-}
Copied: libgda/repos/extra-x86_64/PKGBUILD (from rev 399716, libgda/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-11-09 13:39:45 UTC (rev 399717)
@@ -0,0 +1,108 @@
+# Contributor: tobias <tobias at archlinux.org>
+# Contributor: Tobias Kieslich <tobias at justdreams.de>
+
+pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres})
+pkgver=5.2.10
+pkgrel=1
+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)
+sha256sums=('SKIP'
+ '104594a6034b041d87c1129b0b5544c8899393d66a6a0fb7a8b55f7fcb77e560')
+
+_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
+
+ 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-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
+}
Deleted: fix-crash.diff
===================================================================
--- fix-crash.diff 2020-11-09 13:36:59 UTC (rev 399716)
+++ fix-crash.diff 2020-11-09 13:39:45 UTC (rev 399717)
@@ -1,21 +0,0 @@
-diff --git i/libgda-ui/data-entries/plugins/libmain.c w/libgda-ui/data-entries/plugins/libmain.c
-index a30c2db2c3258111..1356488c8b0940f9 100644
---- i/libgda-ui/data-entries/plugins/libmain.c
-+++ w/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);
More information about the arch-commits
mailing list