[monkey-bubble] - Fix wrong directory ownership (#569437) - Fix FTBFS with gcc-4.6
Hans de Goede
jwrdegoede at fedoraproject.org
Wed Feb 9 09:27:20 UTC 2011
commit 66c5746923a3005fb83c0b90c5b45c051dfe175f
Author: Hans de Goede <hdegoede at redhat.com>
Date: Wed Feb 9 10:38:08 2011 +0100
- Fix wrong directory ownership (#569437)
- Fix FTBFS with gcc-4.6
monkey-bubble-0.4.0-gcc46.patch | 239 +++++++++++++++++++++++++++++++++++++++
monkey-bubble.spec | 10 ++-
2 files changed, 247 insertions(+), 2 deletions(-)
---
diff --git a/monkey-bubble-0.4.0-gcc46.patch b/monkey-bubble-0.4.0-gcc46.patch
new file mode 100644
index 0000000..6cbf0ec
--- /dev/null
+++ b/monkey-bubble-0.4.0-gcc46.patch
@@ -0,0 +1,239 @@
+diff -up monkey-bubble-0.4.0/src/monkey/board.c~ monkey-bubble-0.4.0/src/monkey/board.c
+--- monkey-bubble-0.4.0/src/monkey/board.c~ 2004-07-16 15:31:46.000000000 +0200
++++ monkey-bubble-0.4.0/src/monkey/board.c 2011-02-09 10:15:21.962191004 +0100
+@@ -664,8 +664,7 @@ recursive_tag_exploded (Board * board, g
+ static gint
+ advance_quadrant (Board * board, gint quadrant, Point * cell)
+ {
+- gint x, y;
+- x = cell->x;
++ gint y;
+ y = cell->y;
+ switch (quadrant)
+ {
+diff -up monkey-bubble-0.4.0/src/net/game-manager.c~ monkey-bubble-0.4.0/src/net/game-manager.c
+--- monkey-bubble-0.4.0/src/net/game-manager.c~ 2006-03-21 21:25:19.000000000 +0100
++++ monkey-bubble-0.4.0/src/net/game-manager.c 2011-02-09 10:23:25.339191006 +0100
+@@ -95,13 +95,10 @@ gboolean
+ network_game_manager_add_client(NetworkGameManager * manager,
+ NetworkClient * client)
+ {
+- NetworkMessageHandler * handler;
+ gboolean joined;
+ g_mutex_lock( PRIVATE(manager)->started_lock);
+
+ if( PRIVATE(manager)->can_join == TRUE) {
+- handler = network_client_get_handler(client);
+-
+ g_mutex_lock(PRIVATE(manager)->clients_lock);
+
+
+@@ -188,12 +185,8 @@ void
+ network_game_manager_remove_client(NetworkGameManager * manager,
+ NetworkClient * client)
+ {
+- NetworkMessageHandler * handler;
+-
+ g_mutex_lock( PRIVATE(manager)->started_lock);
+
+- handler = network_client_get_handler(client);
+-
+ g_mutex_lock(PRIVATE(manager)->clients_lock);
+
+
+diff -up monkey-bubble-0.4.0/src/net/game.c~ monkey-bubble-0.4.0/src/net/game.c
+--- monkey-bubble-0.4.0/src/net/game.c~ 2004-12-24 12:35:30.000000000 +0100
++++ monkey-bubble-0.4.0/src/net/game.c 2011-02-09 10:18:10.453191001 +0100
+@@ -555,7 +555,6 @@ init_clients (NetworkGame * self)
+ {
+
+ GList *next;
+- Bubble *bubbles[INIT_BUBBLES_COUNT];
+ Color colors[INIT_BUBBLES_COUNT];
+ int c[COLORS_COUNT];
+ int i;
+@@ -565,7 +564,6 @@ init_clients (NetworkGame * self)
+ {
+ Color c = rand () % COLORS_COUNT;
+ colors[i] = c;
+- bubbles[i] = bubble_new (c, 0, 0);
+ }
+
+ memset (&c, 0, sizeof (c));
+diff -up monkey-bubble-0.4.0/src/ui/game-2-player.c~ monkey-bubble-0.4.0/src/ui/game-2-player.c
+--- monkey-bubble-0.4.0/src/ui/game-2-player.c~ 2004-09-27 09:49:53.000000000 +0200
++++ monkey-bubble-0.4.0/src/ui/game-2-player.c 2011-02-09 10:24:41.241190988 +0100
+@@ -556,7 +556,6 @@ game_2_player_bubbles_exploded(Monkey *
+ int i;
+ guint8 * columns;
+ int to_go;
+- MonkeyView * view;
+ Monkey * other;
+ Color * colors;
+
+@@ -574,10 +573,7 @@ game_2_player_bubbles_exploded(Monkey *
+
+
+ other = PRIVATE(p)->monkey_left;
+- view = PRIVATE(p)->display_left;
+ if( monkey == other ) {
+- view = PRIVATE(p)->display_right;
+-
+ other = PRIVATE(p)->monkey_right;
+ }
+
+diff -up monkey-bubble-0.4.0/src/ui/game-network-player.c~ monkey-bubble-0.4.0/src/ui/game-network-player.c
+--- monkey-bubble-0.4.0/src/ui/game-network-player.c~ 2004-12-24 12:35:30.000000000 +0100
++++ monkey-bubble-0.4.0/src/ui/game-network-player.c 2011-02-09 10:23:56.362191004 +0100
+@@ -235,8 +235,6 @@ game_network_player_bubble_sticked (Monk
+ gboolean
+ add_bubble (gpointer ud)
+ {
+- Monkey *monkey;
+- monkey = (Monkey *) ud;
+ return FALSE;
+ }
+
+diff -up monkey-bubble-0.4.0/src/ui/ui-main.c~ monkey-bubble-0.4.0/src/ui/ui-main.c
+--- monkey-bubble-0.4.0/src/ui/ui-main.c~ 2011-02-09 10:14:05.000000000 +0100
++++ monkey-bubble-0.4.0/src/ui/ui-main.c 2011-02-09 10:30:33.727191000 +0100
+@@ -168,7 +168,6 @@ static UiMain* ui_main_new(void) {
+ UiMain * ui_main;
+ GtkWidget * vbox;
+ GtkWidget * item;
+- KeyboardProperties * kp;
+ GdkPixbuf *appicon = NULL;
+
+ ui_main = UI_MAIN(g_object_new(UI_TYPE_MAIN, NULL));
+@@ -199,7 +198,6 @@ static UiMain* ui_main_new(void) {
+
+ PRIVATE(ui_main)->menu = glade_xml_get_widget(PRIVATE(ui_main)->glade_xml,"main_menubar");
+ g_object_ref(PRIVATE(ui_main)->menu);
+- kp = keyboard_properties_get_instance();
+
+ PRIVATE(ui_main)->accel_group = gtk_accel_group_new ();
+ gtk_window_add_accel_group(GTK_WINDOW(PRIVATE(ui_main)->window),
+@@ -371,15 +369,11 @@ static void ui_main_new_2_player_game(Ui
+
+
+ void ui_main_set_game_manager(UiMain * ui_main,GameManager * manager) {
+- Layer * root_layer;
+-
+
+ if( PRIVATE(ui_main)->game != NULL) {
+ ui_main_stop_game(ui_main);
+ }
+
+- root_layer = monkey_canvas_get_root_layer(PRIVATE(ui_main)->canvas);
+-
+ monkey_canvas_clear(PRIVATE(ui_main)->canvas);
+
+
+@@ -551,25 +545,19 @@ void ui_main_game_changed(Game * game,
+ static void new_network_game(gpointer callback_data,
+ guint callback_action,
+ GtkWidget *widget) {
+- UiNetworkClient * ngl;
+-
+- ngl = ui_network_client_new();
++ ui_network_client_new();
+ }
+
+
+ static void new_network_server(gpointer callback_data,
+ guint callback_action,
+ GtkWidget *widget) {
+- UiNetworkServer * ngl;
+ NetworkSimpleServer * server;
+- UiMain * ui_main;
+-
+- ui_main = UI_MAIN(callback_data);
+ server = network_simple_server_new();
+
+ if( network_simple_server_start( server ) == TRUE) {
+
+- ngl = ui_network_server_new(server);
++ ui_network_server_new(server);
+
+ } else {
+ GladeXML * gx;
+diff -up monkey-bubble-0.4.0/src/ui/ui-network-client.c~ monkey-bubble-0.4.0/src/ui/ui-network-client.c
+--- monkey-bubble-0.4.0/src/ui/ui-network-client.c~ 2006-06-26 17:00:39.000000000 +0200
++++ monkey-bubble-0.4.0/src/ui/ui-network-client.c 2011-02-09 10:26:17.238191014 +0100
+@@ -364,12 +364,9 @@ static void ready_signal(gpointer cal
+
+
+ UiNetworkClient * self;
+- GtkWidget * item;
+
+ self = UI_NETWORK_CLIENT(callback_data);
+
+- item = glade_xml_get_widget( PRIVATE(self)->glade_xml, "ready_button");
+-
+ if( ! PRIVATE(self)->ready ) {
+ net_game_manager_proxy_send_ready_state(PRIVATE(self)->manager_proxy,
+ TRUE);
+diff -up monkey-bubble-0.4.0/src/ui/ui-network-server.c~ monkey-bubble-0.4.0/src/ui/ui-network-server.c
+--- monkey-bubble-0.4.0/src/ui/ui-network-server.c~ 2006-06-26 17:00:39.000000000 +0200
++++ monkey-bubble-0.4.0/src/ui/ui-network-server.c 2011-02-09 10:26:32.903191001 +0100
+@@ -309,12 +309,9 @@ static void ready_signal(gpointer cal
+
+
+ UiNetworkServer * self;
+- GtkWidget * item;
+
+ self = UI_NETWORK_SERVER(callback_data);
+
+- item = glade_xml_get_widget( PRIVATE(self)->glade_xml, "ready_button");
+-
+ if( ! PRIVATE(self)->ready ) {
+ net_game_manager_proxy_send_ready_state(PRIVATE(self)->manager_proxy,
+ TRUE);
+diff -up monkey-bubble-0.4.0/src/view/monkey-view.c~ monkey-bubble-0.4.0/src/view/monkey-view.c
+--- monkey-bubble-0.4.0/src/view/monkey-view.c~ 2004-07-06 09:47:10.000000000 +0200
++++ monkey-bubble-0.4.0/src/view/monkey-view.c 2011-02-09 10:16:43.703191005 +0100
+@@ -152,7 +152,6 @@ static void monkey_view_bubbles_inserted
+ static Block * monkey_view_create_bubble(MonkeyView * view,
+ Bubble * bubble );
+ void monkey_view_load_shooter_images(MonkeyView * monkey_view) {
+- GError * error;
+ gchar path[4096];
+ gint str_length;
+ gint i;
+@@ -160,8 +159,6 @@ void monkey_view_load_shooter_images(Mon
+
+ gdouble x,y;
+
+-
+- error = NULL;
+ shooter = monkey_get_shooter(PRIVATE(monkey_view)->monkey);
+
+
+@@ -295,9 +292,7 @@ MonkeyView * monkey_view_new(MonkeyCanva
+ gboolean back_needed,
+ gboolean show_point) {
+ gdouble x,y;
+- GError * error;
+ Shooter * shooter;
+- Playground * pl;
+ Board * board;
+ Bubble * b;
+ Block * block;
+@@ -305,8 +300,6 @@ MonkeyView * monkey_view_new(MonkeyCanva
+
+ MonkeyView * monkey_view = MONKEY_VIEW (g_object_new (TYPE_MONKEY_VIEW, NULL));
+
+- error = NULL;
+-
+ g_assert( IS_MONKEY_VIEW( monkey_view ) );
+
+ g_object_ref( monkey);
+@@ -475,8 +468,6 @@ MonkeyView * monkey_view_new(MonkeyCanva
+ PRIVATE(monkey_view)->fallen_list = NULL;
+ PRIVATE(monkey_view)->time = 0;
+
+- pl = monkey_get_playground( monkey);
+-
+ g_signal_connect( G_OBJECT(monkey),"bubbles-waiting-changed",
+ G_CALLBACK( monkey_view_bubbles_waiting_changed),
+ monkey_view);
diff --git a/monkey-bubble.spec b/monkey-bubble.spec
index 87f8e79..1c43637 100644
--- a/monkey-bubble.spec
+++ b/monkey-bubble.spec
@@ -1,6 +1,6 @@
Name: monkey-bubble
Version: 0.4.0
-Release: 15%{?dist}
+Release: 16%{?dist}
Summary: Game in the spirit of Frozen Bubble
Group: Amusements/Games
License: GPLv2+
@@ -8,6 +8,7 @@ URL: http://home.gna.org/monkeybubble/
Source0: http://home.gna.org/monkeybubble/downloads/%{name}-%{version}.tar.gz
Source1: splash.svg
Patch0: monkey-bubble-0.4.0-help.patch
+Patch1: monkey-bubble-0.4.0-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel librsvg2-devel gstreamer-devel esound-devel
BuildRequires: gettext desktop-file-utils scrollkeeper gnome-doc-utils
@@ -27,6 +28,7 @@ and features svg vector graphics for resolution independent display.
%prep
%setup -q
%patch0 -p1 -z .help
+%patch1 -p1
# replace the broken included splash.svg
cp %{SOURCE1} pixmaps
# adjust desktop, C-code for fdo icon dir and naming
@@ -102,13 +104,17 @@ touch --no-create %{_datadir}/icons/hicolor || :
%{_sysconfdir}/gconf/schemas/%{name}.schemas
%{_bindir}/monkey-*
%{_datadir}/%{name}
-%{_datadir}/gnome
+%{_datadir}/gnome/help/%{name}
%{_datadir}/omf/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
%changelog
+* Wed Feb 09 2011 Hans de Goede <hdegoede at redhat.com> 0.4.0-16
+- Fix wrong directory ownership (#569437)
+- Fix FTBFS with gcc-4.6
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list