summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /gnome-extra/libgda/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'gnome-extra/libgda/files')
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch55
-rw-r--r--gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch28
-rw-r--r--gnome-extra/libgda/files/libgda-5.2.4-format-security.patch29
-rw-r--r--gnome-extra/libgda/files/libgda-5.2.4-jre18.patch14
4 files changed, 126 insertions, 0 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
new file mode 100644
index 000000000000..fe814a730490
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-control-center-icon-collision.patch
@@ -0,0 +1,55 @@
+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
new file mode 100644
index 000000000000..2fd31ab7d1de
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-4.99.1-gda-browser-doc-collision.patch
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 000000000000..81c7804c512c
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-format-security.patch
@@ -0,0 +1,29 @@
+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
new file mode 100644
index 000000000000..f66fa8f95846
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2.4-jre18.patch
@@ -0,0 +1,14 @@
+--- 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"