Subject: pkg/19562: Enable Xinerama support in Mozilla/Phoenix
To: None <gnats-bugs@gnats.netbsd.org>
From: Eric Gillespie <epg@pretzelnet.org>
List: netbsd-bugs
Date: 12/25/2002 14:59:13
>Number:         19562
>Category:       pkg
>Synopsis:       Enable Xinerama support in Mozilla/Phoenix
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Dec 25 12:00:01 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     
>Release:        NetBSD 1.6
>Organization:
>Environment:
System: NetBSD remus.pretzelnet.org 1.6 NetBSD 1.6 ($Id: ROMA 389 2002-09-15 21:05:13Z epg $) #3: Mon Sep 16 04:20:54 EST 2002 epg@remus.pretzelnet.org:/usr/src/sys/arch/i386/compile/ROMA i386
Architecture: i386
Machine: i386
>Description:
Mozilla has Xinerama support, but it is not enabled by default.
This patch enables it if Xinerama is available on the system.
Since Xinerama is a static library only, the PLIST is not
affected and the resulting package works even on systems without
Xinerama (e.g. older NetBSD releases using XFree86 3.x).

One bug stands in the way: http://bugzilla.mozilla.org/show_bug.cgi?id=183894

The second diff below needs to be added to the patches directory.
>How-To-Repeat:
>Fix:
Index: Makefile.common
===================================================================
RCS file: /cvsroot/pkgsrc/www/mozilla/Makefile.common,v
retrieving revision 1.6
diff -a -u -r1.6 Makefile.common
--- Makefile.common	2002/12/04 15:20:27	1.6
+++ Makefile.common	2002/12/23 20:25:28
@@ -48,6 +48,10 @@
 CONFIGURE_ENV+=	LIBRUNPATH=${MOZ_LIBDIR}
 LDFLAGS+=	-Wl,-R${MOZ_LIBDIR}
 
+.if exists(${X11BASE}/include/X11/extensions/Xinerama.h)
+CONFIGURE_ARGS+=	--enable-xinerama
+.endif
+
 .ifdef BUILD_SVG
 MAKE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1
 CONFIGURE_ENV+=		MOZ_INTERNAL_LIBART_LGPL=1


Add this to patches:

--- gfx/src/gtk/Makefile.in.orig	Sun Dec 22 15:50:41 2002
+++ gfx/src/gtk/Makefile.in
@@ -131,6 +131,10 @@ GARBAGE         += $(X11SHARED_LCPPSRCS)
 
 include $(topsrcdir)/config/rules.mk
 
+ifdef MOZ_ENABLE_XINERAMA
+GFX_XINERAMA_LIBS += $(MOZ_XINERAMA_LIBS)
+endif
+
 ifdef MOZ_ENABLE_GTK
 EXTRA_DSO_LDOPTS += \
 		$(LIBS_DIR) \
@@ -155,10 +159,6 @@ endif
 EXTRA_DSO_LDOPTS += $(MOZ_GTK_LDFLAGS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS)
 CXXFLAGS	+= $(MOZ_XFT_CFLAGS) $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
 CFLAGS		+= $(MOZ_XFT_CFLAGS) $(MOZ_GTK_CFLAGS) $(MOZ_GTK2_CFLAGS)
-
-ifdef MOZ_ENABLE_XINERAMA
-GFX_XINERAMA_LIBS += $(MOZ_XINERAMA_LIBS)
-endif
 
 ifeq ($(OS_ARCH), Linux)
 DEFINES         += -D_BSD_SOURCE
>Release-Note:
>Audit-Trail:
>Unformatted: