Changeset 50766


Ignore:
Timestamp:
May 8, 2009, 11:57:23 PM (8 years ago)
Author:
jeremyhu@…
Message:

firefox-x11-devel: Version bump to 3.5b4 - remove integrated patch, and add a new one...

Location:
trunk/dports/www/firefox-x11-devel
Files:
1 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/www/firefox-x11-devel/Portfile

    r50572 r50766  
    66name            firefox-x11-devel
    77categories      www x11
    8 version         3.1b3
    9 revision        2
     8version         3.5b4
     9revision        0
    1010platforms       darwin
    1111maintainers     jeremyhu openmaintainer
     
    2929use_bzip2       yes
    3030
    31 checksums           md5     61cd1a7fc587f6d2a33c564033198e2c \
    32                     sha1    19bcce6ed27c7db3aed339be9d5352113cb81ee1 \
    33                     rmd160  78dce5b94c9b86fc488f6f458907c0131a62fbe5
     31checksums           md5     ff6bf463300cb56bcf750973b2af3d80 \
     32                    sha1    33bb5b254c3a772d9195c5128a2c569a9cbb8ccd \
     33                    rmd160  d28d545f533f0f3b6b7e6e09813768b2996b3d76
    3434
    3535worksrcdir      mozilla-1.9.1
     
    4646        port:esound \
    4747        port:libcanberra
    48 
    49 #       port:nss \
    50 #       port:nspr
    51 #       port:xulrunner can replace nss and nspr once it's used to build firefox
     48#       port:xulrunner-devel
    5249
    5350use_autoconf yes
     
    109106#       --with-system-nss \
    110107#       --with-nss-prefix=${prefix} \
    111 #       --with-libxul-sdk=${prefix}/lib/xulrunner
     108#       --with-libxul-sdk=${prefix}/lib/xulrunner-devel
    112109
    113110variant debug description {build with debugging symbols} {
     
    158155# #486036 (make-install, in mozilla-1.9.2)
    159156# #485863 (icon-Makefile, in mozilla-1.9.2)
    160 # #478871 (gfxPangoFonts)
    161 # NOTFILED (nsFilePicker)
     157# #492119 (nsFilePicker)
    162158# #486892 (plugins, in mozilla-1.9.2)
    163159# #486890 (sydneyaudio, 3.1b3 and later, in mozilla-1.9.2)
    164 # #487367 (browser-xulrunner-stub)
     160# #487367 (browser-xulrunner-stub, in mozilla-1.9.2)
    165161# #484457 (gdk-Status, in mozilla-1.9.2)
    166 # Previous firefox-x11 port (patch-dylib_file.diff patch-pthread.diff)
    167 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
     162# #487371 (xulrunner-app-Makefile, in mozilla-1.9.2)
     163# #492117 (patch-pthread)
     164# #492138 (netwerk-wifi-src-Makefile)
     165# Previous firefox-x11 port, not sure if still needed, but safe to keep: patch-dylib_file.diff
     166patchfiles 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
    168167
    169168post-patch {
  • trunk/dports/www/firefox-x11-devel/files/system-nss.patch

    r49179 r50766  
    1 https://bugzilla.mozilla.org/show_bug.cgi?id=485862
    2 
    3 --- config/autoconf.mk.in.orig  2009-03-29 22:07:24.000000000 -0700
    4 +++ config/autoconf.mk.in       2009-03-29 22:07:54.000000000 -0700
    5 @@ -278,7 +278,7 @@ OS_LDFLAGS  = @LDFLAGS@
     1--- config/autoconf.mk.in.orig  2009-05-08 15:28:11.000000000 -0700
     2+++ config/autoconf.mk.in       2009-05-08 15:31:04.000000000 -0700
     3@@ -282,7 +282,7 @@ OS_LDFLAGS  = @LDFLAGS@
    64 OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@
    75 OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@
    86 
    9 -OS_INCLUDES    = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
    10 +OS_INCLUDES    = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS)
     7-OS_INCLUDES    = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
     8+OS_INCLUDES    = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS)
    119 OS_LIBS                = @LIBS@
    1210 ACDEFINES      = @MOZ_DEFINES@
  • trunk/dports/www/firefox-x11-devel/files/xulrunner-app-Makefile.patch

    r49646 r50766  
    1 --- xulrunner/app/Makefile.in.orig      2009-04-07 22:17:16.000000000 -0700
    2 +++ xulrunner/app/Makefile.in   2009-04-07 22:22:16.000000000 -0700
     1--- xulrunner/app/Makefile.in.orig      2009-04-23 18:47:13.000000000 -0700
     2+++ xulrunner/app/Makefile.in   2009-05-08 15:41:22.000000000 -0700
    33@@ -87,12 +87,16 @@ CPPSRCS = nsXULRunnerApp.cpp
    4  ifeq ($(OS_ARCH),WINNT)
     4 ifneq (,$(filter WINNT WINCE,$(OS_ARCH)))
    55 CPPSRCS += nsRegisterGREWin.cpp
    66 else
     
    2828 else
    2929 EXTRA_DSO_LIBS += xul
    30 @@ -202,8 +206,8 @@ LDFLAGS += /HEAP:0x40000
     30@@ -206,8 +210,8 @@ LDFLAGS += /HEAP:0x40000
    3131 endif
    3232 endif
    3333 
    34 -ifneq (,$(filter-out OS2 WINNT Darwin BeOS,$(OS_ARCH)))
     34-ifneq (,$(filter-out OS2 WINCE WINNT Darwin BeOS,$(OS_ARCH)))
    3535-
    36 +ifneq (,$(filter-out OS2 WINNT BeOS,$(OS_ARCH)))
     36+ifneq (,$(filter-out OS2 WINCE WINNT BeOS,$(OS_ARCH)))
    3737+ifeq (unix, $(MOZ_FS_LAYOUT))
    38  xulrunner:: mozilla.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
    39         cat $< | sed -e "s|%MOZAPPDIR%|$(mozappdir)|" \
     38 xulrunner:: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS)
     39        cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \
    4040                 -e "s|%MOZ_USER_DIR%|.mozilla/xulrunner|" \
    41 @@ -218,6 +222,7 @@ install:: xulrunner
     41@@ -222,6 +226,7 @@ install:: xulrunner
    4242 
    4343 GARBAGE += xulrunner
Note: See TracChangeset for help on using the changeset viewer.