diff options
Diffstat (limited to 'databases/libgda5/files')
| -rw-r--r-- | databases/libgda5/files/patch-00-unicode | 83 | ||||
| -rw-r--r-- | databases/libgda5/files/patch-ftbfs | 103 | ||||
| -rw-r--r-- | databases/libgda5/files/patch-ftbfs-2 | 11 | ||||
| -rw-r--r-- | databases/libgda5/files/patch-libgda_sqlite_virtual_gda-vprovider-data-model.c | 19 |
4 files changed, 19 insertions, 197 deletions
diff --git a/databases/libgda5/files/patch-00-unicode b/databases/libgda5/files/patch-00-unicode deleted file mode 100644 index 5308f41f6543..000000000000 --- a/databases/libgda5/files/patch-00-unicode +++ /dev/null @@ -1,83 +0,0 @@ -From b611c805b3a2248e2f4f85f993f96c13a05b4730 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Mon, 17 Jul 2017 22:37:50 +0100 -Subject: Convert files to Unicode - -These header files have mixed encoding, and makes various tools choke on -them. ---- - libgda/gda-connection.h | 2 +- - libgda/sql-parser/gda-sql-statement.h | 2 +- - libgda/sql-parser/gda-statement-struct-delete.h | 2 +- - libgda/sql-parser/gda-statement-struct-unknown.h | 2 +- - libgda/sql-parser/gda-statement-struct-util.h | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/libgda/gda-connection.h b/libgda/gda-connection.h -index 94d1b27b5..19ca63fc3 100644 ---- a/libgda/gda-connection.h -+++ libgda/gda-connection.h -@@ -6,7 +6,7 @@ - * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@ximian.com> - * Copyright (C) 2003 Filip Van Raemdonck <mechanix@debian.org> - * Copyright (C) 2004 - 2005 Alan Knowles <alank@src.gnome.org> -- * Copyright (C) 2004 José María Casanova Crespo <jmcasanova@igalia.com> -+ * Copyright (C) 2004 José MarÃa Casanova Crespo <jmcasanova@igalia.com> - * Copyright (C) 2005 - 2009 Bas Driessen <bas.driessen@xobas.com> - * Copyright (C) 2006 - 2008 Murray Cumming <murrayc@murrayc.com> - * Copyright (C) 2007 Leonardo Boshell <lb@kmc.com.co> -diff --git a/libgda/sql-parser/gda-sql-statement.h b/libgda/sql-parser/gda-sql-statement.h -index 0ba1f9edc..8783ca8a1 100644 ---- a/libgda/sql-parser/gda-sql-statement.h -+++ libgda/sql-parser/gda-sql-statement.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org> - * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org> -- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org> -+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org> - * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org> - * Copyright (C) 2011 Murray Cumming <murrayc@murrayc.com> -diff --git a/libgda/sql-parser/gda-statement-struct-delete.h b/libgda/sql-parser/gda-statement-struct-delete.h -index cab8b9dad..2e51c5eae 100644 ---- a/libgda/sql-parser/gda-statement-struct-delete.h -+++ libgda/sql-parser/gda-statement-struct-delete.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2005 Dan Winship <danw@src.gnome.org> - * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org> -- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net> -+ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net> - * Copyright (C) 2007 Armin Burgmeier <armin@openismus.com> - * Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com> - * -diff --git a/libgda/sql-parser/gda-statement-struct-unknown.h b/libgda/sql-parser/gda-statement-struct-unknown.h -index 5c530d4d9..e0aaf945f 100644 ---- a/libgda/sql-parser/gda-statement-struct-unknown.h -+++ libgda/sql-parser/gda-statement-struct-unknown.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org> - * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org> -- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org> -+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org> - * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org> - * Copyright (C) 2009 Murray Cumming <murrayc@murrayc.com> -diff --git a/libgda/sql-parser/gda-statement-struct-util.h b/libgda/sql-parser/gda-statement-struct-util.h -index cd4596281..252d6edcc 100644 ---- a/libgda/sql-parser/gda-statement-struct-util.h -+++ libgda/sql-parser/gda-statement-struct-util.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2005 Dan Winship <danw@src.gnome.org> - * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org> -- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net> -+ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net> - * Copyright (C) 2007 - 2009 Murray Cumming <murrayc@murrayc.com> - * - * This library is free software; you can redistribute it and/or --- -2.11.0 - diff --git a/databases/libgda5/files/patch-ftbfs b/databases/libgda5/files/patch-ftbfs deleted file mode 100644 index d493b571f55a..000000000000 --- a/databases/libgda5/files/patch-ftbfs +++ /dev/null @@ -1,103 +0,0 @@ -Description: Fix FTBFS with glib 2.54 - glib-mkenums now expects input files to be UTF-8, - fix the encoding of libgnomeui/gnome-scores.h -Author: Adrian Bunk <bunk@debian.org> - ---- libgda5-5.2.4.orig/libgda/gda-column.h -+++ libgda/gda-column.h -@@ -1,6 +1,6 @@ - /* - * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org> -- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net> -+ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net> - * Copyright (C) 2008 PrzemysÅ‚aw Grzegorczyk <pgrzegorczyk@gmail.com> - * - * This library is free software; you can redistribute it and/or ---- libgda5-5.2.4.orig/libgda/gda-data-model-extra.h -+++ libgda/gda-data-model-extra.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org> -+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org> - * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org> - * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org> ---- libgda5-5.2.4.orig/libgda/gda-data-model-iter-extra.h -+++ libgda/gda-data-model-iter-extra.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org> - * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org> -- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org> -+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org> - * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org> - * ---- libgda5-5.2.4.orig/libgda/gda-data-model.h -+++ libgda/gda-data-model.h -@@ -4,7 +4,7 @@ - * Copyright (C) 2003 Laurent Sansonetti <lrz@gnome.org> - * Copyright (C) 2005 Dan Winship <danw@src.gnome.org> - * Copyright (C) 2005 - 2012 Vivien Malerba <malerba@gnome-db.org> -- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net> -+ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net> - * Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com> - * Copyright (C) 2011 Daniel Espinosa <despinosa@src.gnome.org> - * ---- libgda5-5.2.4.orig/libgda/gda-mutex.h -+++ libgda/gda-mutex.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org> - * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org> -- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org> -+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org> - * Copyright (C) 2001 - 2013 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org> - * ---- libgda5-5.2.4.orig/libgda/gda-row.h -+++ libgda/gda-row.h -@@ -3,10 +3,10 @@ - * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@gnome-db.org> - * Copyright (C) 2003 Laurent Sansonetti <laurent@datarescue.be> -- * Copyright (C) 2003 Xabier Rodríguez Calvar <xrcalvar@igalia.com> -+ * Copyright (C) 2003 Xabier RodrÃguez Calvar <xrcalvar@igalia.com> - * Copyright (C) 2004 Paisa Seeluangsawat <paisa@users.sf.net> - * Copyright (C) 2005 Bas Driessen <bas.driessen@xobas.com> -- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net> -+ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public ---- libgda5-5.2.4.orig/libgda/gda-server-provider-private.h -+++ libgda/gda-server-provider-private.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2005 Dan Winship <danw@src.gnome.org> - * Copyright (C) 2005 - 2011 Vivien Malerba <malerba@gnome-db.org> -- * Copyright (C) 2005 Álvaro Peña <alvaropg@telefonica.net> -+ * Copyright (C) 2005 Ãlvaro Peña <alvaropg@telefonica.net> - * Copyright (C) 2007 Murray Cumming <murrayc@murrayc.com> - * - * This library is free software; you can redistribute it and/or ---- libgda5-5.2.4.orig/libgda/gda-util.h -+++ libgda/gda-util.h -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org> - * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org> -- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org> -+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org> - * Copyright (C) 2001 - 2013 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org> - * Copyright (C) 2006 - 2007 Murray Cumming <murrayc@murrayc.com> ---- libgda5-5.2.4.orig/libgda/libgda-global-variables.h -+++ libgda/libgda-global-variables.h -@@ -1,5 +1,5 @@ - /* -- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org> -+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org> - * Copyright (C) 2001 - 2003 Rodrigo Moya <rodrigo@gnome-db.org> - * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 - 2003 Gonzalo Paniagua Javier <gonzalo@gnome-db.org> diff --git a/databases/libgda5/files/patch-ftbfs-2 b/databases/libgda5/files/patch-ftbfs-2 deleted file mode 100644 index 7c368cd42cae..000000000000 --- a/databases/libgda5/files/patch-ftbfs-2 +++ /dev/null @@ -1,11 +0,0 @@ ---- libgda-ui/gdaui-easy.h 2017-10-08 21:17:30.203226827 +0000 -+++ libgda-ui/gdaui-easy.h 2017-10-08 21:19:38.143497887 +0000 -@@ -1,7 +1,7 @@ - /* - * Copyright (C) 2000 Reinhard Müller <reinhard@src.gnome.org> - * Copyright (C) 2000 - 2002 Rodrigo Moya <rodrigo@gnome-db.org> -- * Copyright (C) 2001 Carlos Perelló Marín <carlos@gnome-db.org> -+ * Copyright (C) 2001 Carlos Perelló MarÃn <carlos@gnome-db.org> - * Copyright (C) 2001 - 2011 Vivien Malerba <malerba@gnome-db.org> - * Copyright (C) 2002 Gonzalo Paniagua Javier <gonzalo@src.gnome.org> - * diff --git a/databases/libgda5/files/patch-libgda_sqlite_virtual_gda-vprovider-data-model.c b/databases/libgda5/files/patch-libgda_sqlite_virtual_gda-vprovider-data-model.c new file mode 100644 index 000000000000..042c2efca3c0 --- /dev/null +++ b/databases/libgda5/files/patch-libgda_sqlite_virtual_gda-vprovider-data-model.c @@ -0,0 +1,19 @@ +From d2122f1eb84b9d89596865f663c3e5e355011385 Mon Sep 17 00:00:00 2001 +From: Daniel Espinosa <esodan@gmail.com> +Date: Sun, 30 Sep 2018 09:30:34 -0500 +Subject: [PATCH] Fix build on MacOS + +Thanks to Tom Schoonjans @@tschoonj. + +Close issue #142 +--- libgda/sqlite/virtual/gda-vprovider-data-model.c.orig 2018-09-27 03:34:56 UTC ++++ libgda/sqlite/virtual/gda-vprovider-data-model.c +@@ -280,7 +280,7 @@ virtual_filtered_data_free (VirtualFilteredData *data) + static VirtualFilteredData * + virtual_filtered_data_ref (VirtualFilteredData *data) + { +- g_return_if_fail (data != NULL); ++ g_return_val_if_fail (data != NULL, NULL); + data->refcount ++; + return data; + } |