diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-08-18 17:12:55 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-08-18 17:12:55 +0800 |
| commit | e0f642707a5915095add5c38ec950dd5c0d0614a (patch) | |
| tree | e770ab4af1d3966b01b798fda13c831bdcbf26c6 | |
| parent | 33f5e28dc7e3b7c2422f0030f2ecd1a63b53686e (diff) | |
| download | marcuscom-ports-e0f642707a5915095add5c38ec950dd5c0d0614a.tar marcuscom-ports-e0f642707a5915095add5c38ec950dd5c0d0614a.tar.gz marcuscom-ports-e0f642707a5915095add5c38ec950dd5c0d0614a.tar.bz2 marcuscom-ports-e0f642707a5915095add5c38ec950dd5c0d0614a.tar.lz marcuscom-ports-e0f642707a5915095add5c38ec950dd5c0d0614a.tar.xz marcuscom-ports-e0f642707a5915095add5c38ec950dd5c0d0614a.tar.zst marcuscom-ports-e0f642707a5915095add5c38ec950dd5c0d0614a.zip | |
Fix build with newest Gtk 2.
Obtained from: nautilus git master.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14434 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | x11-fm/nautilus/Makefile | 3 | ||||
| -rw-r--r-- | x11-fm/nautilus/files/patch-src_nautilus-navigation-window-pane.c | 22 | ||||
| -rw-r--r-- | x11-fm/nautilus/files/patch-src_nautilus-side-pane.c | 11 |
3 files changed, 35 insertions, 1 deletions
diff --git a/x11-fm/nautilus/Makefile b/x11-fm/nautilus/Makefile index fd7880d1d..380e92402 100644 --- a/x11-fm/nautilus/Makefile +++ b/x11-fm/nautilus/Makefile @@ -3,11 +3,12 @@ # Whom: ade, archie # # $FreeBSD$ -# $MCom: ports/x11-fm/nautilus/Makefile,v 1.200 2010/07/23 14:40:14 kwm Exp $ +# $MCom: ports/x11-fm/nautilus/Makefile,v 1.201 2010/08/13 14:54:44 kwm Exp $ # PORTNAME= nautilus PORTVERSION= 2.31.6 +PORTREVISION= 1 CATEGORIES= x11-fm gnome MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/x11-fm/nautilus/files/patch-src_nautilus-navigation-window-pane.c b/x11-fm/nautilus/files/patch-src_nautilus-navigation-window-pane.c new file mode 100644 index 000000000..9ef73aac7 --- /dev/null +++ b/x11-fm/nautilus/files/patch-src_nautilus-navigation-window-pane.c @@ -0,0 +1,22 @@ +--- src/nautilus-navigation-window-pane.c.orig 2010-08-18 11:05:15.000000000 +0200 ++++ src/nautilus-navigation-window-pane.c 2010-08-18 11:06:41.000000000 +0200 +@@ -457,8 +457,8 @@ notebook_popup_menu_cb (GtkWidget *widge + } + + static gboolean +-notebook_switch_page_cb (GtkNotebook *notebook, +- GtkNotebookPage *page, ++notebook_switch_page_cb (GtkWidget *notebook, ++ GtkWidget *page, + unsigned int page_num, + NautilusNavigationWindowPane *pane) + { +@@ -480,7 +480,7 @@ notebook_switch_page_cb (GtkNotebook *no + void + nautilus_navigation_window_pane_remove_page (NautilusNavigationWindowPane *pane, int page_num) + { +- GtkNotebook *notebook; ++ GtkWidget *notebook; + notebook = GTK_NOTEBOOK (pane->notebook); + + g_signal_handlers_block_by_func (notebook, diff --git a/x11-fm/nautilus/files/patch-src_nautilus-side-pane.c b/x11-fm/nautilus/files/patch-src_nautilus-side-pane.c new file mode 100644 index 000000000..b7e2d7497 --- /dev/null +++ b/x11-fm/nautilus/files/patch-src_nautilus-side-pane.c @@ -0,0 +1,11 @@ +--- src/nautilus-side-pane.c.orig 2010-08-18 11:09:43.000000000 +0200 ++++ src/nautilus-side-pane.c 2010-08-18 11:10:05.000000000 +0200 +@@ -90,7 +90,7 @@ side_panel_free (SidePanel *panel) + + static void + switch_page_callback (GtkWidget *notebook, +- GtkNotebookPage *page, ++ GtkWidget *page, + guint page_num, + gpointer user_data) + { |