[50766] trunk/dports/www/firefox-x11-devel

jeremyhu at macports.org jeremyhu at macports.org
Fri May 8 16:57:24 PDT 2009 

Revision: 50766
          http://trac.macports.org/changeset/50766
Author:   jeremyhu at macports.org
Date:     2009-05-08 16:57:23 -0700 (Fri, 08 May 2009)
Log Message:
-----------
firefox-x11-devel: Version bump to 3.5b4 - remove integrated patch, and add a new one...

Modified Paths:
--------------
    trunk/dports/www/firefox-x11-devel/Portfile
    trunk/dports/www/firefox-x11-devel/files/system-nss.patch
    trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch

Added Paths:
-----------
    trunk/dports/www/firefox-x11-devel/files/netwerk-wifi-src-Makefile.patch

Removed Paths:
-------------
    trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch

Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile	2009-05-08 23:53:11 UTC (rev 50765)
+++ trunk/dports/www/firefox-x11-devel/Portfile	2009-05-08 23:57:23 UTC (rev 50766)
@@ -5,8 +5,8 @@
 
 name            firefox-x11-devel
 categories      www x11
-version         3.1b3
-revision        2
+version         3.5b4
+revision        0
 platforms       darwin
 maintainers     jeremyhu openmaintainer
 description     Mozilla.org's popular stand-alone web browser, Beta and Release Candidates
@@ -28,9 +28,9 @@
 distname        firefox-${version}-source
 use_bzip2       yes
 
-checksums           md5     61cd1a7fc587f6d2a33c564033198e2c \
-                    sha1    19bcce6ed27c7db3aed339be9d5352113cb81ee1 \
-                    rmd160  78dce5b94c9b86fc488f6f458907c0131a62fbe5
+checksums           md5     ff6bf463300cb56bcf750973b2af3d80 \
+                    sha1    33bb5b254c3a772d9195c5128a2c569a9cbb8ccd \
+                    rmd160  d28d545f533f0f3b6b7e6e09813768b2996b3d76
 
 worksrcdir      mozilla-1.9.1
 
@@ -45,11 +45,8 @@
 	port:gconf \
 	port:esound \
 	port:libcanberra
+#	port:xulrunner-devel
 
-#	port:nss \
-#	port:nspr
-#	port:xulrunner can replace nss and nspr once it's used to build firefox
-
 use_autoconf yes
 autoconf.cmd autoconf213
 
@@ -108,7 +105,7 @@
 #	--with-nspr-prefix=${prefix} \
 #	--with-system-nss \
 #	--with-nss-prefix=${prefix} \
-#	--with-libxul-sdk=${prefix}/lib/xulrunner
+#	--with-libxul-sdk=${prefix}/lib/xulrunner-devel
 
 variant debug description {build with debugging symbols} {
     configure.args-delete   --disable-debug \
@@ -157,14 +154,16 @@
 # #485862 (system-nss, in mozilla-1.9.2)
 # #486036 (make-install, in mozilla-1.9.2)
 # #485863 (icon-Makefile, in mozilla-1.9.2)
-# #478871 (gfxPangoFonts)
-# NOTFILED (nsFilePicker)
+# #492119 (nsFilePicker)
 # #486892 (plugins, in mozilla-1.9.2)
 # #486890 (sydneyaudio, 3.1b3 and later, in mozilla-1.9.2)
-# #487367 (browser-xulrunner-stub)
+# #487367 (browser-xulrunner-stub, in mozilla-1.9.2)
 # #484457 (gdk-Status, in mozilla-1.9.2)
-# Previous firefox-x11 port (patch-dylib_file.diff patch-pthread.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 gfxPangoFonts.patch sydneyaudio.patch browser-xulrunner-stub.patch gdk-Status.patch
+# #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

Deleted: trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch	2009-05-08 23:53:11 UTC (rev 50765)
+++ trunk/dports/www/firefox-x11-devel/files/gfxPangoFonts.patch	2009-05-08 23:57:23 UTC (rev 50766)
@@ -1,31 +0,0 @@
-diff --git a/gfx/thebes/src/gfxPangoFonts.cpp b/gfx/thebes/src/gfxPangoFonts.cpp
---- gfx/thebes/src/gfxPangoFonts.cpp
-+++ gfx/thebes/src/gfxPangoFonts.cpp
-@@ -1838,8 +1838,25 @@
- 
-     // context_substitute and get_font are not likely to be used but
-     //   implemented because the class makes them available.
--    fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
--    fcfontmap_class->create_font = gfx_pango_font_map_create_font;
-+    if (pango_version() < PANGO_VERSION_ENCODE(1,23,0)) {
-+        // Since gfx has the implementation of fontmap->get_resolution,
-+        // fontset->get_font and fontset->foreach, these callback
-+        // aren't necesscarry if pango >= 1.23
-+#if PANGO_VERSION_CHECK(1,23,0)
-+        // From 1.23, these callback defines are changed.
-+        // fontset_key_subtitute (from 1.23) and context_substitue (until 1.22)
-+        // is same offset
-+        fcfontmap_class->fontset_key_substitute =
-+            (void (*)(PangoFcFontMap*, PangoFcFontsetKey*, FcPattern*))
-+                gfx_pango_font_map_context_substitute;
-+        fcfontmap_class->create_font = 
-+            (PangoFcFont* (*)(PangoFcFontMap*, PangoFcFontKey*))
-+                gfx_pango_font_map_create_font;
-+#else
-+        fcfontmap_class->context_substitute = gfx_pango_font_map_context_substitute;
-+        fcfontmap_class->create_font = gfx_pango_font_map_create_font;
-+#endif
-+    }
- }
- 
- /**

Added: trunk/dports/www/firefox-x11-devel/files/netwerk-wifi-src-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/netwerk-wifi-src-Makefile.patch	                        (rev 0)
+++ trunk/dports/www/firefox-x11-devel/files/netwerk-wifi-src-Makefile.patch	2009-05-08 23:57:23 UTC (rev 50766)
@@ -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)

Modified: trunk/dports/www/firefox-x11-devel/files/system-nss.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/system-nss.patch	2009-05-08 23:53:11 UTC (rev 50765)
+++ trunk/dports/www/firefox-x11-devel/files/system-nss.patch	2009-05-08 23:57:23 UTC (rev 50766)
@@ -1,13 +1,11 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=485862
-
---- config/autoconf.mk.in.orig	2009-03-29 22:07:24.000000000 -0700
-+++ config/autoconf.mk.in	2009-03-29 22:07:54.000000000 -0700
-@@ -278,7 +278,7 @@ OS_LDFLAGS	= @LDFLAGS@
+--- 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) $(LCMS_CFLAGS)
-+OS_INCLUDES	= $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
+-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@
  

Modified: trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch
===================================================================
--- trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch	2009-05-08 23:53:11 UTC (rev 50765)
+++ trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch	2009-05-08 23:57:23 UTC (rev 50766)
@@ -1,7 +1,7 @@
---- xulrunner/app/Makefile.in.orig	2009-04-07 22:17:16.000000000 -0700
-+++ xulrunner/app/Makefile.in	2009-04-07 22:22:16.000000000 -0700
+--- 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
- ifeq ($(OS_ARCH),WINNT)
+ ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
  CPPSRCS += nsRegisterGREWin.cpp
  else
 -ifneq (,$(filter OS2 Darwin,$(OS_ARCH)))
@@ -27,18 +27,18 @@
  LIBS += $(DIST)/bin/XUL
  else
  EXTRA_DSO_LIBS += xul
-@@ -202,8 +206,8 @@ LDFLAGS += /HEAP:0x40000
+@@ -206,8 +210,8 @@ LDFLAGS += /HEAP:0x40000
  endif
  endif
  
--ifneq (,$(filter-out OS2 WINNT Darwin BeOS,$(OS_ARCH)))
+-ifneq (,$(filter-out OS2 WINCE WINNT Darwin BeOS,$(OS_ARCH)))
 -
-+ifneq (,$(filter-out OS2 WINNT BeOS,$(OS_ARCH)))
++ifneq (,$(filter-out OS2 WINCE WINNT BeOS,$(OS_ARCH)))
 +ifeq (unix, $(MOZ_FS_LAYOUT))
- xulrunner:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
- 	cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
+ xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
+ 	cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
                  -e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
-@@ -218,6 +222,7 @@ install:: xulrunner
+@@ -222,6 +226,7 @@ install:: xulrunner
  
  GARBAGE += xulrunner
  endif
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090508/fcbbcf6b/attachment.html>

More information about the macports-changes mailing list