[SCM] gmerlin/master: fix_577328.patch is no longer needed (fixed in upstream)
zmoelnig-guest at users.alioth.debian.org
zmoelnig-guest at users.alioth.debian.org
Mon Jan 10 12:10:46 UTC 2011
The following commit has been merged in the master branch:
commit 18af074ea659ee691ebb001a91e8fc1b37783847
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date: Mon Jan 10 12:10:36 2011 +0100
fix_577328.patch is no longer needed (fixed in upstream)
diff --git a/debian/patches/fix_577328.patch b/debian/patches/fix_577328.patch
deleted file mode 100644
index 3826f42..0000000
--- a/debian/patches/fix_577328.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: gmerlin-0.4.3/lib/gtk/gtkutils.c
-===================================================================
---- gmerlin-0.4.3.orig/lib/gtk/gtkutils.c 2010-04-19 11:49:27.000000000 -0500
-+++ gmerlin-0.4.3/lib/gtk/gtkutils.c 2010-04-19 11:49:43.000000000 -0500
-@@ -465,7 +465,7 @@
- return (GtkWidget*)0;
-
- toplevel = gtk_widget_get_toplevel(w);
-- if(!GTK_WIDGET_TOPLEVEL (toplevel))
-+ if(!gtk_widget_is_toplevel (toplevel))
- toplevel = (GtkWidget*)0;
- return toplevel;
- }
-Index: gmerlin-0.4.3/lib/gtk/vumeter.c
-===================================================================
---- gmerlin-0.4.3.orig/lib/gtk/vumeter.c 2010-04-19 11:51:21.000000000 -0500
-+++ gmerlin-0.4.3/lib/gtk/vumeter.c 2010-04-19 11:51:49.000000000 -0500
-@@ -687,7 +687,7 @@
- {
- int i;
-
-- if(!GTK_WIDGET_REALIZED(m->layout) || !m->pixmap_width || !m->pixmap_height)
-+ if(!gtk_widget_get_realized(m->layout) || !m->pixmap_width || !m->pixmap_height)
- return;
-
- if(!m->pixmaps_valid)
diff --git a/debian/patches/series b/debian/patches/series
index b501346..0701f8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
remove_desktop_encoding_key.patch
fix_manpages.patch
-fix_577328.patch
--
gmerlin packaging
More information about the pkg-multimedia-commits
mailing list