diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-22 12:02:54 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-03-22 12:02:54 -0300 |
| commit | aa49e201b1464851bcebcd821592a2fceeaddcbc (patch) | |
| tree | 40708e916d04d7929b2bc2a8c17c796fb91dec8e /community/agave/drop-libgnome.patch | |
| parent | e555324330bef021c747085c7499fd843ed20f47 (diff) | |
| parent | 39e662ccfbe62ae77d458159d192816171a22f43 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/agave/PKGBUILD
community/raul/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/cheese/PKGBUILD
gnome-unstable/cogl/PKGBUILD
gnome-unstable/empathy/PKGBUILD
gnome-unstable/eog/PKGBUILD
gnome-unstable/gdk-pixbuf2/PKGBUILD
gnome-unstable/gedit/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/gnome-bluetooth/PKGBUILD
gnome-unstable/gnome-documents/PKGBUILD
gnome-unstable/gnome-documents/gnome-documents.install
gnome-unstable/gnome-shell/PKGBUILD
gnome-unstable/gnome-system-monitor/PKGBUILD
gnome-unstable/gnome-system-monitor/gnome-system-monitor.install
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtksourceview3/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/libwebkit/PKGBUILD
gnome-unstable/metacity/PKGBUILD
gnome-unstable/mutter/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/sushi/PKGBUILD
gnome-unstable/telepathy-farstream/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libdrm/no-pthread-stubs.patch
testing/iproute2/PKGBUILD
testing/openssh/PKGBUILD
Diffstat (limited to 'community/agave/drop-libgnome.patch')
| -rw-r--r-- | community/agave/drop-libgnome.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/community/agave/drop-libgnome.patch b/community/agave/drop-libgnome.patch new file mode 100644 index 000000000..5dd704e34 --- /dev/null +++ b/community/agave/drop-libgnome.patch @@ -0,0 +1,66 @@ +diff -Naur agave-0.4.4.orig/src/dialogs/gcs-about-window.cc agave-0.4.4/src/dialogs/gcs-about-window.cc +--- agave-0.4.4.orig/src/dialogs/gcs-about-window.cc 2007-11-02 04:16:16.000000000 +0100 ++++ agave-0.4.4/src/dialogs/gcs-about-window.cc 2012-03-20 22:01:55.835021376 +0100 +@@ -26,9 +26,6 @@ + #include <cstring> // for strlen() + + #include <config.h> +-#ifdef HAVE_GNOME +-#include <libgnome/gnome-url.h> +-#endif // HAVE_GNOME + + #include <gtkmm/icontheme.h> + +@@ -46,11 +43,8 @@ + { + set_name(PACKAGE_NAME); + +-#ifdef HAVE_GNOME +- set_url_hook(sigc::mem_fun(*this, &AboutWindow::on_link_clicked)); + set_website(PACKAGE_WEBSITE); + set_website_label(_("Project Website")); +-#endif // HAVE_GNOME + + Glib::ustring version(PACKAGE_VERSION); + set_version(version); +@@ -112,15 +106,6 @@ + + + void +- AboutWindow::on_link_clicked(Gtk::AboutDialog& dialog, +- const Glib::ustring& link) +- { +-#ifdef HAVE_GNOME +- gnome_url_show(link.c_str(), 0); +-#endif // HAVE_GNOME +- } +- +- void + AboutWindow::on_response(int response_id) + { + if (response_id == Gtk::RESPONSE_DELETE_EVENT || +diff -Naur agave-0.4.4.orig/src/gcs-mainwindow-actions.cc agave-0.4.4/src/gcs-mainwindow-actions.cc +--- agave-0.4.4.orig/src/gcs-mainwindow-actions.cc 2007-11-02 04:01:16.000000000 +0100 ++++ agave-0.4.4/src/gcs-mainwindow-actions.cc 2012-03-20 22:01:10.637760066 +0100 +@@ -25,7 +25,6 @@ + + #include <vector> + #include <gtk/gtk.h> +-#include <libgnome/gnome-help.h> + #include <gtkmm/iconfactory.h> + #include <gtkmm/stock.h> + #include <gtkmm/clipboard.h> +@@ -251,9 +250,10 @@ + /* Help Menu Actions */ + void MainWindow::on_action_help_contents(void) + { +- gnome_help_display("agave.xml", +- NULL /* link id */, +- NULL /* GError */); ++ gtk_show_uri (NULL, ++ "ghelp:agave", ++ gtk_get_current_event_time (), ++ NULL); + } + + |