Hello community, here is the log from the commit of package xplayer for openSUSE:Factory checked in at 2018-09-19 14:31:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xplayer (Old) and /work/SRC/openSUSE:Factory/.xplayer.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xplayer" Wed Sep 19 14:31:41 2018 rev:18 rq:636480 version:1.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/xplayer/xplayer.changes 2018-06-28 15:13:27.371588796 +0200 +++ /work/SRC/openSUSE:Factory/.xplayer.new/xplayer.changes 2018-09-19 14:33:27.523299680 +0200 @@ -1,0 +2,6 @@ +Mon Sep 10 12:53:21 UTC 2018 - [email protected] + +- Add xplayer-fix-grilo.patch: Fix start-up issues caused by the + Grilo plugin (boo#1106676). + +------------------------------------------------------------------- New: ---- xplayer-fix-grilo.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xplayer.spec ++++++ --- /var/tmp/diff_new_pack.aAgsJv/_old 2018-09-19 14:33:27.999299358 +0200 +++ /var/tmp/diff_new_pack.aAgsJv/_new 2018-09-19 14:33:28.003299356 +0200 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,6 +25,8 @@ Group: Productivity/Multimedia/Video/Players Url: https://github.com/linuxmint/xplayer Source: https://github.com/linuxmint/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM xplayer-fix-grilo.patch boo#1106676 [email protected] -- Fix start-up issues caused by the Grilo plugin. +Patch0: xplayer-fix-grilo.patch BuildRequires: autoconf BuildRequires: autoconf-archive BuildRequires: automake @@ -90,7 +92,6 @@ Obsoletes: %{name}-plugin-zeitgeist <= %{version} %endif %if 0%{?suse_version} >= 1500 -BuildRequires: pkgconfig(grilo-0.3) # Required for cluttersink. Requires: gstreamer-plugin-cluttergst3 Requires: python2-gobject-Gdk @@ -161,6 +162,7 @@ %prep %setup -q +%patch0 -p1 %build NOCONFIGURE=1 ./autogen.sh @@ -205,11 +207,7 @@ %endif %files -%if 0%{?suse_version} >= 1500 %license COPYING -%else -%doc COPYING -%endif %doc AUTHORS ChangeLog NEWS README %doc %{_datadir}/help/C/%{name}/ %{_bindir}/%{name}* ++++++ xplayer-fix-grilo.patch ++++++ --- a/src/plugins/grilo/grilo.ui +++ b/src/plugins/grilo/grilo.ui @@ -108,17 +108,6 @@ <property name="position">0</property> </packing> </child> - <child> - <object class="XplayerSearchEntry" id="gw_search_text"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -131,16 +120,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="shadow_type">in</property> - <child> - <object class="GdMainIconView" id="gw_search_results_view"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">gw_search_store_results</property> - <style> - <class name="content-view"/> - </style> - </object> - </child> </object> <packing> <property name="expand">True</property> --- a/src/plugins/grilo/xplayer-grilo.c +++ b/src/plugins/grilo/xplayer-grilo.c @@ -1189,15 +1189,27 @@ static void setup_sidebar_search (XplayerGriloPlugin *self, GtkBuilder *builder) { + GtkWidget *search_combo_box, *search_results_window; + GtkStyleContext *search_results_view_style; + + self->priv->search_results_view = gd_main_icon_view_new (); + self->priv->search_entry = GTK_WIDGET (xplayer_search_entry_new ()); + self->priv->search_results_model = GTK_TREE_MODEL (gtk_builder_get_object (builder, "gw_search_store_results")); self->priv->search_sources_list = GTK_WIDGET (gtk_builder_get_object (builder, "gw_search_select_source")); - self->priv->search_results_view = GTK_WIDGET (gtk_builder_get_object (builder, "gw_search_results_view")); - self->priv->search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "gw_search_text")); + search_combo_box = GTK_WIDGET (gtk_builder_get_object (builder, "gw_combo_box")); + search_results_window = GTK_WIDGET (gtk_builder_get_object (builder, "gw_search_results_window")); - g_signal_connect (self->priv->search_results_view, + gtk_icon_view_set_model (GTK_ICON_VIEW (self->priv->search_results_view), + self->priv->search_results_model); + gtk_widget_set_can_focus (self->priv->search_results_view, TRUE); + + search_results_view_style = gtk_widget_get_style_context (self->priv->search_results_view); + gtk_style_context_add_class (search_results_view_style, "content-view"); + + g_signal_connect (GTK_ICON_VIEW (self->priv->search_results_view), "item-activated", - G_CALLBACK (search_activated_cb), - self); + G_CALLBACK (search_activated_cb), self); g_signal_connect (self->priv->search_results_view, "popup-menu", G_CALLBACK (popup_menu_cb), self); @@ -1205,23 +1217,27 @@ setup_sidebar_search (XplayerGriloPlugin *self, "button-press-event", G_CALLBACK (context_button_pressed_cb), self); + gtk_widget_set_can_focus (self->priv->search_entry, TRUE); + g_signal_connect (self->priv->search_entry, "activate", - G_CALLBACK (search_entry_activate_cb), - self); + G_CALLBACK (search_entry_activate_cb), self); g_signal_connect (self->priv->search_entry, "notify::selected-id", G_CALLBACK (search_entry_source_changed_cb), self); - g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (gtk_builder_get_object (builder, - "gw_search_results_window"))), + g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (search_results_window)), "value_changed", - G_CALLBACK (adjustment_value_changed_cb), - self); + G_CALLBACK (adjustment_value_changed_cb), self); - g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (gtk_builder_get_object (builder, - "gw_search_results_window"))), - "changed", - G_CALLBACK (adjustment_changed_cb), - self); + g_signal_connect (gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (search_results_window)), + "changed", G_CALLBACK (adjustment_changed_cb), self); + + gtk_box_pack_end (GTK_BOX (search_combo_box), self->priv->search_entry, + TRUE, TRUE, 0); + gtk_container_add (GTK_CONTAINER (search_results_window), + self->priv->search_results_view); + + gtk_widget_show (self->priv->search_entry); + gtk_widget_show (self->priv->search_results_view); xplayer_add_sidebar_page (self->priv->xplayer, "grilo-search", _("Search"),
