[arch-commits] Commit in libgda/repos (4 files)
Andreas Radke
andyrtr at archlinux.org
Sun Jun 7 15:39:08 UTC 2020
Date: Sunday, June 7, 2020 @ 15:39:08
Author: andyrtr
Revision: 388433
archrelease: copy trunk to testing-x86_64
Added:
libgda/repos/testing-x86_64/
libgda/repos/testing-x86_64/0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch
(from rev 388432, libgda/trunk/0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch)
libgda/repos/testing-x86_64/PKGBUILD
(from rev 388432, libgda/trunk/PKGBUILD)
libgda/repos/testing-x86_64/fix-crash.diff
(from rev 388432, libgda/trunk/fix-crash.diff)
-----------------------------------------------------------------+
0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch | 68 ++++++
PKGBUILD | 109 ++++++++++
fix-crash.diff | 21 +
3 files changed, 198 insertions(+)
Copied: libgda/repos/testing-x86_64/0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch (from rev 388432, libgda/trunk/0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch)
===================================================================
--- testing-x86_64/0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch (rev 0)
+++ testing-x86_64/0001-libgda-report-remove-trml2pdf-trml2html-functionalit.patch 2020-06-07 15:39:08 UTC (rev 388433)
@@ -0,0 +1,68 @@
+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;
+ }
Copied: libgda/repos/testing-x86_64/PKGBUILD (from rev 388432, libgda/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-06-07 15:39:08 UTC (rev 388433)
@@ -0,0 +1,109 @@
+# 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/testing-x86_64/fix-crash.diff (from rev 388432, libgda/trunk/fix-crash.diff)
===================================================================
--- testing-x86_64/fix-crash.diff (rev 0)
+++ testing-x86_64/fix-crash.diff 2020-06-07 15:39:08 UTC (rev 388433)
@@ -0,0 +1,21 @@
+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