[49646] trunk/dports/www/firefox-x11-devel/files

jeremyhu at macports.org jeremyhu at macports.org
Tue Apr 14 03:56:22 PDT 2009 

Revision: 49646
          http://trac.macports.org/changeset/49646
Author:   jeremyhu at macports.org
Date:     2009-04-14 03:56:20 -0700 (Tue, 14 Apr 2009)
Log Message:
-----------
firefox-x11-devel: Updated patches to match upstream... doesn't actually change the build

Modified Paths:
--------------
    trunk/dports/www/firefox-x11-devel/files/configure.patch
    trunk/dports/www/firefox-x11-devel/files/make-install.patch
    trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch
    trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch

Modified: trunk/dports/www/firefox-x11-devel/files/configure.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/configure.patch	2009-04-14 07:58:36 UTC (rev 49645)
+++ trunk/dports/www/firefox-x11-devel/files/configure.patch	2009-04-14 10:56:20 UTC (rev 49646)
@@ -1,18 +1,34 @@
+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
-@@ -1558,21 +1558,21 @@ case "$host" in
-         if test "`${PYTHON} -c 'import sys; print sys.platform;'`" != "cygwin"; then
-             PYTHON="${CYGWIN_WRAPPER} $PYTHON"
-         fi
-         ;;
+@@ -1562,17 +1562,16 @@ case "$host" in
      esac
      ;;
  
  *-darwin*)
--    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
-+    HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX"
-+    HOST_CXXFLAGS="$HOST_CXXFLAGS -DXP_UNIX -DXP_MACOSX"
+     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'
@@ -25,7 +41,7 @@
      HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
      ;;
  
-@@ -1704,25 +1704,24 @@ case "$target" in
+@@ -1704,25 +1703,24 @@ case "$target" in
      esac
      ;;
  
@@ -53,7 +69,26 @@
      MACOSX=1
  
      dnl DTrace and -dead_strip don't interact well. See bug 403132.
-@@ -4754,28 +4753,30 @@ cairo-os2)
+@@ -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)'
      ;;
  
@@ -66,6 +101,7 @@
      else
          MOZ_WIDGET_TOOLKIT=mac
      fi
++    MOZ_FS_LAYOUT="bundle"
      MOZ_GFX_TOOLKIT=cairo
      MOZ_USER_DIR="Mozilla"
      AC_DEFINE(XP_MACOSX)
@@ -73,7 +109,6 @@
      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"
-+    TK_CFLAGS="-DNO_X11"
      CFLAGS="$CFLAGS $TK_CFLAGS"
      CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
 +    LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc'
@@ -85,34 +120,21 @@
  fi
  
  if test "$COMPILE_ENVIRONMENT"; then
-@@ -4790,16 +4791,30 @@ 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 = Filesystem layout choice.  Mainly useful for determining
-+dnl = if we're building on darwin "unix like" or "OSX like"
-+dnl ========================================================
-+
-+MOZILLA_FS_LAYOUT="unix"
-+case "$MOZ_WIDGET_TOOLKIT" in
-+cairo-mac|cairo-cocoa)
-+	MOZILLA_FS_LAYOUT="bundle"
-+	;;
-+esac
-+
-+AC_SUBST(MOZILLA_FS_LAYOUT)
-+
-+dnl ========================================================
  dnl = startup-notification support module
  dnl ========================================================
  
  if test "$MOZ_ENABLE_GTK2"
  then
      MOZ_ENABLE_STARTUP_NOTIFICATION=
- 
-     MOZ_ARG_ENABLE_BOOL(startup-notification,

Modified: trunk/dports/www/firefox-x11-devel/files/make-install.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/make-install.patch	2009-04-14 07:58:36 UTC (rev 49645)
+++ trunk/dports/www/firefox-x11-devel/files/make-install.patch	2009-04-14 10:56:20 UTC (rev 49646)
@@ -8,7 +8,7 @@
 +ifneq (,$(filter WINNT,$(OS_ARCH)))
 +	$(error "make install" is not supported on this platform. Use "make package" instead.)
 +endif
-+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
++ifeq (bundle,$(MOZ_FS_LAYOUT))
  	$(error "make install" is not supported on this platform. Use "make package" instead.)
  endif
  	$(NSINSTALL) -D $(DESTDIR)$(installdir)

Modified: trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch	2009-04-14 07:58:36 UTC (rev 49645)
+++ trunk/dports/www/firefox-x11-devel/files/xpcom-Makefile.patch	2009-04-14 10:56:20 UTC (rev 49646)
@@ -5,7 +5,7 @@
  endif
  
 -ifeq (Darwin,$(OS_ARCH))
-+ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
++ifeq (bundle,$(MOZ_FS_LAYOUT))
  EXTRA_DSO_LDOPTS += $(DIST)/bin/XUL
  DEPENDENT_LIBS_LIST += XUL
  else

Modified: trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch	2009-04-14 07:58:36 UTC (rev 49645)
+++ trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch	2009-04-14 10:56:20 UTC (rev 49646)
@@ -23,7 +23,7 @@
  
  ifndef MOZ_ENABLE_LIBXUL
 -ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
++ifeq (bundle,$(MOZ_FS_LAYOUT))
  LIBS += $(DIST)/bin/XUL
  else
  EXTRA_DSO_LIBS += xul
@@ -34,7 +34,7 @@
 -ifneq (,$(filter-out OS2 WINNT Darwin BeOS,$(OS_ARCH)))
 -
 +ifneq (,$(filter-out OS2 WINNT BeOS,$(OS_ARCH)))
-+ifneq (cocoa, $(MOZ_WIDGET_TOOLKIT))
++ifeq (unix, $(MOZ_FS_LAYOUT))
  xulrunner:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
  	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
                  -e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090414/e37de871/attachment.html>

More information about the macports-changes mailing list