summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/files/patch-bugzilla-65993235
-rw-r--r--www/firefox/files/patch-config_config.mk10
-rw-r--r--www/firefox/files/patch-config_mkdepend_Makefile.in10
-rw-r--r--www/firefox/files/patch-ipc-chromium-src-base-dir_reader_linux.h45
-rw-r--r--www/firefox/files/patch-ipc-chromium-src-base-file_util.h13
-rw-r--r--www/firefox/files/patch-js-src-config-mkdepend_Makefile.in9
8 files changed, 71 insertions, 59 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 7206909fca52..c7501ec59f9f 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= firefox
-DISTVERSION= 8.0
+DISTVERSION= 9.0.1
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= ${MASTER_SITE_MOZILLA}
@@ -118,6 +118,8 @@ post-patch:
${WRKSRC}/security/manager/ssl/src/Makefile.in \
${WRKSRC}/js/src/config/mkdepend/Makefile.in \
${WRKSRC}/js/src/config/config.mk \
+ ${WRKSRC}/config/mkdepend/Makefile.in \
+ ${WRKSRC}/config/config.mk \
${WRKSRC}/xpcom/io/nsAppFileLocationProvider.cpp
@${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \
s|-lpthread|${PTHREAD_LIBS}|g ; \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index ded9fdbb205e..a0b633a00849 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (firefox-8.0.source.tar.bz2) = d950324ecd5362a648a891a66c3f2dde5e69b09f30ef8470b7759ec007691139
-SIZE (firefox-8.0.source.tar.bz2) = 70377448
+SHA256 (firefox-9.0.1.source.tar.bz2) = f852011c28b00b26803b4618b52de79c705204b2f4eadba08092a379f94babae
+SIZE (firefox-9.0.1.source.tar.bz2) = 74191266
diff --git a/www/firefox/files/patch-bugzilla-659932 b/www/firefox/files/patch-bugzilla-659932
deleted file mode 100644
index d0698cb253c5..000000000000
--- a/www/firefox/files/patch-bugzilla-659932
+++ /dev/null
@@ -1,35 +0,0 @@
---- toolkit/xre/glxtest.cpp.orig 2011-08-11 17:41:31.000000000 -0400
-+++ toolkit/xre/glxtest.cpp 2011-08-23 15:09:48.000000000 -0400
-@@ -114,6 +114,9 @@
- typedef GLXFBConfig* (* PFNGLXQUERYEXTENSION) (Display *, int *, int *);
- PFNGLXQUERYEXTENSION glXQueryExtension = cast<PFNGLXQUERYEXTENSION>(dlsym(libgl, "glXQueryExtension"));
-
-+ typedef GLXFBConfig* (* PFNGLXQUERYVERSION) (Display *, int *, int *);
-+ PFNGLXQUERYVERSION glXQueryVersion = cast<PFNGLXQUERYVERSION>(dlsym(libgl, "glXQueryVersion"));
-+
- typedef GLXFBConfig* (* PFNGLXCHOOSEFBCONFIG) (Display *, int, const int *, int *);
- PFNGLXCHOOSEFBCONFIG glXChooseFBConfig = cast<PFNGLXCHOOSEFBCONFIG>(dlsym(libgl, "glXChooseFBConfig"));
-
-@@ -139,6 +142,7 @@
- PFNGLGETSTRING glGetString = cast<PFNGLGETSTRING>(dlsym(libgl, "glGetString"));
-
- if (!glXQueryExtension ||
-+ !glXQueryVersion ||
- !glXChooseFBConfig ||
- !glXGetVisualFromFBConfig ||
- !glXCreatePixmap ||
-@@ -158,6 +162,14 @@
- ///// Check that the GLX extension is present /////
- if (!glXQueryExtension(dpy, NULL, NULL))
- fatal_error("GLX extension missing");
-+
-+ ///// Check that the GLX version is >= 1.3, needed for glXCreatePixmap, bug 659932 /////
-+ int majorVersion, minorVersion;
-+ if (!glXQueryVersion(dpy, &majorVersion, &minorVersion))
-+ fatal_error("Unable to query GLX version");
-+
-+ if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3))
-+ fatal_error("GLX version older than the required 1.3");
-
- XSetErrorHandler(x_error_handler);
-
diff --git a/www/firefox/files/patch-config_config.mk b/www/firefox/files/patch-config_config.mk
new file mode 100644
index 000000000000..bea88f7f78e4
--- /dev/null
+++ b/www/firefox/files/patch-config_config.mk
@@ -0,0 +1,10 @@
+--- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200
++++ config/config.mk 2009-08-09 20:50:05.000000000 +0200
+@@ -506,6 +506,7 @@
+ -I$(srcdir) \
+ -I. \
+ -I$(DIST)/include -I$(DIST)/include/nsprpub \
++ -I%%LOCALBASE%%/include \
+ $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \
+ $(OS_INCLUDES) \
+ $(NULL)
diff --git a/www/firefox/files/patch-config_mkdepend_Makefile.in b/www/firefox/files/patch-config_mkdepend_Makefile.in
index 5f341b26d09c..65687c7c5feb 100644
--- a/www/firefox/files/patch-config_mkdepend_Makefile.in
+++ b/www/firefox/files/patch-config_mkdepend_Makefile.in
@@ -1,9 +1,11 @@
---- config/mkdepend/Makefile.in.orig 2009-04-28 08:07:48.532396203 +0000
-+++ config/mkdepend/Makefile.in 2009-04-28 08:08:07.342398592 +0000
-@@ -73,6 +73,7 @@
+--- config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100
++++ config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100
+@@ -71,7 +71,8 @@
+
include $(topsrcdir)/config/rules.mk
- HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
+-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
+HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
diff --git a/www/firefox/files/patch-ipc-chromium-src-base-dir_reader_linux.h b/www/firefox/files/patch-ipc-chromium-src-base-dir_reader_linux.h
new file mode 100644
index 000000000000..36749ba8abc4
--- /dev/null
+++ b/www/firefox/files/patch-ipc-chromium-src-base-dir_reader_linux.h
@@ -0,0 +1,45 @@
+--- ipc/chromium/src/base/dir_reader_linux.h.orig 2011-12-16 21:29:22.000000000 +0100
++++ ipc/chromium/src/base/dir_reader_linux.h 2011-12-19 21:00:27.000000000 +0100
+@@ -9,6 +9,7 @@
+ #include <errno.h>
+ #include <fcntl.h>
+ #include <stdint.h>
++#include <sys/dirent.h>
+ #include <sys/syscall.h>
+ #include <unistd.h>
+
+@@ -19,6 +20,8 @@
+
+ namespace base {
+
++#define linux_dirent struct dirent
++#if 0
+ struct linux_dirent {
+ uint64_t d_ino;
+ int64_t d_off;
+@@ -26,11 +29,16 @@
+ unsigned char d_type;
+ char d_name[0];
+ };
++#endif
+
+ class DirReaderLinux {
+ public:
+ explicit DirReaderLinux(const char* directory_path)
++#ifdef O_DIRECTORY
+ : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)),
++#else
++ : fd_(open(directory_path, O_RDONLY)),
++#endif
+ offset_(0),
+ size_(0) {
+ memset(buf_, 0, sizeof(buf_));
+@@ -57,7 +65,7 @@
+ if (offset_ != size_)
+ return true;
+
+- const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
++ const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_));
+ if (r == 0)
+ return false;
+ if (r == -1) {
diff --git a/www/firefox/files/patch-ipc-chromium-src-base-file_util.h b/www/firefox/files/patch-ipc-chromium-src-base-file_util.h
deleted file mode 100644
index 474da02969de..000000000000
--- a/www/firefox/files/patch-ipc-chromium-src-base-file_util.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ipc/chromium/src/base/file_util.h~
-+++ ipc/chromium/src/base/file_util.h
-@@ -15,8 +15,9 @@
- #elif defined(ANDROID)
- #include <sys/stat.h>
- #elif defined(OS_POSIX)
-+#include <sys/types.h>
-+#include <sys/stat.h>
- #include <fts.h>
--#include <sys/stat.h>
- #endif
-
- #include <stdio.h>
diff --git a/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in b/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in
index 6c25c71ce6c6..fa2cc6012a3a 100644
--- a/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in
+++ b/www/firefox/files/patch-js-src-config-mkdepend_Makefile.in
@@ -1,11 +1,12 @@
---- js/src/config/mkdepend/Makefile.in.orig 2009-04-28 08:17:55.069074748 +0000
-+++ js/src/config/mkdepend/Makefile.in 2009-04-28 08:18:44.897081100 +0000
-@@ -72,7 +72,7 @@
+--- js/src/config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100
++++ js/src/config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100
+@@ -71,7 +71,8 @@
include $(topsrcdir)/config/rules.mk
-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\"
-+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include
++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include
++HOST_CFLAGS += $(XCFLAGS)
ifdef GNU_CC
_GCCDIR = $(shell $(CC) -print-file-name=include)
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-07 01:42:21 +0000