diff options
Diffstat (limited to 'packages/gnome-mplayer/files')
| -rw-r--r-- | packages/gnome-mplayer/files/1.patch | 37 | ||||
| -rw-r--r-- | packages/gnome-mplayer/files/ac-gthread.patch | 12 | ||||
| -rw-r--r-- | packages/gnome-mplayer/files/non-utf8-id3-fallback.patch | 22 | ||||
| -rw-r--r-- | packages/gnome-mplayer/files/uchar-for-utf8-check.patch | 22 |
4 files changed, 0 insertions, 93 deletions
diff --git a/packages/gnome-mplayer/files/1.patch b/packages/gnome-mplayer/files/1.patch deleted file mode 100644 index 77e03365f4..0000000000 --- a/packages/gnome-mplayer/files/1.patch +++ /dev/null @@ -1,37 +0,0 @@ -# HG changeset patch -# User "Paul Sokolovsky <pfalcon@users.sourceforge.net>" -# Date 1199174323 -7200 -# Node ID d630a2e72d3fa094a330f5bd6351b0cf7c9690a6 -# Parent 4b4820fa6fff9dbb8c6c8e1bd23eed54faf10982 -gui.c: Add vertical pane layout for main i/f vs playlist. -Decision which layout to use is based on screen aspect. -This change will allow sane layout on PDA devices, many -of which have vertical layout by default. Possible -improvements: -1. Add menu check item for users to be able to select layout -as they see fit. - -diff -r 4b4820fa6fff -r d630a2e72d3f src/gui.c ---- a/src/gui.c Tue Jan 01 09:29:28 2008 +0200 -+++ b/src/gui.c Tue Jan 01 09:58:43 2008 +0200 -@@ -3071,8 +3071,20 @@ GtkWidget *create_window(gint windowid) - - gtk_widget_show(menubar); - gtk_widget_show(drawing_area); -+ if (gdk_screen_width() > gdk_screen_height()) { - pane = gtk_hpaned_new(); - gtk_paned_pack1(GTK_PANED(pane),vbox,TRUE,TRUE); -+ } else { -+ GtkRequisition menu_size; -+ GtkRequisition vbox_size; -+ pane = gtk_vpaned_new(); -+ gtk_paned_pack1(GTK_PANED(pane),vbox,TRUE,FALSE); /* No shrink beyond size request*/ -+ -+ gtk_widget_size_request(menubar, &menu_size); -+ gtk_widget_size_request(vbox, &vbox_size); -+ /* 5 is adhox compensation for layout issues ;-( */ -+ gtk_widget_set_size_request(vbox, -1, menu_size.height + vbox_size.height - 5); -+ } - - gtk_container_add(GTK_CONTAINER(window), pane); - diff --git a/packages/gnome-mplayer/files/ac-gthread.patch b/packages/gnome-mplayer/files/ac-gthread.patch deleted file mode 100644 index ea4abf143d..0000000000 --- a/packages/gnome-mplayer/files/ac-gthread.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r d630a2e72d3f configure.in ---- a/configure.in Tue Jan 01 09:58:43 2008 +0200 -+++ b/configure.in Tue Jan 01 10:16:44 2008 +0200 -@@ -32,7 +32,7 @@ AM_PROG_LIBTOOL - #AC_SUBST(GNOME_CFLAGS) - #AC_SUBST(GNOME_LIBS) - --PKG_CHECK_MODULES(GTK, [gtk+-2.0 glib-2.0]) -+PKG_CHECK_MODULES(GTK, [gtk+-2.0 glib-2.0 gthread-2.0]) - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - diff --git a/packages/gnome-mplayer/files/non-utf8-id3-fallback.patch b/packages/gnome-mplayer/files/non-utf8-id3-fallback.patch deleted file mode 100644 index 3b13bf0015..0000000000 --- a/packages/gnome-mplayer/files/non-utf8-id3-fallback.patch +++ /dev/null @@ -1,22 +0,0 @@ -I found that on ARM/glibc 2.5/glib 2.12.something test in strip_unicode() doesn't -really catch invalid utf-8 chars. Also, let's tell user where problem lies straight. - -Paul Sokolovsky <pmiscml@gmail.com> ---- a/src/thread.c.org 2007-12-24 00:10:15.000000000 +0200 -+++ a/src/thread.c 2008-01-04 22:04:30.000000000 +0200 -@@ -349,13 +349,11 @@ - //g_idle_add(set_media_info, idledata); - utf8name = g_locale_to_utf8(parse[name],-1, NULL, NULL,NULL); - if (utf8name == NULL) { -- strip_unicode(parse[name],strlen(parse[name])); -- utf8name = g_strdup(parse[name]); -+ utf8name = g_strdup("<cannot convert to utf-8>"); - } - utf8artist = g_locale_to_utf8(parse[artist],-1, NULL, NULL,NULL); - if (utf8artist == NULL) { -- strip_unicode(parse[artist],strlen(parse[artist])); -- utf8artist = g_strdup(parse[artist]); -+ utf8artist = g_strdup("<cannot convert to utf-8>"); - } - - message = g_markup_printf_escaped(_("<small>\n<b>Title:</b>\t%s\n<b>Artist:</b>\t%s\n<b>File:</b>\t%s\n</small>"),utf8name,utf8artist,idledata->info); diff --git a/packages/gnome-mplayer/files/uchar-for-utf8-check.patch b/packages/gnome-mplayer/files/uchar-for-utf8-check.patch deleted file mode 100644 index f19d20716e..0000000000 --- a/packages/gnome-mplayer/files/uchar-for-utf8-check.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/src/support.c.org 2007-12-18 20:39:09.000000000 +0200 -+++ a/src/support.c 2008-01-04 22:12:32.000000000 +0200 -@@ -24,7 +24,7 @@ - - #include "support.h" - --void strip_unicode(gchar * data, gsize len) -+void strip_unicode(guchar * data, gsize len) - { - gsize i = 0; - ---- a/src/support.h.org 2007-12-17 18:21:46.000000000 +0200 -+++ a/src/support.h 2008-01-04 22:24:15.000000000 +0200 -@@ -31,7 +31,7 @@ - #include <stdlib.h> - #include <unistd.h> - --void strip_unicode(gchar * data, gsize len); -+void strip_unicode(guchar * data, gsize len); - gint play_file(gchar * filename, gint playlist); - gint detect_playlist(gchar * filename); - gint parse_playlist(gchar * filename); |