- switch from gtk1 to gtk2. tested by many (thanks!)

- fix backup mastersite
- fix gdk_property_get warnings (from marcm@)

some feedback marcm@, okay brad@ pvalchev@
This commit is contained in:
kurt 2005-09-08 12:48:39 +00:00
parent 49bf3b1527
commit b29fbb1dab
4 changed files with 34 additions and 16 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2005/08/12 19:01:44 pvalchev Exp $
# $OpenBSD: Makefile,v 1.33 2005/09/08 12:48:39 kurt Exp $
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
@ -6,8 +6,8 @@ COMMENT= "redesign of Mozilla's browser component"
VER= 1.0.6
DISTNAME= mozilla
PKGNAME= mozilla-firefox-${VER}p1
SO_VERSION= 5.0
PKGNAME= mozilla-firefox-${VER}p2
SO_VERSION= 6.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@ -20,27 +20,27 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xft Xi Xp Xrender Xt c fontconfig freetype \
m pthread z
WANTLIB= X11 Xext Xft Xp Xrender Xt c fontconfig freetype \
m pthread z atk-1.0.0.0 glib-2.0.0.0 \
gmodule-2.0.0.0 gobject-2.0.0.0 jpeg pango-1.0.0.0 \
pangox-1.0.0.0 pangoxft-1.0.0.0 png
.if empty(MACHINE_ARCH:Malpha)
WANTLIB+= stdc++
.endif
MASTER_SITES= http://ftp.eu.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/ \
http://ftp.mozilla.org/pub/firefox/releases/${VER}/source/
http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${VER}/source/
DISTFILES= firefox-${VER}-source.tar.bz2
MODULES= gcc3 devel/gettext
MODGCC3_ARCHES= alpha
MODGCC3_LANGS= C++
RUN_DEPENDS= :esound-*:audio/esound
BUILD_DEPENDS= :ORBit-*:devel/ORBit \
BUILD_DEPENDS= :libIDL-*:devel/libIDL \
:zip->=2.3:archivers/zip \
:pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= gtk.1,gdk.1::x11/gtk+ \
glib.1,gmodule.1::devel/glib \
jpeg.62::graphics/jpeg \
png.3::graphics/png
LIB_DEPENDS= gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2
VMEM_WARNING= Yes
@ -62,6 +62,7 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \
--without-system-nspr \
--enable-xft \
--enable-optimize=-Os \
--enable-default-toolkit=gtk2 \
--disable-debug \
--disable-tests \
--disable-pedantic \
@ -70,7 +71,7 @@ CONFIGURE_ARGS= --with-system-jpeg=${LOCALBASE} \
# from browser/config/mozconfig
CONFIGURE_ARGS+=--disable-ldap \
--disable-mailnews \
--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,gnomevfs,negotiateauth \
--enable-extensions=cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,negotiateauth \
--enable-crypto \
--disable-composer \
--enable-single-profile \

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-gfx_src_gtk_nsScreenGtk_cpp,v 1.1 2005/09/08 12:48:39 kurt Exp $
--- gfx/src/gtk/nsScreenGtk.cpp.orig Thu Aug 25 18:29:50 2005
+++ gfx/src/gtk/nsScreenGtk.cpp Thu Aug 25 18:31:17 2005
@@ -143,7 +143,7 @@ nsScreenGtk :: Init ()
if (!gdk_property_get(root_window,
gdk_atom_intern ("_NET_WORKAREA", FALSE),
cardinal_atom,
- 0, G_MAXLONG, FALSE,
+ 0, G_MAXLONG - 3, FALSE,
&type_returned,
&format_returned,
&length_returned,

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PFRAG.shared,v 1.6 2005/08/12 19:01:44 pvalchev Exp $
@comment $OpenBSD: PFRAG.shared,v 1.7 2005/09/08 12:48:39 kurt Exp $
@lib mozilla-firefox/components/libaccessibility.so.${SO_VERSION}
@lib mozilla-firefox/components/libappcomps.so.${SO_VERSION}
@lib mozilla-firefox/components/libautoconfig.so.${SO_VERSION}
@ -33,6 +33,7 @@
@lib mozilla-firefox/components/libpippki.so.${SO_VERSION}
@lib mozilla-firefox/components/libpref.so.${SO_VERSION}
@lib mozilla-firefox/components/librdf.so.${SO_VERSION}
@lib mozilla-firefox/components/libsystem-pref.so.${SO_VERSION}
@lib mozilla-firefox/components/libtoolkitcomps.so.${SO_VERSION}
@lib mozilla-firefox/components/libtransformiix.so.${SO_VERSION}
@lib mozilla-firefox/components/libtxmgr.so.${SO_VERSION}
@ -41,7 +42,7 @@
@lib mozilla-firefox/components/libuniversalchardet.so.${SO_VERSION}
@lib mozilla-firefox/components/libwebbrwsr.so.${SO_VERSION}
@lib mozilla-firefox/components/libwebsrvcs.so.${SO_VERSION}
@lib mozilla-firefox/components/libwidget_gtk.so.${SO_VERSION}
@lib mozilla-firefox/components/libwidget_gtk2.so.${SO_VERSION}
@lib mozilla-firefox/components/libxmlextras.so.${SO_VERSION}
@lib mozilla-firefox/components/libxpcom_compat_c.so.${SO_VERSION}
@lib mozilla-firefox/components/libxpconnect.so.${SO_VERSION}
@ -50,7 +51,6 @@
@lib mozilla-firefox/components/libxremoteservice.so.${SO_VERSION}
@lib mozilla-firefox/libgkgfx.so.${SO_VERSION}
@lib mozilla-firefox/libgtkembedmoz.so.${SO_VERSION}
@lib mozilla-firefox/libgtksuperwin.so.${SO_VERSION}
@lib mozilla-firefox/libgtkxtbin.so.${SO_VERSION}
@lib mozilla-firefox/libjsj.so.${SO_VERSION}
@lib mozilla-firefox/libmozjs.so.${SO_VERSION}

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2005/08/12 19:01:44 pvalchev Exp $
@comment $OpenBSD: PLIST,v 1.11 2005/09/08 12:48:39 kurt Exp $
@conflict mozilla-firebird-*
%%SHARED%%
bin/firefox
@ -112,6 +112,9 @@ mozilla-firefox/chrome/help/locale/en-US/help/
mozilla-firefox/chrome/help/skin/
mozilla-firefox/chrome/help/skin/classic/
mozilla-firefox/chrome/help/skin/classic/help/
mozilla-firefox/chrome/icons/
mozilla-firefox/chrome/icons/default/
mozilla-firefox/chrome/icons/default/default.xpm
mozilla-firefox/chrome/inspector/
mozilla-firefox/chrome/inspector.jar
mozilla-firefox/chrome/inspector/content/
@ -193,6 +196,7 @@ mozilla-firefox/chrome/toolkit/content/mozapps/update/
mozilla-firefox/chrome/toolkit/content/mozapps/xpinstall/
mozilla-firefox/chrome/toolkit/content/passwordmgr/
mozilla-firefox/components/
mozilla-firefox/components/accessibility-atk.xpt
mozilla-firefox/components/accessibility.xpt
mozilla-firefox/components/appshell.xpt
mozilla-firefox/components/autocomplete.xpt
@ -254,6 +258,7 @@ mozilla-firefox/components/migration.xpt
mozilla-firefox/components/mimetype.xpt
mozilla-firefox/components/mozbrwsr.xpt
mozilla-firefox/components/mozfind.xpt
mozilla-firefox/components/mozgnome.xpt
mozilla-firefox/components/necko.xpt
mozilla-firefox/components/necko_about.xpt
mozilla-firefox/components/necko_cache.xpt