tag 631035 + patch thanks On Sun, Jun 19, 2011 at 08:53:46PM +0200, jcris...@debian.org wrote: > Source: gecko-mediaplayer > Version: 0.9.9.2-1 > Severity: serious > Tags: sid wheezy > User: pkg-mozilla-maintain...@lists.alioth.debian.org > Usertags: xulrunner-2.0 > > Hi, > > your package fails to build against iceweasel 4.0 (currently in > experimental). iceweasel 5.0 will soon be uploaded to unstable, so > your package needs to be updated to cope with the new version, or > will have to be removed. > > Build logs are available at > http://people.debian.org/~glandium/iceweasel4-transition.logs.tbz2 > > Cheers, Julien
The attached patch makes gecko-mediaplayer build. It may not be suitable for inclusion upstream, as e.g. xpcomglue_s_nomozalloc is only available on xulrunner >= 2.0. Mike
diff -Nru gecko-mediaplayer-0.9.9.2/debian/changelog gecko-mediaplayer-0.9.9.2/debian/changelog --- gecko-mediaplayer-0.9.9.2/debian/changelog 2010-03-06 18:30:05.000000000 +0100 +++ gecko-mediaplayer-0.9.9.2/debian/changelog 2011-07-30 10:21:13.000000000 +0200 @@ -1,3 +1,14 @@ +gecko-mediaplayer (0.9.9.2-1.1) UNRELEASED; urgency=low + + * Non-maintainer upload. + * configure.in, configure: Add -DMOZ_NO_MOZALLOC to GECKO_CFLAGS and + use xpcomglue_s_nomozalloc instead of xpcomglue_s. + * src/plugin.cpp: Remove call to empty NPP_Initialize. + * debian/rules: Configure with --with-xulrunner-sdk and --enable-new-libxul. + (Closes: #631035) + + -- Mike Hommey <gland...@debian.org> Sat, 30 Jul 2011 10:15:09 +0200 + gecko-mediaplayer (0.9.9.2-1) unstable; urgency=low * Point fix release (LP: #523793): diff -Nru gecko-mediaplayer-0.9.9.2/debian/patches/debian-changes-0.9.9.2-1.1 gecko-mediaplayer-0.9.9.2/debian/patches/debian-changes-0.9.9.2-1.1 --- gecko-mediaplayer-0.9.9.2/debian/patches/debian-changes-0.9.9.2-1.1 1970-01-01 01:00:00.000000000 +0100 +++ gecko-mediaplayer-0.9.9.2/debian/patches/debian-changes-0.9.9.2-1.1 2011-07-30 10:21:19.000000000 +0200 @@ -0,0 +1,68 @@ +Description: Upstream changes introduced in version 0.9.9.2-1.1 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + gecko-mediaplayer (0.9.9.2-1.1) UNRELEASED; urgency=low + . + * Non-maintainer upload. + * configure.in, configure: Add -DMOZ_NO_MOZALLOC to GECKO_CFLAGS and + use xpcomglue_s_nomozalloc instead of xpcomglue_s. + * src/plugin.cpp: Remove call to empty NPP_Initialize. + * debian/rules: Configure with --with-xulrunner-sdk and --enable-new-libxul. + (Closes: #631035) + . + The person named in the Author field signed this changelog entry. +Author: Mike Hommey <gland...@debian.org> +Bug-Debian: http://bugs.debian.org/631035 + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: <vendor|upstream|other>, <url of original patch> +Bug: <url in upstream bugtracker> +Bug-Debian: http://bugs.debian.org/<bugnumber> +Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> +Forwarded: <no|not-needed|url proving that it has been forwarded> +Reviewed-By: <name and email of someone who approved the patch> +Last-Update: <YYYY-MM-DD> + +--- gecko-mediaplayer-0.9.9.2.orig/configure.in ++++ gecko-mediaplayer-0.9.9.2/configure.in +@@ -35,8 +35,8 @@ AC_ARG_WITH([xulrunner-sdk], + [Path to xulrunner SDK for build --with-xulrunner-sdk=/path/to/sdk])], + [ + XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk +- GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java" +- GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl" ++ GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java -DMOZ_NO_MOZALLOC" ++ GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl" + AC_ARG_ENABLE(new-libxul, + AC_HELP_STRING([--enable-new-libxul],[libxul/xulrunner-sdk is 1.9.2 or higher]), + [usenewlibxul=$enableval],[usenewlibxul=no]) +--- gecko-mediaplayer-0.9.9.2.orig/configure ++++ gecko-mediaplayer-0.9.9.2/configure +@@ -8710,8 +8710,8 @@ fi + if test "${with_xulrunner_sdk+set}" = set; then + withval=$with_xulrunner_sdk; + XULRUNNER_SDK_PREFIX=$with_xulrunner_sdk +- GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java" +- GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl" ++ GECKO_CFLAGS="-I$XULRUNNER_SDK_PREFIX/include -I$XULRUNNER_SDK_PREFIX/include/plugin -I$XULRUNNER_SDK_PREFIX/include/nspr -I$XULRUNNER_SDK_PREFIX/include/xpcom -I$XULRUNNER_SDK_PREFIX/include/string -I$XULRUNNER_SDK_PREFIX/include/java -DMOZ_NO_MOZALLOC" ++ GECKO_LIBS="-L$XULRUNNER_SDK_PREFIX/lib -lxpcomglue_s_nomozalloc -lxul -lxpcom -lplds4 -lplc4 -lnspr4 -lpthread -ldl" + # Check whether --enable-new-libxul was given. + if test "${enable_new_libxul+set}" = set; then + enableval=$enable_new_libxul; usenewlibxul=$enableval +--- gecko-mediaplayer-0.9.9.2.orig/src/np_entry.cpp ++++ gecko-mediaplayer-0.9.9.2/src/np_entry.cpp +@@ -174,8 +174,6 @@ NPError OSCALL NP_Initialize(NPNetscapeF + #ifdef OJI + pluginFuncs->javaClass = NPP_GetJavaClass(); + #endif +- +- NPP_Initialize(); + #endif + + return NPERR_NO_ERROR; diff -Nru gecko-mediaplayer-0.9.9.2/debian/patches/series gecko-mediaplayer-0.9.9.2/debian/patches/series --- gecko-mediaplayer-0.9.9.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ gecko-mediaplayer-0.9.9.2/debian/patches/series 2011-07-30 10:19:19.000000000 +0200 @@ -0,0 +1 @@ +debian-changes-0.9.9.2-1.1 diff -Nru gecko-mediaplayer-0.9.9.2/debian/rules gecko-mediaplayer-0.9.9.2/debian/rules --- gecko-mediaplayer-0.9.9.2/debian/rules 2010-03-06 18:30:05.000000000 +0100 +++ gecko-mediaplayer-0.9.9.2/debian/rules 2011-07-30 10:17:37.000000000 +0200 @@ -27,6 +27,8 @@ --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr --sysconfdir=\$${prefix}/share \ --with-gconf --with-gio --disable-schemas-install \ + --with-xulrunner-sdk=$(shell pkg-config --variable=sdkdir libxul) \ + --enable-new-libxul \ CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" touch configure-stamp
