[arch-commits] Commit in libgda/repos/extra-x86_64 (4 files)
Jan Steffens
heftig at archlinux.org
Sun Aug 25 21:06:45 UTC 2019
Date: Sunday, August 25, 2019 @ 21:06:44
Author: heftig
Revision: 361188
archrelease: copy trunk to extra-x86_64
Added:
libgda/repos/extra-x86_64/PKGBUILD
(from rev 361187, libgda/trunk/PKGBUILD)
libgda/repos/extra-x86_64/fix-crash.diff
(from rev 361187, libgda/trunk/fix-crash.diff)
Deleted:
libgda/repos/extra-x86_64/PKGBUILD
libgda/repos/extra-x86_64/fix-crash.diff
----------------+
PKGBUILD | 206 +++++++++++++++++++++++++++----------------------------
fix-crash.diff | 42 +++++------
2 files changed, 124 insertions(+), 124 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-08-25 21:06:32 UTC (rev 361187)
+++ PKGBUILD 2019-08-25 21:06:44 UTC (rev 361188)
@@ -1,103 +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=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 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)
-sha256sums=('SKIP'
- '7eab1c7f5c11a87ce7a3e47c5c9058595f14c0b601daa6e0a32d797b708d97ba')
-
-_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
- find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
- 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
-}
Copied: libgda/repos/extra-x86_64/PKGBUILD (from rev 361187, libgda/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-08-25 21:06:44 UTC (rev 361188)
@@ -0,0 +1,103 @@
+# 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=2
+pkgdesc="Database access library"
+url="https://www.gnome-db.org/"
+arch=(x86_64)
+license=(GPL)
+depends=(gtksourceview3 libxslt python2 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)
+sha256sums=('SKIP'
+ '7eab1c7f5c11a87ce7a3e47c5c9058595f14c0b601daa6e0a32d797b708d97ba')
+
+_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
+ find -name '*.py' -exec sed -i '1s/python$/&2/' {} +
+ 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 2019-08-25 21:06:32 UTC (rev 361187)
+++ fix-crash.diff 2019-08-25 21:06:44 UTC (rev 361188)
@@ -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);
Copied: libgda/repos/extra-x86_64/fix-crash.diff (from rev 361187, libgda/trunk/fix-crash.diff)
===================================================================
--- fix-crash.diff (rev 0)
+++ fix-crash.diff 2019-08-25 21:06:44 UTC (rev 361188)
@@ -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