[SCM] gnome-mplayer/experimental: Remove all patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Mar 3 18:51:18 UTC 2013
The following commit has been merged in the experimental branch:
commit d29efa68b9f5a35eea6dfc71448d4bdec122b412
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Mar 3 18:59:04 2013 +0100
Remove all patches
diff --git a/debian/changelog b/debian/changelog
index 3ec4b52..d4fbbdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ gnome-mplayer (1.0.8-1) UNRELEASED; urgency=low
- Add myself to Uploaders.
- Use dh-autoreconf instead of autotools-dev.
* debian/copyright: Update copyright years.
+ * debian/patches: Remove all patches, not needed anymore.
-- Sebastian Ramacher <sramacher at debian.org> Sun, 27 Jan 2013 01:02:45 +0100
diff --git a/debian/patches/fallback-to-nonsymbolic-icons.patch b/debian/patches/fallback-to-nonsymbolic-icons.patch
deleted file mode 100644
index 5d2fe56..0000000
--- a/debian/patches/fallback-to-nonsymbolic-icons.patch
+++ /dev/null
@@ -1,290 +0,0 @@
-Description: Fall back to non-symbolic icons if necessary
- If the icon theme doesn't support symoblic icons, fallback to the hicolor
- icons.
-Origin: upstream,
- https://code.google.com/p/gnome-mplayer/source/detail?r=2357,
- https://code.google.com/p/gnome-mplayer/source/detail?r=2363,
- https://code.google.com/p/gnome-mplayer/source/detail?r=2381
-Bug-Debian: http://bugs.debian.org/696714
-Last-Update: 2012-12-30
-
-Index: gnome-mplayer/src/gui.c
-===================================================================
---- gnome-mplayer.orig/src/gui.c 2012-12-26 13:26:28.369863714 +0100
-+++ gnome-mplayer/src/gui.c 2012-12-26 13:28:07.296911956 +0100
-@@ -1182,13 +1182,18 @@
- gboolean set_gui_state(void *data)
- {
- gchar *tip_text = NULL;
--
-+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-+
- gm_log(verbose, G_LOG_LEVEL_MESSAGE, "setting gui state to %s", PLAYSTATE_to_string(guistate));
-
- if (lastguistate != guistate) {
- if (guistate == PLAYING) {
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-pause-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-pause-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-pause-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PAUSE, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PAUSE, button_size);
- #endif
-@@ -1214,7 +1219,11 @@
-
- if (guistate == PAUSED) {
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
- #endif
-@@ -1239,7 +1248,11 @@
-
- if (guistate == STOPPED) {
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
- #endif
-@@ -2577,7 +2590,8 @@
- gboolean stop_callback(GtkWidget * widget, GdkEventExpose * event, void *data)
- {
- IdleData *idle = (IdleData *) data;
--
-+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-+
- if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) == MEDIA_STATE_PLAY ||
- gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) == MEDIA_STATE_PAUSE) {
- gmtk_media_player_set_state(GMTK_MEDIA_PLAYER(media), MEDIA_STATE_STOP);
-@@ -2585,7 +2599,11 @@
- gmtk_media_tracker_set_percentage(tracker, 0.0);
- gtk_widget_set_sensitive(play_event_box, TRUE);
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
- #endif
-@@ -2599,7 +2617,11 @@
- if (gmtk_media_player_get_media_state(GMTK_MEDIA_PLAYER(media)) == MEDIA_STATE_QUIT) {
- gmtk_media_tracker_set_percentage(tracker, 0.0);
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
- #endif
-@@ -2672,7 +2694,8 @@
- GtkTreePath *path;
- GtkTreeIter previter;
- GtkTreeIter localiter;
--
-+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-+
- if (gtk_list_store_iter_is_valid(playliststore, &iter)) {
- if (gmtk_media_player_get_attribute_boolean(GMTK_MEDIA_PLAYER(media), ATTRIBUTE_HAS_CHAPTERS)) {
- valid = FALSE;
-@@ -2706,7 +2729,11 @@
- autopause = FALSE;
- gtk_widget_set_sensitive(play_event_box, TRUE);
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
- #endif
-@@ -2733,7 +2760,8 @@
- {
- gboolean valid = FALSE;
- GtkTreePath *path;
--
-+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-+
- if (gtk_list_store_iter_is_valid(playliststore, &iter)) {
- if (gmtk_media_player_get_attribute_boolean(GMTK_MEDIA_PLAYER(media), ATTRIBUTE_HAS_CHAPTERS)) {
- gmtk_media_player_seek_chapter(GMTK_MEDIA_PLAYER(media), 1, SEEK_RELATIVE);
-@@ -2756,7 +2784,11 @@
- autopause = FALSE;
- gtk_widget_set_sensitive(play_event_box, TRUE);
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
- #endif
-@@ -6718,7 +6750,8 @@
- gchar *tip_text = NULL;
- #endif
- gchar *short_filename = NULL;
--
-+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-+
- gm_log(verbose, G_LOG_LEVEL_MESSAGE, "in media state change with state = %s dontplaynext = %i",
- gmtk_media_state_to_string(media_state), dontplaynext);
- switch (media_state) {
-@@ -6774,7 +6807,11 @@
- // break purposely not put here, so gui is properly updated
- case MEDIA_STATE_STOP:
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
- #endif
-@@ -6810,7 +6847,11 @@
- if (idledata->mapped_af_export == NULL)
- map_af_export_file(idledata);
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-pause-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-pause-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-pause-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PAUSE, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PAUSE, button_size);
- #endif
-@@ -6855,7 +6896,11 @@
- break;
- case MEDIA_STATE_PAUSE:
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "media-playback-start-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_MEDIA_PLAY, button_size);
- #endif
-@@ -7726,15 +7771,33 @@
- gtk_container_add(GTK_CONTAINER(window), vbox_master);
- icon_theme = gtk_icon_theme_get_default();
- #ifdef GTK3_ENABLED
-- image_play = gtk_image_new_from_icon_name("media-playback-start-symbolic", button_size);
-- image_stop = gtk_image_new_from_icon_name("media-playback-stop-symbolic", button_size);
-- image_pause = gtk_image_new_from_icon_name("media-playback-pause-symbolic", button_size);
-- image_ff = gtk_image_new_from_icon_name("media-seek-forward-symbolic", button_size);
-- image_rew = gtk_image_new_from_icon_name("media-seek-backward-symbolic", button_size);
-- image_prev = gtk_image_new_from_icon_name("media-skip-backward-symbolic", button_size);
-- image_next = gtk_image_new_from_icon_name("media-skip-forward-symbolic", button_size);
-- image_menu = gtk_image_new_from_icon_name("view-sidebar-symbolic", button_size);
-- image_fs = gtk_image_new_from_icon_name("view-fullscreen-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "media-playback-start-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "media-playback-stop-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "media-playback-pause-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "media-seek-forward-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "media-seek-backward-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "view-sidebar-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "view-fullscreen-symbolic")) {
-+ image_play = gtk_image_new_from_icon_name("media-playback-start-symbolic", button_size);
-+ image_stop = gtk_image_new_from_icon_name("media-playback-stop-symbolic", button_size);
-+ image_pause = gtk_image_new_from_icon_name("media-playback-pause-symbolic", button_size);
-+ image_ff = gtk_image_new_from_icon_name("media-seek-forward-symbolic", button_size);
-+ image_rew = gtk_image_new_from_icon_name("media-seek-backward-symbolic", button_size);
-+ image_prev = gtk_image_new_from_icon_name("media-skip-backward-symbolic", button_size);
-+ image_next = gtk_image_new_from_icon_name("media-skip-forward-symbolic", button_size);
-+ image_menu = gtk_image_new_from_icon_name("view-sidebar-symbolic", button_size);
-+ image_fs = gtk_image_new_from_icon_name("view-fullscreen-symbolic", button_size);
-+ } else {
-+ image_play = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, button_size);
-+ image_stop = gtk_image_new_from_stock(GTK_STOCK_MEDIA_STOP, button_size);
-+ image_pause = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PAUSE, button_size);
-+ image_ff = gtk_image_new_from_stock(GTK_STOCK_MEDIA_FORWARD, button_size);
-+ image_rew = gtk_image_new_from_stock(GTK_STOCK_MEDIA_REWIND, button_size);
-+ image_prev = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PREVIOUS, button_size);
-+ image_next = gtk_image_new_from_stock(GTK_STOCK_MEDIA_NEXT, button_size);
-+ image_menu = gtk_image_new_from_stock(GTK_STOCK_INDEX, button_size);
-+ image_fs = gtk_image_new_from_stock(GTK_STOCK_FULLSCREEN, button_size);
-+ }
- #else
- image_play = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, button_size);
- image_stop = gtk_image_new_from_stock(GTK_STOCK_MEDIA_STOP, button_size);
-@@ -7983,7 +8046,12 @@
- #ifdef GTK2_12_ENABLED
- vol_slider = gtk_volume_button_new();
- #ifdef GTK3_ENABLED
-- g_object_set(G_OBJECT(vol_slider), "use-symbolic", TRUE, NULL);
-+ if (gtk_icon_theme_has_icon(icon_theme, "audio-volume-muted-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "audio-volume-high-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "audio-volume-low-symbolic") &&
-+ gtk_icon_theme_has_icon(icon_theme, "audio-volume-medium-symbolic")) {
-+ g_object_set(G_OBJECT(vol_slider), "use-symbolic", TRUE, NULL);
-+ }
- #endif
- adj = gtk_scale_button_get_adjustment(GTK_SCALE_BUTTON(vol_slider));
- gtk_scale_button_set_adjustment(GTK_SCALE_BUTTON(vol_slider), adj);
-@@ -8390,6 +8458,8 @@
- GdkScreen *screen;
- GdkRectangle rect;
- GtkAllocation alloc;
-+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-+
- if (fs_controls == NULL && fullscreen) {
- fs_controls = gtk_window_new(GTK_WINDOW_POPUP);
- gtk_widget_add_events(fs_controls, GDK_ENTER_NOTIFY_MASK);
-@@ -8398,7 +8468,11 @@
- g_signal_connect(G_OBJECT(fs_controls), "leave_notify_event", G_CALLBACK(fs_controls_left), NULL);
- g_object_ref(hbox);
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-restore-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "view-restore-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-restore-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
- #endif
-@@ -8428,11 +8502,16 @@
-
- void hide_fs_controls()
- {
--
-+ GtkIconTheme *icon_theme = gtk_icon_theme_get_default();
-+
- if (fs_controls != NULL) {
- g_object_ref(hbox);
- #ifdef GTK3_ENABLED
-- gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-fullscreen-symbolic", button_size);
-+ if (gtk_icon_theme_has_icon(icon_theme, "view-fullscreen-symbolic")) {
-+ gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-fullscreen-symbolic", button_size);
-+ } else {
-+ gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_FULLSCREEN, button_size);
-+ }
- #else
- gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_FULLSCREEN, button_size);
- #endif
diff --git a/debian/patches/fix-gtk3-deprecation-warnings.patch b/debian/patches/fix-gtk3-deprecation-warnings.patch
deleted file mode 100644
index 9939da3..0000000
--- a/debian/patches/fix-gtk3-deprecation-warnings.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-Description: Fix deprecation warnings from GTK+ 3
-Origin: upstream,
- https://code.google.com/p/gnome-mplayer/source/detail?r=2363
-Last-Update: 2012-12-15
-
---- a/src/gui.c
-+++ b/src/gui.c
-@@ -1366,7 +1366,12 @@
- gtk_window_set_resizable(GTK_WINDOW(folder_progress_window), FALSE);
- gtk_widget_set_size_request(folder_progress_window, 400, -1);
-
-- vbox = gtk_vbox_new(FALSE, 10);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
-+#else
-+ vbox = gtk_vbox_new(FALSE, 10);
-+#endif
- folder_progress_bar = gtk_progress_bar_new();
- gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(folder_progress_bar), 0.10);
- folder_progress_label = gtk_label_new("");
-@@ -1374,7 +1379,11 @@
-
- cancel = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- g_signal_connect(G_OBJECT(cancel), "clicked", G_CALLBACK(cancel_clicked), NULL);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ hbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
-+#else
- hbox = gtk_hbutton_box_new();
-+#endif
- gtk_button_box_set_layout(GTK_BUTTON_BOX(hbox), GTK_BUTTONBOX_END);
- gtk_container_add(GTK_CONTAINER(hbox), cancel);
-
-@@ -3119,16 +3128,31 @@
-
- gtk_window_set_resizable(GTK_WINDOW(open_window), FALSE);
- gtk_window_set_title(GTK_WINDOW(open_window), _("Open Location"));
-- vbox = gtk_vbox_new(FALSE, 6);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,6);
-+ gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
-+#else
-+ vbox = gtk_vbox_new(FALSE, 6);
-+#endif
- label = gtk_label_new(_("Location:"));
- open_location = gtk_entry_new();
- gtk_entry_set_width_chars(GTK_ENTRY(open_location), 50);
- gtk_entry_set_activates_default(GTK_ENTRY(open_location), TRUE);
-- item_box = gtk_hbox_new(FALSE, 6);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ item_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,6);
-+ gtk_box_set_homogeneous(GTK_BOX(item_box), FALSE);
-+#else
-+ item_box = gtk_hbox_new(FALSE, 6);
-+#endif
- gtk_box_pack_start(GTK_BOX(item_box), label, FALSE, FALSE, 12);
- gtk_box_pack_end(GTK_BOX(item_box), open_location, TRUE, TRUE, 0);
-
-- button_box = gtk_hbox_new(FALSE, 6);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ button_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,6);
-+ gtk_box_set_homogeneous(GTK_BOX(button_box), FALSE);
-+#else
-+ button_box = gtk_hbox_new(FALSE, 6);
-+#endif
- cancel_button = gtk_button_new_from_stock(GTK_STOCK_CANCEL);
- open_button = gtk_button_new_from_stock(GTK_STOCK_OPEN);
- #ifdef GTK2_22_ENABLED
-@@ -4659,7 +4683,12 @@
- gtk_window_set_resizable(GTK_WINDOW(adv_window), FALSE);
- gtk_window_set_title(GTK_WINDOW(adv_window), _("Video Picture Adjustments"));
-
-- adv_vbox = gtk_vbox_new(FALSE, 10);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ adv_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(adv_vbox), FALSE);
-+#else
-+ adv_vbox = gtk_vbox_new(FALSE, 10);
-+#endif
- adv_hbutton_box = gtk_hbutton_box_new();
- gtk_button_box_set_layout(GTK_BUTTON_BOX(adv_hbutton_box), GTK_BUTTONBOX_END);
- adv_table = gtk_table_new(20, 2, FALSE);
-@@ -5144,14 +5173,54 @@
- gtk_window_set_icon(GTK_WINDOW(config_window), pb_icon);
-
- gtk_window_set_resizable(GTK_WINDOW(config_window), FALSE);
-- conf_vbox = gtk_vbox_new(FALSE, 10);
-- conf_page1 = gtk_vbox_new(FALSE, 10);
-- conf_page2 = gtk_vbox_new(FALSE, 10);
-- conf_page3 = gtk_vbox_new(FALSE, 10);
-- conf_page4 = gtk_vbox_new(FALSE, 10);
-- conf_page5 = gtk_vbox_new(FALSE, 10);
-- conf_page6 = gtk_vbox_new(FALSE, 10);
-- conf_page7 = gtk_vbox_new(FALSE, 10);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ conf_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(conf_vbox), FALSE);
-+#else
-+ conf_vbox = gtk_vbox_new(FALSE, 10);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ conf_page1 = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(conf_page1), FALSE);
-+#else
-+ conf_page1 = gtk_vbox_new(FALSE, 10);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ conf_page2 = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(conf_page2), FALSE);
-+#else
-+ conf_page2 = gtk_vbox_new(FALSE, 10);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ conf_page3 = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(conf_page3), FALSE);
-+#else
-+ conf_page3 = gtk_vbox_new(FALSE, 10);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ conf_page4 = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(conf_page4), FALSE);
-+#else
-+ conf_page4 = gtk_vbox_new(FALSE, 10);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ conf_page5 = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(conf_page5), FALSE);
-+#else
-+ conf_page5 = gtk_vbox_new(FALSE, 10);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ conf_page6 = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(conf_page6), FALSE);
-+#else
-+ conf_page6 = gtk_vbox_new(FALSE, 10);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ conf_page7 = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(conf_page7), FALSE);
-+#else
-+ conf_page7 = gtk_vbox_new(FALSE, 10);
-+#endif
- conf_hbutton_box = gtk_hbutton_box_new();
- gtk_button_box_set_layout(GTK_BUTTON_BOX(conf_hbutton_box), GTK_BUTTONBOX_END);
- conf_table = gtk_table_new(20, 2, FALSE);
-@@ -7716,9 +7785,24 @@
- gtk_drag_dest_add_uri_targets(window);
- //Connect the signal for DnD
- g_signal_connect(G_OBJECT(window), "drag_data_received", G_CALLBACK(drop_callback), NULL);
-- vbox = gtk_vbox_new(FALSE, 0);
-- hbox = gtk_hbox_new(FALSE, 0);
-- controls_box = gtk_vbox_new(FALSE, 0);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(vbox), FALSE);
-+#else
-+ vbox = gtk_vbox_new(FALSE, 10);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,0);
-+ gtk_box_set_homogeneous(GTK_BOX(hbox), FALSE);
-+#else
-+ hbox = gtk_hbox_new(FALSE, 0);
-+#endif
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ controls_box = gtk_box_new(GTK_ORIENTATION_VERTICAL,0);
-+ gtk_box_set_homogeneous(GTK_BOX(controls_box), FALSE);
-+#else
-+ controls_box = gtk_vbox_new(FALSE, 0);
-+#endif
- media = gmtk_media_player_new();
- g_signal_connect_swapped(G_OBJECT(media), "media_state_changed",
- G_CALLBACK(player_media_state_changed_callback), NULL);
-@@ -7734,10 +7818,20 @@
- media_label = gtk_label_new("");
- gtk_widget_set_size_request(media_label, 300, 100);
- gtk_label_set_ellipsize(GTK_LABEL(media_label), PANGO_ELLIPSIZE_END);
-- media_hbox = gtk_hbox_new(FALSE, 10);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ media_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(media_hbox), FALSE);
-+#else
-+ media_hbox = gtk_hbox_new(FALSE, 10);
-+#endif
- g_signal_connect(media_hbox, "show", G_CALLBACK(view_option_show_callback), NULL);
- g_signal_connect(media_hbox, "size_allocate", G_CALLBACK(view_option_size_allocate_callback), NULL);
-- details_vbox = gtk_vbox_new(FALSE, 10);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ details_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL,10);
-+ gtk_box_set_homogeneous(GTK_BOX(details_vbox), FALSE);
-+#else
-+ details_vbox = gtk_vbox_new(FALSE, 10);
-+#endif
- details_table = gtk_table_new(20, 2, FALSE);
- g_signal_connect(details_vbox, "show", G_CALLBACK(view_option_show_callback), NULL);
- g_signal_connect(details_vbox, "size_allocate", G_CALLBACK(view_option_size_allocate_callback), NULL);
-@@ -7769,7 +7863,12 @@
- g_signal_connect(plvbox, "size_allocate", G_CALLBACK(view_option_size_allocate_callback), NULL);
- //if (remember_loc)
- // gtk_paned_set_position(GTK_PANED(pane),loc_panel_position);
-- vbox_master = gtk_vbox_new(FALSE, 0);
-+#if GTK_MAJOR_VERSION == 3 && GTK_MINOR_VERSION >= 2
-+ vbox_master = gtk_box_new(GTK_ORIENTATION_VERTICAL,0);
-+ gtk_box_set_homogeneous(GTK_BOX(vbox_master), FALSE);
-+#else
-+ vbox_master = gtk_vbox_new(FALSE, 0);
-+#endif
- if (windowid == 0)
- gtk_box_pack_start(GTK_BOX(vbox_master), menubar, FALSE, FALSE, 0);
- gtk_widget_show(menubar);
diff --git a/debian/patches/option-album-image-fetch.patch b/debian/patches/option-album-image-fetch.patch
deleted file mode 100644
index b1ca29a..0000000
--- a/debian/patches/option-album-image-fetch.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Add option to disable album image download
-Origin: https://code.google.com/p/gnome-mplayer/source/detail?r=2361
-Last-Update: 2012-11-22
-
---- a/src/gui.c
-+++ b/src/gui.c
-@@ -242,6 +242,7 @@
- static GtkWidget *config_use_mediakeys;
- static GtkWidget *config_use_defaultpl;
- static GtkWidget *config_disable_animation;
-+static GtkWidget *config_disable_cover_art_fetch;
- static GtkWidget *config_mouse_wheel;
- static GtkWidget *config_enable_nautilus_plugin;
-
-@@ -4235,6 +4236,7 @@
- disable_embeddedfonts = !(gboolean) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_embeddedfonts));
- disable_pause_on_click = !(gboolean) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_pause_on_click));
- disable_animation = (gboolean) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_disable_animation));
-+ disable_cover_art_fetch = (gboolean) gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(config_disable_cover_art_fetch));
- oldosd = osdlevel;
- osdlevel = (gint) gtk_range_get_value(GTK_RANGE(config_osdlevel));
- pplevel = (gint) gtk_range_get_value(GTK_RANGE(config_pplevel));
-@@ -6057,6 +6059,11 @@
- gtk_table_attach(GTK_TABLE(conf_table), config_disable_animation, 0, 2, i, i + 1, GTK_FILL, GTK_SHRINK, 0, 0);
- i++;
-
-+ config_disable_cover_art_fetch = gtk_check_button_new_with_label(_("Disable Cover Art Fetch"));
-+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_disable_cover_art_fetch), disable_cover_art_fetch);
-+ gtk_table_attach(GTK_TABLE(conf_table), config_disable_cover_art_fetch, 0, 2, i, i + 1, GTK_FILL, GTK_SHRINK, 0, 0);
-+ i++;
-+
- config_mouse_wheel = gtk_check_button_new_with_label(_("Use Mouse Wheel to change volume, instead of seeking"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(config_mouse_wheel), mouse_wheel_changes_volume);
- gtk_table_attach(GTK_TABLE(conf_table), config_mouse_wheel, 0, 2, i, i + 1, GTK_FILL, GTK_SHRINK, 0, 0);
---- a/src/main.c
-+++ b/src/main.c
-@@ -766,6 +766,7 @@
- embedding_disabled = FALSE;
- disable_pause_on_click = FALSE;
- disable_animation = FALSE;
-+ disable_cover_art_fetch = FALSE;
- auto_hide_timeout = 3;
- mouse_over_controls = FALSE;
- use_mediakeys = TRUE;
-@@ -897,6 +898,7 @@
- disable_embeddedfonts = gm_pref_store_get_boolean(gm_store, DISABLEEMBEDDEDFONTS);
- disable_pause_on_click = gm_pref_store_get_boolean(gm_store, DISABLEPAUSEONCLICK);
- disable_animation = gm_pref_store_get_boolean(gm_store, DISABLEANIMATION);
-+ disable_cover_art_fetch = gm_pref_store_get_boolean_with_default(gm_store, DISABLE_COVER_ART_FETCH, disable_cover_art_fetch);
- auto_hide_timeout = gm_pref_store_get_int_with_default(gm_store, AUTOHIDETIMEOUT, auto_hide_timeout);
- disable_cover_art_fetch = gm_pref_store_get_boolean(gm_store, DISABLE_COVER_ART_FETCH);
- use_mediakeys = gm_pref_store_get_boolean_with_default(gm_store, USE_MEDIAKEYS, use_mediakeys);
diff --git a/debian/patches/remove-audio-midi-from-desktop.patch b/debian/patches/remove-audio-midi-from-desktop.patch
deleted file mode 100644
index 1e1b639..0000000
--- a/debian/patches/remove-audio-midi-from-desktop.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Don't claim to support audio/midi.
- mplayer shipped by Debian doesn't support midi files so gnome-mplayer doesn't
- support them.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2012-11-07
-Forwarded: no
-
-diff --git a/gnome-mplayer.desktop b/gnome-mplayer.desktop
-index 7b74311..3e46c6c 100644
---- a/gnome-mplayer.desktop
-+++ b/gnome-mplayer.desktop
-@@ -39,4 +39,4 @@ StartupNotify=true
- Terminal=false
- Type=Application
- Categories=AudioVideo;Audio;Video;Player;TV;
--MimeType=audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audio/mp3;audio/mp4;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;application/x-vorbis+ogg;audio/x-vorbis+ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;audio/x-pn-realaudio;application/vnd.rn-realmedia;application/vnd.rn-realaudio;video/vnd.rn-realvideo;audio/x-realaudio;audio/x-pn-realaudio-plugin;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;audio/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;audio/x-ms-wax;audio/x-ms-wma;application/x-drm-v2;audio/wav;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;audio/mpeg2;audio/x-mpeg2;video/mp4;video/3gpp;audio/x-mpeg3;audio/x-mpegurl;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;audio/basic;audio/x-basic;audio/midi;audio/x-scpls;video/x-matroska;video/matroska;video/x-mng;audio/webm;video/webm;audio/x-webm;video/x-webm;video/mp2t;video/vnd.mpegurl;video/x-ogm+ogg;
-+MimeType=audio/x-musepack;application/x-musepack;audio/musepack;application/musepack;application/x-ape;audio/ape;audio/x-ape;audio/x-mp3;application/x-id3;audio/mpeg;audio/x-mpeg;audio/x-mpeg-3;audio/mpeg3;audio/mp3;audio/mp4;audio/x-m4a;audio/mpc;audio/x-mpc;audio/mp;audio/x-mp;application/ogg;application/x-ogg;application/x-vorbis+ogg;audio/x-vorbis+ogg;audio/vorbis;audio/x-vorbis;audio/ogg;audio/x-ogg;audio/x-flac;application/x-flac;audio/flac;audio/x-s3m;audio/x-mod;audio/x-xm;audio/x-it;video/quicktime;video/x-quicktime;application/x-quicktimeplayer;application/smil;audio/x-pn-realaudio;application/vnd.rn-realmedia;application/vnd.rn-realaudio;video/vnd.rn-realvideo;audio/x-realaudio;audio/x-pn-realaudio-plugin;application/asx;video/x-ms-asf-plugin;video/x-msvideo;video/msvideo;application/x-mplayer2;application/x-ms-wmv;video/x-ms-asf;video/x-ms-wm;video/x-ms-wmv;audio/x-ms-wmv;video/x-ms-wmp;video/x-ms-wvx;audio/x-ms-wax;audio/x-ms-wma;application/x-drm-v2;audio/wav;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;audio/mpeg2;audio/x-mpeg2;video/mp4;video/3gpp;audio/x-mpeg3;audio/x-mpegurl;video/fli;video/x-fli;video/x-flv;video/vnd.vivo;application/x-nsv-vp3-mp3;audio/basic;audio/x-basic;audio/x-scpls;video/x-matroska;video/matroska;video/x-mng;audio/webm;video/webm;audio/x-webm;video/x-webm;video/mp2t;video/vnd.mpegurl;video/x-ogm+ogg;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 66d556c..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,4 +0,0 @@
-remove-audio-midi-from-desktop.patch
-fallback-to-nonsymbolic-icons.patch
-option-album-image-fetch.patch
-fix-gtk3-deprecation-warnings.patch
--
gnome-mplayer packaging
More information about the pkg-multimedia-commits
mailing list