From owner-freebsd-gnome@FreeBSD.ORG Mon Sep 4 20:25:39 2006 Return-Path: X-Original-To: gnome@FreeBSD.org Delivered-To: freebsd-gnome@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0A24E16A594; Mon, 4 Sep 2006 20:25:38 +0000 (UTC) (envelope-from thierry@pompo.net) Received: from graf.pompo.net (graf.pompo.net [81.56.186.139]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6D3EB43D5C; Mon, 4 Sep 2006 20:25:25 +0000 (GMT) (envelope-from thierry@pompo.net) Received: by graf.pompo.net (Postfix, from userid 1001) id 0AECA11440; Mon, 4 Sep 2006 22:24:08 +0200 (CEST) To: FreeBSD-gnats-submit@freebsd.org From: Thierry Thomas X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: <20060904202409.0AECA11440@graf.pompo.net> Date: Mon, 4 Sep 2006 22:24:08 +0200 (CEST) Cc: gnome@FreeBSD.org Subject: www/seamonkey: enable Pango font rendering support. X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Thierry Thomas List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Sep 2006 20:25:39 -0000 >Submitter-Id: current-users >Originator: Thierry Thomas >Organization: Kabbale Eros >Confidential: no >Synopsis: www/seamonkey: enable Pango font rendering support. >Severity: non-critical >Priority: medium >Category: ports >Class: change-request >Release: FreeBSD 6.1-STABLE i386 >Environment: System: FreeBSD graf.pompo.net 6.1-STABLE FreeBSD 6.1-STABLE #0: Tue Jun 27 06:04:37 CEST 2006 thierry@graf.pompo.net:/usr/obj/usr/src/sys/GRAF060511 i386 >Description: Enable Pango font rendering support. >How-To-Repeat: E.g. display pages with True Type fonts. >Fix: Please apply the following patch: --- seamonkey.diff begins here --- diff -urN www/seamonkey.orig/Makefile www/seamonkey/Makefile --- www/seamonkey.orig/Makefile Thu Aug 3 22:27:59 2006 +++ www/seamonkey/Makefile Mon Sep 4 10:15:59 2006 @@ -8,6 +8,7 @@ PORTNAME= seamonkey DISTVERSION= 1.0.4 +PORTREVISION= 1 CATEGORIES?= www MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} @@ -32,7 +33,8 @@ MOZ_OPTIONS+= --enable-application=suite \ --enable-svg-renderer=cairo \ --enable-system-cairo \ - --enable-canvas + --enable-canvas \ + --enable-pango MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=suite NOT_FOR_ARCHS= ia64 @@ -95,7 +97,7 @@ MOZ_OPTIONS+= --disable-composer .endif -post-patch: +pre-configure: @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ ${WRKSRC}/modules/libpref/src/init/all.js @${REINPLACE_CMD} -e 's||\"${LOCALBASE}/include/iconv.h\"|g' \ diff -urN www/seamonkey.orig/files/patch-configure www/seamonkey/files/patch-configure --- www/seamonkey.orig/files/patch-configure Fri Dec 23 01:04:18 2005 +++ www/seamonkey/files/patch-configure Mon Sep 4 21:28:02 2006 @@ -1,15 +1,15 @@ ---- configure.orig Tue Oct 4 02:01:48 2005 -+++ configure Thu Dec 22 17:54:43 2005 -@@ -10016,7 +10016,7 @@ +--- configure.orig Fri Jun 16 22:04:20 2006 ++++ configure Mon Sep 4 21:27:00 2006 +@@ -10115,7 +10115,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-liconv $LIBS" +LIBS="-L$LOCALBASE/lib -liconv $LIBS" cat > conftest.$ac_ext <&6 @@ -18,16 +18,16 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10057,7 +10057,7 @@ +@@ -10156,7 +10156,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-liconv $LIBS" +LIBS="-L$LOCALBASE/lib -liconv $LIBS" cat > conftest.$ac_ext <&6 @@ -36,7 +36,7 @@ else echo "$ac_t""no" 1>&6 fi -@@ -12518,7 +12518,7 @@ +@@ -12618,7 +12618,7 @@ MOZ_SUITE=1 MOZ_PROFILESHARING= MOZ_APP_VERSION=$SEAMONKEY_VERSION @@ -45,3 +45,12 @@ cat >> confdefs.h <<\EOF #define MOZ_SUITE 1 EOF +@@ -13248,7 +13248,7 @@ + echo "configure:13249: checking MOZ_PANGO_LIBS" >&5 + ## don't use --libs since that can do evil things like add + ## -Wl,--export-dynamic +- MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pango >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pango >= 1.6.0 pangoft2 >= 1.6.0\"`" ++ MOZ_PANGO_LIBS="`$PKG_CONFIG --libs-only-L \"pangoxft >= 1.6.0 pangoft2 >= 1.6.0\"` `$PKG_CONFIG --libs-only-l \"pangoxft >= 1.6.0 pangoft2 >= 1.6.0\"`" + echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 + else + MOZ_PANGO_CFLAGS="" diff -urN www/seamonkey.orig/files/patch-gfx_src_gtk_Makefile.in www/seamonkey/files/patch-gfx_src_gtk_Makefile.in --- www/seamonkey.orig/files/patch-gfx_src_gtk_Makefile.in Thu Jan 1 01:00:00 1970 +++ www/seamonkey/files/patch-gfx_src_gtk_Makefile.in Mon Sep 4 19:49:35 2006 @@ -0,0 +1,11 @@ +--- ./gfx/src/gtk/Makefile.in.orig Tue Apr 26 06:46:13 2005 ++++ ./gfx/src/gtk/Makefile.in Mon Sep 4 19:15:34 2006 +@@ -201,7 +201,7 @@ + $(NULL) + endif + +-EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) ++EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_PANGO_LIBS) $(MOZ_GTK2_LIBS) + CXXFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) + CFLAGS += $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS) + --- seamonkey.diff ends here ---