diff options
| author | wiz <wiz@pkgsrc.org> | 2019-06-01 15:01:39 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2019-06-01 15:01:39 +0000 |
| commit | ccc9dd0978e8f66e7a1dfd04b1bb028533cfd611 (patch) | |
| tree | 85d26a5b210cc806060780647cca0309d1f7dc9d /www | |
| parent | 7c2935bb59a228ff020466da4bb3fc94d6a1c909 (diff) | |
| download | pkgsrc-ccc9dd0978e8f66e7a1dfd04b1bb028533cfd611.tar.gz | |
firefox60: update to 60.7.0nb2.
NetBSD doesn't ship libGL.so.1 due to a major bump. Look for the unversioned
name.
Based on maya's patch for www/firefox.
Diffstat (limited to 'www')
| -rw-r--r-- | www/firefox60/Makefile | 4 | ||||
| -rw-r--r-- | www/firefox60/distinfo | 3 | ||||
| -rw-r--r-- | www/firefox60/patches/patch-gfx_gl_GLContextProviderGLX.cpp | 16 |
3 files changed, 20 insertions, 3 deletions
diff --git a/www/firefox60/Makefile b/www/firefox60/Makefile index a2aacfd73d9..b2b9fd3bd06 100644 --- a/www/firefox60/Makefile +++ b/www/firefox60/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2019/05/29 12:31:33 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2019/06/01 15:01:39 wiz Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 60.7 @@ -6,7 +6,7 @@ MOZ_BRANCH_MINOR= .0esr DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= www MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.xz diff --git a/www/firefox60/distinfo b/www/firefox60/distinfo index a6aebb049ae..6c515d99175 100644 --- a/www/firefox60/distinfo +++ b/www/firefox60/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2019/05/29 12:31:33 wiz Exp $ +$NetBSD: distinfo,v 1.14 2019/06/01 15:01:39 wiz Exp $ SHA1 (firefox-60.7.0esr.source.tar.xz) = 733187de6b20f8902fa207f08ec85f952a2c2e40 RMD160 (firefox-60.7.0esr.source.tar.xz) = 21176def2d22c83042d36844c5d148d324199ac6 @@ -10,6 +10,7 @@ SHA1 (patch-build_moz.configure_old.configure) = 1df6867eaf73a350fbe8fcd5bd34e1f SHA1 (patch-build_moz.configure_rust.configure) = 2818454ba4df3cbd85174edc4828206b3bf0a82b SHA1 (patch-dom_media_CubebUtils.cpp) = 76fc35167e603f96450f4bc17cd0d76157a22dd3 SHA1 (patch-gfx_angle_checkout_src_common_third__party_smhasher_src_PMurHash.cpp) = f1d0adae2873545818072adb4e8599267bc4e6c5 +SHA1 (patch-gfx_gl_GLContextProviderGLX.cpp) = 28c033037ac30636acdc7dd8f6637d5446ff25f7 SHA1 (patch-gfx_webrender_src_query.rs) = 6434b0fc1d6441ddb555a2a3b199564b488ec336 SHA1 (patch-ipc_chromium_src_base_lock__impl__posix.cc) = 16e37fe54ba1d8d233f6b04dbd06e248305d7f6e SHA1 (patch-ipc_chromium_src_base_message__pump__libevent.cc) = cdb159f0ede970b150eca4cc5e0d1b2cf4e414b2 diff --git a/www/firefox60/patches/patch-gfx_gl_GLContextProviderGLX.cpp b/www/firefox60/patches/patch-gfx_gl_GLContextProviderGLX.cpp new file mode 100644 index 00000000000..8e518689b42 --- /dev/null +++ b/www/firefox60/patches/patch-gfx_gl_GLContextProviderGLX.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-gfx_gl_GLContextProviderGLX.cpp,v 1.1 2019/06/01 15:01:39 wiz Exp $ + +NetBSD doesn't ship libGL.so.1 due to a major bump. Look for the unversioned +name. + +--- gfx/gl/GLContextProviderGLX.cpp.orig 2019-05-14 19:13:16.000000000 +0000 ++++ gfx/gl/GLContextProviderGLX.cpp +@@ -80,7 +80,7 @@ bool GLXLibrary::EnsureInitialized() { + // implementation requires an executable stack, which causes mprotect calls, + // which trigger glibc bug + // http://sourceware.org/bugzilla/show_bug.cgi?id=12225 +-#ifdef __OpenBSD__ ++#if defined(__OpenBSD__) || defined(__NetBSD__) + libGLfilename = "libGL.so"; + #else + libGLfilename = "libGL.so.1"; |