diff -u pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.postrm pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.postrm --- pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.postrm +++ pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.postrm @@ -21,12 +21,12 @@ case "$1" in purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) - if which update-iceape-chrome 2> /dev/null > /dev/null; then - update-iceape-chrome + if which update-seamonkey-chrome 2> /dev/null > /dev/null; then + update-seamonkey-chrome fi # Manually touch this until update-iceweasel-chrome is available - if [ -d /usr/lib/iceweasel ]; then - touch /usr/lib/iceweasel/.autoreg + if [ -d /usr/lib/firefox ]; then + touch /usr/lib/firefox/.autoreg fi ;; diff -u pcmanx-gtk2-0.3.8/debian/control pcmanx-gtk2-0.3.8/debian/control --- pcmanx-gtk2-0.3.8/debian/control +++ pcmanx-gtk2-0.3.8/debian/control @@ -1,7 +1,8 @@ Source: pcmanx-gtk2 Section: x11 Priority: optional -Maintainer: Emfox Zhou +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Emfox Zhou Build-Depends: debhelper (>= 4.0.0), libxft-dev, libgtk2.0-dev, xulrunner-dev (>= 1.9.0.1), libx11-dev, libxt-dev, sharutils, dpatch (>= 2.0) Standards-Version: 3.8.0 Homepage: http://pcmanx.csie.net/ @@ -25,7 +26,7 @@ Section: web Architecture: any Depends: ${shlibs:Depends}, libgconf2-4 -Recommends: iceweasel | iceape-browser | firefox +Recommends: iceweasel | iceape-browser | firefox | abrowser | seamonkey-browser Description: pcmanx plugin for Mozilla based browser This plugin adds support for telnet:// protocol to your Mozilla based browser. The protocol engine is done by PCManX and the output window diff -u pcmanx-gtk2-0.3.8/debian/rules pcmanx-gtk2-0.3.8/debian/rules --- pcmanx-gtk2-0.3.8/debian/rules +++ pcmanx-gtk2-0.3.8/debian/rules @@ -61,7 +61,7 @@ # Add here commands to install the package into debian/pcmanx-gtk2. $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp install -m 644 debian/pcmanx.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/ - rm $(CURDIR)/debian/tmp/usr/lib/xulrunner-devel-1.9/bin/components/pcmanx.png + rm $(CURDIR)/debian/tmp/usr/lib/xulrunner-devel-1.9.1.5/bin/components/pcmanx.png binary-indep: build install @@ -77,7 +77,7 @@ dh_strip dh_compress dh_fixperms - dh_makeshlibs -V -Xiceweasel + dh_makeshlibs -V -Xfirefox dh_installdeb dh_shlibdeps dh_gencontrol diff -u pcmanx-gtk2-0.3.8/debian/changelog pcmanx-gtk2-0.3.8/debian/changelog --- pcmanx-gtk2-0.3.8/debian/changelog +++ pcmanx-gtk2-0.3.8/debian/changelog @@ -1,3 +1,36 @@ +pcmanx-gtk2 (0.3.8-3ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - packages that Depend/Recommend/Suggest firefox + (meta-package) must alternatively Depend/Recommend/Suggest abrowser + - Don't apply iceape-dev.dpatch patch. + - debian/mozilla-plugin-pcmanx.links: s/iceape/seamonkey/; + s/iceweasel/firefox/. + - debian/control: add "| seamonkey-browser" to mozilla-plugin-pcmanx Depends + field. + - debian/rules: use "dh_makeshlibs -V -Xfirefox" instead of + "dh_makeshlibs -V -Xiceweasel" in binary-arch target. + - debian/mozilla-plugin-pcmanx.install: s/iceape/xulrunner/. + - mozilla-plugin-pcmanx.{postinst,postrm}: s/iceape/seamonkey/; + s/iceweasel/firefox/. + - const-char.dpatch: fixes FTBFS due to invalid pointer conversion. + + * debian/mozilla-plugin-pcmanx.install + - Changed usr/lib/xulrunner-devel-1.9/bin/plugins usr/lib/pcmanx-gtk2 to + usr/lib/xulrunner-devel-1.9.1.5/bin/plugins /usr/lib/pcmanx-gtk2 + and usr/lib/xulrunner-devel-1.9/bin/components usr/lib/pcmanx-gtk2 to + usr/lib/xulrunner-devel-1.9.1.5/bin/components + /usr/lib/pcmanx-gtk2" to fix FTBFS + * debian/patches + - xulrunner_fix.dpatch took out iceape-dev fix from iceape-dev.dpatch + and kept the part that fixes xulrunner-dev closes (LP: #352968) + * debian/rules + - changed rm + $(CURDIR)/debian/tmp/usr/lib/xulrunner-devel-1.9/bin/components/pcmanx.png + to rm $(CURDIR)/debian/tmp/usr/lib/xulrunner-devel-1.9.1.5/bin/components/pcmanx.png + + -- Ezra Reeves Sun, 15 Nov 2009 14:43:20 -0500 + pcmanx-gtk2 (0.3.8-3) unstable; urgency=low * gcc_4.3_4.4_ftbfs.dpatch: Fix FTBFS with GCC 4.4 (Closes: #504886) @@ -19,6 +52,49 @@ -- Emfox Zhou Sun, 17 Aug 2008 15:30:36 +0800 +pcmanx-gtk2 (0.3.7-3.1ubuntu4) karmic; urgency=low + + * debian/patches (LP: #448816): + - gcc_4.4.dpatch: fixes FTBFS due to missing include with gcc 4.4. + - const-char.dpatch: fixes FTBFS due to invalid pointer conversion. + + -- Ilya Barygin Sun, 11 Oct 2009 20:21:21 +0400 + +pcmanx-gtk2 (0.3.7-3.1ubuntu3) intrepid; urgency=low + + * fix LP: #272772: packages that Depend/Recommend/Suggest firefox + (meta-package) must alternatively Depend/Recommend/Suggest abrowser + - update debian/control + + -- Fabien Tassin Sun, 21 Sep 2008 23:02:15 +0200 + +pcmanx-gtk2 (0.3.7-3.1ubuntu2) intrepid; urgency=low + + * Don't apply iceape-dev.dpatch patch. + * Don't build-dep on iceape-dev. + * debian/mozilla-plugin-pcmanx.links: s/iceape/seamonkey/; + s/iceweasel/firefox/. + * debian/control: add "| seamonkey-browser" to mozilla-plugin-pcmanx Depends + field. + + -- Devid Antonio Filoni Mon, 08 Sep 2008 12:27:44 +0200 + +pcmanx-gtk2 (0.3.7-3.1ubuntu1) intrepid; urgency=low + + * Add libxul-dev to Build-Depends field in debian/control, fix FTBFS. + * Add ubuntu_hardening.dpatch patch, fix FTBFS caused by -D_FORTIFY_SOURCE=2 + compiler flag enabled in Ubuntu. + * debian/rules: don't remove debian/tmp/usr/lib/iceape/components/pcmanx.png + file, instead remove debian/tmp/usr/lib/xulrunner/components/pcmanx.png + file, fix FTBFS. + * debian/rules: use "dh_makeshlibs -V -Xfirefox" instead of "dh_makeshlibs + -V -Xfirefox" in binary-arch target. + * debian/mozilla-plugin-pcmanx.install: s/iceape/xulrunner/. + * mozilla-plugin-pcmanx.{postinst,postrm}: s/iceape/seamonkey/; + s/iceweasel/firefox/. + + -- Devid Antonio Filoni Sun, 07 Sep 2008 23:40:25 +0200 + pcmanx-gtk2 (0.3.7-3.1) unstable; urgency=low * Non-maintainer upload. @@ -162,0 +239 @@ + diff -u pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.install pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.install --- pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.install +++ pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.install @@ -1,2 +1,2 @@ -usr/lib/xulrunner-devel-1.9/bin/plugins usr/lib/pcmanx-gtk2 -usr/lib/xulrunner-devel-1.9/bin/components usr/lib/pcmanx-gtk2 +usr/lib/xulrunner-devel-1.9.1.5/bin/plugins /usr/lib/pcmanx-gtk2 +usr/lib/xulrunner-devel-1.9.1.5/bin/components /usr/lib/pcmanx-gtk2 diff -u pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.postinst pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.postinst --- pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.postinst +++ pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.postinst @@ -20,12 +20,12 @@ case "$1" in configure) - if which update-iceape-chrome 2> /dev/null > /dev/null; then - update-iceape-chrome + if which update-seamonkey-chrome 2> /dev/null > /dev/null; then + update-seamonkey-chrome fi # Manually touch this until update-iceweasel-chrome is available - if [ -d /usr/lib/iceweasel ]; then - touch /usr/lib/iceweasel/.autoreg + if [ -d /usr/lib/firefox ]; then + touch /usr/lib/firefox/.autoreg fi ;; diff -u pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.links pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.links --- pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.links +++ pcmanx-gtk2-0.3.8/debian/mozilla-plugin-pcmanx.links @@ -1,6 +1,6 @@ -usr/lib/pcmanx-gtk2/plugins/pcmanx-plugin.so usr/lib/iceweasel/plugins/pcmanx-plugin.so -usr/lib/pcmanx-gtk2/components/TelnetProtocol.js usr/lib/iceweasel/components/TelnetProtocol.js -usr/lib/pcmanx-gtk2/components/pcmanx_interface.xpt usr/lib/iceweasel/components/pcmanx_interface.xpt -usr/lib/pcmanx-gtk2/plugins/pcmanx-plugin.so usr/lib/iceape/plugins/pcmanx-plugin.so -usr/lib/pcmanx-gtk2/components/TelnetProtocol.js usr/lib/iceape/components/TelnetProtocol.js -usr/lib/pcmanx-gtk2/components/pcmanx_interface.xpt usr/lib/iceape/components/pcmanx_interface.xpt +usr/lib/pcmanx-gtk2/plugins/pcmanx-plugin.so usr/lib/firefox/plugins/pcmanx-plugin.so +usr/lib/pcmanx-gtk2/components/TelnetProtocol.js usr/lib/firefox/components/TelnetProtocol.js +usr/lib/pcmanx-gtk2/components/pcmanx_interface.xpt usr/lib/firefox/components/pcmanx_interface.xpt +usr/lib/pcmanx-gtk2/plugins/pcmanx-plugin.so usr/lib/seamonkey/plugins/pcmanx-plugin.so +usr/lib/pcmanx-gtk2/components/TelnetProtocol.js usr/lib/seamonkey/components/TelnetProtocol.js +usr/lib/pcmanx-gtk2/components/pcmanx_interface.xpt usr/lib/seamonkey/components/pcmanx_interface.xpt reverted: --- pcmanx-gtk2-0.3.8/debian/patches/iceape-dev.dpatch +++ pcmanx-gtk2-0.3.8.orig/debian/patches/iceape-dev.dpatch @@ -1,30 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## iceape-dev.dpatch by -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Allow to build against iceape-dev - -@DPATCH@ - ---- pcmanx-gtk2-0.3.7.orig/configure.ac -+++ pcmanx-gtk2-0.3.7/configure.ac -@@ -404,7 +404,7 @@ - - # Check Firefox-plugin - if test "x$enable_mozilla" = "xno"; then -- gecko_provider=firefox-plugin -+ gecko_provider=iceape - PKG_CHECK_MODULES(MOZILLA, $gecko_provider-plugin, - enable_mozilla=yes, enable_mozilla=no) - fi ---- pcmanx-gtk2-0.3.7.orig/configure -+++ pcmanx-gtk2-0.3.7/configure -@@ -26885,7 +26885,7 @@ - - # Check Firefox-plugin - if test "x$enable_mozilla" = "xno"; then -- gecko_provider=firefox-plugin -+ gecko_provider=iceape - - pkg_failed=no - { echo "$as_me:$LINENO: checking for MOZILLA" >&5 diff -u pcmanx-gtk2-0.3.8/debian/patches/00list pcmanx-gtk2-0.3.8/debian/patches/00list --- pcmanx-gtk2-0.3.8/debian/patches/00list +++ pcmanx-gtk2-0.3.8/debian/patches/00list @@ -5 +5,3 @@ -iceape-dev.dpatch +const-char.dpatch +xulrunner-dev_fix.dpatch + only in patch2: unchanged: --- pcmanx-gtk2-0.3.8.orig/debian/patches/const-char.dpatch +++ pcmanx-gtk2-0.3.8/debian/patches/const-char.dpatch @@ -0,0 +1,20 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## const-char.dpatch by Ilya Barygin +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Declare a pointer in src/view/telnetview.cpp, fixing FTBFS with +## DP: eglibc 2.10 + +@DPATCH@ +diff -urNad pcmanx-gtk2-0.3.7~/src/view/telnetview.cpp pcmanx-gtk2-0.3.7/src/view/telnetview.cpp +--- pcmanx-gtk2-0.3.7~/src/view/telnetview.cpp 2008-01-02 06:03:53.000000000 +0300 ++++ pcmanx-gtk2-0.3.7/src/view/telnetview.cpp 2009-10-11 19:08:56.000000000 +0400 +@@ -632,7 +632,7 @@ + #ifdef USE_WGET + if (m_bWgetFiles == true) { + const char* t_pcURL = sURL.c_str(); +- char* t_pcDot = strrchr(t_pcURL, '.') + 1; ++ const char* t_pcDot = strrchr(t_pcURL, '.') + 1; + char t_cFileType = strlen(t_pcURL) - (t_pcDot -t_pcURL); + if (t_cFileType == 3) { + if (strncmp(t_pcDot, "rar", 3) == 0 || only in patch2: unchanged: --- pcmanx-gtk2-0.3.8.orig/debian/patches/xulrunner-dev_fix +++ pcmanx-gtk2-0.3.8/debian/patches/xulrunner-dev_fix @@ -0,0 +1,350 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## iceape-dev.dpatch by +## xulrunner-dev_fix by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Allow to build against iceape-dev +## DP: Changed to fix xulrunner-dev compatability but we dont want iceape-dev + +@DPATCH@ +diff -urNad pcmanx-gtk2-0.3.8-3ubuntu1~/plugin/src/npn_gate.cpp pcmanx-gtk2-0.3.8-3ubuntu1/plugin/src/npn_gate.cpp +--- pcmanx-gtk2-0.3.8-3ubuntu1~/plugin/src/npn_gate.cpp 2009-11-05 22:42:26.000000000 -0500 ++++ pcmanx-gtk2-0.3.8-3ubuntu1/plugin/src/npn_gate.cpp 2009-11-14 22:07:18.925377289 -0500 +@@ -42,6 +42,138 @@ + // + #include "npplat.h" + ++// For 1.9 compatibility ++// ------------------------------------------------ ++ ++typedef NPError (*NPN_GetURLNotifyUPP)(NPP instance, const char* url, const char* window, void* notifyData); ++#define NewNPN_GetURLNotifyProc(FUNC) \ ++ ((NPN_GetURLNotifyUPP) (FUNC)) ++#define CallNPN_GetURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4) \ ++ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4)) ++ ++typedef NPError (*NPN_GetURLUPP)(NPP instance, const char* url, const char* window); ++#define NewNPN_GetURLProc(FUNC) \ ++ ((NPN_GetURLUPP) (FUNC)) ++#define CallNPN_GetURLProc(FUNC, ARG1, ARG2, ARG3) \ ++ (*(FUNC))((ARG1), (ARG2), (ARG3)) ++ ++typedef NPError (*NPN_PostURLNotifyUPP)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData); ++#define NewNPN_PostURLNotifyProc(FUNC) \ ++ ((NPN_PostURLNotifyUPP) (FUNC)) ++#define CallNPN_PostURLNotifyProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6, ARG7) \ ++ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6), (ARG7)) ++ ++typedef NPError (*NPN_PostURLUPP)(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file); ++#define NewNPN_PostURLProc(FUNC) \ ++ ((NPN_PostURLUPP) (FUNC)) ++#define CallNPN_PostURLProc(FUNC, ARG1, ARG2, ARG3, ARG4, ARG5, ARG6) \ ++ (*(FUNC))((ARG1), (ARG2), (ARG3), (ARG4), (ARG5), (ARG6)) ++ ++typedef NPError (*NPN_RequestReadUPP)(NPStream* stream, NPByteRange* rangeList); ++#define NewNPN_RequestReadProc(FUNC) \ ++ ((NPN_RequestReadUPP) (FUNC)) ++#define CallNPN_RequestReadProc(FUNC, stream, range) \ ++ (*(FUNC))((stream), (range)) ++ ++typedef NPError (*NPN_NewStreamUPP)(NPP instance, NPMIMEType type, const char* window, NPStream** stream); ++#define NewNPN_NewStreamProc(FUNC) \ ++ ((NPN_NewStreamUPP) (FUNC)) ++#define CallNPN_NewStreamProc(FUNC, npp, type, window, stream) \ ++ (*(FUNC))((npp), (type), (window), (stream)) ++ ++typedef int32_t (*NPN_WriteUPP)(NPP instance, NPStream* stream, int32_t len, void* buffer); ++#define NewNPN_WriteProc(FUNC) \ ++ ((NPN_WriteUPP) (FUNC)) ++#define CallNPN_WriteProc(FUNC, npp, stream, len, buffer) \ ++ (*(FUNC))((npp), (stream), (len), (buffer)) ++ ++typedef NPError (*NPN_DestroyStreamUPP)(NPP instance, NPStream* stream, NPReason reason); ++#define NewNPN_DestroyStreamProc(FUNC) \ ++ ((NPN_DestroyStreamUPP) (FUNC)) ++#define CallNPN_DestroyStreamProc(FUNC, npp, stream, reason) \ ++ (*(FUNC))((npp), (stream), (reason)) ++ ++typedef void (*NPN_StatusUPP)(NPP instance, const char* message); ++#define NewNPN_StatusProc(FUNC) \ ++ ((NPN_StatusUPP) (FUNC)) ++#define CallNPN_StatusProc(FUNC, npp, msg) \ ++ (*(FUNC))((npp), (msg)) ++ ++typedef const char* (*NPN_UserAgentUPP)(NPP instance); ++#define NewNPN_UserAgentProc(FUNC) \ ++ ((NPN_UserAgentUPP) (FUNC)) ++#define CallNPN_UserAgentProc(FUNC, ARG1) \ ++ (*(FUNC))((ARG1)) ++ ++typedef void* (*NPN_MemAllocUPP)(uint32_t size); ++#define NewNPN_MemAllocProc(FUNC) \ ++ ((NPN_MemAllocUPP) (FUNC)) ++#define CallNPN_MemAllocProc(FUNC, ARG1) \ ++ (*(FUNC))((ARG1)) ++ ++typedef void (*NPN_MemFreeUPP)(void* ptr); ++#define NewNPN_MemFreeProc(FUNC) \ ++ ((NPN_MemFreeUPP) (FUNC)) ++#define CallNPN_MemFreeProc(FUNC, ARG1) \ ++ (*(FUNC))((ARG1)) ++ ++typedef void (*NPN_ReloadPluginsUPP)(NPBool reloadPages); ++#define NewNPN_ReloadPluginsProc(FUNC) \ ++ ((NPN_ReloadPluginsUPP) (FUNC)) ++#define CallNPN_ReloadPluginsProc(FUNC, ARG1) \ ++ (*(FUNC))((ARG1)) ++ ++typedef uint32_t (*NPN_MemFlushUPP)(uint32_t size); ++#define NewNPN_MemFlushProc(FUNC) \ ++ ((NPN_MemFlushUPP) (FUNC)) ++#define CallNPN_MemFlushProc(FUNC, ARG1) \ ++ (*(FUNC))((ARG1)) ++ ++typedef NPError (*NPN_GetValueUPP)(NPP instance, NPNVariable variable, void *ret_alue); ++#define NewNPN_GetValueProc(FUNC) \ ++ ((NPN_GetValueUPP) (FUNC)) ++#define CallNPN_GetValueProc(FUNC, ARG1, ARG2, ARG3) \ ++ (*(FUNC))((ARG1), (ARG2), (ARG3)) ++ ++typedef NPError (*NPN_SetValueUPP)(NPP instance, NPPVariable variable, void *ret_alue); ++#define NewNPN_SetValueProc(FUNC) \ ++ ((NPN_SetValueUPP) (FUNC)) ++#define CallNPN_SetValueProc(FUNC, ARG1, ARG2, ARG3) \ ++ (*(FUNC))((ARG1), (ARG2), (ARG3)) ++ ++typedef void (*NPN_InvalidateRectUPP)(NPP instance, NPRect *rect); ++#define NewNPN_InvalidateRectProc(FUNC) \ ++ ((NPN_InvalidateRectUPP) (FUNC)) ++#define CallNPN_InvalidateRectProc(FUNC, ARG1, ARG2) \ ++ (*(FUNC))((ARG1), (ARG2)) ++ ++typedef void (*NPN_InvalidateRegionUPP)(NPP instance, NPRegion region); ++#define NewNPN_InvalidateRegionProc(FUNC) \ ++ ((NPN_InvalidateRegionUPP) (FUNC)) ++#define CallNPN_InvalidateRegionProc(FUNC, ARG1, ARG2) \ ++ (*(FUNC))((ARG1), (ARG2)) ++ ++typedef void (*NPN_ForceRedrawUPP)(NPP instance); ++#define NewNPN_ForceRedrawProc(FUNC) \ ++ ((NPN_ForceRedrawUPP) (FUNC)) ++#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 +203,7 @@ + return rv; + } + +-NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file, void* notifyData) ++NPError NPN_PostURLNotify(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file, void* notifyData) + { + int navMinorVers = NPNFuncs.version & 0xFF; + NPError rv = NPERR_NO_ERROR; +@@ -84,7 +216,7 @@ + return rv; + } + +-NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32 len, const char* buf, NPBool file) ++NPError NPN_PostURL(NPP instance, const char* url, const char* window, uint32_t len, const char* buf, NPBool file) + { + NPError rv = CallNPN_PostURLProc(NPNFuncs.posturl, instance, url, window, len, buf, file); + return rv; +@@ -110,10 +242,10 @@ + return rv; + } + +-int32 NPN_Write(NPP instance, NPStream *stream, int32 len, void *buffer) ++int32_t NPN_Write(NPP instance, NPStream *stream, int32_t len, void *buffer) + { + int navMinorVersion = NPNFuncs.version & 0xFF; +- int32 rv = 0; ++ int32_t rv = 0; + + if( navMinorVersion >= NPVERS_HAS_STREAMOUTPUT ) + rv = CallNPN_WriteProc(NPNFuncs.write, instance, stream, len, buffer); +@@ -143,12 +275,12 @@ + + const char* NPN_UserAgent(NPP instance) + { +- const char * rv = NULL; ++ const char * rv = (const char *)NULL; + rv = CallNPN_UserAgentProc(NPNFuncs.uagent, instance); + return rv; + } + +-void* NPN_MemAlloc(uint32 size) ++void* NPN_MemAlloc(uint32_t size) + { + void * rv = NULL; + rv = CallNPN_MemAllocProc(NPNFuncs.memalloc, size); +@@ -160,9 +292,9 @@ + CallNPN_MemFreeProc(NPNFuncs.memfree, ptr); + } + +-uint32 NPN_MemFlush(uint32 size) ++uint32_t NPN_MemFlush(uint32_t size) + { +- uint32 rv = CallNPN_MemFlushProc(NPNFuncs.memflush, size); ++ uint32_t rv = CallNPN_MemFlushProc(NPNFuncs.memflush, size); + 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 -urNad pcmanx-gtk2-0.3.8-3ubuntu1~/plugin/src/npp_gate.cpp pcmanx-gtk2-0.3.8-3ubuntu1/plugin/src/npp_gate.cpp +--- pcmanx-gtk2-0.3.8-3ubuntu1~/plugin/src/npp_gate.cpp 2009-11-05 22:42:26.000000000 -0500 ++++ pcmanx-gtk2-0.3.8-3ubuntu1/plugin/src/npp_gate.cpp 2009-11-14 22:07:18.925377289 -0500 +@@ -45,7 +45,7 @@ + // here the plugin creates a plugin instance object which + // will be associated with this newly created NPP instance and + // will do all the necessary job +-NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16 mode, int16 argc, char* argn[], char* argv[], NPSavedData* saved) ++NPError NPP_New(NPMIMEType pluginType, NPP instance, uint16_t mode, int16_t argc, char* argn[], char* argv[], NPSavedData* saved) + { + if(instance == NULL) + return NPERR_INVALID_INSTANCE_ERROR; +@@ -130,7 +130,7 @@ + return rv; + } + +-NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16* stype) ++NPError NPP_NewStream(NPP instance, NPMIMEType type, NPStream* stream, NPBool seekable, uint16_t* stype) + { + if(instance == NULL) + return NPERR_INVALID_INSTANCE_ERROR; +@@ -143,7 +143,7 @@ + return rv; + } + +-int32 NPP_WriteReady (NPP instance, NPStream *stream) ++int32_t NPP_WriteReady (NPP instance, NPStream *stream) + { + if(instance == NULL) + return 0x0fffffff; +@@ -152,11 +152,11 @@ + if(plugin == NULL) + return 0x0fffffff; + +- int32 rv = plugin->WriteReady(stream); ++ int32_t rv = plugin->WriteReady(stream); + return rv; + } + +-int32 NPP_Write (NPP instance, NPStream *stream, int32 offset, int32 len, void *buffer) ++int32_t NPP_Write (NPP instance, NPStream *stream, int32_t offset, int32_t len, void *buffer) + { + if(instance == NULL) + return len; +@@ -165,7 +165,7 @@ + if(plugin == NULL) + return len; + +- int32 rv = plugin->Write(stream, offset, len, buffer); ++ int32_t rv = plugin->Write(stream, offset, len, buffer); + return rv; + } + +@@ -244,7 +244,7 @@ + return rv; + } + +-int16 NPP_HandleEvent(NPP instance, void* event) ++int16_t NPP_HandleEvent(NPP instance, void* event) + { + if(instance == NULL) + return 0; +@@ -253,7 +253,7 @@ + if(plugin == NULL) + return 0; + +- uint16 rv = plugin->HandleEvent(event); ++ uint16_t rv = plugin->HandleEvent(event); + return rv; + } + +diff -urNad pcmanx-gtk2-0.3.8-3ubuntu1~/plugin/src/npplat.h pcmanx-gtk2-0.3.8-3ubuntu1/plugin/src/npplat.h +--- pcmanx-gtk2-0.3.8-3ubuntu1~/plugin/src/npplat.h 2009-11-14 20:54:20.000000000 -0500 ++++ pcmanx-gtk2-0.3.8-3ubuntu1/plugin/src/npplat.h 2009-11-14 22:07:18.925377289 -0500 +@@ -39,7 +39,7 @@ + #define _NPPLAT_H_ + + #include "npapi.h" +-#include "npupp.h" ++#include "npfunctions.h" + + /**************************************************/ + /* */ +diff -urNad pcmanx-gtk2-0.3.8-3ubuntu1~/plugin/src/pluginbase.h pcmanx-gtk2-0.3.8-3ubuntu1/plugin/src/pluginbase.h +--- pcmanx-gtk2-0.3.8-3ubuntu1~/plugin/src/pluginbase.h 2009-11-05 22:42:26.000000000 -0500 ++++ pcmanx-gtk2-0.3.8-3ubuntu1/plugin/src/pluginbase.h 2009-11-14 22:07:18.925377289 -0500 +@@ -38,14 +38,15 @@ + #ifndef __PLUGININSTANCEBASE_H__ + #define __PLUGININSTANCEBASE_H__ + ++#include "npapi.h" + #include "npplat.h" + + struct nsPluginCreateData + { + NPP instance; + NPMIMEType type; +- uint16 mode; +- int16 argc; ++ uint16_t mode; ++ int16_t argc; + char** argn; + char** argv; + NPSavedData* saved; +@@ -64,14 +65,14 @@ + // class as needed + virtual NPError SetWindow(NPWindow* pNPWindow) { return NPERR_NO_ERROR; } + virtual NPError NewStream(NPMIMEType type, NPStream* stream, +- NPBool seekable, uint16* stype) { return NPERR_NO_ERROR; } ++ NPBool seekable, uint16_t* stype) { return NPERR_NO_ERROR; } + virtual NPError DestroyStream(NPStream *stream, NPError reason) { return NPERR_NO_ERROR; } + virtual void StreamAsFile(NPStream* stream, const char* fname) { return; } +- virtual int32 WriteReady(NPStream *stream) { return 0x0fffffff; } +- virtual int32 Write(NPStream *stream, int32 offset, +- int32 len, void *buffer) { return len; } ++ virtual int32_t WriteReady(NPStream *stream) { return 0x0fffffff; } ++ virtual int32_t Write(NPStream *stream, int32_t offset, ++ int32_t len, void *buffer) { return len; } + virtual void Print(NPPrint* printInfo) { return; } +- virtual uint16 HandleEvent(void* event) { return 0; } ++ virtual uint16_t HandleEvent(void* event) { return 0; } + virtual void URLNotify(const char* url, NPReason reason, + void* notifyData) { return; } + virtual NPError GetValue(NPPVariable variable, void *value) { return NPERR_NO_ERROR; } only in patch2: unchanged: --- pcmanx-gtk2-0.3.8.orig/debian/patches/gcc_4.4.dpatch +++ pcmanx-gtk2-0.3.8/debian/patches/gcc_4.4.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## gcc_4.4.dpatch by Ilya Barygin +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Includes a necessary header in src/nancy_bot/msgdata.cpp, fixing +## DP: FTBFS with gcc 4.4 + +@DPATCH@ +diff -urNad pcmanx-gtk2-0.3.7~/src/nancy_bot/msgdata.cpp pcmanx-gtk2-0.3.7/src/nancy_bot/msgdata.cpp +--- pcmanx-gtk2-0.3.7~/src/nancy_bot/msgdata.cpp 2009-10-11 18:56:28.000000000 +0400 ++++ pcmanx-gtk2-0.3.7/src/nancy_bot/msgdata.cpp 2009-10-11 19:00:43.000000000 +0400 +@@ -6,6 +6,7 @@ + + #include + #include ++#include + + #include "nancy_bot/msgdata.h" + #include "nancy_bot/botutil.h" only in patch2: unchanged: --- pcmanx-gtk2-0.3.8.orig/po/zh_TW.po +++ pcmanx-gtk2-0.3.8/po/zh_TW.po @@ -603,3 +603,21 @@ #, c-format msgid "Error saving file '%s': %s" msgstr "當儲存為「%s」時發生錯誤： %s" + +#: ../src/mainframe.cpp:693 +msgid "" +"Hong Jen Yee (Main developer) \n" +"Jim Huang (Developer) \n" +"Kanru Chen (Developer) \n" +"Chia I Wu (Developer) \n" +"Shih-Yuan Lee (Developer) \n" +"Youchen Lee (Developer) \n" +"Emfox Zhou (Developer) " +msgstr "" +"洪任諭 Hong Jen Yee (主要開發者) \n" +"黃敬群 Jim Huang (開發者) \n" +"陳侃如 Kanru Chen (開發者) \n" +"吳佳一 Chia I Wu (開發者) \n" +"李世元 Shih-Yuan Lee (開發者) \n" +"李宥辰 Youchen Lee (開發者) \n" +"周 玮 Emfox Zhou (開發者) " only in patch2: unchanged: --- pcmanx-gtk2-0.3.8.orig/po/zh_CN.po +++ pcmanx-gtk2-0.3.8/po/zh_CN.po @@ -602,3 +602,21 @@ #, c-format msgid "Error saving file '%s': %s" msgstr "保存文件'%s‘出错：%s" + +#: ../src/mainframe.cpp:693 +msgid "" +"Hong Jen Yee (Main developer) \n" +"Jim Huang (Developer) \n" +"Kanru Chen (Developer) \n" +"Chia I Wu (Developer) \n" +"Shih-Yuan Lee (Developer) \n" +"Youchen Lee (Developer) \n" +"Emfox Zhou (Developer) " +msgstr "" +"洪任谕 Hong Jen Yee (主要开发者) \n" +"黄敬群 Jim Huang (开发者) \n" +"陈侃如 Kanru Chen (开发者) \n" +"吴佳一 Chia I Wu (开发者) \n" +"李世元 Shih-Yuan Lee (开发者) \n" +"李宥辰 Youchen Lee (开发者) \n" +"周 玮 Emfox Zhou (开发者) "