Author: alexander Date: 2006-06-25 02:04:39 -0600 (Sun, 25 Jun 2006) New Revision: 1592
Added: trunk/packages/seamonkey/seamonkey-1.0.2-pangocairo-1.patch Modified: trunk/packages/seamonkey/.mozconfig trunk/packages/seamonkey/Makefile trunk/root/.mozilla/default/79exklwh.slt/prefs.js Log: Updated Seamonkey to 1.0.2 and fixed the pangoxft issue properly Modified: trunk/packages/seamonkey/.mozconfig =================================================================== --- trunk/packages/seamonkey/.mozconfig 2006-06-25 04:38:38 UTC (rev 1591) +++ trunk/packages/seamonkey/.mozconfig 2006-06-25 08:04:39 UTC (rev 1592) @@ -11,13 +11,9 @@ ac_add_options --enable-canvas ac_add_options --enable-xft ac_add_options --disable-freetype2 -# Uncomment before release -# ac_add_options --disable-postscript ac_add_options --enable-pango -# --enable-ctl is superseded by --enable-pango -# ac_add_options --enable-ctl ac_add_options --enable-svg -ac_add_options --enable-optimize +ac_add_options --enable-optimize="-Os" ac_add_options --disable-debug ac_add_options --disable-tests ac_add_options --disable-gnomevfs @@ -25,5 +21,3 @@ ac_add_options --enable-xinerama ac_add_options --disable-installer ac_add_options --disable-updater - -LDFLAGS="-Wl,--as-needed -lpangoxft-1.0" Modified: trunk/packages/seamonkey/Makefile =================================================================== --- trunk/packages/seamonkey/Makefile 2006-06-25 04:38:38 UTC (rev 1591) +++ trunk/packages/seamonkey/Makefile 2006-06-25 08:04:39 UTC (rev 1592) @@ -1,13 +1,15 @@ # Firefox Makefile NM= seamonkey -VRS= 1.0.1 +VRS= 1.0.2 DIR= mozilla FILE= $(NM)-$(VRS).source.tar.bz2 URL-$(FILE)= http://ftp.mozilla.org/pub/mozilla.org/$(NM)/releases/$(VRS)/$(FILE) -SHA-$(FILE)= e8673838903d50247d96ed42daf99c2adbd9f577 +SHA-$(FILE)= 966e9a57269cd54f40312e5fdaa42e9f2c3fbcea +PATCH1= $(NM)-$(VRS)-pangocairo-1.patch + # Targets include $(ROOT)/scripts/functions @@ -25,11 +27,10 @@ ifeq ($(LFS-ARCH),ppc) echo "ac_cv_visibility_pragma=no" >> .mozconfig endif + patch -Np1 -i ../$(PATCH1) make -f client.mk build make -f client.mk install cp -ra $(ROOT)/root/.mozilla /root - # ln -sf /usr/lib/mozilla/plugins/libmozsvgdec.{so,a} \ - # /usr/lib/$(NM)-$(VRS)/plugins ln -sf seamonkey /usr/bin/mozilla clean: Added: trunk/packages/seamonkey/seamonkey-1.0.2-pangocairo-1.patch =================================================================== --- trunk/packages/seamonkey/seamonkey-1.0.2-pangocairo-1.patch (rev 0) +++ trunk/packages/seamonkey/seamonkey-1.0.2-pangocairo-1.patch 2006-06-25 08:04:39 UTC (rev 1592) @@ -0,0 +1,27 @@ +Submitted By: Alexander E. Patrakov +Date: 2006-06-25 +Initial Package Version: 1.0.2 +Origin: http://crux.nu/portdb/?command=viewfile&repo=predatorfreak&port=seamonkey&file=seamonkey-1.0-pangocairo.patch +Upstream Status: unknown +Description: Fixes build issue in pango-enabled seamonkey + +--- mozilla/gfx/src/gtk/mozilla-decoder.cpp.noxft 2005-08-18 22:41:26.000000000 -0400 ++++ mozilla/gfx/src/gtk/mozilla-decoder.cpp 2005-08-18 22:38:01.000000000 -0400 +@@ -40,7 +40,7 @@ + #define PANGO_ENABLE_ENGINE + + #include "mozilla-decoder.h" +-#include <pango/pangoxft.h> ++#include <pango/pangocairo.h> + #include <pango/pangofc-fontmap.h> + #include <pango/pangofc-font.h> + #include <gdk/gdkx.h> +@@ -208,7 +208,7 @@ + } + } + +- pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())), ++ pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()), + mozilla_find_decoder, + NULL, + NULL); Modified: trunk/root/.mozilla/default/79exklwh.slt/prefs.js =================================================================== --- trunk/root/.mozilla/default/79exklwh.slt/prefs.js 2006-06-25 04:38:38 UTC (rev 1591) +++ trunk/root/.mozilla/default/79exklwh.slt/prefs.js 2006-06-25 08:04:39 UTC (rev 1592) @@ -10,9 +10,9 @@ */ user_pref("browser.preferences.lastpanel", 0); -user_pref("browser.search.defaultengine", "engine:///usr/lib/seamonkey-1.0.1/searchplugins/google.src"); +user_pref("browser.search.defaultengine", "engine:///usr/lib/seamonkey-1.0.2/searchplugins/google.src"); user_pref("browser.startup.homepage", "file:///usr/share/LFS-BOOK-trunk-HTML/index.html"); -user_pref("browser.startup.homepage_override.mstone", "rv:1.8.0.2"); +user_pref("browser.startup.homepage_override.mstone", "rv:1.8.0.4"); user_pref("dom.disable_open_during_load", true); user_pref("extensions.disabledObsolete", true); user_pref("extensions.irc.bugURL", "http://bugs.linuxfromscratch.org/show_bug.cgi?id=%s";); -- http://linuxfromscratch.org/mailman/listinfo/livecd FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
