diff options
| author |   Stefan Knoblich <stkn@gentoo.org> | 2005-03-13 10:46:01 +0000 |
|---|---|---|
| committer | Stefan Knoblich <stkn@gentoo.org> | 2005-03-13 10:46:01 +0000 |
| commit | ef12bad193c48eb96807a87286d76e3ca4bcc5ec (patch) | |
| tree | 6a2d7f087a1e0321c106ab7b92996e2ec624901f | |
| parent | Add /usr/lib/klibc to PRELINK_PATH_MASK. (diff) | |
| download | gentoo-2-ef12bad193c48eb96807a87286d76e3ca4bcc5ec.tar.gz gentoo-2-ef12bad193c48eb96807a87286d76e3ca4bcc5ec.tar.bz2 gentoo-2-ef12bad193c48eb96807a87286d76e3ca4bcc5ec.zip | |
Added patch from gnomemeeting cvs that fixes building on systems without libsdl
(Portage version: 2.0.51.19)
| -rw-r--r-- | net-im/gnomemeeting/ChangeLog | 6 | ||||
| -rw-r--r-- | net-im/gnomemeeting/files/gnomemeeting-1.2.0-nosdl.patch | 48 | ||||
| -rw-r--r-- | net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild | 6 |
3 files changed, 58 insertions, 2 deletions
diff --git a/net-im/gnomemeeting/ChangeLog b/net-im/gnomemeeting/ChangeLog index bf53456502c5..a11735d9b13e 100644 --- a/net-im/gnomemeeting/ChangeLog +++ b/net-im/gnomemeeting/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-im/gnomemeeting # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.50 2005/02/06 22:53:39 stkn Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/ChangeLog,v 1.51 2005/03/13 10:46:01 stkn Exp $ + + 13 Mar 2005; Stefan Knoblich <stkn@gentoo.org> + +files/gnomemeeting-1.2.0-nosdl.patch, gnomemeeting-1.2.0.ebuild: + Patch fixes compiling on systems without libsdl installed, closes #82811. 06 Feb 2005; Stefan Knoblich <stkn@gentoo.org> +files/gnomemeeting-1.00-gcc34.patch, gnomemeeting-1.00.ebuild: diff --git a/net-im/gnomemeeting/files/gnomemeeting-1.2.0-nosdl.patch b/net-im/gnomemeeting/files/gnomemeeting-1.2.0-nosdl.patch new file mode 100644 index 000000000000..c93061c522b4 --- /dev/null +++ b/net-im/gnomemeeting/files/gnomemeeting-1.2.0-nosdl.patch @@ -0,0 +1,48 @@ +--- gnomemeeting-1.2.0/src/main_window.cpp 2005-02-16 15:09:24.000000000 -0100 ++++ gnomemeeting-1.2.0.new/src/main_window.cpp 2004-11-20 14:54:23.000000000 -0100 +@@ -1127,12 +1127,12 @@ gm_mw_init_menu (GtkWidget *main_window) + GTK_STOCK_ZOOM_100, '=', + GTK_SIGNAL_FUNC (zoom_normal_changed_cb), + (gpointer) VIDEO_DISPLAY_KEY "zoom_factor", FALSE), ++#ifdef HAS_SDL +- + GTK_MENU_ENTRY("fullscreen", _("Fullscreen"), _("Switch to fullscreen"), + GTK_STOCK_ZOOM_IN, 'f', + GTK_SIGNAL_FUNC (fullscreen_changed_cb), + (gpointer) main_window, FALSE), ++#endif +- + GTK_MENU_NEW(_("_Tools")), + + GTK_MENU_ENTRY("address_book", _("Address _Book"), +@@ -1631,12 +1631,12 @@ gm_mw_video_window_new (GtkWidget *main_ + GTK_STOCK_ZOOM_100, '=', + GTK_SIGNAL_FUNC (zoom_normal_changed_cb), + (gpointer) VIDEO_DISPLAY_KEY "local_zoom_factor", TRUE), ++#ifdef HAS_SDL +- + GTK_MENU_ENTRY("fullscreen", _("Fullscreen"), _("Switch to fullscreen"), + GTK_STOCK_ZOOM_IN, 'f', + GTK_SIGNAL_FUNC (fullscreen_changed_cb), + (gpointer) main_window, TRUE), ++#endif +- + GTK_MENU_END + }; + +@@ -1654,12 +1654,12 @@ gm_mw_video_window_new (GtkWidget *main_ + GTK_STOCK_ZOOM_100, '=', + GTK_SIGNAL_FUNC (zoom_normal_changed_cb), + (gpointer) VIDEO_DISPLAY_KEY "remote_zoom_factor", TRUE), ++#ifdef HAS_SDL +- + GTK_MENU_ENTRY("fullscreen", _("Fullscreen"), _("Switch to fullscreen"), + GTK_STOCK_ZOOM_IN, 'f', + GTK_SIGNAL_FUNC (fullscreen_changed_cb), + (gpointer) main_window, TRUE), ++#endif +- + GTK_MENU_END + }; + + diff --git a/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild b/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild index 22c1755f20cd..5b6887661bea 100644 --- a/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild +++ b/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild,v 1.5 2005/01/14 17:11:25 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/gnomemeeting/gnomemeeting-1.2.0.ebuild,v 1.6 2005/03/13 10:46:01 stkn Exp $ inherit gnome2 eutils @@ -49,6 +49,10 @@ src_unpack() { # Fix a hanging bug which shows up when registered to a GateKeeper # see http://cvs.gnome.org/viewcvs/gnomemeeting/src/endpoint.cpp?only_with_tag=HEAD&r2=1.434&r1=1.433 epatch ${FILESDIR}/gnomemeeting-1.2.0-gk-hang-fix.patch + + # Fix compilation problems with sdl support disabled + # (taken from gnomemeeting bugzilla, fixes #82811) + epatch ${FILESDIR}/${P}-nosdl.patch } src_compile() { |