cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- re-enable xft for gtk

Browse Source 
- wantlib correction for alpha (from alek@)
- fix lp64 bug that prevented mail from being viewed on sparc64
This commit is contained in:
kurt 2005-03-30 22:03:04 +00:00
parent f3f39c94a2
commit ef866a5413
4 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
www/mozilla/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.84 2005/03/26 19:05:54 wilfried Exp $
# $OpenBSD: Makefile,v 1.85 2005/03/30 22:03:04 kurt Exp $
ONLY_FOR_ARCHS= alpha i386 sparc sparc64 amd64 powerpc
@ -7,7 +7,7 @@ COMMENT-devel= "devel files for Gecko"
VER= 1.7.6
DISTNAME= mozilla
PKGNAME= mozilla-${VER}
PKGNAME= mozilla-${VER}p0
DISTFILES= mozilla-source-${VER}.tar.bz2
CATEGORIES= www
@ -28,7 +28,7 @@ MULTI_PACKAGES= -devel
VMEM_WARNING=yes
.for i in ${MULTI_PACKAGES}
PKGNAME$i= mozilla${i}-${VER}
PKGNAME$i= mozilla${i}-${VER}p0
.endfor
SUBPACKAGE?=
@ -44,9 +44,11 @@ BUILD_DEPENDS= :zip->=2.3:archivers/zip \
LIB_DEPENDS= jpeg.62::graphics/jpeg \
png.3::graphics/png
WANTLIB= X11 Xext Xt m
.if defined(PACKAGING) && ${SUBPACKAGE} == "-devel"
LIB_DEPENDS=
WANTLIB= X11 Xt m Xext
MODULES= devel/gettext
. if ${FLAVOR:L:Mgtk2}
RUN_DEPENDS= :${PKGNAME}-gtk2:www/mozilla,gtk2
WANTLIB+= Xft Xrender fontconfig freetype
@ -55,7 +57,11 @@ RUN_DEPENDS= :${PKGNAME}:www/mozilla
. endif
.else
RUN_DEPENDS= :esound-0.2.*:audio/esound
WANTLIB= X11 Xext Xp Xt c m pthread stdc++ z
WANTLIB+= Xft Xp Xrender c fontconfig freetype pthread z
. if empty(MACHINE_ARCH:Malpha)
WANTLIB+= stdc++
. endif
. if ${FLAVOR:L:Mgtk2}
LIB_DEPENDS+= gnomevfs-2::x11/gnome/vfs2
WANTLIB+= ORBit-2 bonobo-2 bonobo-activation gconf-2 gthread-2.0.0.0
@ -65,9 +71,8 @@ WANTLIB+= ORBit-2 bonobo-2 bonobo-activation gconf-2 gthread-2.0.0.0
.if ${FLAVOR:L:Mgtk2}
BUILD_DEPENDS+= :libIDL-*:devel/libIDL
LIB_DEPENDS+= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2
WANTLIB+= Xcursor Xft Xinerama Xrender atk-1.0.0.0 fontconfig freetype \
glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0
WANTLIB+= Xcursor Xinerama atk-1.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \
gobject-2.0.0.0 pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0
.else
BUILD_DEPENDS+= :ORBit-*:devel/ORBit
LIB_DEPENDS+= gtk.1,gdk.1::x11/gtk+
@ -92,6 +97,7 @@ CONFIGURE_ARGS= \
--with-system-zlib=/usr/lib \
--with-pthreads \
--without-system-nspr \
--enable-xft \
--enable-optimize=-Os \
--enable-crypto \
--enable-extensions=default \
@ -101,13 +107,9 @@ CONFIGURE_ARGS= \
--disable-ldap
.if ${FLAVOR:L:Mgtk2}
CONFIGURE_ARGS+=--enable-default-toolkit=gtk2 \
--enable-xft \
--disable-freetype2
CONFIGURE_ARGS+=--enable-default-toolkit=gtk2
.else
CONFIGURE_ARGS+=--enable-default-toolkit=gtk \
--disable-xft \
--enable-freetype2
CONFIGURE_ARGS+=--enable-default-toolkit=gtk
.endif
CONFIGURE_ENV= PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"

12
www/mozilla/patches/patch-mailnews_mime_src_mimemsg_cpp Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mailnews_mime_src_mimemsg_cpp,v 1.1 2005/03/30 22:03:04 kurt Exp $
--- mailnews/mime/src/mimemsg.cpp.orig Tue Mar 29 16:57:29 2005
+++ mailnews/mime/src/mimemsg.cpp Tue Mar 29 16:57:51 2005
@@ -519,7 +519,7 @@ MimeMessage_close_headers (MimeObject *o
{
PRUint32 flags = 0;
char dummy = 0;
- if (sscanf(xmoz, " %lx %c", &flags, &dummy) == 1 &&
+ if (sscanf(xmoz, " %x %c", &flags, &dummy) == 1 &&
flags & MSG_FLAG_PARTIAL)
obj->options->generate_footer_html_fn =
MimeMessage_partial_message_html;

3
www/mozilla/pkg/PFRAG.gtk2
View File

@ -1,7 +1,6 @@
@comment $OpenBSD: PFRAG.gtk2,v 1.2 2005/03/13 05:02:17 kurt Exp $
@comment $OpenBSD: PFRAG.gtk2,v 1.3 2005/03/30 22:03:04 kurt Exp $
mozilla/chrome/icons/default/default.xpm
mozilla/components/accessibility-atk.xpt
@lib mozilla/components/libnkgnomevfs.so.1.0
@lib mozilla/components/libsystem-pref.so.1.0
@lib mozilla/components/libwidget_gtk2.so.1.0
mozilla/res/fonts/fontEncoding.properties

3
www/mozilla/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.30 2005/03/26 19:05:54 wilfried Exp $
@comment $OpenBSD: PLIST,v 1.31 2005/03/30 22:03:04 kurt Exp $
%%SHARED%%
%%gtk2%%
!%%gtk2%%
@ -595,6 +595,7 @@ mozilla/res/entityTables/htmlEntityVersions.properties
mozilla/res/entityTables/mathml20.properties
mozilla/res/entityTables/transliterate.properties
mozilla/res/fonts/
mozilla/res/fonts/fontEncoding.properties
mozilla/res/fonts/mathfont.properties
mozilla/res/fonts/mathfontCMEX10.properties
mozilla/res/fonts/mathfontCMSY10.properties