diff options
Diffstat (limited to 'gnome-extra/libgda/files')
5 files changed, 0 insertions, 262 deletions
diff --git a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch deleted file mode 100644 index fe814a7..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 6ec47f4cf542ad9f7c4d30d557e4813b5c6f31d5 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gmail.com> -Date: Sat, 4 Jun 2011 05:45:35 -0400 -Subject: [PATCH] Prevent file collision with gda-control-center-4.0's icons - ---- - control-center/data/Makefile.am | 12 ++++++------ - ... hicolor_apps_16x16_gda-control-center-5.0.png} | Bin 833 -> 833 bytes - ... hicolor_apps_22x22_gda-control-center-5.0.png} | Bin 1157 -> 1157 bytes - ... hicolor_apps_24x24_gda-control-center-5.0.png} | Bin 1144 -> 1144 bytes - ...icolor_apps_256x256_gda-control-center-5.0.png} | Bin 33543 -> 33543 bytes - ... hicolor_apps_32x32_gda-control-center-5.0.png} | Bin 1867 -> 1867 bytes - ... hicolor_apps_48x48_gda-control-center-5.0.png} | Bin 3144 -> 3144 bytes - control-center/gda-control-center-5.0.desktop.in | 2 +- - 8 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/control-center/data/Makefile.am b/control-center/data/Makefile.am -index 03fa362..862ec88 100644 ---- a/control-center/data/Makefile.am -+++ b/control-center/data/Makefile.am -@@ -5,12 +5,12 @@ public_icons_themes = \ - $(NULL) - - public_icons = \ -- hicolor_apps_16x16_gda-control-center.png \ -- hicolor_apps_22x22_gda-control-center.png \ -- hicolor_apps_24x24_gda-control-center.png \ -- hicolor_apps_256x256_gda-control-center.png \ -- hicolor_apps_32x32_gda-control-center.png \ -- hicolor_apps_48x48_gda-control-center.png \ -+ hicolor_apps_16x16_gda-control-center-5.0.png \ -+ hicolor_apps_22x22_gda-control-center-5.0.png \ -+ hicolor_apps_24x24_gda-control-center-5.0.png \ -+ hicolor_apps_256x256_gda-control-center-5.0.png \ -+ hicolor_apps_32x32_gda-control-center-5.0.png \ -+ hicolor_apps_48x48_gda-control-center-5.0.png \ - $(NULL) - - private_icons = \ -diff --git a/control-center/gda-control-center-5.0.desktop.in b/control-center/gda-control-center-5.0.desktop.in -index 6fd5b58..429787d 100644 ---- a/control-center/gda-control-center-5.0.desktop.in -+++ b/control-center/gda-control-center-5.0.desktop.in -@@ -1,7 +1,7 @@ - [Desktop Entry] - _Name=Database access control center - _Comment=Configure your database access environment --Icon=gda-control-center -+Icon=gda-control-center-5.0 - Exec=gda-control-center-5.0 - Terminal=false - Type=Application --- -1.7.5.3 - diff --git a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch deleted file mode 100644 index 2fd31ab..0000000 --- a/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bfb0d952d111929174c3326dbc69ab65a808a235 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gmail.com> -Date: Sat, 4 Jun 2011 05:59:46 -0400 -Subject: [PATCH] Prevent file collision with gda-browser-4.0's gtk-doc files - ---- - tools/browser/doc/Makefile.am | 2 +- - ...browser-docs.sgml => gda-browser-5.0-docs.sgml} | 0 - ...r-sections.txt => gda-browser-5.0-sections.txt} | 0 - .../{gda-browser.types => gda-browser-5.0.types} | 0 - 4 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/tools/browser/doc/Makefile.am b/tools/browser/doc/Makefile.am -index 971fa79..cf6637a 100644 ---- a/tools/browser/doc/Makefile.am -+++ b/tools/browser/doc/Makefile.am -@@ -3,7 +3,7 @@ - AUTOMAKE_OPTIONS = 1.6 - - # The name of the module. --DOC_MODULE=gda-browser -+DOC_MODULE=gda-browser-5.0 - - # The top-level SGML file. - DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml --- -1.7.5.3 - diff --git a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch deleted file mode 100644 index 81c7804..0000000 --- a/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 68af249e1c36cbac2e39903b0fc357e3ad2bf1ee Mon Sep 17 00:00:00 2001 -From: Vivien Malerba <malerba@gnome-db.org> -Date: Wed, 16 Apr 2014 14:59:50 +0200 -Subject: [PATCH] Markup message correction - ---- - libgda-ui/demos/ddl_queries.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c -index a47630f..4b29377 100644 ---- a/libgda-ui/demos/ddl_queries.c -+++ b/libgda-ui/demos/ddl_queries.c -@@ -475,9 +475,9 @@ show_sql (G_GNUC_UNUSED GtkButton *button, DemoData *data) - else - msg = g_strdup_printf ("<b>SQL:</b>\n%s", sql); - -- dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window), -- GTK_DIALOG_MODAL, -- msg_type, GTK_BUTTONS_CLOSE, msg); -+ dlg = gtk_message_dialog_new (GTK_WINDOW (data->top_window), -+ GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_CLOSE, NULL); -+ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dlg), msg); - g_free (sql); - g_free (msg); - --- -1.9.0 - diff --git a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch deleted file mode 100644 index f66fa8f..0000000 --- a/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- libgda-5.2.2/configure.orig 2014-05-17 14:58:33.206028742 +0200 -+++ libgda-5.2.2/configure 2014-05-17 14:58:45.937790443 +0200 -@@ -23200,6 +23259,11 @@ - JTYPE="Sun JRE 1.7" - JFLAGS="-Xlint:unchecked -Xlint:deprecation" - ;; -+ JRE1.8.*) -+ try_java=true -+ JTYPE="Sun JRE 1.8" -+ JFLAGS="-Xlint:unchecked -Xlint:deprecation" -+ ;; - JREgcj-4*) - try_java=true - JTYPE="GCJ" diff --git a/gnome-extra/libgda/files/libgda-5.2.8-my_bool-error.patch b/gnome-extra/libgda/files/libgda-5.2.8-my_bool-error.patch deleted file mode 100644 index f30dbc9..0000000 --- a/gnome-extra/libgda/files/libgda-5.2.8-my_bool-error.patch +++ /dev/null @@ -1,136 +0,0 @@ -diff -urNp libgda-5.2.8-orig/providers/mysql/gda-mysql-provider.c libgda-5.2.8-dwok/providers/mysql/gda-mysql-provider.c ---- libgda-5.2.8-orig/providers/mysql/gda-mysql-provider.c 2019-08-21 12:47:26.763768166 +0200 -+++ libgda-5.2.8-dwok/providers/mysql/gda-mysql-provider.c 2019-08-21 12:58:54.915575798 +0200 -@@ -1835,7 +1835,7 @@ real_prepare (GdaServerProvider *provide - return FALSE; - } - -- my_bool update_max_length = 1; -+ _Bool update_max_length = 1; - if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) { - _gda_mysql_make_error (cnc, NULL, mysql_stmt, error); - mysql_stmt_close (mysql_stmt); -@@ -1941,7 +1941,7 @@ prepare_stmt_simple (MysqlConnectionData - return FALSE; - } - -- my_bool update_max_length = 1; -+ _Bool update_max_length = 1; - if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) { - _gda_mysql_make_error (cdata->cnc, NULL, mysql_stmt, error); - mysql_stmt_close (mysql_stmt); -@@ -2327,7 +2327,7 @@ gda_mysql_provider_statement_execute (Gd - if (allow_noparam) { - /* bind param to NULL */ - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - empty_rs = TRUE; - continue; - } -@@ -2347,7 +2347,7 @@ gda_mysql_provider_statement_execute (Gd - if (allow_noparam) { - /* bind param to NULL */ - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - empty_rs = TRUE; - continue; - } -@@ -2399,7 +2399,7 @@ gda_mysql_provider_statement_execute (Gd - GdaStatement *rstmt; - if (! gda_rewrite_statement_for_null_parameters (stmt, params, &rstmt, error)) { - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - } - else if (!rstmt) - return NULL; -@@ -2459,7 +2459,7 @@ gda_mysql_provider_statement_execute (Gd - ts = (GdaTimestamp*) gda_value_get_timestamp (value); - if (!ts) { - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - } - else { - _Bool tofree = FALSE; -@@ -2495,7 +2495,7 @@ gda_mysql_provider_statement_execute (Gd - ts = (GdaTime*) gda_value_get_time (value); - if (!ts) { - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - } - else { - _Bool tofree = FALSE; -@@ -2528,7 +2528,7 @@ gda_mysql_provider_statement_execute (Gd - ts = (GDate*) g_value_get_boxed (value); - if (!ts) { - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - } - else { - MYSQL_TIME *mtime; -@@ -2548,7 +2548,7 @@ gda_mysql_provider_statement_execute (Gd - str = g_value_get_string (value); - if (!str) { - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - } - else { - mysql_bind_param[i].buffer_type= MYSQL_TYPE_STRING; -@@ -2624,7 +2624,7 @@ gda_mysql_provider_statement_execute (Gd - bin = ((GdaBinary*) blob); - if (!bin) { - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - } - else { - gchar *str = NULL; -@@ -2665,7 +2665,7 @@ gda_mysql_provider_statement_execute (Gd - bin = gda_value_get_binary (value); - if (!bin) { - mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL; -- mysql_bind_param[i].is_null = (my_bool*)1; -+ mysql_bind_param[i].is_null = (_Bool *) 1; - } - else { - mysql_bind_param[i].buffer_type= MYSQL_TYPE_BLOB; -diff -urNp libgda-5.2.8-orig/providers/mysql/gda-mysql-recordset.c libgda-5.2.8-dwok/providers/mysql/gda-mysql-recordset.c ---- libgda-5.2.8-orig/providers/mysql/gda-mysql-recordset.c 2019-08-21 12:45:14.144430495 +0200 -+++ libgda-5.2.8-dwok/providers/mysql/gda-mysql-recordset.c 2019-08-21 12:59:57.265383845 +0200 -@@ -627,7 +627,7 @@ gda_mysql_recordset_new (GdaConnection - /* binding results with types */ - mysql_bind_result[i].buffer_type = field->type; - mysql_bind_result[i].is_unsigned = field->flags & UNSIGNED_FLAG ? TRUE : FALSE; -- mysql_bind_result[i].is_null = g_malloc0 (sizeof (my_bool)); -+ mysql_bind_result[i].is_null = g_malloc0 (sizeof (_Bool)); - - switch (mysql_bind_result[i].buffer_type) { - case MYSQL_TYPE_TINY: -@@ -753,7 +753,7 @@ new_row_from_mysql_stmt (GdaMysqlRecords - - gint col; - for (col = 0; col < ((GdaDataSelect *) imodel)->prep_stmt->ncols; ++col) { -- my_bool truncated; -+ _Bool truncated; - mysql_bind_result[col].error = &truncated; - mysql_stmt_fetch_column (imodel->priv->mysql_stmt, &(mysql_bind_result[col]), - (unsigned int)col, 0); -@@ -784,10 +784,10 @@ new_row_from_mysql_stmt (GdaMysqlRecords - - /*g_print ("%s: #%d : TYPE=%d, GTYPE=%s\n", __func__, i, mysql_bind_result[i].buffer_type, g_type_name (type));*/ - -- my_bool is_null = FALSE; -+ _Bool is_null = FALSE; - unsigned long length; - -- memmove (&is_null, mysql_bind_result[i].is_null, sizeof (my_bool)); -+ memmove (&is_null, mysql_bind_result[i].is_null, sizeof (_Bool)); - if (is_null) { - gda_value_set_null (value); - continue; |