Attachment 78567 Details for Bug 113004 – file.diff

[patch] file.diff

file.diff (text/plain), 11.95 KB, created by tkato432 on 2007-05-25 19:10:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2007-05-25 19:10:06 UTC

Size: 11.95 KB

patch

obsolete

>diff -urN /usr/ports/games/monkeybubble/Makefile games/monkeybubble/Makefile
>--- /usr/ports/games/monkeybubble/Makefile	Sun May 20 13:50:24 2007
>+++ games/monkeybubble/Makefile	Mon May 21 16:22:59 2007
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	monkeybubble
>-PORTVERSION=	0.3.2
>-PORTREVISION=	6
>+PORTVERSION=	0.4.0
> CATEGORIES=	games gnome
> MASTER_SITES=	http://home.gna.org/monkeybubble/downloads/
> DISTNAME=	monkey-bubble-${PORTVERSION}
>@@ -15,24 +14,22 @@
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	GTK2 Puzzle Bobble clone with monkeys
> 
>-USE_X_PREFIX=	yes
>-HAS_MONKEYS=	yes
>-
>-GNU_CONFIGURE=	yes
>+USE_GNOME=	gnomedocutils gnomehack gnomeprefix gnometarget intlhack \
>+		librsvg2 libgnomeui
>+USE_GSTREAMER=	yes
> USE_GMAKE=	yes
>-USE_GSTREAMER80=	ogg gconf
>-USE_GNOME=	gnomehack gnomeprefix librsvg2 libgnomeui \
>-		intlhack
>+GNU_CONFIGURE=	yes
>+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>+		LDFLAGS="-L${LOCALBASE}/lib"
>+INSTALLS_OMF=	yes
> 
> GCONF_SCHEMAS=	monkey-bubble.schemas
> 
>-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
>-		LIBS="-L${LOCALBASE}/lib"
>-
> .include <bsd.port.pre.mk>
> 
> post-patch:
>-	${REINPLACE_CMD} -e "s,-Werror,," ${WRKSRC}/src/net/Makefile.in \
>-		${WRKSRC}/src/ui/Makefile.in
>+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
>+		's|-g -O2||g ; \
>+		 s|-Werror||g'
> 
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/games/monkeybubble/distinfo games/monkeybubble/distinfo
>--- /usr/ports/games/monkeybubble/distinfo	Thu Nov 24 16:06:00 2005
>+++ games/monkeybubble/distinfo	Wed May  2 03:12:50 2007
>@@ -1,3 +1,3 @@
>-MD5 (monkey-bubble-0.3.2.tar.gz) = 37e91fa4cdbab9ec06b2ee2a5aa0683c
>-SHA256 (monkey-bubble-0.3.2.tar.gz) = 68a4d3f26404993431014a23bf181150e9a11c394e003277d8e5db49c85af018
>-SIZE (monkey-bubble-0.3.2.tar.gz) = 5453029
>+MD5 (monkey-bubble-0.4.0.tar.gz) = 0de8a05c8c15e08326d244534dc30f22
>+SHA256 (monkey-bubble-0.4.0.tar.gz) = eb96293a0fadbbfc3cd3ae0bbb557d9bf8a4dd8edccdd8ce1b913e8ba49a1c89
>+SIZE (monkey-bubble-0.4.0.tar.gz) = 5360713
>diff -urN /usr/ports/games/monkeybubble/files/patch-help__C__monkey-bubble.xml games/monkeybubble/files/patch-help__C__monkey-bubble.xml
>--- /usr/ports/games/monkeybubble/files/patch-help__C__monkey-bubble.xml	Thu Jan  1 09:00:00 1970
>+++ games/monkeybubble/files/patch-help__C__monkey-bubble.xml	Wed May  2 03:37:21 2007
>@@ -0,0 +1,29 @@
>+--- help/C/monkey-bubble.xml.orig	Wed Aug  2 00:12:41 2006
>++++ help/C/monkey-bubble.xml	Wed May  2 03:37:19 2007
>+@@ -15,6 +15,16 @@
>+ <article id="index" lang="en"> 
>+   <articleinfo> 
>+     <title>&app; Manual V&manrevision;</title> 
>++    <abstract role="description">
>++      <para>
>++       Monkey Bubble is in a game in which you must explode all bubbles in the
>++       game area.
>++
>++       You explode bubbles by putting at least 3 of the same colour in contact.
>++       Any bubble that is connected to the top or the sides of the game area by
>++       bubbles you just exploded falls too.
>++      </para>
>++    </abstract>
>+     <copyright> 
>+       <year>2004</year> 
>+       <holder>Thomas Cataldo</holder> 
>+@@ -22,6 +32,9 @@
>+     <publisher> 
>+       <publishername>GNOME Documentation Project</publishername> 
>+     </publisher> 
>++    <othercredit role="maintainer"> 
>++      <name>GNOME Documentation Project</name> 
>++    </othercredit> 
>+     <authorgroup> 
>+       <author> 
>+ 	<firstname>Thomas</firstname> 
>diff -urN /usr/ports/games/monkeybubble/files/patch-src::audio::sound-manager.c games/monkeybubble/files/patch-src::audio::sound-manager.c
>--- /usr/ports/games/monkeybubble/files/patch-src::audio::sound-manager.c	Wed Aug 25 12:01:57 2004
>+++ games/monkeybubble/files/patch-src::audio::sound-manager.c	Thu Jan  1 09:00:00 1970
>@@ -1,20 +0,0 @@
>---- src/audio/sound-manager.c.orig	Tue Aug 24 22:53:40 2004
>-+++ src/audio/sound-manager.c	Tue Aug 24 22:54:13 2004
>-@@ -193,6 +193,8 @@
>- 		 GObject *new_pad,
>- 		 SoundManager * m)
>- {
>-+    
>-+    GstPad * pad;
>-    
>-     gst_element_set_state (PRIVATE(m)->main_bin, GST_STATE_PAUSED);
>- 
>-@@ -209,7 +211,7 @@
>- 		     PRIVATE(m)->output,
>- 			NULL);
>-   
>--  GstPad * pad = gst_element_get_pad( GST_ELEMENT(PRIVATE(m)->vorbis_dec),"sink");
>-+  pad = gst_element_get_pad( GST_ELEMENT(PRIVATE(m)->vorbis_dec),"sink");
>- 
>-   gst_pad_link( GST_PAD(new_pad), pad);
>-   PRIVATE(m)->new_pad_ok = TRUE;
>diff -urN /usr/ports/games/monkeybubble/files/patch-src::ui::eggcellrendererkeys.c games/monkeybubble/files/patch-src::ui::eggcellrendererkeys.c
>--- /usr/ports/games/monkeybubble/files/patch-src::ui::eggcellrendererkeys.c	Wed Aug 25 12:01:57 2004
>+++ games/monkeybubble/files/patch-src::ui::eggcellrendererkeys.c	Thu Jan  1 09:00:00 1970
>@@ -1,20 +0,0 @@
>---- src/ui/eggcellrendererkeys.c.orig	Fri Aug 13 14:50:55 2004
>-+++ src/ui/eggcellrendererkeys.c	Fri Aug 13 14:51:54 2004
>-@@ -588,7 +588,7 @@
>- void
>- egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
>-                                         guint                keyval,
>--                                        GdkModifierType      mask)
>-+                                        EggVirtualModifierType      mask)
>- {
>-   char *text;
>-   gboolean changed;
>-@@ -630,7 +630,7 @@
>- void
>- egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
>-                                         guint               *keyval,
>--                                        GdkModifierType     *mask)
>-+                                        EggVirtualModifierType     *mask)
>- {
>-   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
>- 
>diff -urN /usr/ports/games/monkeybubble/files/patch-src::ui::game-network-player-manager.c games/monkeybubble/files/patch-src::ui::game-network-player-manager.c
>--- /usr/ports/games/monkeybubble/files/patch-src::ui::game-network-player-manager.c	Wed Aug 25 12:01:57 2004
>+++ games/monkeybubble/files/patch-src::ui::game-network-player-manager.c	Thu Jan  1 09:00:00 1970
>@@ -1,16 +0,0 @@
>---- src/ui/game-network-player-manager.c.orig	Tue Aug 24 22:56:44 2004
>-+++ src/ui/game-network-player-manager.c	Tue Aug 24 22:57:00 2004
>-@@ -125,11 +125,12 @@
>- gboolean start_timeout(gpointer data) {
>-     GameNetworkPlayerManager * manager;
>-     GameNetworkPlayer * game;
>-+    UiMain * ui_main;
>- 
>-     manager = GAME_NETWORK_PLAYER_MANAGER(data);
>- 
>- 
>--    UiMain * ui_main =  ui_main_get_instance();
>-+    ui_main =  ui_main_get_instance();
>- 
>-     PRIVATE(manager)->playing = TRUE;
>- 
>diff -urN /usr/ports/games/monkeybubble/files/patch-src::ui::ui-main.c games/monkeybubble/files/patch-src::ui::ui-main.c
>--- /usr/ports/games/monkeybubble/files/patch-src::ui::ui-main.c	Wed Aug 25 20:17:30 2004
>+++ games/monkeybubble/files/patch-src::ui::ui-main.c	Thu Jan  1 09:00:00 1970
>@@ -1,18 +0,0 @@
>---- src/ui/ui-main.c.orig	Fri Aug 13 14:47:33 2004
>-+++ src/ui/ui-main.c	Fri Aug 13 14:48:06 2004
>-@@ -647,6 +647,7 @@
>-                                const char *message_format, ...) {
>-         char *message;
>-         va_list args;
>-+        GtkWidget *dialog;
>-     
>-         if (message_format)	{
>-                 va_start (args, message_format);
>-@@ -656,7 +657,6 @@
>-                 message = NULL;
>-         }
>-     
>--        GtkWidget *dialog;
>-         dialog = gtk_message_dialog_new (transient_parent,
>-                                          GTK_DIALOG_DESTROY_WITH_PARENT,
>-                                          GTK_MESSAGE_ERROR,
>diff -urN /usr/ports/games/monkeybubble/pkg-plist games/monkeybubble/pkg-plist
>--- /usr/ports/games/monkeybubble/pkg-plist	Sun Apr 30 11:22:23 2006
>+++ games/monkeybubble/pkg-plist	Wed May  2 03:48:04 2007
>@@ -1,9 +1,7 @@
> bin/monkey-bubble
> bin/monkey-srv
> share/gnome/applications/monkey-bubble.desktop
>-share/gnome/help/monkey-bubble/C/empty.xml
> share/gnome/help/monkey-bubble/C/monkey-bubble.xml
>-share/gnome/help/monkey-bubble/fr/empty.xml
> share/gnome/help/monkey-bubble/fr/monkey-bubble.xml
> share/gnome/monkey-bubble/gfx/banana.svg
> share/gnome/monkey-bubble/gfx/bubbles/bubble_01.svg
>@@ -14,7 +12,14 @@
> share/gnome/monkey-bubble/gfx/bubbles/bubble_06.svg
> share/gnome/monkey-bubble/gfx/bubbles/bubble_07.svg
> share/gnome/monkey-bubble/gfx/bubbles/bubble_08.svg
>-share/gnome/monkey-bubble/gfx/bubbles/little_bubble.svg
>+share/gnome/monkey-bubble/gfx/bubbles/little_bubble_01.svg
>+share/gnome/monkey-bubble/gfx/bubbles/little_bubble_02.svg
>+share/gnome/monkey-bubble/gfx/bubbles/little_bubble_03.svg
>+share/gnome/monkey-bubble/gfx/bubbles/little_bubble_04.svg
>+share/gnome/monkey-bubble/gfx/bubbles/little_bubble_05.svg
>+share/gnome/monkey-bubble/gfx/bubbles/little_bubble_06.svg
>+share/gnome/monkey-bubble/gfx/bubbles/little_bubble_07.svg
>+share/gnome/monkey-bubble/gfx/bubbles/little_bubble_08.svg
> share/gnome/monkey-bubble/gfx/frozen-bubble/back_hiscores.png
> share/gnome/monkey-bubble/gfx/harm.svg
> share/gnome/monkey-bubble/gfx/harm_down.svg
>@@ -41,7 +46,6 @@
> share/gnome/monkey-bubble/gfx/pane.svg
> share/gnome/monkey-bubble/gfx/pause.svg
> share/gnome/monkey-bubble/gfx/right_monkey.svg
>-share/gnome/monkey-bubble/gfx/snake-body.svg
> share/gnome/monkey-bubble/gfx/snake/snake.svg
> share/gnome/monkey-bubble/gfx/snake/snake_-0.svg
> share/gnome/monkey-bubble/gfx/snake/snake_-1.svg
>@@ -125,6 +129,7 @@
> share/gnome/monkey-bubble/gfx/snake/snake_7.svg
> share/gnome/monkey-bubble/gfx/snake/snake_8.svg
> share/gnome/monkey-bubble/gfx/snake/snake_9.svg
>+share/gnome/monkey-bubble/gfx/snake-body.svg
> share/gnome/monkey-bubble/gfx/splash.svg
> share/gnome/monkey-bubble/gfx/star.svg
> share/gnome/monkey-bubble/gfx/tomato.svg
>@@ -134,29 +139,43 @@
> share/gnome/monkey-bubble/glade/netgame.glade
> share/gnome/monkey-bubble/glade/netserver.glade
> share/gnome/monkey-bubble/levels
>+share/gnome/monkey-bubble/sounds/destroy_group.wav
> share/gnome/monkey-bubble/sounds/game.ogg
>+share/gnome/monkey-bubble/sounds/launch.wav
>+share/gnome/monkey-bubble/sounds/rebound.wav
> share/gnome/monkey-bubble/sounds/splash.ogg
>+share/gnome/monkey-bubble/sounds/stick.wav
> share/gnome/omf/monkey-bubble/monkey-bubble-C.omf
>-@exec scrollkeeper-install -q %D/share/gnome/omf/monkey-bubble/monkey-bubble-C.omf 2>/dev/null || /usr/bin/true
> share/gnome/omf/monkey-bubble/monkey-bubble-fr.omf
>-@exec scrollkeeper-install -q %D/share/gnome/omf/monkey-bubble/monkey-bubble-fr.omf 2>/dev/null || /usr/bin/true
> share/gnome/pixmaps/monkey-bubble-icon.png
>+share/locale/bg/LC_MESSAGES/monkey-bubble.mo
> share/locale/cs/LC_MESSAGES/monkey-bubble.mo
> share/locale/de/LC_MESSAGES/monkey-bubble.mo
> share/locale/en_CA/LC_MESSAGES/monkey-bubble.mo
> share/locale/en_GB/LC_MESSAGES/monkey-bubble.mo
> share/locale/es/LC_MESSAGES/monkey-bubble.mo
> share/locale/eu/LC_MESSAGES/monkey-bubble.mo
>+share/locale/fi/LC_MESSAGES/monkey-bubble.mo
> share/locale/fr/LC_MESSAGES/monkey-bubble.mo
> share/locale/hr/LC_MESSAGES/monkey-bubble.mo
>+share/locale/hu/LC_MESSAGES/monkey-bubble.mo
>+share/locale/ja/LC_MESSAGES/monkey-bubble.mo
>+share/locale/lv/LC_MESSAGES/monkey-bubble.mo
>+share/locale/ms/LC_MESSAGES/monkey-bubble.mo
>+share/locale/ne/LC_MESSAGES/monkey-bubble.mo
> share/locale/nl/LC_MESSAGES/monkey-bubble.mo
> share/locale/pt/LC_MESSAGES/monkey-bubble.mo
> share/locale/pt_BR/LC_MESSAGES/monkey-bubble.mo
>+share/locale/ru/LC_MESSAGES/monkey-bubble.mo
>+share/locale/rw/LC_MESSAGES/monkey-bubble.mo
> share/locale/sr/LC_MESSAGES/monkey-bubble.mo
> share/locale/sr@Latn/LC_MESSAGES/monkey-bubble.mo
> share/locale/sv/LC_MESSAGES/monkey-bubble.mo
> share/locale/tr/LC_MESSAGES/monkey-bubble.mo
> share/locale/uk/LC_MESSAGES/monkey-bubble.mo
>+share/locale/vi/LC_MESSAGES/monkey-bubble.mo
>+share/locale/zh_CN/LC_MESSAGES/monkey-bubble.mo
>+share/locale/zh_TW/LC_MESSAGES/monkey-bubble.mo
> @dirrm share/gnome/omf/monkey-bubble
> @dirrm share/gnome/monkey-bubble/sounds
> @dirrm share/gnome/monkey-bubble/glade
>@@ -169,7 +188,3 @@
> @dirrm share/gnome/help/monkey-bubble/fr
> @dirrm share/gnome/help/monkey-bubble/C
> @dirrm share/gnome/help/monkey-bubble
>-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/monkey-bubble
>-@dirrm etc/gconf/gconf.xml.defaults/apps/monkey-bubble
>-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/monkey-bubble/monkey-bubble-C.omf 2>/dev/null || /usr/bin/true
>-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/monkey-bubble/monkey-bubble-fr.omf 2>/dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 113004: 78567