rpms/nspluginwrapper/devel nspluginwrapper-1.1.0-build.patch, 1.1, 1.2 nspluginwrapper-1.1.0-fork.patch, 1.1, 1.2 nspluginwrapper-1.1.0-runtime-restart.patch, 1.1, 1.2 nspluginwrapper.spec, 1.49, 1.50
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Fri Jul 18 09:22:14 UTC 2008
Author: stransky
Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19995
Modified Files:
nspluginwrapper-1.1.0-build.patch
nspluginwrapper-1.1.0-fork.patch
nspluginwrapper-1.1.0-runtime-restart.patch
nspluginwrapper.spec
Log Message:
Sync with F9:
* Tue Jul 18 2008 Martin Stransky <stransky at redhat.com> 1.1.0-3
- Enabled experimental stand-alone plugin player
* Tue Jul 15 2008 Martin Stransky <stransky at redhat.com> 1.1.0-2
- Fixed build warnings in our patches
nspluginwrapper-1.1.0-build.patch:
Index: nspluginwrapper-1.1.0-build.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-1.1.0-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-build.patch 8 Jul 2008 13:17:06 -0000 1.1
+++ nspluginwrapper-1.1.0-build.patch 18 Jul 2008 09:21:25 -0000 1.2
@@ -1,11 +1,11 @@
diff -up nspluginwrapper-1.1.0/configure.build nspluginwrapper-1.1.0/configure
--- nspluginwrapper-1.1.0/configure.build 2008-06-29 22:19:50.000000000 +0200
-+++ nspluginwrapper-1.1.0/configure 2008-07-07 16:26:11.000000000 +0200
++++ nspluginwrapper-1.1.0/configure 2008-07-15 16:48:26.000000000 +0200
@@ -3,6 +3,8 @@
# nspluginwrapper configure script (C) 2005-2008 Gwenole Beauchesne
# derived from qemu configure script, (C) 2003 Fabrice Bellard
#
-+set -x
++#set -x
+
PACKAGE=nspluginwrapper
@@ -209,13 +209,15 @@
if test "$host_cpu" = "i386" ; then
echo "ARCH=i386" >> $config_mak
echo "#define HOST_I386 1" >> $config_h
-@@ -666,20 +700,22 @@ if test -n "$fbigendian" ; then
+@@ -665,21 +699,24 @@ if test -n "$fbigendian" ; then
+ echo "#define FLOAT_WORDS_BIGENDIAN $fbigendian" >> $config_h
fi
- echo "SRC_PATH=$source_path" >> $config_mak
+-echo "SRC_PATH=$source_path" >> $config_mak
-echo "build_viewer=$build_viewer" >> $config_mak
--echo "build_player=$build_player" >> $config_mak
+ echo "build_player=$build_player" >> $config_mak
-echo "biarch=$biarch" >> $config_mak
++echo "SRC_PATH=$source_path" >> $config_mak
echo "lib32=$lib32" >> $config_mak
echo "lib64=$lib64" >> $config_mak
echo "prefix=$prefix" >> $config_mak
@@ -239,7 +241,7 @@
VERSION=`sed < $source_path/$PACKAGE.spec -n '/^\%define version[ ]*/s///p'`
RELEASE=`sed < $source_path/$PACKAGE.spec -n '/^\%define release[ ]*/s///p'`
SVNDATE=`sed < $source_path/$PACKAGE.spec -n '/^\%define svndate[ ]*/s///p'`
-@@ -700,8 +736,14 @@ else
+@@ -700,8 +737,14 @@ else
echo "#define NPW_VERSION \"$VERSION\"" >> $config_h
fi
@@ -255,7 +257,7 @@
if test "$has_visibility_attribute" = "yes"; then
echo "#define attribute_hidden __attribute__((visibility(\"hidden\")))" >> $config_h
-@@ -729,9 +771,8 @@ config_h="config.h"
+@@ -729,9 +772,8 @@ config_h="config.h"
echo "/* Automatically generated by configure - do not modify */" > $config_h
echo "#include \"config-host.h\"" >> $config_h
@@ -267,7 +269,7 @@
if test "$target_os" = "linux"; then
echo "TARGET_OS=linux" >> $config_mak
-@@ -772,3 +813,7 @@ if test "$source_path_used" = "yes" ; th
+@@ -772,3 +814,7 @@ if test "$source_path_used" = "yes" ; th
esac
ln -sf $source_path/Makefile Makefile
fi
@@ -277,7 +279,7 @@
+
diff -up nspluginwrapper-1.1.0/Makefile.build nspluginwrapper-1.1.0/Makefile
--- nspluginwrapper-1.1.0/Makefile.build 2008-07-06 22:15:03.000000000 +0200
-+++ nspluginwrapper-1.1.0/Makefile 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/Makefile 2008-07-15 16:50:26.000000000 +0200
@@ -59,23 +59,6 @@ ifneq (,$(findstring $(OS),netbsd dragon
X_LDFLAGS += -Wl,--rpath,$(x11prefix)/$(lib64)
endif
@@ -380,13 +382,13 @@
ifeq ($(build_player),yes)
TARGETS += $(npplayer_PROGRAM)
endif
-@@ -242,56 +210,19 @@ uninstall.config:
+@@ -242,56 +210,26 @@ uninstall.config:
rm -f $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npconfig_PROGRAM)
uninstall.mkruntime:
rm -f $(DESTDIR)$(pkglibdir)/noarch/mkruntime
-
-install: install.dirs install.player install.wrapper install.viewer install.libxpcom install.libnoxshm install.loader install.config install.mkruntime
-+install: install.dirs install.wrapper install.viewer install.loader install.config
++install: install.dirs install.player install.wrapper install.viewer install.loader install.config
install.dirs:
- mkdir -p $(DESTDIR)$(pkglibdir)/noarch
- mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH)
@@ -395,15 +397,16 @@
- mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)
- mkdir -p $(DESTDIR)$(pkglibdir)/$(ARCH_32)/$(TARGET_OS)
-endif
--ifeq ($(build_player),yes)
--install.player: $(npplayer_PROGRAM)
++ mkdir -p $(DESTDIR)$(pkglibdir)
+ ifeq ($(build_player),yes)
+ install.player: $(npplayer_PROGRAM)
- install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM)
-- mkdir -p $(DESTDIR)$(bindir)
++ install -m 755 $(STRIP_OPT) $(npplayer_PROGRAM) $(DESTDIR)$(pkglibdir)/$(npplayer_PROGRAM)
+ mkdir -p $(DESTDIR)$(bindir)
- $(LN_S) $(pkglibdir)/$(ARCH)/$(OS)/$(npplayer_PROGRAM) $(DESTDIR)$(bindir)/nspluginplayer
--else
--install.player:
--endif
-+ mkdir -p $(DESTDIR)$(pkglibdir)
+ else
+ install.player:
+ endif
install.wrapper: $(npwrapper_LIBRARY)
- install -m 755 $(STRIP_OPT) $(npwrapper_LIBRARY) $(DESTDIR)$(pkglibdir)/$(ARCH)/$(OS)/$(npwrapper_LIBRARY)
-ifeq ($(build_viewer),yes)
@@ -445,7 +448,7 @@
$(archivedir)::
[ -d $(archivedir) ] || mkdir $(archivedir) > /dev/null 2>&1
-@@ -340,13 +271,13 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c
+@@ -340,13 +278,13 @@ npwrapper-%.os: $(SRC_PATH)/src/%.c
$(CC) -o $@ -c $< $(PIC_CFLAGS) $(CPPFLAGS) $(npwrapper_CFLAGS) -DBUILD_WRAPPER
$(npviewer_PROGRAM): $(npviewer_OBJECTS) $(npviewer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
@@ -462,7 +465,7 @@
$(npplayer_PROGRAM): $(npplayer_OBJECTS) $(npplayer_MAPFILE) $(LSB_OBJ_DIR) $(LSB_LIBS)
$(CC) $(LDFLAGS) -o $@ $(npplayer_OBJECTS) $(npplayer_LDFLAGS)
-@@ -356,12 +287,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c
+@@ -356,12 +294,6 @@ npplayer-%.o: $(SRC_PATH)/src/%.c
npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
@@ -475,7 +478,7 @@
$(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
$(CC) $(LDFLAGS_32) $(DSO_LDFLAGS) -o $@ $(libnoxshm_OBJECTS) $(libnoxshm_LDFLAGS) -Wl,--soname,libnoxshm.so
-@@ -372,17 +297,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS)
+@@ -372,17 +304,23 @@ $(npconfig_PROGRAM): $(npconfig_OBJECTS)
$(CC) -o $@ $(npconfig_OBJECTS) $(npconfig_LDFLAGS)
npconfig-%.o: $(SRC_PATH)/src/%.c
@@ -502,7 +505,7 @@
$(LSB_OBJ_DIR)/%.a: $(LSB_OBJ_DIR)/%.o
$(AR) rc $@ $<
-@@ -395,6 +326,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
+@@ -395,6 +333,6 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
$(LN_S) libgcc_s.so $@
$(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
@@ -512,7 +515,7 @@
-Wl,-soname,`grep "$(patsubst $(LSB_OBJ_DIR)/%.o,%,$<) " $(LSB_SRC_DIR)/LibNameMap.txt | cut -f2 -d' '`
diff -up nspluginwrapper-1.1.0/src/debug.h.build nspluginwrapper-1.1.0/src/debug.h
--- nspluginwrapper-1.1.0/src/debug.h.build 2008-06-21 22:13:34.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/debug.h 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/debug.h 2008-07-15 16:48:26.000000000 +0200
@@ -33,7 +33,7 @@ extern void npw_printf(const char *forma
extern void npw_vprintf(const char *format, va_list args) attribute_hidden;
@@ -524,7 +527,7 @@
#define D(x) ;
diff -up nspluginwrapper-1.1.0/src/npw-config.c.build nspluginwrapper-1.1.0/src/npw-config.c
--- nspluginwrapper-1.1.0/src/npw-config.c.build 2008-06-26 23:44:15.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-config.c 2008-07-15 16:48:26.000000000 +0200
@@ -38,10 +38,15 @@
#include <pwd.h>
#include <dirent.h>
@@ -825,8 +828,8 @@
return 0;
diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.c
---- /dev/null 2008-07-07 15:46:30.273004002 +0200
-+++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-07 16:25:17.000000000 +0200
+--- /dev/null 2008-07-15 15:29:44.189003873 +0200
++++ nspluginwrapper-1.1.0/src/npw-dir.c 2008-07-15 16:48:26.000000000 +0200
@@ -0,0 +1,97 @@
+/*
+ * npw-dir.h - Directory management for nspluginwrapper
@@ -926,8 +929,8 @@
+ return(p_path);
+}
diff -up /dev/null nspluginwrapper-1.1.0/src/npw-dir.h
---- /dev/null 2008-07-07 15:46:30.273004002 +0200
-+++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-07 16:25:17.000000000 +0200
+--- /dev/null 2008-07-15 15:29:44.189003873 +0200
++++ nspluginwrapper-1.1.0/src/npw-dir.h 2008-07-15 16:48:26.000000000 +0200
@@ -0,0 +1,35 @@
+/*
+ * npw-dir.h - Directory management for nspluginwrapper
@@ -966,7 +969,7 @@
+#endif
diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.build nspluginwrapper-1.1.0/src/npw-viewer.c
--- nspluginwrapper-1.1.0/src/npw-viewer.c.build 2008-07-06 22:47:22.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-15 16:48:26.000000000 +0200
@@ -54,10 +54,6 @@
#define DEBUG 1
#include "debug.h"
@@ -1064,7 +1067,7 @@
diff -up nspluginwrapper-1.1.0/src/npw-viewer.sh.build nspluginwrapper-1.1.0/src/npw-viewer.sh
--- nspluginwrapper-1.1.0/src/npw-viewer.sh.build 2008-07-06 18:37:56.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-viewer.sh 2008-07-15 16:48:26.000000000 +0200
@@ -4,7 +4,13 @@
#
OS="`uname -s`"
@@ -1130,7 +1133,7 @@
REALPLAYER_HOME="/usr/pkg/lib/RealPlayer"
diff -up nspluginwrapper-1.1.0/src/npw-wrapper.c.build nspluginwrapper-1.1.0/src/npw-wrapper.c
--- nspluginwrapper-1.1.0/src/npw-wrapper.c.build 2008-07-06 22:07:21.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-wrapper.c 2008-07-15 16:48:26.000000000 +0200
@@ -44,6 +44,7 @@
#include "rpc.h"
@@ -1181,7 +1184,7 @@
if (g_plugin.name == NULL && g_plugin.description == NULL && g_plugin.formats == NULL) {
diff -up nspluginwrapper-1.1.0/src/sysdeps.h.build nspluginwrapper-1.1.0/src/sysdeps.h
--- nspluginwrapper-1.1.0/src/sysdeps.h.build 2008-06-21 22:13:34.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-07 16:25:17.000000000 +0200
++++ nspluginwrapper-1.1.0/src/sysdeps.h 2008-07-15 16:48:26.000000000 +0200
@@ -45,8 +45,8 @@
#define NPW_VIEWER NPW_VIEWER_BASE
#define NPW_WRAPPER_BASE "npwrapper"
nspluginwrapper-1.1.0-fork.patch:
Index: nspluginwrapper-1.1.0-fork.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-1.1.0-fork.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-fork.patch 8 Jul 2008 13:17:06 -0000 1.1
+++ nspluginwrapper-1.1.0-fork.patch 18 Jul 2008 09:21:25 -0000 1.2
@@ -1,6 +1,6 @@
diff -up nspluginwrapper-1.1.0/src/npw-viewer.c.fork nspluginwrapper-1.1.0/src/npw-viewer.c
---- nspluginwrapper-1.1.0/src/npw-viewer.c.fork 2008-07-08 14:23:26.000000000 +0200
-+++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-08 14:26:58.000000000 +0200
+--- nspluginwrapper-1.1.0/src/npw-viewer.c.fork 2008-07-15 15:33:06.000000000 +0200
++++ nspluginwrapper-1.1.0/src/npw-viewer.c 2008-07-15 15:42:07.000000000 +0200
@@ -67,6 +67,20 @@
// RPC global connections
rpc_connection_t *g_rpc_connection attribute_hidden = NULL;
@@ -28,7 +28,7 @@
D(bug("NPN_ForceRedraw instance=%p\n", instance));
+
+ if(!pid_check())
-+ return NPERR_INVALID_INSTANCE_ERROR;
++ return;
UNIMPLEMENTED();
}
@@ -74,7 +74,7 @@
return;
+
+ if(!pid_check())
-+ return NPERR_INVALID_INSTANCE_ERROR;
++ return;
D(bug("NPN_InvalidateRect instance=%p\n", instance));
invoke_NPN_InvalidateRect(instance, invalidRect);
@@ -84,7 +84,7 @@
D(bug("NPN_InvalidateRegion instance=%p\n", instance));
+
+ if(!pid_check())
-+ return NPERR_INVALID_INSTANCE_ERROR;
++ return;
UNIMPLEMENTED();
}
@@ -166,22 +166,24 @@
g_NPN_Status(NPP instance, const char *message)
{
+ if(!pid_check())
-+ return NPERR_INVALID_INSTANCE_ERROR;
++ return;
+
D(bug("NPN_Status instance=%p\n", instance));
invoke_NPN_Status(instance, message);
D(bug(" done\n"));
-@@ -1130,6 +1183,9 @@ invoke_NPN_UserAgent(void)
+@@ -1130,6 +1183,11 @@ invoke_NPN_UserAgent(void)
static const char *
g_NPN_UserAgent(NPP instance)
{
-+ if(!pid_check())
-+ return NPERR_INVALID_INSTANCE_ERROR;
++ if(!pid_check()) {
++ static char tmp_agent_string[] = "None";
++ return tmp_agent_string;
++ }
+
D(bug("NPN_UserAgent instance=%p\n", instance));
if (g_user_agent == NULL)
g_user_agent = invoke_NPN_UserAgent();
-@@ -1212,6 +1268,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM
+@@ -1212,6 +1270,8 @@ invoke_NPN_NewStream(NPP instance, NPMIM
static NPError
g_NPN_NewStream(NPP instance, NPMIMEType type, const char *target, NPStream **stream)
{
@@ -190,7 +192,7 @@
if (instance == NULL)
return NPERR_INVALID_INSTANCE_ERROR;
-@@ -1257,6 +1315,9 @@ invoke_NPN_DestroyStream(NPP instance, N
+@@ -1257,6 +1317,9 @@ invoke_NPN_DestroyStream(NPP instance, N
static NPError
g_NPN_DestroyStream(NPP instance, NPStream *stream, NPError reason)
{
@@ -200,7 +202,7 @@
if (instance == NULL)
return NPERR_INVALID_INSTANCE_ERROR;
-@@ -1314,6 +1375,9 @@ invoke_NPN_Write(NPP instance, NPStream
+@@ -1314,6 +1377,9 @@ invoke_NPN_Write(NPP instance, NPStream
static int32
g_NPN_Write(NPP instance, NPStream *stream, int32 len, void *buf)
{
@@ -210,7 +212,7 @@
if (instance == NULL)
return -1;
-@@ -1350,6 +1414,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in
+@@ -1350,6 +1416,8 @@ invoke_NPN_PushPopupsEnabledState(NPP in
static void
g_NPN_PushPopupsEnabledState(NPP instance, NPBool enabled)
{
@@ -219,7 +221,7 @@
if (instance == NULL)
return;
-@@ -1381,6 +1447,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins
+@@ -1381,6 +1449,8 @@ invoke_NPN_PopPopupsEnabledState(NPP ins
static void
g_NPN_PopPopupsEnabledState(NPP instance)
{
@@ -228,7 +230,7 @@
if (instance == NULL)
return;
-@@ -1480,6 +1548,9 @@ invoke_NPN_CreateObject(NPP instance)
+@@ -1480,6 +1550,9 @@ invoke_NPN_CreateObject(NPP instance)
static NPObject *
g_NPN_CreateObject(NPP instance, NPClass *class)
{
@@ -238,7 +240,7 @@
if (instance == NULL)
return NULL;
-@@ -1520,6 +1591,9 @@ invoke_NPN_RetainObject(NPObject *npobj)
+@@ -1520,6 +1593,9 @@ invoke_NPN_RetainObject(NPObject *npobj)
static NPObject *
g_NPN_RetainObject(NPObject *npobj)
{
@@ -248,7 +250,7 @@
if (npobj == NULL)
return NULL;
-@@ -1558,6 +1632,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj
+@@ -1558,6 +1634,9 @@ invoke_NPN_ReleaseObject(NPObject *npobj
static void
g_NPN_ReleaseObject(NPObject *npobj)
{
@@ -258,7 +260,7 @@
if (npobj == NULL)
return;
-@@ -1605,6 +1682,9 @@ static bool
+@@ -1605,6 +1684,9 @@ static bool
g_NPN_Invoke(NPP instance, NPObject *npobj, NPIdentifier methodName,
const NPVariant *args, uint32_t argCount, NPVariant *result)
{
@@ -268,7 +270,7 @@
if (!instance || !npobj || !npobj->_class || !npobj->_class->invoke)
return false;
-@@ -1652,6 +1732,9 @@ static bool
+@@ -1652,6 +1734,9 @@ static bool
g_NPN_InvokeDefault(NPP instance, NPObject *npobj,
const NPVariant *args, uint32_t argCount, NPVariant *result)
{
@@ -278,7 +280,7 @@
if (!instance || !npobj || !npobj->_class || !npobj->_class->invokeDefault)
return false;
-@@ -1697,6 +1780,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje
+@@ -1697,6 +1782,9 @@ invoke_NPN_Evaluate(NPP instance, NPObje
static bool
g_NPN_Evaluate(NPP instance, NPObject *npobj, NPString *script, NPVariant *result)
{
@@ -288,7 +290,7 @@
if (!instance || !npobj)
return false;
-@@ -1746,6 +1832,9 @@ static bool
+@@ -1746,6 +1834,9 @@ static bool
g_NPN_GetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName,
NPVariant *result)
{
@@ -298,7 +300,7 @@
if (!instance || !npobj || !npobj->_class || !npobj->_class->getProperty)
return false;
-@@ -1792,6 +1881,9 @@ static bool
+@@ -1792,6 +1883,9 @@ static bool
g_NPN_SetProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName,
const NPVariant *value)
{
@@ -308,7 +310,7 @@
if (!instance || !npobj || !npobj->_class || !npobj->_class->setProperty)
return false;
-@@ -1833,6 +1925,9 @@ invoke_NPN_RemoveProperty(NPP instance,
+@@ -1833,6 +1927,9 @@ invoke_NPN_RemoveProperty(NPP instance,
static bool
g_NPN_RemoveProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName)
{
@@ -318,7 +320,7 @@
if (!instance || !npobj || !npobj->_class || !npobj->_class->removeProperty)
return false;
-@@ -1874,6 +1969,9 @@ invoke_NPN_HasProperty(NPP instance, NPO
+@@ -1874,6 +1971,9 @@ invoke_NPN_HasProperty(NPP instance, NPO
static bool
g_NPN_HasProperty(NPP instance, NPObject *npobj, NPIdentifier propertyName)
{
@@ -328,7 +330,7 @@
if (!instance || !npobj || !npobj->_class || !npobj->_class->hasProperty)
return false;
-@@ -1915,6 +2013,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj
+@@ -1915,6 +2015,9 @@ invoke_NPN_HasMethod(NPP instance, NPObj
static bool
g_NPN_HasMethod(NPP instance, NPObject *npobj, NPIdentifier methodName)
{
@@ -338,7 +340,7 @@
if (!instance || !npobj || !npobj->_class || !npobj->_class->hasMethod)
return false;
-@@ -1950,6 +2051,9 @@ invoke_NPN_SetException(NPObject *npobj,
+@@ -1950,6 +2053,9 @@ invoke_NPN_SetException(NPObject *npobj,
static void
g_NPN_SetException(NPObject *npobj, const NPUTF8 *message)
{
@@ -348,7 +350,7 @@
D(bug("NPN_SetException npobj=%p, message='%s'\n", npobj, message));
invoke_NPN_SetException(npobj, message);
D(bug(" done\n"));
-@@ -2011,6 +2115,8 @@ invoke_NPN_GetStringIdentifier(const NPU
+@@ -2011,6 +2117,8 @@ invoke_NPN_GetStringIdentifier(const NPU
static NPIdentifier
g_NPN_GetStringIdentifier(const NPUTF8 *name)
{
@@ -357,7 +359,7 @@
if (name == NULL)
return NULL;
-@@ -2060,6 +2166,9 @@ invoke_NPN_GetStringIdentifiers(const NP
+@@ -2060,6 +2168,9 @@ invoke_NPN_GetStringIdentifiers(const NP
static void
g_NPN_GetStringIdentifiers(const NPUTF8 **names, uint32_t nameCount, NPIdentifier *identifiers)
{
@@ -367,7 +369,7 @@
if (names == NULL)
return;
-@@ -2101,6 +2210,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti
+@@ -2101,6 +2212,9 @@ invoke_NPN_GetIntIdentifier(int32_t inti
static NPIdentifier
g_NPN_GetIntIdentifier(int32_t intid)
{
@@ -377,7 +379,7 @@
D(bug("NPN_GetIntIdentifier intid=%d\n", intid));
NPIdentifier ret = invoke_NPN_GetIntIdentifier(intid);
D(bug(" return: %p\n", ret));
-@@ -2137,6 +2249,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi
+@@ -2137,6 +2251,9 @@ invoke_NPN_IdentifierIsString(NPIdentifi
static bool
g_NPN_IdentifierIsString(NPIdentifier identifier)
{
@@ -387,7 +389,7 @@
D(bug("NPN_IdentifierIsString identifier=%p\n", identifier));
bool ret = invoke_NPN_IdentifierIsString(identifier);
D(bug(" return: %d\n", ret));
-@@ -2173,6 +2288,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi
+@@ -2173,6 +2290,9 @@ invoke_NPN_UTF8FromIdentifier(NPIdentifi
static NPUTF8 *
g_NPN_UTF8FromIdentifier(NPIdentifier identifier)
{
@@ -397,7 +399,7 @@
D(bug("NPN_UTF8FromIdentifier identifier=%p\n", identifier));
NPUTF8 *ret = invoke_NPN_UTF8FromIdentifier(identifier);
D(bug(" return: '%s'\n", ret));
-@@ -2210,6 +2328,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie
+@@ -2210,6 +2330,9 @@ invoke_NPN_IntFromIdentifier(NPIdentifie
static int32_t
g_NPN_IntFromIdentifier(NPIdentifier identifier)
{
@@ -407,7 +409,7 @@
D(bug("NPN_IntFromIdentifier identifier=%p\n", identifier));
int32_t ret = invoke_NPN_IntFromIdentifier(identifier);
D(bug(" return: %d\n", ret));
-@@ -3259,6 +3380,9 @@ static int do_main(int argc, char **argv
+@@ -3259,6 +3382,9 @@ static int do_main(int argc, char **argv
}
D(bug(" Plugin connection: %s\n", connection_path));
nspluginwrapper-1.1.0-runtime-restart.patch:
Index: nspluginwrapper-1.1.0-runtime-restart.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-1.1.0-runtime-restart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-1.1.0-runtime-restart.patch 8 Jul 2008 13:17:06 -0000 1.1
+++ nspluginwrapper-1.1.0-runtime-restart.patch 18 Jul 2008 09:21:25 -0000 1.2
@@ -398,7 +398,7 @@
#endif
+// This callback is called when the connection is closed or broken
-+typedef int (*rpc_error_callback_t)(rpc_connection_t *connection);
++typedef void (*rpc_error_callback_t)(rpc_connection_t *connection);
+
+// Set callback for a connection
+void rpc_connection_error_callback_set(rpc_connection_t *connection, rpc_error_callback_t callback);
Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- nspluginwrapper.spec 8 Jul 2008 13:17:06 -0000 1.49
+++ nspluginwrapper.spec 18 Jul 2008 09:21:25 -0000 1.50
@@ -70,7 +70,7 @@
Summary: A compatibility layer for Netscape 4 plugins
Name: nspluginwrapper
Version: 1.1.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Source0: %{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
Source1: %{plugin_config_name}.tar.gz
Source2: plugin-config.sh.in
@@ -87,11 +87,11 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
Provides: %{name} = %{version}-%{release}
Requires: %{_bindir}/linux32
-Requires: gecko-libs = %{gecko_ver}
+Requires: gecko-libs >= %{gecko_ver}
Requires: mozilla-filesystem
BuildRequires: pkgconfig gtk2-devel glib2-devel nspr-devel
BuildRequires: libX11-devel libXt-devel cairo-devel pango-devel libcurl-devel
-BuildRequires: gecko-devel = %{gecko_ver}
+BuildRequires: gecko-devel >= %{gecko_ver}
ExclusiveArch: i386 x86_64 ppc
%description
@@ -169,7 +169,7 @@
./configure --prefix=/usr CFLAGS="$RPM_OPT_FLAGS"
make
popd
-
+
%install
rm -rf $RPM_BUILD_ROOT
@@ -204,6 +204,13 @@
> $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
chmod 644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{name}
+# set up nsplugin player starting script
+%{__cat} > $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer << EOF
+export MOZ_PLUGIN_PATH=%{pluginsourcedir}
+%{pkgdir}/npplayer "$@"
+EOF
+chmod 755 $RPM_BUILD_ROOT%{pkgdir}/nspluginplayer
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -226,11 +233,19 @@
%{pkgdir}/npwrapper.so
%{pkgdir}/npviewer.bin
%{pkgdir}/npviewer
+%{pkgdir}/npplayer
+%{pkgdir}/nspluginplayer
%{plugindir}/npwrapper.so
%{_bindir}/mozilla-plugin-config
%config %{_sysconfdir}/sysconfig/%{name}
%changelog
+* Tue Jul 18 2008 Martin Stransky <stransky at redhat.com> 1.1.0-3
+- Enabled experimental stand-alone plugin player
+
+* Tue Jul 15 2008 Martin Stransky <stransky at redhat.com> 1.1.0-2
+- Fixed build warnings in our patches
+
* Tue Jul 8 2008 Martin Stransky <stransky at redhat.com> 1.1.0-1
- update to latest upstream version (1.1.0)
More information about the fedora-extras-commits
mailing list