Hello community, here is the log from the commit of package goobox for openSUSE:Factory checked in at 2013-09-29 19:24:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/goobox (Old) and /work/SRC/openSUSE:Factory/.goobox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "goobox" Changes: -------- --- /work/SRC/openSUSE:Factory/goobox/goobox.changes 2013-04-19 15:36:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.goobox.new/goobox.changes 2013-09-29 19:24:41.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Sep 29 09:15:45 UTC 2013 - zai...@opensuse.org + +- Add goobox-3.8-and_above-compatible.patch, in order to better fit + with Gnome 3.8 and newer. + +------------------------------------------------------------------- New: ---- goobox-3.8-and_above-compatible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ goobox.spec ++++++ --- /var/tmp/diff_new_pack.CvYz21/_old 2013-09-29 19:24:41.000000000 +0200 +++ /var/tmp/diff_new_pack.CvYz21/_new 2013-09-29 19:24:41.000000000 +0200 @@ -25,15 +25,17 @@ Group: Productivity/Multimedia/CD/Grabbers Url: http://www.gnome.org Source: http://download.gnome.org/sources/goobox/3.2/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM goobox-3.8-and_above-compatible.patch zai...@opensuse.org -- Bring goobox up to Gnome 3.10.0 standard, patches from upstream git. +Patch0: goobox-3.8-and_above-compatible.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: intltool BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: yelp-tools -BuildRequires: pkgconfig(glib-2.0) >= 2.30 +BuildRequires: pkgconfig(glib-2.0) >= 2.36 BuildRequires: pkgconfig(gstreamer-1.0) >= 1.0.0 -BuildRequires: pkgconfig(gtk+-3.0) >= 3.6.0 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.8.0 BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libbrasero-media3) #BuildRequires: pkgconfig(libcoverart) >= 1.0.0beta1 @@ -52,6 +54,7 @@ %prep %setup -q translation-update-upstream +%patch0 -p1 %build %configure ++++++ goobox-3.8-and_above-compatible.patch ++++++ >From 6ae8c25787ec20fc9718d73c6e425b786b83c519 Mon Sep 17 00:00:00 2001 From: Yosef Or Boczko <yosef...@walla.com> Date: Wed, 19 Jun 2013 14:43:34 +0000 Subject: Set button arrow icons according to locale's text direction --- diff --git a/src/goo-player-bar.c b/src/goo-player-bar.c index 6e31415..ddda839 100644 --- a/src/goo-player-bar.c +++ b/src/goo-player-bar.c @@ -263,6 +263,9 @@ goo_player_bar_construct (GooPlayerBar *self, GtkWidget *main_box; GtkWidget *button_box; GtkWidget *button; + gboolean rtl; + + rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; frame = gtk_event_box_new (); gtk_style_context_add_class (gtk_widget_get_style_context (frame), "goobox-player-bar"); @@ -290,11 +293,11 @@ goo_player_bar_construct (GooPlayerBar *self, gtk_style_context_add_class (gtk_widget_get_style_context (button_box), GTK_STYLE_CLASS_LINKED); gtk_box_pack_start (GTK_BOX (main_box), button_box, FALSE, FALSE, 0); - button = _gtk_button_new_from_icon_name (GOO_STOCK_PREV, GTK_ICON_SIZE_SMALL_TOOLBAR); + button = _gtk_button_new_from_icon_name (rtl ? GOO_STOCK_NEXT : GOO_STOCK_PREV, GTK_ICON_SIZE_SMALL_TOOLBAR); _gtk_button_sync_with_action (button, gtk_action_group_get_action (actions, "Prev")); gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 0); - button = _gtk_button_new_from_icon_name (GOO_STOCK_NEXT, GTK_ICON_SIZE_SMALL_TOOLBAR); + button = _gtk_button_new_from_icon_name (rtl ? GOO_STOCK_PREV : GOO_STOCK_NEXT, GTK_ICON_SIZE_SMALL_TOOLBAR); _gtk_button_sync_with_action (button, gtk_action_group_get_action (actions, "Next")); gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 0); -- cgit v0.9.2 >From 05be4bbfe770cd47eea3fe3c46b023c57016c107 Mon Sep 17 00:00:00 2001 From: Paolo Bacchilega <pao...@src.gnome.org> Date: Thu, 20 Jun 2013 18:50:47 +0000 Subject: use the 'popup' property for the GtkMenuButton --- diff --git a/src/goo-player-bar.c b/src/goo-player-bar.c index ddda839..65f5b99 100644 --- a/src/goo-player-bar.c +++ b/src/goo-player-bar.c @@ -250,7 +250,7 @@ _gtk_button_sync_with_action (GtkWidget *button, gtk_widget_set_tooltip_text (button, gtk_action_get_tooltip (action)); if (GTK_IS_MENU_BUTTON (button)) g_object_set (button, - "menu", gth_toggle_menu_action_get_menu (GTH_TOGGLE_MENU_ACTION (action)), + "popup", gth_toggle_menu_action_get_menu (GTH_TOGGLE_MENU_ACTION (action)), NULL); } -- cgit v0.9.2 >From 5982d5e5a9923cba86e87db860971bfba5816fa7 Mon Sep 17 00:00:00 2001 From: Paolo Bacchilega <pao...@src.gnome.org> Date: Thu, 20 Jun 2013 18:51:07 +0000 Subject: fixed the style with Gtk+ 3.8 --- diff --git a/src/goo-player-bar.c b/src/goo-player-bar.c index 65f5b99..565bf6e 100644 --- a/src/goo-player-bar.c +++ b/src/goo-player-bar.c @@ -268,7 +268,7 @@ goo_player_bar_construct (GooPlayerBar *self, rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; frame = gtk_event_box_new (); - gtk_style_context_add_class (gtk_widget_get_style_context (frame), "goobox-player-bar"); + gtk_style_context_add_class (gtk_widget_get_style_context (frame), GTK_STYLE_CLASS_BACKGROUND); gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (self), frame, TRUE, TRUE, 0); diff --git a/src/goo-window.c b/src/goo-window.c index a2c8d1e..4155bfc 100644 --- a/src/goo-window.c +++ b/src/goo-window.c @@ -2094,6 +2094,7 @@ goo_window_construct (GooWindow *window, GError *error = NULL; gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (window)), "goobox-main-window"); + gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (window)), GTK_STYLE_CLASS_VIEW); g_signal_connect (G_OBJECT (window), "delete_event", diff --git a/src/ui/goobox.css b/src/ui/goobox.css index d8dec00..bb54e6c 100644 --- a/src/ui/goobox.css +++ b/src/ui/goobox.css @@ -1,12 +1,3 @@ -GtkWindow.goobox-main-window { - background-color: @theme_base_color; - color: @text_color; -} - -GtkWindow.goobox-main-window:backdrop { - background-color: @theme_unfocused_base_color; -} - .goobox-info-album { padding: 0; font-weight: bold; @@ -25,11 +16,6 @@ GtkWindow.goobox-main-window:backdrop { color: mix (@theme_fg_color, @theme_bg_color, 0.75); } -.goobox-player-bar { - background-color: @bg_color; - border: 0; -} - .goobox-cover-frame GtkButton:hover { border-image-width: 0; border-radius: 0; -- cgit v0.9.2 >From 519dfc8dbb1fa99786cb7220288bd9397d0b1edd Mon Sep 17 00:00:00 2001 From: Paolo Bacchilega <pao...@src.gnome.org> Date: Thu, 20 Jun 2013 17:20:16 +0000 Subject: removed some deprecated functions --- diff --git a/src/glib-utils.c b/src/glib-utils.c index d321f81..0eb5d50 100644 --- a/src/glib-utils.c +++ b/src/glib-utils.c @@ -946,18 +946,18 @@ _g_list_insert_list_before (GList *list1, GHashTable *static_strings = NULL; -static GStaticMutex static_strings_mutex = G_STATIC_MUTEX_INIT; const char * get_static_string (const char *s) { - const char *result; + static GMutex static_strings_mutex; + const char *result; if (s == NULL) return NULL; - g_static_mutex_lock (&static_strings_mutex); + g_mutex_lock (&static_strings_mutex); if (static_strings == NULL) static_strings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); @@ -969,7 +969,7 @@ get_static_string (const char *s) GINT_TO_POINTER (1)); } - g_static_mutex_unlock (&static_strings_mutex); + g_mutex_unlock (&static_strings_mutex); return result; } diff --git a/src/gtk-utils.c b/src/gtk-utils.c index 90a85a0..d1c4b59 100644 --- a/src/gtk-utils.c +++ b/src/gtk-utils.c @@ -340,7 +340,7 @@ get_themed_icon_pixbuf (GThemedIcon *icon, g_clear_error (&error); } - gtk_icon_info_free (icon_info); + g_object_unref (icon_info); g_strfreev (icon_names); return pixbuf; diff --git a/src/main.c b/src/main.c index 8fdd5e2..862a5fb 100644 --- a/src/main.c +++ b/src/main.c @@ -701,8 +701,6 @@ goo_application_class_init (GooApplicationClass *klass) static GtkApplication * goo_application_new (void) { - g_type_init (); - return g_object_new (goo_application_get_type (), "application-id", "org.gnome.Goobox", "flags", 0, -- cgit v0.9.2 >From 5101378744f67e4a9e10bd37c5c176acd3914515 Mon Sep 17 00:00:00 2001 From: Paolo Bacchilega <pao...@src.gnome.org> Date: Thu, 20 Jun 2013 19:11:13 +0000 Subject: fixed indentation --- diff --git a/src/goo-player-bar.c b/src/goo-player-bar.c index 565bf6e..6c93e20 100644 --- a/src/goo-player-bar.c +++ b/src/goo-player-bar.c @@ -263,9 +263,9 @@ goo_player_bar_construct (GooPlayerBar *self, GtkWidget *main_box; GtkWidget *button_box; GtkWidget *button; - gboolean rtl; + gboolean rtl; - rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; + rtl = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL; frame = gtk_event_box_new (); gtk_style_context_add_class (gtk_widget_get_style_context (frame), GTK_STYLE_CLASS_BACKGROUND); -- cgit v0.9.2 >From 2511ab2c46df82fbfb3a777fd2d18295bd003c95 Mon Sep 17 00:00:00 2001 From: Yosef Or Boczko <yosef...@walla.com> Date: Thu, 20 Jun 2013 22:08:59 +0000 Subject: Use in rtl-symbolic instead in symbol in the opposite direction and fix playback-start symbol --- diff --git a/src/goo-player-bar.c b/src/goo-player-bar.c index 6c93e20..0c57db1 100644 --- a/src/goo-player-bar.c +++ b/src/goo-player-bar.c @@ -281,7 +281,7 @@ goo_player_bar_construct (GooPlayerBar *self, /* Play buttons */ - button = _gtk_button_new_from_icon_name (GOO_STOCK_PLAY, PLAY_BUTTON_SIZE); + button = _gtk_button_new_from_icon_name (rtl ? GOO_STOCK_PLAY_RTL : GOO_STOCK_PLAY, PLAY_BUTTON_SIZE); _gtk_button_sync_with_action (button, gtk_action_group_get_action (actions, "TogglePlay")); g_signal_connect (gtk_action_group_get_action (actions, "TogglePlay"), "notify::icon-name", @@ -293,11 +293,11 @@ goo_player_bar_construct (GooPlayerBar *self, gtk_style_context_add_class (gtk_widget_get_style_context (button_box), GTK_STYLE_CLASS_LINKED); gtk_box_pack_start (GTK_BOX (main_box), button_box, FALSE, FALSE, 0); - button = _gtk_button_new_from_icon_name (rtl ? GOO_STOCK_NEXT : GOO_STOCK_PREV, GTK_ICON_SIZE_SMALL_TOOLBAR); + button = _gtk_button_new_from_icon_name (rtl ? GOO_STOCK_PREV_RTL : GOO_STOCK_PREV, GTK_ICON_SIZE_SMALL_TOOLBAR); _gtk_button_sync_with_action (button, gtk_action_group_get_action (actions, "Prev")); gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 0); - button = _gtk_button_new_from_icon_name (rtl ? GOO_STOCK_PREV : GOO_STOCK_NEXT, GTK_ICON_SIZE_SMALL_TOOLBAR); + button = _gtk_button_new_from_icon_name (rtl ? GOO_STOCK_NEXT_RTL : GOO_STOCK_NEXT, GTK_ICON_SIZE_SMALL_TOOLBAR); _gtk_button_sync_with_action (button, gtk_action_group_get_action (actions, "Next")); gtk_box_pack_start (GTK_BOX (button_box), button, FALSE, FALSE, 0); diff --git a/src/goo-stock.h b/src/goo-stock.h index ac3c096..1092cdb 100644 --- a/src/goo-stock.h +++ b/src/goo-stock.h @@ -24,10 +24,13 @@ #define GOO_STOCK_H #define GOO_STOCK_PLAY "media-playback-start-symbolic" +#define GOO_STOCK_PLAY_RTL "media-playback-start-rtl-symbolic" #define GOO_STOCK_PAUSE "media-playback-pause-symbolic" #define GOO_STOCK_STOP "media-playback-stop-symbolic" #define GOO_STOCK_NEXT "media-skip-forward-symbolic" +#define GOO_STOCK_NEXT_RTL "media-skip-forward-rtl-symbolic" #define GOO_STOCK_PREV "media-skip-backward-symbolic" +#define GOO_STOCK_PREV_RTL "media-skip-backward-rtl-symbolic" #define GOO_STOCK_EJECT "media-eject-symbolic" #define GOO_STOCK_EXTRACT "document-save-symbolic" #define GOO_STOCK_RESET "goo-reset" -- cgit v0.9.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
