diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-25 12:00:05 -0300 |
commit | d59c722c306fa39fcecf011b411b77faffca5cbd (patch) | |
tree | d6a3582523245b624d1a905d4b46d8344429e617 /community/gecko-mediaplayer | |
parent | 939541abc901bd03328b55aaed0fb1862f803c05 (diff) | |
parent | 5894dd675f4bd3ba296d262fae99b3b87a0f87fd (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gri/PKGBUILD
community/multiget/PKGBUILD
core/bash/PKGBUILD
core/grep/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/vlc/PKGBUILD
extra/xfce4-screenshooter/PKGBUILD
extra/xfce4-settings/PKGBUILD
libre/linux-libre/PKGBUILD
libre/linux-libre/dib0700-fix.patch
libre/linux-libre/i915-fix-ghost-tv-output.patch
libre/linux-libre/i915-fix-incorrect-error-message.patch
libre/linux-libre/iwlagn-fix-NULL-pointer-dereference.patch
libre/linux-libre/linux-libre.install
libre/linux-libre/usb-add-reset-resume-quirk-for-several-webcams.patch
Diffstat (limited to 'community/gecko-mediaplayer')
-rw-r--r-- | community/gecko-mediaplayer/PKGBUILD | 14 | ||||
-rw-r--r-- | community/gecko-mediaplayer/firefox-8.patch | 48 |
2 files changed, 57 insertions, 5 deletions
diff --git a/community/gecko-mediaplayer/PKGBUILD b/community/gecko-mediaplayer/PKGBUILD index a8c45c588..7e632f8bb 100644 --- a/community/gecko-mediaplayer/PKGBUILD +++ b/community/gecko-mediaplayer/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 51299 2011-07-06 15:48:09Z lfleischer $ +# $Id: PKGBUILD 59322 2011-11-23 15:17:06Z lfleischer $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Allan McRae <mcrae_allan@hotmail.com> # Contributor: fancris3 <fancris3 at aol.com> @@ -6,7 +6,7 @@ pkgname=gecko-mediaplayer pkgver=1.0.4 -pkgrel=1 +pkgrel=2 pkgdesc='Browser plugin that uses gnome-mplayer to play media in a web browser.' arch=('i686' 'x86_64' 'mips64el') url='http://code.google.com/p/gecko-mediaplayer/' @@ -14,13 +14,17 @@ license=('GPL') depends=("gnome-mplayer>=${pkgver}" 'dbus-glib') makedepends=('xulrunner' 'pkgconfig') replaces=('mplayer-plugin') -source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -md5sums=('7bb7665f8a1e6832907d052863e8f7aa') +source=("http://gecko-mediaplayer.googlecode.com/files/${pkgname}-${pkgver}.tar.gz" + 'firefox-8.patch') +md5sums=('7bb7665f8a1e6832907d052863e8f7aa' + 'e58a8fc33c1cf7a2453e1f6612acf028') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr --sysconfdir=/etc --without-gconf + patch -p1 -i ../firefox-8.patch + + ./configure --prefix=/usr --sysconfdir=/etc --without-gconf --enable-new-libxul make } diff --git a/community/gecko-mediaplayer/firefox-8.patch b/community/gecko-mediaplayer/firefox-8.patch new file mode 100644 index 000000000..d4db7afd3 --- /dev/null +++ b/community/gecko-mediaplayer/firefox-8.patch @@ -0,0 +1,48 @@ +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/np_entry.cpp gecko-mediaplayer-1.0.5b1-new/src/np_entry.cpp +--- gecko-mediaplayer-1.0.5b1-old/src/np_entry.cpp 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/np_entry.cpp 2011-11-22 15:57:46.751354874 +0200 +@@ -80,9 +80,9 @@ + + #endif /* XP_WIN */ + +-char *NPP_GetMIMEDescription(); ++const char *NPP_GetMIMEDescription(); + +-char *NP_GetMIMEDescription() ++const char *NP_GetMIMEDescription() + { + return NPP_GetMIMEDescription(); + } +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/npp_gate.cpp gecko-mediaplayer-1.0.5b1-new/src/npp_gate.cpp +--- gecko-mediaplayer-1.0.5b1-old/src/npp_gate.cpp 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/npp_gate.cpp 2011-11-22 15:58:02.473353591 +0200 +@@ -44,7 +44,7 @@ + #include "plugin_types.h" + #include "plugin_setup.h" + +-char *NPP_GetMIMEDescription(void) ++const char *NPP_GetMIMEDescription(void) + { + return GetMIMEDescription(); + } +diff -Naur gecko-mediaplayer-1.0.5b1-old/src/npupp.h gecko-mediaplayer-1.0.5b1-new/src/npupp.h +--- gecko-mediaplayer-1.0.5b1-old/src/npupp.h 2011-09-20 20:48:04.000000000 +0300 ++++ gecko-mediaplayer-1.0.5b1-new/src/npupp.h 2011-11-22 15:56:32.262360950 +0200 +@@ -684,7 +684,7 @@ + + NPError OSCALL NP_Shutdown(); + +- char *NP_GetMIMEDescription(); ++ const char *NP_GetMIMEDescription(); + + #ifdef __cplusplus + } +@@ -700,7 +700,7 @@ + + /* plugin meta member functions */ + +- NP_EXPORT(char *) NP_GetMIMEDescription(void); ++ NP_EXPORT(const char *) NP_GetMIMEDescription(void); + NP_EXPORT(NPError) NP_Initialize(NPNetscapeFuncs *, NPPluginFuncs *); + NP_EXPORT(NPError) NP_Shutdown(void); + NP_EXPORT(NPError) NP_GetValue(void *future, NPPVariable aVariable, void *aValue); |