[50844] trunk/dports/devel
jeremyhu at macports.org
jeremyhu at macports.org
Sun May 10 21:48:33 PDT 2009
Revision: 50844
http://trac.macports.org/changeset/50844
Author: jeremyhu at macports.org
Date: 2009-05-10 21:48:33 -0700 (Sun, 10 May 2009)
Log Message:
-----------
New port: xulrunner-devel ... for firefox and thunderbird (soon) betas
Added Paths:
-----------
trunk/dports/devel/xulrunner-devel/
trunk/dports/devel/xulrunner-devel/Portfile
trunk/dports/devel/xulrunner-devel/files/
trunk/dports/devel/xulrunner-devel/files/browser-xulrunner-stub.patch
trunk/dports/devel/xulrunner-devel/files/configure.patch
trunk/dports/devel/xulrunner-devel/files/gdk-Status.patch
trunk/dports/devel/xulrunner-devel/files/icon-Makefile.patch
trunk/dports/devel/xulrunner-devel/files/make-install.patch
trunk/dports/devel/xulrunner-devel/files/netwerk-wifi-src-Makefile.patch
trunk/dports/devel/xulrunner-devel/files/nsFilePicker.patch
trunk/dports/devel/xulrunner-devel/files/patch-dylib_file.diff
trunk/dports/devel/xulrunner-devel/files/patch-pthread.diff
trunk/dports/devel/xulrunner-devel/files/plugins.patch
trunk/dports/devel/xulrunner-devel/files/share-applications-firefox.desktop
trunk/dports/devel/xulrunner-devel/files/sydneyaudio.patch
trunk/dports/devel/xulrunner-devel/files/system-nss.patch
trunk/dports/devel/xulrunner-devel/files/xpcom-Makefile.patch
trunk/dports/devel/xulrunner-devel/files/xulrunner-app-Makefile.patch
Added: trunk/dports/devel/xulrunner-devel/Portfile
===================================================================
--- trunk/dports/devel/xulrunner-devel/Portfile (rev 0)
+++ trunk/dports/devel/xulrunner-devel/Portfile 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,240 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+
+name xulrunner-devel
+set pkg_name xulrunner
+categories devel
+version 1.9.1b4
+set ff_version 3.5b4
+revision 0
+platforms darwin
+maintainers jeremyhu openmaintainer
+description Mozilla runtime package that can be used to bootstrap XUL+XPCOM applications
+
+long_description ${description}
+
+universal_variant no
+
+homepage http://developer.mozilla.org/en/docs/XULRunner
+#master_sites http://mozilla.isc.org/pub/mozilla.org/xulrunner/releases/${version}/source
+
+master_sites http://mozilla.isc.org/pub/mozilla.org/firefox/releases/${ff_version}/source/ \
+ http://www.mirrorservice.org/sites/releases.mozilla.org/pub/mozilla.org/firefox/releases/${ff_version}/source/ \
+ http://mirror.internode.on.net/pub/mozilla/firefox/releases/${ff_version}/source/ \
+ http://kyoto-mz-dl.sinet.ad.jp/pub/mozilla.org/firefox/releases/${ff_version}/source/ \
+ http://mirror.yandex.ru/mozilla/firefox/releases/${ff_version}/source/ \
+ http://mozilla.c3sl.ufpr.br/releases/firefox/releases/${ff_version}/source/ \
+ http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${ff_version}/source/
+#distname ${name}-${version}-source
+distname firefox-${ff_version}-source
+use_bzip2 yes
+
+checksums md5 ff6bf463300cb56bcf750973b2af3d80 \
+ sha1 33bb5b254c3a772d9195c5128a2c569a9cbb8ccd \
+ rmd160 d28d545f533f0f3b6b7e6e09813768b2996b3d76
+
+worksrcdir mozilla-1.9.1
+
+depends_build \
+ port:findutils \
+ port:pkgconfig \
+ port:autoconf213
+
+depends_lib \
+ port:heimdal \
+ port:lcms \
+ port:gconf \
+ port:esound \
+ port:libcanberra \
+ port:findutils \
+ port:nss \
+ port:nspr \
+ port:gtk2 \
+ port:xorg-libXt
+
+use_autoconf yes
+autoconf.cmd autoconf213
+
+configure.args \
+ --with-xulrunner-stub-name=xulrunner-stub \
+ --disable-static \
+ --enable-shared \
+ --with-distribution-id=org.macports \
+ --enable-default-toolkit=cairo-gtk2 \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib \
+ --with-system-nspr \
+ --with-nspr-prefix=${prefix} \
+ --with-system-nss \
+ --with-nss-prefix=${prefix} \
+ --with-system-bzip2=${prefix} \
+ --with-system-jpeg=${prefix} \
+ --with-system-zlib=${prefix} \
+ --enable-system-lcms \
+ --enable-system-cairo \
+ --enable-system-sqlite \
+ --with-default-mozilla-five-home=${prefix}/lib/${pkg_name} \
+ --enable-oji \
+ --enable-plugins \
+ --enable-mathml \
+ --enable-extensions="default,spellcheck" \
+ --enable-permissions \
+ --enable-cookie \
+ --enable-image-decoders=all \
+ --enable-image-encoder=all \
+ --enable-canvas \
+ --enable-jsd \
+ --enable-xpctools \
+ --enable-crypto \
+ --enable-pango \
+ --enable-svg \
+ --enable-svg-renderer=cairo \
+ --enable-xinerama \
+ --with-pthreads \
+ --disable-gnomevfs \
+ --disable-gnomeui \
+ --enable-postscript \
+ --enable-safe-browsing \
+ --disable-crashreporter \
+ --enable-optimize='-O2' \
+ --disable-prebinding \
+ --enable-strip \
+ --enable-install-strip \
+ --disable-debug \
+ --disable-installer \
+ --disable-updater \
+ --disable-pedantic \
+ --disable-tests \
+ --disable-mochitest \
+ --enable-libxul
+
+variant debug description {build with debugging symbols} {
+ configure.args-delete --disable-debug \
+ --disable-mochitest \
+ --enable-optimize='-O2' \
+ --enable-strip \
+ --enable-install-strip
+
+ configure.args-append --enable-debug='-ggdb3' \
+ --enable-mochitest \
+ --disable-optimize \
+ --disable-strip \
+ --disable-install-strip
+}
+
+variant gnome description {use gnome libraries where appropriate} {
+ depends_lib-append \
+ port:gnome-vfs \
+ port:libgnomeui \
+ port:libgnome \
+ port:gnome-icon-theme
+
+ configure.args-delete --disable-gnomevfs \
+ --disable-gnomeui
+
+ configure.args-append --enable-gnomevfs \
+ --enable-gnomeui
+}
+
+post-extract {
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
+ move ${worksrcpath}/modules/libjar/nsWildCard.cpp ${worksrcpath}/modules/libjar/nsWildCard_jar.cpp
+}
+
+# Upstream bugs (http://bugzilla.mozilla.org)
+# #485827 (xpcom-Makefile)
+# #486782 (configure, in mozilla-1.9.2)
+# #485862 (system-nss, in mozilla-1.9.2)
+# #486036 (make-install, in mozilla-1.9.2)
+# #485863 (icon-Makefile, in mozilla-1.9.2)
+# #492119 (nsFilePicker)
+# #486892 (plugins, in mozilla-1.9.2)
+# #486890 (sydneyaudio, 3.1b3 and later, in mozilla-1.9.2)
+# #487367 (browser-xulrunner-stub, in mozilla-1.9.2)
+# #484457 (gdk-Status, in mozilla-1.9.2)
+# #487371 (xulrunner-app-Makefile, in mozilla-1.9.2)
+# #492117 (patch-pthread)
+# #492138 (netwerk-wifi-src-Makefile)
+# Previous firefox-x11 port, not sure if still needed, but safe to keep: patch-dylib_file.diff
+patchfiles configure.patch xpcom-Makefile.patch system-nss.patch make-install.patch patch-dylib_file.diff patch-pthread.diff icon-Makefile.patch nsFilePicker.patch plugins.patch sydneyaudio.patch browser-xulrunner-stub.patch gdk-Status.patch xulrunner-app-Makefile.patch netwerk-wifi-src-Makefile.patch
+
+post-patch {
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=485857
+ reinplace "s:XP_MACOSX:__APPLE__:g" ${worksrcpath}/xpcom/base/nsStackWalk.cpp
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=484353
+ reinplace "s:nsWildCard.cpp:nsWildCard_jar.cpp:g" ${worksrcpath}/modules/libjar/objs.mk
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=486034
+ # find -xtype -> gfind -xtype
+ reinplace "s:find:gfind:g" ${worksrcpath}/toolkit/mozapps/installer/packager.mk
+
+ if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
+ reinplace "s:/usr/X11R6:${prefix}:" ${worksrcpath}/modules/plugin/base/src/nsPluginsDirUnix.cpp
+ }
+
+ # Set the right install_name on the libs
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/rules.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/config/config.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/nsprpub/configure.in
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/nsprpub/configure
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/security/coreconf/Darwin.mk
+ reinplace "s:@executable_path:${prefix}/lib/${pkg_name}:g" ${worksrcpath}/security/nss/lib/freebl/config.mk
+
+ # Fix the correct library filenames for loading at runtime
+ reinplace "s:libatk-1.0.so.0:${prefix}/lib/libatk-1.0.dylib:" ${worksrcpath}/accessible/src/atk/nsAppRootAccessible.cpp
+
+ reinplace "s:libgssapi_krb5.so.2:${prefix}/heimdal/lib/libgssapi.2.dylib:" ${worksrcpath}/extensions/auth/nsAuthGSSAPI.cpp
+
+ reinplace "s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:" ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+ reinplace "s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:" ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+ reinplace "s:libgnomevfs-2.so.0:${prefix}/lib/libgnomevfs-2.dylib:" ${worksrcpath}/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp
+
+ reinplace "s:libgconf-2.so.4:${prefix}/lib/libgconf-2.dylib:" ${worksrcpath}/extensions/pref/system-pref/src/gconf/nsSystemPrefService.cpp
+
+ reinplace "s:libcups.so.2:/usr/lib/libcups.2.dylib:" ${worksrcpath}/gfx/src/psshared/nsCUPSShim.cpp
+
+ reinplace "s:libgnomeui-2.so.0:${prefix}/lib/libgnomeui-2.dylib:" ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp
+ reinplace "s:libgnome-2.so.0:${prefix}/lib/libgnome-2.dylib:" ${worksrcpath}/toolkit/xre/nsNativeAppSupportUnix.cpp
+
+ reinplace "s:libgtk-x11-2.0.so.0:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsBidiKeyboard.cpp
+ reinplace "s:libXss.so.1:${prefix}/lib/libXss.1.0.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsIdleServiceGTK.cpp
+ reinplace "s:libXinerama.so.1:${prefix}/lib/libXinerama.1.dylib:" ${worksrcpath}/widget/src/gtk2/nsScreenManagerGtk.cpp
+ reinplace "s:libesd.so.0:${prefix}/lib/libesd.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
+ reinplace "s:libcanberra.so.0:${prefix}/lib/libcanberra.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsSound.cpp
+ reinplace "s:libgtk-x11-2.0.dylib:${prefix}/lib/libgtk-x11-2.0.dylib:" ${worksrcpath}/widget/src/gtk2/nsFilePicker.cpp
+
+ # Set our system plugins path
+ reinplace "s:/usr/lib/mozilla/plugins:${prefix}/lib/nsplugins:" ${worksrcpath}/xpcom/io/nsAppFileLocationProvider.cpp
+
+ reinplace "s:/etc/gre\.:${prefix}/etc/gre.:g" \
+ ${worksrcpath}/xpcom/build/nsXPCOMPrivate.h \
+ ${worksrcpath}/xulrunner/app/nsRegisterGREUnix.cpp \
+ ${worksrcpath}/xulrunner/installer/Makefile.in
+}
+
+configure.env \
+ MOZCONFIG="${worksrcpath}/xulrunner/config/mozconfig" \
+ MOZILLA_FIVE_HOME="${prefix}/lib/${pkg_name}"
+
+build.args-append \
+ includedir="${prefix}/include/${pkg_name}" \
+ idldir="${prefix}/share/idl/${pkg_name}" \
+ installdir="${prefix}/lib/${pkg_name}" \
+ sdkdir="${prefix}/lib/${pkg_name}"
+
+destroot.args-append \
+ includedir="${prefix}/include/${pkg_name}" \
+ idldir="${prefix}/share/idl/${pkg_name}" \
+ installdir="${prefix}/lib/${pkg_name}" \
+ sdkdir="${prefix}/lib/${pkg_name}"
+
+post-destroot {
+ ## Workaround to get root certs loaded, so https:// works
+ #ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${pkg_name}/libnssckbi.dylib
+
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=486064
+ system "cat ${worksrcpath}/dist/include/gfx/gfxtypes.h ${worksrcpath}/dist/include/thebes/gfxTypes.h > ${destroot}${prefix}/include/${pkg_name}/unstable/gfxtypes.h"
+}
Property changes on: trunk/dports/devel/xulrunner-devel/Portfile
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Added: trunk/dports/devel/xulrunner-devel/files/browser-xulrunner-stub.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/browser-xulrunner-stub.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/browser-xulrunner-stub.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,11 @@
+--- browser/app/Makefile.in.orig 2009-04-07 21:38:10.000000000 -0700
++++ browser/app/Makefile.in 2009-04-07 21:40:05.000000000 -0700
+@@ -418,7 +418,7 @@ endif
+ else
+ ifdef LIBXUL_SDK
+ libs::
+- cp $(LIBXUL_DIST)/bin/xulrunner-stub$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
++ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
+ endif
+ endif
+
Added: trunk/dports/devel/xulrunner-devel/files/configure.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/configure.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/configure.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,140 @@
+diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
+--- config/autoconf.mk.in
++++ config/autoconf.mk.in
+@@ -76,16 +76,18 @@ LIBXUL_DIST = @LIBXUL_DIST@
+ XULRUNNER_STUB_NAME = @XULRUNNER_STUB_NAME@
+
+ MOZ_CHROME_FILE_FORMAT = @MOZ_CHROME_FILE_FORMAT@
+
+ MOZ_WIDGET_TOOLKIT = @MOZ_WIDGET_TOOLKIT@
+ MOZ_GFX_TOOLKIT = @MOZ_GFX_TOOLKIT@
+ MOZ_GFX_OPTIMIZE_MOBILE = @MOZ_GFX_OPTIMIZE_MOBILE@
+
++MOZ_FS_LAYOUT = @MOZ_FS_LAYOUT@
++
+ MOZ_DFB = @MOZ_DFB@
+ MOZ_X11 = @MOZ_X11@
+
+ MOZ_PANGO = @MOZ_PANGO@
+
+ MOZ_JS_LIBS = @MOZ_JS_LIBS@
+
+ MOZ_DEBUG = @MOZ_DEBUG@
+diff --git a/configure.in b/configure.in
+--- configure.in
++++ configure.in
+@@ -1562,17 +1562,16 @@ case "$host" in
+ esac
+ ;;
+
+ *-darwin*)
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
+ HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+ MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
+- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+ ;;
+
+ *-linux*|*-kfreebsd*-gnu)
+ HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
+ HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"'
+ HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
+ ;;
+
+@@ -1704,25 +1703,24 @@ case "$target" in
+ esac
+ ;;
+
+ *-darwin*)
+ MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
+ MOZ_OPTIMIZE_FLAGS="-O2"
+ _PEDANTIC=
+- CFLAGS="$CFLAGS -fpascal-strings -fno-common"
+- CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
++ CFLAGS="$CFLAGS -fpascal-strings -fno-common -I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
++ CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common -I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
+ DLL_SUFFIX=".dylib"
+ DSO_LDOPTS=''
+ STRIP="$STRIP -x -S"
+ _PLATFORM_DEFAULT_TOOLKIT='cairo-cocoa'
+ MOZ_ENABLE_POSTSCRIPT=
+ TARGET_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
+- LDFLAGS="$LDFLAGS -framework Cocoa"
+ # The ExceptionHandling framework is needed for Objective-C exception
+ # logging code in nsObjCExceptions.h. Currently we only use that in debug
+ # builds.
+ MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling"
+ # set MACOSX to generate lib/mac/MoreFiles/Makefile
+ MACOSX=1
+
+ dnl DTrace and -dead_strip don't interact well. See bug 403132.
+@@ -4678,16 +4676,18 @@ MOZ_ARG_HEADER(Toolkit Options)
+ fi
+
+ AC_DEFINE_UNQUOTED(MOZ_DEFAULT_TOOLKIT,"$MOZ_WIDGET_TOOLKIT")
+
+ dnl ========================================================
+ dnl = Enable the toolkit as needed =
+ dnl ========================================================
+
++MOZ_FS_LAYOUT="unix"
++
+ case "$MOZ_WIDGET_TOOLKIT" in
+ photon)
+ MOZ_ENABLE_PHOTON=1
+ AC_DEFINE(MOZ_WIDGET_PHOTON)
+ ;;
+
+ cairo-windows)
+ MOZ_WIDGET_TOOLKIT=windows
+@@ -4754,28 +4754,30 @@ cairo-os2)
+ TK_LIBS='$(MOZ_CAIRO_LIBS)'
+ ;;
+
+ cairo-mac|cairo-cocoa)
+ if test "$MOZ_WIDGET_TOOLKIT" = "cairo-cocoa"; then
+ MOZ_WIDGET_TOOLKIT=cocoa
+ AC_DEFINE(MOZ_WIDGET_COCOA)
+ MOZ_ENABLE_COCOA=1
++ LDFLAGS="$LDFLAGS -framework Cocoa"
+ else
+ MOZ_WIDGET_TOOLKIT=mac
+ fi
++ MOZ_FS_LAYOUT="bundle"
+ MOZ_GFX_TOOLKIT=cairo
+ MOZ_USER_DIR="Mozilla"
+ AC_DEFINE(XP_MACOSX)
+ AC_DEFINE(TARGET_CARBON)
+ AC_DEFINE(TARGET_API_MAC_CARBON)
+ TK_LIBS='-framework Carbon -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework AddressBook'
+- TK_CFLAGS="-I${MACOS_SDK_DIR}/Developer/Headers/FlatCarbon"
+ CFLAGS="$CFLAGS $TK_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
++ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
+ ;;
+ esac
+
+ if test "$MOZ_ENABLE_XREMOTE"; then
+ AC_DEFINE(MOZ_ENABLE_XREMOTE)
+ fi
+
+ if test "$COMPILE_ENVIRONMENT"; then
+@@ -4788,16 +4790,17 @@ if test "$COMPILE_ENVIRONMENT"; then
+ fi
+
+ PKG_CHECK_MODULES(MOZ_GTK2, gtk+-2.0 >= $GTK2_VERSION gtk+-unix-print-2.0 glib-2.0 gobject-2.0 $GDK_PACKAGES)
+ fi
+
+ fi # COMPILE_ENVIRONMENT
+
+ AC_SUBST(MOZ_DEFAULT_TOOLKIT)
++AC_SUBST(MOZ_FS_LAYOUT)
+
+ dnl ========================================================
+ dnl = startup-notification support module
+ dnl ========================================================
+
+ if test "$MOZ_ENABLE_GTK2"
+ then
+ MOZ_ENABLE_STARTUP_NOTIFICATION=
Added: trunk/dports/devel/xulrunner-devel/files/gdk-Status.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/gdk-Status.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/gdk-Status.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,15 @@
+--- gfx/thebes/src/gfxPlatformGtk.cpp.orig 2009-04-07 16:13:18.000000000 -0700
++++ gfx/thebes/src/gfxPlatformGtk.cpp 2009-04-07 16:14:29.000000000 -0700
+@@ -63,6 +63,12 @@
+ #include <gdk/gdkx.h>
+ #include "gfxXlibSurface.h"
+ #include "cairo-xlib.h"
++
++/* Undefine the Status from Xlib since it will conflict with system headers on OSX */
++#if defined(__APPLE__) && defined(Status)
++#undef Status
++#endif
++
+ #endif /* MOZ_X11 */
+
+ #ifdef MOZ_DFB
Added: trunk/dports/devel/xulrunner-devel/files/icon-Makefile.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/icon-Makefile.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/icon-Makefile.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,11 @@
+--- modules/libpr0n/decoders/icon/Makefile.in.orig 2009-03-31 12:55:07.000000000 -0700
++++ modules/libpr0n/decoders/icon/Makefile.in 2009-03-31 12:55:47.000000000 -0700
+@@ -67,7 +67,7 @@ ifeq ($(OS_ARCH),OS2)
+ PLATFORM = os2
+ endif
+
+-ifeq ($(OS_ARCH),Darwin)
++ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ PLATFORM = mac
+ endif
+
Added: trunk/dports/devel/xulrunner-devel/files/make-install.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/make-install.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/make-install.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,14 @@
+--- toolkit/mozapps/installer/packager.mk.bak 2009-03-30 17:04:13.000000000 -0700
++++ toolkit/mozapps/installer/packager.mk 2009-03-30 17:05:06.000000000 -0700
+@@ -410,7 +410,10 @@ make-package: stage-package
+ # dist/sdk/lib -> prefix/lib/appname-devel-version/lib
+ # prefix/lib/appname-devel-version/* symlinks to the above directories
+ install:: stage-package
+-ifneq (,$(filter WINNT Darwin,$(OS_ARCH)))
++ifneq (,$(filter WINNT,$(OS_ARCH)))
++ $(error "make install" is not supported on this platform. Use "make package" instead.)
++endif
++ifeq (bundle,$(MOZ_FS_LAYOUT))
+ $(error "make install" is not supported on this platform. Use "make package" instead.)
+ endif
+ $(NSINSTALL) -D $(DESTDIR)$(installdir)
Added: trunk/dports/devel/xulrunner-devel/files/netwerk-wifi-src-Makefile.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/netwerk-wifi-src-Makefile.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/netwerk-wifi-src-Makefile.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,11 @@
+--- netwerk/wifi/src/Makefile.in.orig 2009-05-08 16:00:28.000000000 -0700
++++ netwerk/wifi/src/Makefile.in 2009-05-08 16:00:48.000000000 -0700
+@@ -57,7 +57,7 @@ CPPSRCS = nsWifiMonitor.cpp \
+ nsWifiAccessPoint.cpp \
+ $(NULL)
+
+-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
++ifeq ($(OS_ARCH),Darwin)
+ CPPSRCS += nsWifiScannerMac.cpp
+ else
+ ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
Added: trunk/dports/devel/xulrunner-devel/files/nsFilePicker.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/nsFilePicker.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/nsFilePicker.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,14 @@
+--- widget/src/gtk2/nsFilePicker.cpp.bak 2009-04-03 18:35:03.000000000 -0700
++++ widget/src/gtk2/nsFilePicker.cpp 2009-04-03 18:38:58.000000000 -0700
+@@ -203,7 +203,11 @@ nsFilePicker::LoadSymbolsGTK24()
+ _gtk_file_chooser_get_filename = (_gtk_file_chooser_get_filename_fn)func;
+ } else {
+ // XXX hmm, this seems to fail when gtk 2.4 is already loaded...
++#ifdef __APPLE__
++ mGTK24 = PR_LoadLibrary("libgtk-x11-2.0.dylib");
++#else
+ mGTK24 = LoadVersionedLibrary("gtk-2", ".4");
++#endif
+ if (!mGTK24) {
+ return NS_ERROR_NOT_AVAILABLE;
+ }
Added: trunk/dports/devel/xulrunner-devel/files/patch-dylib_file.diff
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/patch-dylib_file.diff (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/patch-dylib_file.diff 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,13 @@
+--- config/config.mk 2006-01-06 16:01:22.000000000 -0500
++++ config/config.mk 2007-08-21 13:51:05.000000000 -0400
+@@ -697,6 +697,10 @@
+ else
+ XCODE_PRODUCT_DIR = build
+ endif # HAS_XCODE_2_1=1
++# Tell the Darwin linker how to find shared libraries that are not yet installed.
++ifneq (,$(findstring -lplds4,$(EXTRA_DSO_LDOPTS)))
++EXTRA_DSO_LDOPTS += $(foreach library, $(patsubst -l%, $(LIB_PREFIX)%$(DLL_SUFFIX), $(filter -l%, $(NSPR_LIBS))), -dylib_file @executable_path/$(library):$(DIST)/bin/$(library))
++endif
+ endif # OS_ARCH=Darwin
+
+
Added: trunk/dports/devel/xulrunner-devel/files/patch-pthread.diff
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/patch-pthread.diff (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/patch-pthread.diff 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,11 @@
+--- nsprpub/pr/include/md/_pth.h.orig 2005-07-21 20:22:53.000000000 +0200
++++ nsprpub/pr/include/md/_pth.h 2007-11-05 09:01:53.000000000 +0100
+@@ -98,7 +98,7 @@
+ #else
+ #define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m)))
+ #endif
+-#if defined(DARWIN)
++#if defined(DARWIN) && !defined(__DARWIN_UNIX03)
+ #define _PT_PTHREAD_CONDATTR_INIT(x) 0
+ #else
+ #define _PT_PTHREAD_CONDATTR_INIT pthread_condattr_init
Added: trunk/dports/devel/xulrunner-devel/files/plugins.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/plugins.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/plugins.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,25 @@
+diff --git a/modules/plugin/base/src/nsPluginsDirUnix.cpp b/modules/plugin/base/src/nsPluginsDirUnix.cpp
+--- modules/plugin/base/src/nsPluginsDirUnix.cpp
++++ modules/plugin/base/src/nsPluginsDirUnix.cpp
+@@ -74,16 +74,21 @@
+ #define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".so"
+ #elif defined(_AIX)
+ #define DEFAULT_X11_PATH "/usr/lib"
+ #define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".a"
+ #elif defined(SOLARIS)
+ #define DEFAULT_X11_PATH "/usr/openwin/lib/"
+ #elif defined(LINUX)
+ #define DEFAULT_X11_PATH "/usr/X11R6/lib/"
++#elif defined(__APPLE__)
++#define DEFAULT_X11_PATH "/usr/X11R6/lib"
++#undef LOCAL_PLUGIN_DLL_SUFFIX
++#define LOCAL_PLUGIN_DLL_SUFFIX ".dylib"
++#define LOCAL_PLUGIN_DLL_ALT_SUFFIX ".so"
+ #else
+ #define DEFAULT_X11_PATH ""
+ #endif
+
+ #if defined(MOZ_WIDGET_GTK2)
+
+ #define PLUGIN_MAX_LEN_OF_TMP_ARR 512
+
Added: trunk/dports/devel/xulrunner-devel/files/share-applications-firefox.desktop
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/share-applications-firefox.desktop (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/share-applications-firefox.desktop 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Firefox Web Browser
+Comment=Browse the World Wide Web
+Exec=firefox
+Icon=web-browser.png
+Terminal=false
+Type=Application
+Categories=Application;Network
+StartupNotify=true
Added: trunk/dports/devel/xulrunner-devel/files/sydneyaudio.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/sydneyaudio.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/sydneyaudio.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,13 @@
+--- toolkit/library/Makefile.in.orig 2009-04-04 19:40:25.000000000 -0700
++++ toolkit/library/Makefile.in 2009-04-04 19:47:10.000000000 -0700
+@@ -205,7 +205,10 @@ EXTRA_DSO_LDOPTS += \
+ -lcrypto \
+ $(TK_LIBS) \
+ $(NULL)
++endif
+
++ifeq ($(OS_ARCH),Darwin)
+ ifdef MOZ_SYDNEYAUDIO
+ EXTRA_DSO_LDOPTS += \
++ -framework Carbon \
+ -framework CoreAudio \
Added: trunk/dports/devel/xulrunner-devel/files/system-nss.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/system-nss.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/system-nss.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,11 @@
+--- config/autoconf.mk.in.orig 2009-05-08 15:28:11.000000000 -0700
++++ config/autoconf.mk.in 2009-05-08 15:31:04.000000000 -0700
+@@ -282,7 +282,7 @@ OS_LDFLAGS = @LDFLAGS@
+ OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
+ OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
+
+-OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
++OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
+ OS_LIBS = @LIBS@
+ ACDEFINES = @MOZ_DEFINES@
+
Added: trunk/dports/devel/xulrunner-devel/files/xpcom-Makefile.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/xpcom-Makefile.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/xpcom-Makefile.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,11 @@
+--- xpcom/stub/Makefile.in.orig 2009-03-29 20:11:15.000000000 -0700
++++ xpcom/stub/Makefile.in 2009-03-29 20:11:48.000000000 -0700
+@@ -107,7 +107,7 @@ else
+ DEPENDENT_LIBS_LIST += $(LIB_PREFIX)mozjs$(DLL_SUFFIX)
+ endif
+
+-ifeq (Darwin,$(OS_ARCH))
++ifeq (bundle,$(MOZ_FS_LAYOUT))
+ EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
+ DEPENDENT_LIBS_LIST += XUL
+ else
Added: trunk/dports/devel/xulrunner-devel/files/xulrunner-app-Makefile.patch
===================================================================
--- trunk/dports/devel/xulrunner-devel/files/xulrunner-app-Makefile.patch (rev 0)
+++ trunk/dports/devel/xulrunner-devel/files/xulrunner-app-Makefile.patch 2009-05-11 04:48:33 UTC (rev 50844)
@@ -0,0 +1,48 @@
+--- xulrunner/app/Makefile.in.orig 2009-04-23 18:47:13.000000000 -0700
++++ xulrunner/app/Makefile.in 2009-05-08 15:41:22.000000000 -0700
+@@ -87,12 +87,16 @@ CPPSRCS = nsXULRunnerApp.cpp
+ ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
+ CPPSRCS += nsRegisterGREWin.cpp
+ else
+-ifneq (,$(filter OS2 Darwin,$(OS_ARCH)))
++ifeq (OS2,$(OS_ARCH))
++CPPSRCS += nsRegisterGREVoid.cpp
++else
++ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+ CPPSRCS += nsRegisterGREVoid.cpp
+ else
+ CPPSRCS += nsRegisterGREUnix.cpp
+ endif
+ endif
++endif
+
+ LOCAL_INCLUDES += \
+ -I$(topsrcdir)/toolkit/xre \
+@@ -104,7 +108,7 @@ TK_LIBS := -framework Cocoa $(TK_LIBS)
+ endif
+
+ ifndef MOZ_ENABLE_LIBXUL
+-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
++ifeq (bundle,$(MOZ_FS_LAYOUT))
+ LIBS += $(DIST)/bin/XUL
+ else
+ EXTRA_DSO_LIBS += xul
+@@ -206,8 +210,8 @@ LDFLAGS += /HEAP:0x40000
+ endif
+ endif
+
+-ifneq (,$(filter-out OS2 WINCE WINNT Darwin BeOS,$(OS_ARCH)))
+-
++ifneq (,$(filter-out OS2 WINCE WINNT BeOS,$(OS_ARCH)))
++ifeq (unix, $(MOZ_FS_LAYOUT))
+ xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
+ cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
+ -e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
+@@ -222,6 +226,7 @@ install:: xulrunner
+
+ GARBAGE += xulrunner
+ endif
++endif
+
+ ifneq (,$(filter gtk gtk2,$(MOZ_WIDGET_TOOLKIT)))
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090510/72ded5b2/attachment-0001.html>
More information about the macports-changes
mailing list