Date: Monday, October 9, 2017 @ 11:34:48 Author: heftig Revision: 307219
5.2.4+39+g3f70d4fce-2 Added: libgda/trunk/fix-crash.diff Modified: libgda/trunk/PKGBUILD ----------------+ PKGBUILD | 5 ++++- fix-crash.diff | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-09 09:09:21 UTC (rev 307218) +++ PKGBUILD 2017-10-09 11:34:48 UTC (rev 307219) @@ -4,7 +4,7 @@ pkgname=(libgda libgda-{firebird,jdbc,mysql,postgres}) pkgver=5.2.4+39+g3f70d4fce -pkgrel=1 +pkgrel=2 pkgdesc="Database access library" url="http://www.gnome-db.org/" arch=(i686 x86_64) @@ -14,11 +14,13 @@ gobject-introspection gtk-doc vala itstool gnome-common git) _commit=3f70d4fced92d5fe7134c77b78e0730ce2945cc5 # LIBGDA_5.2 source=("git+https://git.gnome.org/browse/libgda#commit=$_commit" + fix-crash.diff java.patch 0001-Convert-files-to-Unicode.patch glib-2.54-ftbfs.patch glib-2.54-ftbfs-2.patch) sha256sums=('SKIP' + '7eab1c7f5c11a87ce7a3e47c5c9058595f14c0b601daa6e0a32d797b708d97ba' 'e28ea88d49bcb91fa6907440a6785a508fb681c463188b3805509773f5d0fc22' '2e25ee9ca86b3767485b26b19317e5188641e2dbfa6202bb204b16e332cca3a4' '73f65147b1d7d3b78982c9ac562816e855db1b20d7ff346d9fd1ecb013864afc' @@ -40,6 +42,7 @@ patch -Np1 -i ../0001-Convert-files-to-Unicode.patch patch -Np1 -i ../glib-2.54-ftbfs.patch patch -Np1 -i ../glib-2.54-ftbfs-2.patch + patch -Np1 -i ../fix-crash.diff javac getsp.java find -name '*.py' -exec sed -i '1s/python$/&2/' {} + Added: fix-crash.diff =================================================================== --- fix-crash.diff (rev 0) +++ fix-crash.diff 2017-10-09 11:34:48 UTC (rev 307219) @@ -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);