summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorryoon <ryoon@pkgsrc.org>2013-11-03 11:29:34 +0000
committerryoon <ryoon@pkgsrc.org>2013-11-03 11:29:34 +0000
commit469fa76a4b704addd49c16546f09e27f00650199 (patch)
treede3ade295029a26e59a2b2f1b8c3324562249bec
parente3bd31312addf72eff24d060a0968993c8818c34 (diff)
downloadpkgsrc-469fa76a4b704addd49c16546f09e27f00650199.tar.gz
Fix PR pkg/48363
* Remove DragonFly from SkThreadUtils_pthread_linux.cpp condition. DragonFly has no cpuset(3) or CPU_SET(3) macros/functions. It has usched_set(2), but I cannot implement with them. Use SkThreadUtils_pthread_other.cpp instead.
-rw-r--r--www/firefox/distinfo4
-rw-r--r--www/firefox/patches/patch-gfx_skia_moz.build11
2 files changed, 3 insertions, 12 deletions
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 8db23726c1e..38c373a202e 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.118 2013/11/02 22:57:55 ryoon Exp $
+$NetBSD: distinfo,v 1.119 2013/11/03 11:29:34 ryoon Exp $
SHA1 (firefox-25.0.source.tar.bz2) = 854722e283659d2b6b2eacd38f757b3c5b63a448
RMD160 (firefox-25.0.source.tar.bz2) = f320994b6b2f2030b5a68bc28cdd6904d9ef8ce3
@@ -30,7 +30,7 @@ SHA1 (patch-extensions_auth_nsAuthGSSAPI.cpp) = 548886fc4a86a988f3f91650061ddc04
SHA1 (patch-extensions_spellcheck_hunspell_src_mozHunspell.cpp) = 1f841becb14483909e05f179f4dce53a7d5b1bd1
SHA1 (patch-gfx__skia__include__core__SkPreConfig.h) = 6f99cf0eb5d4617d529c378707f537bc1e5cb28f
SHA1 (patch-gfx_graphite2_src_Bidi.cpp) = 5e80b4a32a47ae44d237fec69ea87bdd612a76ce
-SHA1 (patch-gfx_skia_moz.build) = e01cd36a98155548b811b08f82a3dc504f634644
+SHA1 (patch-gfx_skia_moz.build) = 72a4c39ce367ed25cbfef17283e87db10142163e
SHA1 (patch-gfx_skia_src_utils_SkThreadUtils__pthread__linux.cpp) = 40da83981e1249ea28241b745e71fa047200ce9f
SHA1 (patch-image_decoders_nsJPEGDecoder.cpp) = e5df11499b1ec14e1d4c9a1408c0611d1c4e0574
SHA1 (patch-intl_hyphenation_src_hnjalloc.h) = 7fcc7b0fcf5a33486214197e925fbc8e6e22e2ee
diff --git a/www/firefox/patches/patch-gfx_skia_moz.build b/www/firefox/patches/patch-gfx_skia_moz.build
index 1553604b56a..033141aa2de 100644
--- a/www/firefox/patches/patch-gfx_skia_moz.build
+++ b/www/firefox/patches/patch-gfx_skia_moz.build
@@ -1,16 +1,7 @@
-$NetBSD: patch-gfx_skia_moz.build,v 1.2 2013/11/02 22:57:55 ryoon Exp $
+$NetBSD: patch-gfx_skia_moz.build,v 1.3 2013/11/03 11:29:34 ryoon Exp $
--- gfx/skia/moz.build.orig 2013-10-25 22:27:18.000000000 +0000
+++ gfx/skia/moz.build
-@@ -183,7 +183,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gt
- 'SkTime_Unix.cpp',
- 'SkOSFile.cpp',
- ]
-- if CONFIG['OS_TARGET'] in ('Linux', 'FreeBSD', 'NetBSD'):
-+ if CONFIG['OS_TARGET'] in ('Linux', 'FreeBSD', 'NetBSD', 'DragonFly'):
- CPP_SOURCES += [
- 'SkThreadUtils_pthread_linux.cpp',
- ]
@@ -197,7 +197,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt
'SkFontHost_FreeType_common.cpp',
'SkOSFile.cpp',