Fix two alignement problems

4 files changed, 48 insertions, 4 deletions

diff --git a/multimedia/swfdec-mozilla/Makefile b/multimedia/swfdec-mozilla/Makefile
index c14144018db..c9dd5863ae5 100644
--- a/multimedia/swfdec-mozilla/Makefile
+++ b/multimedia/swfdec-mozilla/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.16 2012/02/06 12:41:07 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2012/02/13 11:36:43 martin Exp $
 #
 
 DISTNAME=	swfdec-mozilla-0.8.2
-PKGREVISION=	13
+PKGREVISION=	14
 CATEGORIES=	multimedia
 MASTER_SITES=	http://swfdec.freedesktop.org/download/swfdec-mozilla/0.8/
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	martin@NetBSD.org
 HOMEPAGE=	http://swfdec.freedesktop.org/
 COMMENT=	Mozilla plugin for swfdec
 LICENSE=	gnu-lgpl-v2.1 # or later
@@ -17,6 +17,7 @@ GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	pkg-config
 
+CFLAGS+=		-g
 CONFIGURE_ARGS+=	--with-plugin-dir=${PREFIX}/lib/netscape/plugins
 
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
diff --git a/multimedia/swfdec-mozilla/distinfo b/multimedia/swfdec-mozilla/distinfo
index bdfc499d8e9..c100706cceb 100644
--- a/multimedia/swfdec-mozilla/distinfo
+++ b/multimedia/swfdec-mozilla/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/10/31 12:48:56 wiz Exp $
+$NetBSD: distinfo,v 1.2 2012/02/13 11:36:43 martin Exp $
 
 SHA1 (swfdec-mozilla-0.8.2.tar.gz) = 330fc304acc8ee63f4e9af993cbf87c25d82cebf
 RMD160 (swfdec-mozilla-0.8.2.tar.gz) = c6aef5170a06477d5bb7720c8814b34d7711b8b9
 Size (swfdec-mozilla-0.8.2.tar.gz) = 381148 bytes
+SHA1 (patch-src_swfmoz_dialog.c) = 36aed2e9d9baf906a0306814a710fb0fa281f203
+SHA1 (patch-src_swfmoz_player.c) = caeab5a4ae963897a27d8bb29a5750ba506678c1
diff --git a/multimedia/swfdec-mozilla/patches/patch-src_swfmoz_dialog.c b/multimedia/swfdec-mozilla/patches/patch-src_swfmoz_dialog.c
new file mode 100644
index 00000000000..c2d31101502
--- /dev/null
+++ b/multimedia/swfdec-mozilla/patches/patch-src_swfmoz_dialog.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_swfmoz_dialog.c,v 1.1 2012/02/13 11:36:43 martin Exp $
+
+# Upstream bugreport:
+#  http://bugs.freedesktop.org/show_bug.cgi?id=45794
+
+--- src/swfmoz_dialog.c.orig	2008-06-17 11:37:20.000000000 +0200
++++ src/swfmoz_dialog.c	2012-02-13 11:51:18.000000000 +0100
+@@ -120,7 +120,7 @@
+   SwfmozLoader *loader;
+   GtkWidget *chooser;
+   char *s, *filename;
+-  gboolean error;
++  gpointer error = NULL;
+ 
+   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->media));
+   /* FIXME: assert this doesn't happen? */
diff --git a/multimedia/swfdec-mozilla/patches/patch-src_swfmoz_player.c b/multimedia/swfdec-mozilla/patches/patch-src_swfmoz_player.c
new file mode 100644
index 00000000000..eb38560f83c
--- /dev/null
+++ b/multimedia/swfdec-mozilla/patches/patch-src_swfmoz_player.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_swfmoz_player.c,v 1.1 2012/02/13 11:36:43 martin Exp $
+
+# Upstream bugreport:
+#  http://bugs.freedesktop.org/show_bug.cgi?id=45794
+
+--- src/swfmoz_player.c.orig	2008-09-24 11:18:44.000000000 +0200
++++ src/swfmoz_player.c	2012-02-08 18:17:29.000000000 +0100
+@@ -610,7 +610,7 @@
+ swfmoz_player_loaders_update (GtkListStore *store, GtkTreeIter *iter, SwfdecLoader *loader)
+ {
+   goffset loaded, size;
+-  gboolean error;
++  gpointer error = NULL;
+   const SwfdecURL *url;
+   SwfdecPlayer *player;
+   const char *url_string;
+@@ -623,7 +623,7 @@
+   /* FIXME: swfdec needs a function for this */
+   g_object_get (G_OBJECT (loader), "error", &error, NULL);
+ 
+-  if (error == TRUE) {
++  if (error != NULL) {
+     status = g_strdup("error");
+   } else {
+     str_loaded = g_format_size_for_display(loaded);