rpms/pcmanx-gtk2/devel pcmanx-gtk2-0.3.8-xulrunner.patch, 1.1, 1.2 pcmanx-gtk2.spec, 1.12, 1.13

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/pcmanx-gtk2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31626

Modified Files:
	pcmanx-gtk2-0.3.8-xulrunner.patch pcmanx-gtk2.spec 
Log Message:
Resolves: rhbz#511615 FTBFS

pcmanx-gtk2-0.3.8-xulrunner.patch:
 np_entry.cpp |    1 
 npn_gate.cpp |  152 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
 npp_gate.cpp |   16 +++---
 npplat.h     |    6 +-
 pluginbase.h |   16 +++---
 5 files changed, 165 insertions(+), 26 deletions(-)

Index: pcmanx-gtk2-0.3.8-xulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/devel/pcmanx-gtk2-0.3.8-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pcmanx-gtk2-0.3.8-xulrunner.patch	7 Jan 2009 21:44:34 -0000	1.1
+++ pcmanx-gtk2-0.3.8-xulrunner.patch	21 Jul 2009 16:32:18 -0000	1.2
@@ -12,7 +12,7 @@ diff -up pcmanx-gtk2-0.3.8/plugin/src/np
 diff -up pcmanx-gtk2-0.3.8/plugin/src/npn_gate.cpp.xul pcmanx-gtk2-0.3.8/plugin/src/npn_gate.cpp
 --- pcmanx-gtk2-0.3.8/plugin/src/npn_gate.cpp.xul	2008-08-10 09:06:29.000000000 +0200
 +++ pcmanx-gtk2-0.3.8/plugin/src/npn_gate.cpp	2009-01-07 22:36:21.000000000 +0100
-@@ -42,6 +42,126 @@
+@@ -42,6 +42,138 @@
  //
  #include "npplat.h"
  
@@ -133,13 +133,25 @@ diff -up pcmanx-gtk2-0.3.8/plugin/src/np
 +#define CallNPN_ForceRedrawProc(FUNC, ARG1)   \
 +    (*(FUNC))((ARG1)) 
 +
++typedef JRIEnv* (* NP_LOADDS NPN_GetJavaEnvUPP)(void);
++#define NewNPN_GetJavaEnvProc(FUNC)             \
++                ((NPN_GetJavaEnvUPP) (FUNC))
++#define CallNPN_GetJavaEnvProc(FUNC)            \
++                (*(FUNC))()
++
++typedef jref (* NP_LOADDS NPN_GetJavaPeerUPP)(NPP instance);
++#define NewNPN_GetJavaPeerProc(FUNC)            \
++                ((NPN_GetJavaPeerUPP) (FUNC))
++#define CallNPN_GetJavaPeerProc(FUNC, ARG1)             \
++                (*(FUNC))((ARG1))       
++
 +// ------------------------------------------------
 +
 +
  extern NPNetscapeFuncs NPNFuncs;
  
  void NPN_Version(int* plugin_major, int* plugin_minor, int* netscape_major, int* netscape_minor)
-@@ -71,7 +191,7 @@ NPError NPN_GetURL(NPP instance, const c
+@@ -71,7 +203,7 @@
    return rv;
  }
  
@@ -148,7 +160,7 @@ diff -up pcmanx-gtk2-0.3.8/plugin/src/np
  {
  	int navMinorVers = NPNFuncs.version & 0xFF;
    NPError rv = NPERR_NO_ERROR;
-@@ -84,7 +204,7 @@ NPError NPN_PostURLNotify(NPP instance, 
+@@ -84,7 +216,7 @@
    return rv;
  }
  
@@ -157,7 +169,7 @@ diff -up pcmanx-gtk2-0.3.8/plugin/src/np
  {
    NPError rv = CallNPN_PostURLProc(NPNFuncs.posturl, instance, url, window, len, buf, file);
    return rv;
-@@ -110,10 +230,10 @@ NPError NPN_NewStream(NPP instance, NPMI
+@@ -110,10 +242,10 @@
    return rv;
  }
  
@@ -170,7 +182,7 @@ diff -up pcmanx-gtk2-0.3.8/plugin/src/np
  
    if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT )
  		rv = CallNPN_WriteProc(NPNFuncs.write, instance, stream, len, buffer);
-@@ -143,12 +263,12 @@ void NPN_Status(NPP instance, const char
+@@ -143,12 +275,12 @@
  
  const char* NPN_UserAgent(NPP instance)
  {
@@ -185,7 +197,7 @@ diff -up pcmanx-gtk2-0.3.8/plugin/src/np
  {
    void * rv = NULL;
    rv = CallNPN_MemAllocProc(NPNFuncs.memalloc, size);
-@@ -160,9 +280,9 @@ void NPN_MemFree(void* ptr)
+@@ -160,9 +292,9 @@
    CallNPN_MemFreeProc(NPNFuncs.memfree, ptr);
  }
  
@@ -197,6 +209,23 @@ diff -up pcmanx-gtk2-0.3.8/plugin/src/np
    return rv;
  }
  
+@@ -175,14 +307,14 @@
+ JRIEnv* NPN_GetJavaEnv(void)
+ {
+   JRIEnv * rv = NULL;
+-	rv = CallNPN_GetJavaEnvProc(NPNFuncs.getJavaEnv);
++	rv = (JRIEnv*)CallNPN_GetJavaEnvProc(NPNFuncs.getJavaEnv);
+   return rv;
+ }
+ 
+ jref NPN_GetJavaPeer(NPP instance)
+ {
+   jref rv;
+-  rv = CallNPN_GetJavaPeerProc(NPNFuncs.getJavaPeer, instance);
++  rv = (jref)CallNPN_GetJavaPeerProc(NPNFuncs.getJavaPeer, instance);
+   return rv;
+ }
+ #endif
 diff -up pcmanx-gtk2-0.3.8/plugin/src/npp_gate.cpp.xul pcmanx-gtk2-0.3.8/plugin/src/npp_gate.cpp
 --- pcmanx-gtk2-0.3.8/plugin/src/npp_gate.cpp.xul	2008-08-10 09:06:29.000000000 +0200
 +++ pcmanx-gtk2-0.3.8/plugin/src/npp_gate.cpp	2009-01-07 22:36:21.000000000 +0100


Index: pcmanx-gtk2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pcmanx-gtk2/devel/pcmanx-gtk2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- pcmanx-gtk2.spec	20 Jul 2009 09:19:49 -0000	1.12
+++ pcmanx-gtk2.spec	21 Jul 2009 16:32:18 -0000	1.13
@@ -7,7 +7,7 @@
 Summary:   Telnet client designed for BBS browsing
 Name:      pcmanx-gtk2
 Version:   0.3.8
-Release:   6%{?dist}
+Release:   7%{?dist}
 License:   GPLv2+
 Group:     Applications/Internet
 Source0:   http://pcmanx.csie.net/release/%{name}-%{version}.tar.bz2
@@ -60,16 +60,9 @@ webpage in the browser window. 
 %patch4 -p1 -b .includes
 
 ########################################################################
-# automake 1.10 fails without config.rpath.
 # Check the following code and see if it can be removed.
- for f in `ls -d %{_datadir}/automake-1.* | sort  -g -k 2 -t .` ; do
-    automakever=`echo $f | sed -e 's|%{_datadir}/automake-||'`
- done
 
- eval %{__sed} -i.orig -e \'s\|-1\\\.9\|-$automakever\|\' autogen.sh
- %{__sed} -i -e 's|set -x|set -e -x|' autogen.sh
-
- touch config.rpath
+ %{__sed} -i -e 's/AM_VERSION=-1.10/AM_VERSION=-1.11/' autogen.sh
 ########################################################################
 
 %build
@@ -128,6 +121,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/mozilla/plugins/
 
 %changelog
+* Tue Jul 21 2009 Caolán McNamara <caolanm at redhat.com> - 0.3.8-7
+- Resolves: rhbz#511615 FTBFS
+
 * Mon Jul 20 2009 Jan Horak <jhorak at redhat.com> - 0.3.8-6
 - Rebuild against newer gecko