summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick McLean <chutzpah@gentoo.org>2011-07-04 15:31:34 +0000
committerPatrick McLean <chutzpah@gentoo.org>2011-07-04 15:31:34 +0000
commiteee569983a16c8524292ad69193e4e5891418a7c (patch)
tree7465910521f39982f4455ea05325afd2e85fd1c4 /www-plugins/nspluginwrapper/files
parentVersion bump, includes fix for bug #373971. Also add patch to compile on hard... (diff)
downloadhistorical-eee569983a16c8524292ad69193e4e5891418a7c.tar.gz
historical-eee569983a16c8524292ad69193e4e5891418a7c.tar.bz2
historical-eee569983a16c8524292ad69193e4e5891418a7c.zip
Really remove older versions.
Package-Manager: portage-2.1.10.3/cvs/Linux x86_64
Diffstat (limited to 'www-plugins/nspluginwrapper/files')
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-gcc44.patch98
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-npidentifiers.patch178
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-respect-ldflags.patch19
-rw-r--r--www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch34
4 files changed, 0 insertions, 329 deletions
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-gcc44.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-gcc44.patch
deleted file mode 100644
index e5d5007543c7..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-gcc44.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -aur nspluginwrapper-1.2.2/Makefile nspluginwrapper-1.2.2-new/Makefile
---- nspluginwrapper-1.2.2/Makefile 2009-01-02 16:54:10.000000000 +0800
-+++ nspluginwrapper-1.2.2-new/Makefile 2009-06-26 20:20:20.866502278 +0800
-@@ -41,6 +41,8 @@
- STRIP_OPT = -s
- endif
-
-+USE_SYSTEM_LIBS = 1
-+
- LN_S = ln -sf
-
- ifeq ($(LD_soname),)
-@@ -79,6 +81,11 @@
- ARCH_32 = $(ARCH)
- ifeq ($(biarch), yes)
- ARCH_32 = $(TARGET_ARCH)
-+endif
-+
-+ifneq (1, $(USE_SYSTEM_LIBS))
-+
-+ifeq ($(biarch), yes)
- LSB_LIBS = $(LSB_OBJ_DIR)/libc.so $(LSB_OBJ_DIR)/libgcc_s_32.so
- LSB_LIBS += $(LSB_CORE_STUBS:%=$(LSB_OBJ_DIR)/%.so)
- LSB_LIBS += $(LSB_CORE_STATIC_STUBS:%=$(LSB_OBJ_DIR)/%.a)
-@@ -92,6 +99,7 @@
- LSB_CORE_STUBS = $(shell cat $(LSB_SRC_DIR)/core_filelist)
- LSB_CORE_STATIC_STUBS = $(shell cat $(LSB_SRC_DIR)/core_static_filelist)
- LSB_DESKTOP_STUBS = $(shell cat $(LSB_SRC_DIR)/desktop_filelist)
-+endif
-
- ifeq (i386,$(TARGET_ARCH))
- TARGET_ELF_ARCH = elf32-i386
-@@ -116,10 +124,15 @@
- npviewer_OBJECTS = $(npviewer_RAWSRCS:%.c=npviewer-%.o)
- ifeq ($(biarch),yes)
- npviewer_CFLAGS = $(CFLAGS_32)
-+ifneq (1, $(USE_SYSTEM_LIBS))
- npviewer_CFLAGS += -I$(LSB_INC_DIR)
- npviewer_CFLAGS += -I$(LSB_INC_DIR)/glib-2.0
- npviewer_CFLAGS += -I$(LSB_INC_DIR)/gtk-2.0
- npviewer_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
-+else
-+npviewer_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 glib-2.0)
-+npviewer_LDFLAGS = $(LDFLAGS_32)
-+endif
- npviewer_LDFLAGS += -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0 -ldl -lglib-2.0 -lX11 -lXt
- else
- npviewer_CFLAGS += $(GTK_CFLAGS)
-@@ -156,8 +169,11 @@
- libxpcom_OBJECTS = $(libxpcom_RAWSRCS:%.c=libxpcom-%.o)
- libxpcom_CFLAGS = $(PIC_CFLAGS)
- ifeq ($(biarch),yes)
-+libxpcom_LDFLAGS = $(LDFLAGS_32)
-+ifneq (1, $(USE_SYSTEM_LIBS))
- libxpcom_CFLAGS += -I$(LSB_INC_DIR)
--libxpcom_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
-+libxpcom_LDFLAGS += -L$(LSB_OBJ_DIR)
-+endif
- endif
-
- libnoxshm_LIBRARY = libnoxshm.so
-@@ -166,8 +182,11 @@
- libnoxshm_OBJECTS = $(libnoxshm_RAWSRCS:%.c=libnoxshm-%.o)
- libnoxshm_CFLAGS = $(PIC_CFLAGS)
- ifeq ($(biarch),yes)
-+libnoxshm_LDFLAGS = $(LDFLAGS_32)
-+ifneq (1, $(USE_SYSTEM_LIBS))
- libnoxshm_CFLAGS += -I$(LSB_INC_DIR)
--libnoxshm_LDFLAGS = $(LDFLAGS_32) -L$(LSB_OBJ_DIR)
-+libnoxshm_LDFLAGS += -L$(LSB_OBJ_DIR)
-+endif
- endif
-
- npconfig_PROGRAM = npconfig
-@@ -230,6 +249,7 @@
- FILES += $(wildcard tests/*.html)
- FILES += $(wildcard tests/*.c tests/*.h)
- FILES += $(wildcard npapi/*.h npapi/nspr/*.h npapi/nspr/obsolete/*.h)
-+ifneq (1, $(USE_SYSTEM_LIBS))
- FILES += $(LSB_TOP_DIR)/headers/core_filelist
- FILES += $(addprefix $(LSB_TOP_DIR)/headers/,$(shell cat $(LSB_TOP_DIR)/headers/core_filelist))
- FILES += $(LSB_TOP_DIR)/headers/desktop_filelist
-@@ -243,12 +263,15 @@
- FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_CORE_STATIC_STUBS))
- FILES += $(patsubst %,$(LSB_SRC_DIR)/%.c,$(LSB_DESKTOP_STUBS))
- FILES += $(patsubst %,$(LSB_SRC_DIR)/%.Version,$(LSB_DESKTOP_STUBS))
-+endif
-
- all: $(TARGETS)
-
- clean:
- rm -f $(TARGETS) *.o *.os
-+ifneq (1, $(USE_SYSTEM_LIBS))
- rm -rf $(LSB_OBJ_DIR)
-+endif
-
- distclean: clean
- rm -f config-host.* config.*
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-npidentifiers.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-npidentifiers.patch
deleted file mode 100644
index 568a4ea1f79a..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-npidentifiers.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-Index: src/npw-viewer.c
-===================================================================
---- src/npw-viewer.c (revision 942)
-+++ src/npw-viewer.c (working copy)
-@@ -2059,7 +2059,7 @@
- RPC_METHOD_NPN_INVOKE,
- RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, methodName,
-+ RPC_TYPE_NP_IDENTIFIER, &methodName,
- RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args,
- RPC_TYPE_INVALID);
-
-@@ -2249,7 +2249,7 @@
- RPC_METHOD_NPN_GET_PROPERTY,
- RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, propertyName,
-+ RPC_TYPE_NP_IDENTIFIER, &propertyName,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -2311,7 +2311,7 @@
- RPC_METHOD_NPN_SET_PROPERTY,
- RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, propertyName,
-+ RPC_TYPE_NP_IDENTIFIER, &propertyName,
- RPC_TYPE_NP_VARIANT, value,
- RPC_TYPE_INVALID);
-
-@@ -2370,7 +2370,7 @@
- RPC_METHOD_NPN_REMOVE_PROPERTY,
- RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, propertyName,
-+ RPC_TYPE_NP_IDENTIFIER, &propertyName,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -2427,7 +2427,7 @@
- RPC_METHOD_NPN_HAS_PROPERTY,
- RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, propertyName,
-+ RPC_TYPE_NP_IDENTIFIER, &propertyName,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -2484,7 +2484,7 @@
- RPC_METHOD_NPN_HAS_METHOD,
- RPC_TYPE_NPW_PLUGIN_INSTANCE, plugin,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, methodName,
-+ RPC_TYPE_NP_IDENTIFIER, &methodName,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -2780,7 +2780,7 @@
-
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPN_IDENTIFIER_IS_STRING,
-- RPC_TYPE_NP_IDENTIFIER, identifier,
-+ RPC_TYPE_NP_IDENTIFIER, &identifier,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -2838,7 +2838,7 @@
-
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPN_UTF8_FROM_IDENTIFIER,
-- RPC_TYPE_NP_IDENTIFIER, identifier,
-+ RPC_TYPE_NP_IDENTIFIER, &identifier,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -2902,7 +2902,7 @@
-
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPN_INT_FROM_IDENTIFIER,
-- RPC_TYPE_NP_IDENTIFIER, identifier,
-+ RPC_TYPE_NP_IDENTIFIER, &identifier,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-Index: src/npw-wrapper.c
-===================================================================
---- src/npw-wrapper.c (revision 942)
-+++ src/npw-wrapper.c (working copy)
-@@ -1528,7 +1528,7 @@
- free(name);
-
- return rpc_method_send_reply(connection,
-- RPC_TYPE_NP_IDENTIFIER, ident,
-+ RPC_TYPE_NP_IDENTIFIER, &ident,
- RPC_TYPE_INVALID);
- }
-
-@@ -1601,7 +1601,7 @@
- NPIdentifier ident = g_NPN_GetIntIdentifier(intid);
-
- return rpc_method_send_reply(connection,
-- RPC_TYPE_NP_IDENTIFIER, ident,
-+ RPC_TYPE_NP_IDENTIFIER, &ident,
- RPC_TYPE_INVALID);
- }
-
-Index: src/npruntime.c
-===================================================================
---- src/npruntime.c (revision 942)
-+++ src/npruntime.c (working copy)
-@@ -221,7 +221,7 @@
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPCLASS_HAS_METHOD,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, name,
-+ RPC_TYPE_NP_IDENTIFIER, &name,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -327,7 +327,7 @@
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPCLASS_INVOKE,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, name,
-+ RPC_TYPE_NP_IDENTIFIER, &name,
- RPC_TYPE_ARRAY, RPC_TYPE_NP_VARIANT, argCount, args,
- RPC_TYPE_INVALID);
-
-@@ -509,7 +509,7 @@
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPCLASS_HAS_PROPERTY,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, name,
-+ RPC_TYPE_NP_IDENTIFIER, &name,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -599,7 +599,7 @@
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPCLASS_GET_PROPERTY,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, name,
-+ RPC_TYPE_NP_IDENTIFIER, &name,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-@@ -684,7 +684,7 @@
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPCLASS_SET_PROPERTY,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, name,
-+ RPC_TYPE_NP_IDENTIFIER, &name,
- RPC_TYPE_NP_VARIANT, value,
- RPC_TYPE_INVALID);
-
-@@ -763,7 +763,7 @@
- int error = rpc_method_invoke(g_rpc_connection,
- RPC_METHOD_NPCLASS_REMOVE_PROPERTY,
- RPC_TYPE_NP_OBJECT, npobj,
-- RPC_TYPE_NP_IDENTIFIER, name,
-+ RPC_TYPE_NP_IDENTIFIER, &name,
- RPC_TYPE_INVALID);
-
- if (error != RPC_ERROR_NO_ERROR) {
-Index: src/npw-rpc.c
-===================================================================
---- src/npw-rpc.c (revision 942)
-+++ src/npw-rpc.c (working copy)
-@@ -1252,7 +1252,7 @@
- // the browser side
- static int do_send_NPIdentifier(rpc_message_t *message, void *p_value)
- {
-- NPIdentifier ident = (NPIdentifier)p_value;
-+ NPIdentifier ident = *(NPIdentifier *)p_value;
- int id = 0;
- if (ident) {
- #ifdef BUILD_WRAPPER
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-respect-ldflags.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-respect-ldflags.patch
deleted file mode 100644
index 5b9e5a810e3b..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.2.2-respect-ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ur nspluginwrapper-1.2.2.orig/Makefile nspluginwrapper-1.2.2/Makefile
---- nspluginwrapper-1.2.2.orig/Makefile 2009-01-02 03:54:10.000000000 -0500
-+++ nspluginwrapper-1.2.2/Makefile 2009-08-21 11:35:57.000000000 -0400
-@@ -109,6 +109,7 @@
- npwrapper_CFLAGS = $(CFLAGS) $(X_CFLAGS) $(MOZILLA_CFLAGS) $(GLIB_CFLAGS)
- npwrapper_LDFLAGS = $(X_LDFLAGS) $(libpthread_LDFLAGS) $(libsocket_LDFLAGS)
- npwrapper_LDFLAGS += $(GLIB_LDFLAGS)
-+npwrapper_LDFLAGS += $(LDFLAGS)
-
- npviewer_PROGRAM = npviewer.bin
- npviewer_RAWSRCS = npw-viewer.c npw-common.c npw-malloc.c npw-rpc.c rpc.c debug.c utils.c npruntime.c
-@@ -181,6 +182,7 @@
- # XXX use the ELF decoder for native plugins too?
- npconfig_LDFLAGS += $(libpthread_LDFLAGS)
- endif
-+npconfig_LDFLAGS += $(LDFLAGS)
-
- nploader_PROGRAM = npviewer
- nploader_RAWSRCS = npw-viewer.sh
diff --git a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch b/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch
deleted file mode 100644
index dbd7d09f08e1..000000000000
--- a/www-plugins/nspluginwrapper/files/nspluginwrapper-1.4.0-parallel-make.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -ur nspluginwrapper-1.4.0.orig//Makefile nspluginwrapper-1.4.0/Makefile
---- nspluginwrapper-1.4.0.orig//Makefile 2011-05-26 11:32:55.694455398 -0400
-+++ nspluginwrapper-1.4.0/Makefile 2011-05-26 11:43:31.955887009 -0400
-@@ -14,7 +14,7 @@
- endif
-
- ifeq ($(INSTALL),)
--INSTALL = install
-+INSTALL = install -D
- ifneq (,$(findstring $(OS),solaris))
- INSTALL = $(SRC_PATH)/utils/install.sh
- endif
-@@ -236,11 +236,7 @@
- uninstall.mkruntime:
- rm -f $(DESTDIR)$(npcommondir)/mkruntime
-
--install: install.dirs install.player install.wrapper install.viewer install.libnoxshm install.loader install.config
--install.dirs:
-- mkdir -p $(DESTDIR)$(npcommondir) || :
-- mkdir -p $(DESTDIR)$(nphostdir) || :
-- mkdir -p $(DESTDIR)$(nptargetdir) || :
-+install: install.player install.wrapper install.viewer install.libnoxshm install.loader install.config
- ifeq ($(build_player),yes)
- install.player: $(npplayer_PROGRAM)
- $(INSTALL) -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(nphostdir)/$(npplayer_PROGRAM)
-@@ -260,7 +256,7 @@
- endif
- install.viewer.bin: $(npviewer_PROGRAM)
- $(INSTALL) -m 755 $(STRIP_OPT) $(npviewer_PROGRAM) $(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM)
--install.viewer.glue::
-+install.viewer.glue:: install.viewer.bin
- p=$(DESTDIR)$(nptargetdir)/$(npviewer_PROGRAM:%.bin=%); \
- echo "#!/bin/sh" > $$p; \
- echo "TARGET_OS=$(TARGET_OS)" >> $$p; \