[nspluginwrapper/f16] update to latest upstream

Fri Sep 14 13:33:11 UTC 2012

commit 452315b161128e307407db3af3f68f6edad9156f
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Fri Sep 14 15:33:03 2012 +0200

    update to latest upstream

 ...-make.patch => nspluginwrapper-1.4.4-make.patch |   12 ++++++------
 nspluginwrapper-pthread.patch                      |   13 +++----------
 nspluginwrapper.spec                               |    8 ++++----
 sources                                            |    2 +-
 4 files changed, 14 insertions(+), 21 deletions(-)
---

diff --git a/nspluginwrapper-1.3.0-make.patch b/nspluginwrapper-1.4.4-make.patch
similarity index 82%
rename from nspluginwrapper-1.3.0-make.patch
rename to nspluginwrapper-1.4.4-make.patch
index 6d165fd..f86d3e3 100644
--- a/nspluginwrapper-1.3.0-make.patch
+++ b/nspluginwrapper-1.4.4-make.patch
@@ -1,6 +1,6 @@
-diff -up nspluginwrapper-1.3.2/Makefile.make nspluginwrapper-1.3.2/Makefile
---- nspluginwrapper-1.3.2/Makefile.make	2011-04-23 20:47:21.000000000 +0200
-+++ nspluginwrapper-1.3.2/Makefile	2011-05-03 15:17:49.789380125 +0200
+diff -up nspluginwrapper-1.4.4/Makefile.make nspluginwrapper-1.4.4/Makefile
+--- nspluginwrapper-1.4.4/Makefile.make	2011-12-29 05:44:50.000000000 +0100
++++ nspluginwrapper-1.4.4/Makefile	2012-09-14 14:21:50.207020448 +0200
 @@ -104,6 +104,7 @@ npwrapper_CFLAGS  = $(CFLAGS) $(X_CFLAGS
  npwrapper_LDFLAGS = $(LDFLAGS) $(libpthread_LDFLAGS)
  npwrapper_LIBS    = $(X_LIBS) $(libpthread_LIBS) $(libsocket_LIBS)
@@ -17,7 +17,7 @@ diff -up nspluginwrapper-1.3.2/Makefile.make nspluginwrapper-1.3.2/Makefile
  ifeq ($(TARGET_OS):$(TARGET_ARCH),linux:i386)
  npviewer_MAPFILE  = $(SRC_PATH)/src/npw-viewer.map
  endif
-@@ -321,13 +323,13 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
+@@ -302,13 +304,13 @@ npplayer-%.o: $(SRC_PATH)/src/tidy/%.c
  	$(CC) -o $@ -c $< $(CPPFLAGS) $(npplayer_CFLAGS) -DBUILD_PLAYER
  
  $(libnoxshm_LIBRARY): $(libnoxshm_OBJECTS) $(LSB_OBJ_DIR) $(LSB_LIBS)
@@ -33,10 +33,10 @@ diff -up nspluginwrapper-1.3.2/Makefile.make nspluginwrapper-1.3.2/Makefile
  
  npconfig-%.o: $(SRC_PATH)/src/%.c
  	$(CC) $(npconfig_CFLAGS) -o $@ -c $< $(CPPFLAGS)
-@@ -353,7 +355,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
+@@ -334,7 +336,7 @@ $(LSB_OBJ_DIR)/libgcc_s_32.so: $(LSB_OBJ
  	$(LN_S) libgcc_s.so $@
  
- $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o
+ $(LSB_OBJ_DIR)/%.so: $(LSB_OBJ_DIR)/%.o | $(LSB_OBJ_DIR)
 -	$(CC) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
 +	$(CC) $(LDFLAGS) $(LDFLAGS_32) -nostdlib $(DSO_LDFLAGS) $< -o $@ \
  		-Wl,--version-script,$(patsubst $(LSB_OBJ_DIR)/%.o,$(LSB_SRC_DIR)/%.Version,$<) \
diff --git a/nspluginwrapper-pthread.patch b/nspluginwrapper-pthread.patch
index b4ed0d8..1aeb270 100644
--- a/nspluginwrapper-pthread.patch
+++ b/nspluginwrapper-pthread.patch
@@ -10,18 +10,11 @@ diff -up nspluginwrapper-1.4.4/Makefile.pthread nspluginwrapper-1.4.4/Makefile
  ifeq ($(OS),dragonfly)
  libpthread_LDFLAGS = -pthread
  endif
-diff -up nspluginwrapper-1.4.4/src/npw-player.c.pthread nspluginwrapper-1.4.4/src/npw-player.c
---- nspluginwrapper-1.4.4/src/npw-player.c.pthread	2011-07-01 05:18:57.000000000 +0200
-+++ nspluginwrapper-1.4.4/src/npw-player.c	2011-10-27 17:45:55.963760487 +0200
-@@ -25,10 +25,10 @@
- #include <unistd.h>
- #include <glib.h>
- #include <glib/gstdio.h>
--#include <glib/gthread.h>
- #include <gtk/gtk.h>
+--- nspluginwrapper-1.4.4/src/npw-player.c.pthread	2011-12-29 05:44:50.000000000 +0100
++++ nspluginwrapper-1.4.4/src/npw-player.c	2012-09-14 14:31:47.669931757 +0200
+@@ -29,4 +29,5 @@
  #include <gdk/gdkx.h>
  #include <gdk/gdkkeysyms.h>
 +#include <pthread.h>
  
  #include "rpc.h"
- #include "utils.h"
diff --git a/nspluginwrapper.spec b/nspluginwrapper.spec
index 30b1022..5a64a72 100644
--- a/nspluginwrapper.spec
+++ b/nspluginwrapper.spec
@@ -80,10 +80,12 @@
 %define pluginsourcedir	%{pluginsourcedir64}
 %endif
 
+%define svndate 928c322
+
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	1.4.4
-Release:	11%{?dist}
+Release:	12%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -93,11 +95,10 @@ Source0:	http://gwenole.beauchesne.info/projects/nspluginwrapper/files/%{name}-%
 Source1:	%{plugin_config_name}.tar.gz
 Source2:	plugin-config.sh.in
 Source3:	%{name}.sh.in
-Patch1:		nspluginwrapper-1.3.0-make.patch
+Patch1:		nspluginwrapper-1.4.4-make.patch
 Patch3:		nspluginwrapper-1.3.0-directory.patch
 Patch6:		nspluginwrapper-1.3.0-compiz.patch
 Patch7:		nspluginwrapper-1.3.0-comp.patch
-Patch9:		nspluginwrapper-1.3.0-timeout.patch
 Patch10:	nspluginwrapper-pthread.patch
 Patch11:	nspluginwrapper-arm.patch
 Patch12:	nspluginwrapper-1.4.4-restart.patch
@@ -132,7 +133,6 @@ This package consists in:
 %patch3 -p1 -b .dir
 %patch6 -p1 -b .compiz
 %patch7 -p1 -b .comp
-%patch9 -p1 -b .timeout
 THREAD_LIBS=`pkg-config --libs gthread-2.0`
 sed -e "s/__PTHREAD_LIBS__/$THREAD_LIBS/" %{P:%%PATCH10} > pthread.patch
 %{__patch} -p1 -b --suffix .version --fuzz=0 < pthread.patch
diff --git a/sources b/sources
index aa6bf4e..8f0bc59 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 0a00e94ba608dfea365851af9deb20dc  plugin-config-1.9.tar.gz
-36f3e290fc4ce56f65ee695078961188  nspluginwrapper-1.4.4.tar.gz
+63fb5b33ad6f8906eedf20b47c018ec4  nspluginwrapper-1.4.4-928c322.tar.gz
