[SCM] gecko-mediaplayer/master: Drop patches from upstream

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Thu Jun 12 16:44:45 UTC 2014


The following commit has been merged in the master branch:
commit b623c6c1cf3c31b486f7ee29345aa8e8fcade098
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Jun 12 18:39:48 2014 +0200

    Drop patches from upstream

diff --git a/debian/patches/functable-check.patch b/debian/patches/functable-check.patch
deleted file mode 100644
index 3b7d9cc..0000000
--- a/debian/patches/functable-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Fix function table check
- We only need to know if we have access to all the values we need. Everything
- else is not necessary.
-Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2013-06-24
-Forwarded: https://code.google.com/p/gecko-mediaplayer/issues/detail?id=184
-
---- a/src/np_entry.cpp
-+++ b/src/np_entry.cpp
-@@ -42,6 +42,7 @@
- #include <npapi.h>
- #include <npfunctions.h>
- #include "npupp.h"
-+#include <cstddef>
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
-@@ -117,9 +118,14 @@
-     if (HIBYTE(pFuncs->version) > NP_VERSION_MAJOR)
-         return NPERR_INCOMPATIBLE_VERSION_ERROR;
- 
--    if (pFuncs->size < sizeof(NPNetscapeFuncs))
-+    if (pFuncs->size < offsetof(NPNetscapeFuncs, setexception) + sizeof(NPN_SetExceptionProcPtr))
-         return NPERR_INVALID_FUNCTABLE_ERROR;
- 
-+#ifdef XP_UNIX
-+    if (pluginFuncs->size < offsetof(NPPluginFuncs, getvalue) + sizeof(NPP_GetValueProcPtr))
-+      return NPERR_INVALID_FUNCTABLE_ERROR;
-+#endif
-+
-     NPNFuncs.size = pFuncs->size;
-     NPNFuncs.version = pFuncs->version;
-     NPNFuncs.geturlnotify = pFuncs->geturlnotify;
diff --git a/debian/patches/series b/debian/patches/series
index dfb722a..605d4d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-nomozalloc.patch
-functable-check.patch

-- 
gecko-mediaplayer packaging



More information about the pkg-multimedia-commits mailing list