[arch-commits] Commit in gecko-mediaplayer/trunk (3 files)

[Evangelos Foutras]

    Date: Wednesday, June 24, 2015 @ 04:24:13
  Author: foutrelis
Revision: 135777

Fix FTBFS

Added:
  gecko-mediaplayer/trunk/np_loadds.patch
Modified:
  gecko-mediaplayer/trunk/PKGBUILD
Deleted:
  gecko-mediaplayer/trunk/firefox-8.patch

-----------------+
 PKGBUILD        |   13 +++++++++++--
 firefox-8.patch |   48 ------------------------------------------------
 np_loadds.patch |   16 ++++++++++++++++
 3 files changed, 27 insertions(+), 50 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-24 02:18:10 UTC (rev 135776)
+++ PKGBUILD	2015-06-24 02:24:13 UTC (rev 135777)
@@ -14,9 +14,18 @@
 depends=("gnome-mplayer>=${pkgver}" 'dbus-glib' 'gmtk' 'curl')
 makedepends=('xulrunner' 'pkgconfig')
 replaces=('mplayer-plugin')
-source=("https://${pkgname}.googlecode.com/svn/packages/${pkgname}-${pkgver}.tar.gz")
-md5sums=('69b50ecbbbf34ca6d980a477345dbd40')
+source=("https://${pkgname}.googlecode.com/svn/packages/${pkgname}-${pkgver}.tar.gz"
+        "np_loadds.patch")
+md5sums=('69b50ecbbbf34ca6d980a477345dbd40'
+         '224c865f5df059ef7ac1430889d66a1f')
 
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # https://code.google.com/p/gecko-mediaplayer/issues/detail?id=191
+  patch -Np1 -i ../np_loadds.patch
+}
+
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 

Deleted: firefox-8.patch
===================================================================
--- firefox-8.patch	2015-06-24 02:18:10 UTC (rev 135776)
+++ firefox-8.patch	2015-06-24 02:24:13 UTC (rev 135777)
@@ -1,48 +0,0 @@
-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);

Added: np_loadds.patch
===================================================================
--- np_loadds.patch	                        (rev 0)
+++ np_loadds.patch	2015-06-24 02:24:13 UTC (rev 135777)
@@ -0,0 +1,16 @@
+Description: Define NP_LOADDS if it doesn't exist
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2014-06-14
+
+--- gecko-mediaplayer-1.0.9.orig/src/npupp.h
++++ gecko-mediaplayer-1.0.9/src/npupp.h
+@@ -63,6 +63,9 @@
+ 
+ #include "npruntime.h"
+ 
++#ifndef NP_LOADDS
++#define NP_LOADDS
++#endif
+ 
+ /******************************************************************************************
+    plug-in function table macros