rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-npviewer-gthread.patch, 1.1, 1.2 nspluginwrapper.spec, 1.36, 1.37

[Martin Stransky (stransky)]

Author: stransky

Update of /cvs/pkgs/rpms/nspluginwrapper/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16853

Modified Files:
	nspluginwrapper-0.9.91.5-npviewer-gthread.patch 
	nspluginwrapper.spec 
Log Message:
fixed build script, added gthread-2.0

nspluginwrapper-0.9.91.5-npviewer-gthread.patch:

Index: nspluginwrapper-0.9.91.5-npviewer-gthread.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-0.9.91.5-npviewer-gthread.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-0.9.91.5-npviewer-gthread.patch	25 Dec 2007 18:26:07 -0000	1.1
+++ nspluginwrapper-0.9.91.5-npviewer-gthread.patch	10 Jan 2008 12:07:15 -0000	1.2
@@ -1,7 +1,7 @@
-diff -urN nspluginwrapper-0.9.91.5.orig/src/npw-viewer.c nspluginwrapper-0.9.91.5/src/npw-viewer.c
---- nspluginwrapper-0.9.91.5.orig/src/npw-viewer.c	2007-12-24 16:02:34.000000000 -0500
-+++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2007-12-24 16:03:03.000000000 -0500
-@@ -3144,6 +3144,7 @@
+diff -up nspluginwrapper-0.9.91.5/src/npw-viewer.c.thread nspluginwrapper-0.9.91.5/src/npw-viewer.c
+--- nspluginwrapper-0.9.91.5/src/npw-viewer.c.thread	2008-01-10 12:53:38.000000000 +0100
++++ nspluginwrapper-0.9.91.5/src/npw-viewer.c	2008-01-10 12:53:38.000000000 +0100
+@@ -3144,6 +3144,7 @@ static int do_main(int argc, char **argv
    XtToolkitInitialize();
    x_app_context = XtCreateApplicationContext();
    x_display = XtOpenDisplay(x_app_context, NULL, "npw-viewer", "npw-viewer", NULL, 0, &argc, argv);
@@ -9,3 +9,17 @@
    gtk_init(&argc, &argv);
  
    // Initialize RPC communication channel
+diff -up nspluginwrapper-0.9.91.5/configure.thread nspluginwrapper-0.9.91.5/configure
+--- nspluginwrapper-0.9.91.5/configure.thread	2008-01-10 12:53:38.000000000 +0100
++++ nspluginwrapper-0.9.91.5/configure	2008-01-10 12:55:34.000000000 +0100
+@@ -226,8 +226,8 @@ rm -f $TMPC $TMPE
+ # check for GTK+ 2.0 compile CFLAGS
+ #if test "$build_viewer" = "yes"; then
+     if $pkgconfig --exists gtk+-2.0; then
+-	GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0`
+-	GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0`
++	GTK_CFLAGS=`$pkgconfig --cflags gtk+-2.0 gthread-2.0`
++	GTK_LDFLAGS=`$pkgconfig --libs gtk+-2.0 gthread-2.0`
+     else
+ 	echo "GTK+ 2.0 environment not found"
+ 	exit 1


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- nspluginwrapper.spec	10 Jan 2008 11:49:53 -0000	1.36
+++ nspluginwrapper.spec	10 Jan 2008 12:07:15 -0000	1.37
@@ -92,7 +92,7 @@
 Provides:	%{name} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Requires:	%{_bindir}/linux32 
-BuildRequires:	pkgconfig gtk2-devel glib2
+BuildRequires:	pkgconfig gtk2-devel glib2-devel
 BuildRequires:	libXt-devel cairo-devel
 Requires:	gecko-libs = %{gecko_ver}
 BuildRequires:	gecko-devel = %{gecko_ver}
@@ -115,7 +115,7 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1 -b .xl
-%patch7 -p1
+%patch7 -p1 -b .thread
 
 pushd %plugin_config_name
 %patch10 -p2
@@ -240,6 +240,7 @@
 %changelog
 * Thu Jan 10 2008 Martin Stransky <stransky at redhat.com> 0.9.91.5-19
 - xulrunner rebuild
+- fixed build script, added gthread-2.0
 
 * Mon Dec 24 2007 Warren Togami <wtogami at redhat.com> 0.9.91.5-18
 - Make nsviewer.bin initialized for multithreading, fixes #360891