Sat Nov 19 23:14:48 UTC 2011

2 files changed, 52 insertions, 4 deletions

diff --git a/community/gnash/PKGBUILD b/community/gnash/PKGBUILD
index 68f826412..0b4a6d049 100644
--- a/community/gnash/PKGBUILD
+++ b/community/gnash/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=gnash
 pkgname=(gnash-common gnash-gtk)
 pkgver=0.8.9
-pkgrel=5
+pkgrel=6
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/gnash/"
 license=(GPL3)
@@ -15,9 +15,10 @@ makedepends=(curl giflib libldap sdl agg libjpeg libpng libtool
              pkgconfig boost)
 options=(!libtool !emptydirs)
 source=(http://ftp.gnu.org/gnu/gnash/${pkgver}/gnash-${pkgver}.tar.bz2
-        gentoo-ffmpeg-0.8.patch)
+        gentoo-ffmpeg-0.8.patch xul8.patch)
 md5sums=('5b2be6b04a1bcc5fb404cc377034499e'
-         '98dec9a5c1b1084245a3f46b4022a6e2')
+         '98dec9a5c1b1084245a3f46b4022a6e2'
+         '9b77325d0b8b9d4150c4097771482d26')
 
 build() {
   cd "$srcdir/gnash-$pkgver"
@@ -25,8 +26,11 @@ build() {
   # Consolidated gentoo patches for ffmpeg compatibility
   # as of 2011-10-31
   patch -Np1 -i "$srcdir/gentoo-ffmpeg-0.8.patch"
-  ./autogen.sh
 
+  # Patch for compatibility with newer xulrunner headers
+  patch -Np1 -i "$srcdir/xul8.patch"
+
+  ./autogen.sh
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
diff --git a/community/gnash/xul8.patch b/community/gnash/xul8.patch
new file mode 100644
index 000000000..7bd708b2d
--- /dev/null
+++ b/community/gnash/xul8.patch
@@ -0,0 +1,44 @@
+diff -u -r gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp
+--- gnash-0.8.9/plugin/npapi/mozilla-sdk/np_entry.cpp	2011-03-13 17:47:36.000000000 +0100
++++ gnash-0.8.9-xul/plugin/npapi/mozilla-sdk/np_entry.cpp	2011-11-18 16:25:55.198007371 +0100
+@@ -238,7 +238,7 @@
+     return NS_PluginInitialize();
+ }
+ 
+-char *
++const char *
+ NP_GetMIMEDescription(void)
+ {
+     return NPP_GetMIMEDescription();
+diff -u -r gnash-0.8.9/plugin/npapi/plugin.cpp gnash-0.8.9-xul/plugin/npapi/plugin.cpp
+--- gnash-0.8.9/plugin/npapi/plugin.cpp	2011-03-18 14:44:30.000000000 +0100
++++ gnash-0.8.9-xul/plugin/npapi/plugin.cpp	2011-11-18 16:35:42.496794816 +0100
+@@ -128,10 +128,10 @@
+ }
+ 
+ /// \brief Return the MIME Type description for this plugin.
+-char*
++const char*
+ NPP_GetMIMEDescription(void)
+ {
+-    return const_cast<char *>(MIME_TYPES_DESCRIPTION);
++    return MIME_TYPES_DESCRIPTION;
+ }
+ 
+ static bool waitforgdb = false;
+diff -u -r gnash-0.8.9/plugin/npapi/test.cpp gnash-0.8.9-xul/plugin/npapi/test.cpp
+--- gnash-0.8.9/plugin/npapi/test.cpp	2011-03-13 17:47:36.000000000 +0100
++++ gnash-0.8.9-xul/plugin/npapi/test.cpp	2011-11-18 16:37:06.997539299 +0100
+@@ -408,10 +408,10 @@
+ {
+ }
+ 
+-char*
++const char*
+ NPP_GetMIMEDescription(void)
+ {
+-    char *x = 0;
++    const char *x = 0;
+     return x;
+ }
+