Bugzilla – Bug 2223
totem-03-browserplugin.diff does not apply to totem 2.23.4
Last modified: 2008-06-20 02:01:22 UTC
You need to log in before you can comment on or make changes to this bug.
The browser plugin code in configure.in and browser-plugin/Makefile.am has been reworked considerably. The patch no longer applies and is beyond my understanding how to fix it. Please rework the patch for totem 2.23.4 and bump the spec file in spec-files/trunk.
Brian/Jerry: ping. This bug has been open for almost a week and the next round of tarballs are being released.
Based on my evaluation, I think this patch is now upstream. Note the real guts of this patch was the following change: if test "$have_libxpcomglue_s" = "yes"; then LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s" else - AC_MSG_WARN([libxpcomglue_s not available; plugins may not be po rtable]) + LIBXPCOMGLUE_S="-L/usr/lib/firefox -lxpcom -lxpcom_core -R/usr/ lib/firefox" fi Whereas the new code in GNOME 2.23 looks like this: if test "$have_libxpcomglue_s" = "yes"; then LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s" else LIBXPCOMGLUE_S=`$PKG_CONFIG --libs $MOZILLA-xpcom` fi Looking at /usr/lib/pkgconfig/firefox-xpcom.pc on my machine, it has these link lines: Libs: -L${libdir} -lxpcom -lxpcom_core So, I notice in the generated totem Makefiles, the LIBXPCOMGLUE_S variable is getting set like this: LIBXPCOMGLUE_S = -L/usr/lib/firefox -lxpcom -lxpcom_core To me, this looks suspiciously like what the totem-03-browserplugin.diff patch was setting the value to, aside from the fact that it is missing the "-R/usr/lib/firefox". I'd say if there is a problem with the RUNPATH part being missing, that this should be fixed in the firefox.pc file, not by hacking totem further. Therefore I'd say it's safe to rip out this patch. However, Jerry should probably confirm first since he is the actual patch owner. Since I haven't worked on this code, I am not sure how to test if the totem browser plugin is working or not. Since Jerry wrote the patch, I think he should be better able to actually test that the totem browser plugin still works reasonably when this patch is not applied.
Jerry is taking vacations these days. So the work will be delayed for a while.
Jedy will work on this until Jerry is back.
Jerry, please remember to update the bugs status daily here. Thanks! Quoted from Jerry's mail: "I verified that even with removal of patch 03,04,05, totem's plugins does not work at all. I have filed bug http://bugzilla.gnome.org/show_bug.cgi?id=539089 for it. and for now, I want to disable it."
we can remove patch 03,05, but the plugin doesnot work
fixed, will be in 94.