Added patch from gnomemeeting cvs that fixes building on systems without libsdl

Package-Manager: portage-2.0.51.19

4 files changed, 72 insertions, 15 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/Manifest b/net-im/gnomemeeting/Manifest
index 37e8c182e8bd..5cfbcc50ca9c 100644
--- a/net-im/gnomemeeting/Manifest
+++ b/net-im/gnomemeeting/Manifest
@@ -1,22 +1,23 @@
-MD5 1840e7e5c9134095b084af3c52152d2c ChangeLog 8532
-MD5 a18bb24d09a6be5fa8b540529f82b02b gnomemeeting-0.94.1.ebuild 2006
-MD5 a90d873b38a939fba966f9b04e58ac42 gnomemeeting-0.98.0.ebuild 1687
-MD5 600e50cb52f072809c3f46a0fe8d02ed gnomemeeting-0.98.5-r1.ebuild 1860
-MD5 698cb54471981882511cf00e76533a54 gnomemeeting-0.98.5.ebuild 1855
+MD5 2ed481fc81ae810b046beb1f532fd69b gnomemeeting-1.2.0.ebuild 2924
 MD5 2eca81a5c31cfef1cd02675db4e996c6 gnomemeeting-1.0.2-r1.ebuild 2288
+MD5 600e50cb52f072809c3f46a0fe8d02ed gnomemeeting-0.98.5-r1.ebuild 1860
+MD5 a18bb24d09a6be5fa8b540529f82b02b gnomemeeting-0.94.1.ebuild 2006
 MD5 9adb1bf9d688e8be734b36bc0e54c110 gnomemeeting-1.0.2.ebuild 2286
-MD5 5e442d151db50f960aa0ed3ef72c081a gnomemeeting-1.00.ebuild 2043
-MD5 6aa93ade11247745af6624437b56bc6b gnomemeeting-1.2.0.ebuild 2781
+MD5 698cb54471981882511cf00e76533a54 gnomemeeting-0.98.5.ebuild 1855
+MD5 a90d873b38a939fba966f9b04e58ac42 gnomemeeting-0.98.0.ebuild 1687
 MD5 eed4f567de688fc863665054fba871e6 metadata.xml 722
+MD5 94ae0ff210d198db763ec571f738bc84 ChangeLog 8726
+MD5 5e442d151db50f960aa0ed3ef72c081a gnomemeeting-1.00.ebuild 2043
+MD5 967c15eee4dba436c91d06bda647a525 files/gnomemeeting-0.98.5-libxml_2.6.patch 406
+MD5 d7e3749e5f20f11f1d4b3dc54c8d9501 files/gnomemeeting-1.2.0-nosdl.patch 1647
+MD5 99311f0023ae8d29bca828f49a5bb750 files/digest-gnomemeeting-1.0.2 71
+MD5 0cc72cbb5df4cb6b2ac1e8d7953f79f0 files/gnomemeeting-1.00-gcc34.patch 892
 MD5 458cb44a30e47a07c5116219068ab5a3 files/digest-gnomemeeting-0.94.1 72
-MD5 c91514d9a4bf338c62c4ef78ddb97553 files/digest-gnomemeeting-0.98.0 73
 MD5 1eeb16dcd662b2829936876613f02611 files/digest-gnomemeeting-0.98.5 73
-MD5 1eeb16dcd662b2829936876613f02611 files/digest-gnomemeeting-0.98.5-r1 73
-MD5 99311f0023ae8d29bca828f49a5bb750 files/digest-gnomemeeting-1.0.2 71
-MD5 99311f0023ae8d29bca828f49a5bb750 files/digest-gnomemeeting-1.0.2-r1 71
 MD5 67fe9473695e53f1d3eb2093e925fa9b files/digest-gnomemeeting-1.00 70
 MD5 30d60925fde5aa7b9591fb163cfb4786 files/digest-gnomemeeting-1.2.0 71
-MD5 967c15eee4dba436c91d06bda647a525 files/gnomemeeting-0.98.5-libxml_2.6.patch 406
+MD5 1eeb16dcd662b2829936876613f02611 files/digest-gnomemeeting-0.98.5-r1 73
 MD5 0c651ec46c87a73e45039d9ab14fddd0 files/gnomemeeting-1.0.2-configure.diff 1304
 MD5 c043ef3af6d65a83c7fc246114910237 files/gnomemeeting-1.2.0-gk-hang-fix.patch 806
-MD5 0cc72cbb5df4cb6b2ac1e8d7953f79f0 files/gnomemeeting-1.00-gcc34.patch 892
+MD5 c91514d9a4bf338c62c4ef78ddb97553 files/digest-gnomemeeting-0.98.0 73
+MD5 99311f0023ae8d29bca828f49a5bb750 files/digest-gnomemeeting-1.0.2-r1 71
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() {