Thu Mar 29 10:19:31 2018 UTC ()
thunderbird: fix SUBST* and patch so it actually does something.


(wiz)
diff -r1.207 -r1.208 pkgsrc/mail/thunderbird/Makefile
diff -r1.198 -r1.199 pkgsrc/mail/thunderbird/distinfo
diff -r1.2 -r1.3 pkgsrc/mail/thunderbird/patches/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp
cvs diff -r1.207 -r1.208 pkgsrc/mail/thunderbird/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/Makefile 2018/03/28 20:13:55 1.207
+++ pkgsrc/mail/thunderbird/Makefile 2018/03/29 10:19:30 1.208
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.207 2018/03/28 20:13:55 wiz Exp $ 1# $NetBSD: Makefile,v 1.208 2018/03/29 10:19:30 wiz Exp $
2 2
3DISTNAME= thunderbird-${TB_VER}.source 3DISTNAME= thunderbird-${TB_VER}.source
4PKGNAME= thunderbird-${TB_VER} 4PKGNAME= thunderbird-${TB_VER}
5TB_VER= 52.7.0 5TB_VER= 52.7.0
6CATEGORIES= mail 6CATEGORIES= mail
7MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/} 7MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${TB_VER}/source/}
8EXTRACT_SUFX= .tar.xz 8EXTRACT_SUFX= .tar.xz
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.mozillamessaging.com/en-US/thunderbird/ 11HOMEPAGE= https://www.mozillamessaging.com/en-US/thunderbird/
12COMMENT= Organize, secure and customize your mail 12COMMENT= Organize, secure and customize your mail
13 13
14USE_TOOLS+= unzip pax 14USE_TOOLS+= unzip pax
@@ -32,27 +32,27 @@ ALL_ENV+= MOZILLA_PKG_NAME=thunderbird @@ -32,27 +32,27 @@ ALL_ENV+= MOZILLA_PKG_NAME=thunderbird
32 32
33#SUBST_CLASSES+= ext-compat 33#SUBST_CLASSES+= ext-compat
34#SUBST_STAGE.ext-compat= pre-configure 34#SUBST_STAGE.ext-compat= pre-configure
35#SUBST_MESSAGE.ext-compat= Fixing extension compatibility 35#SUBST_MESSAGE.ext-compat= Fixing extension compatibility
36#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf 36#SUBST_FILES.ext-compat= mailnews/extensions/enigmail/package/install.rdf
37#SUBST_FILES.ext-compat+= calendar/*/install.rdf 37#SUBST_FILES.ext-compat+= calendar/*/install.rdf
38#SUBST_FILES.ext-compat+= calendar/*/*/install.rdf 38#SUBST_FILES.ext-compat+= calendar/*/*/install.rdf
39#SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g' 39#SUBST_SED.ext-compat= -e 's,\(<em:maxVersion>\).*<,\19.0<,g'
40 40
41SUBST_CLASSES+= sys-dic 41SUBST_CLASSES+= sys-dic
42SUBST_STAGE.sys-dic= pre-configure 42SUBST_STAGE.sys-dic= pre-configure
43SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries. 43SUBST_MESSAGE.sys-dic= Reference to system hunspell dictionaries.
44SUBST_FILES.sys-dic= mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp 44SUBST_FILES.sys-dic= mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp
45SUBST_VARS.sys-dic= PREFIX 45SUBST_VARS.sys-dic= LOCALBASE
46 46
47CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/header.py 47CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/header.py
48CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/typelib.py 48CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/typelib.py
49CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/xpidl.py 49CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/xpidl.py
50CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/xpt.py 50CHECK_INTERPRETER_SKIP+=lib/thunderbird-sdk/sdk/bin/xpt.py
51 51
52CHECK_WRKREF_SKIP+=lib/thunderbird/chrome/toolkit/content/global/buildconfig.html 52CHECK_WRKREF_SKIP+=lib/thunderbird/chrome/toolkit/content/global/buildconfig.html
53 53
54post-extract: 54post-extract:
55 mv ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.s \ 55 mv ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.s \
56 ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.S 56 ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.S
57 57
58pre-configure: 58pre-configure:
cvs diff -r1.198 -r1.199 pkgsrc/mail/thunderbird/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/distinfo 2018/03/28 13:34:19 1.198
+++ pkgsrc/mail/thunderbird/distinfo 2018/03/29 10:19:30 1.199
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.198 2018/03/28 13:34:19 ryoon Exp $ 1$NetBSD: distinfo,v 1.199 2018/03/29 10:19:30 wiz Exp $
2 2
3SHA1 (thunderbird-52.7.0.source.tar.xz) = 9030278d1fb4cd28a3a5e8830cfb98a8f0d45523 3SHA1 (thunderbird-52.7.0.source.tar.xz) = 9030278d1fb4cd28a3a5e8830cfb98a8f0d45523
4RMD160 (thunderbird-52.7.0.source.tar.xz) = 5a10590da00d39da4cc3849d33f68fafc136f505 4RMD160 (thunderbird-52.7.0.source.tar.xz) = 5a10590da00d39da4cc3849d33f68fafc136f505
5SHA512 (thunderbird-52.7.0.source.tar.xz) = 875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21 5SHA512 (thunderbird-52.7.0.source.tar.xz) = 875ad6f2b030c65d248ecec4f4a5b51767c3ee7944ac72893237efd2af50145ec2e4a9efa8d60807b78bcfb8189969e5a67d15124710e8b0091f639cddfbfe21
6Size (thunderbird-52.7.0.source.tar.xz) = 230410444 bytes 6Size (thunderbird-52.7.0.source.tar.xz) = 230410444 bytes
7SHA1 (patch-calendar_lightning_Makefile.in) = 02a1528f2da82f1d4ff4931a7d7dc8227b7fa9f2 7SHA1 (patch-calendar_lightning_Makefile.in) = 02a1528f2da82f1d4ff4931a7d7dc8227b7fa9f2
8SHA1 (patch-calendar_lightning_build_universal.mk) = 86dc2c6b4f9feb835570111078aa5d08a389d0da 8SHA1 (patch-calendar_lightning_build_universal.mk) = 86dc2c6b4f9feb835570111078aa5d08a389d0da
9SHA1 (patch-calendar_providers_gdata_Makefile.in) = 0e90ddc9aecc817b0b150bbc37d23ddec97b093e 9SHA1 (patch-calendar_providers_gdata_Makefile.in) = 0e90ddc9aecc817b0b150bbc37d23ddec97b093e
10SHA1 (patch-ldap_c-sdk_include_portable.h) = 7b36594a98beb5af9f82810a052ad2d4706ac968 10SHA1 (patch-ldap_c-sdk_include_portable.h) = 7b36594a98beb5af9f82810a052ad2d4706ac968
11SHA1 (patch-mail_app_nsMailApp.cpp) = 8834e141e4526af4b6a7a65195fd8f13d7c9cdb1 11SHA1 (patch-mail_app_nsMailApp.cpp) = 8834e141e4526af4b6a7a65195fd8f13d7c9cdb1
12SHA1 (patch-mail_components_shell_nsMailGNOMEIntegration.cpp) = cbd87d7d7fc8df32b7fd444148d48a92c54c94d9 12SHA1 (patch-mail_components_shell_nsMailGNOMEIntegration.cpp) = cbd87d7d7fc8df32b7fd444148d48a92c54c94d9
13SHA1 (patch-mail_installer_package-manifest.in) = 3829a4d1ae7e8da29ae90d8ac31856fe260c2acc 13SHA1 (patch-mail_installer_package-manifest.in) = 3829a4d1ae7e8da29ae90d8ac31856fe260c2acc
14SHA1 (patch-mail_installer_removed-files.in) = 1a6744cda9842046b9d4b388333678a580d49d43 14SHA1 (patch-mail_installer_removed-files.in) = 1a6744cda9842046b9d4b388333678a580d49d43
@@ -26,27 +26,27 @@ SHA1 (patch-mozilla_config_baseconfig.mk @@ -26,27 +26,27 @@ SHA1 (patch-mozilla_config_baseconfig.mk
26SHA1 (patch-mozilla_config_external_moz.build) = bf05e5da3781087c4e588e0bdccaee05b9d02b24 26SHA1 (patch-mozilla_config_external_moz.build) = bf05e5da3781087c4e588e0bdccaee05b9d02b24
27SHA1 (patch-mozilla_config_stl__wrappers_ios) = f84d793f65bc7c7d1ffc7b542f846b394cf6de50 27SHA1 (patch-mozilla_config_stl__wrappers_ios) = f84d793f65bc7c7d1ffc7b542f846b394cf6de50
28SHA1 (patch-mozilla_config_stl__wrappers_ostream) = b36e7e199e355a0950e0db51c45fb34ce5ea2cc4 28SHA1 (patch-mozilla_config_stl__wrappers_ostream) = b36e7e199e355a0950e0db51c45fb34ce5ea2cc4
29SHA1 (patch-mozilla_config_system-headers) = 4665d754c8e498b3a34f877836287c7723ce930f 29SHA1 (patch-mozilla_config_system-headers) = 4665d754c8e498b3a34f877836287c7723ce930f
30SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 81752c113fcbef0a4ead18be1fbab1660c7d2fa9 30SHA1 (patch-mozilla_config_system__wrappers_unwind.h) = 81752c113fcbef0a4ead18be1fbab1660c7d2fa9
31SHA1 (patch-mozilla_dom_base_moz.build) = ea955077112082d25be57c7ad58102670e117821 31SHA1 (patch-mozilla_dom_base_moz.build) = ea955077112082d25be57c7ad58102670e117821
32SHA1 (patch-mozilla_dom_media_AudioStream.cpp) = c44bd89b7246ef9a5770b826967f342ce6fe18ae 32SHA1 (patch-mozilla_dom_media_AudioStream.cpp) = c44bd89b7246ef9a5770b826967f342ce6fe18ae
33SHA1 (patch-mozilla_dom_media_AudioStream.h) = a8f4160cc59c0cc92144dffb8fd468ad4d8ca70d 33SHA1 (patch-mozilla_dom_media_AudioStream.h) = a8f4160cc59c0cc92144dffb8fd468ad4d8ca70d
34SHA1 (patch-mozilla_dom_media_moz.build) = 3d9719c07eed295f5054a59c1bffefa71df774f1 34SHA1 (patch-mozilla_dom_media_moz.build) = 3d9719c07eed295f5054a59c1bffefa71df774f1
35SHA1 (patch-mozilla_dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = 702db96c0699a012712b1e886ac55c932f124e80 35SHA1 (patch-mozilla_dom_media_platforms_ffmpeg_ffvpx_FFVPXRuntimeLinker.cpp) = 702db96c0699a012712b1e886ac55c932f124e80
36SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 375a2ebda12bd4633c7ae3d5c0e0b6de6a61bb0f 36SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.cpp) = 375a2ebda12bd4633c7ae3d5c0e0b6de6a61bb0f
37SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 7009f9f2d01ca96f0ef6ca6f412485a4576f3072 37SHA1 (patch-mozilla_dom_plugins_ipc_PluginModuleChild.h) = 7009f9f2d01ca96f0ef6ca6f412485a4576f3072
38SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = cff51ad6909e0ceaa401c2825ca538f4271ac786 38SHA1 (patch-mozilla_dom_system_OSFileConstants.cpp) = cff51ad6909e0ceaa401c2825ca538f4271ac786
39SHA1 (patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = bd81d7b2b9e5517924ed515d31150893472dc770 39SHA1 (patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp) = 07a8e9f7ea6ec5f667877ba78cf2c0b80c87f3f1
40SHA1 (patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 14b213eff89b78ecfe3ff74a4daca13138defd2e 40SHA1 (patch-mozilla_gfx_cairo_libpixman_src_pixman-arm-neon-asm.S) = 14b213eff89b78ecfe3ff74a4daca13138defd2e
41SHA1 (patch-mozilla_gfx_gl_GLContextProviderGLX.cpp) = f8b7ad2c1d1b8f0a4492fc49d1e5884ec4bdf4c4 41SHA1 (patch-mozilla_gfx_gl_GLContextProviderGLX.cpp) = f8b7ad2c1d1b8f0a4492fc49d1e5884ec4bdf4c4
42SHA1 (patch-mozilla_gfx_graphite2_moz-gr-update.sh) = a74a7dd83de0d04aeb8694db5b49803f8db58235 42SHA1 (patch-mozilla_gfx_graphite2_moz-gr-update.sh) = a74a7dd83de0d04aeb8694db5b49803f8db58235
43SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = 423009ff077aa4c0862fd5b8ec9066eb054440cf 43SHA1 (patch-mozilla_gfx_graphite2_src_Bidi.cpp) = 423009ff077aa4c0862fd5b8ec9066eb054440cf
44SHA1 (patch-mozilla_gfx_moz.build) = ced2bc2e349cb4d58137ae64f4ec75b04239e854 44SHA1 (patch-mozilla_gfx_moz.build) = ced2bc2e349cb4d58137ae64f4ec75b04239e854
45SHA1 (patch-mozilla_gfx_skia_generate__mozbuild.py) = c85162fd7517a4e006512fef42a3c5124d2704aa 45SHA1 (patch-mozilla_gfx_skia_generate__mozbuild.py) = c85162fd7517a4e006512fef42a3c5124d2704aa
46SHA1 (patch-mozilla_gfx_skia_moz.build) = 359b4f6fc45ec4fcc6376cc67ec3c2485cb15877 46SHA1 (patch-mozilla_gfx_skia_moz.build) = 359b4f6fc45ec4fcc6376cc67ec3c2485cb15877
47SHA1 (patch-mozilla_gfx_thebes_moz.build) = ba8f4af4ec885bee26949470682d2e48e240c7de 47SHA1 (patch-mozilla_gfx_thebes_moz.build) = ba8f4af4ec885bee26949470682d2e48e240c7de
48SHA1 (patch-mozilla_gfx_ycbcr_moz.build) = 84eab4220cbce9ad44a62b7ba64e838927382b13 48SHA1 (patch-mozilla_gfx_ycbcr_moz.build) = 84eab4220cbce9ad44a62b7ba64e838927382b13
49SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.S) = b0a01fed529bbbea8e1ca06d8154f9cf331f844d 49SHA1 (patch-mozilla_gfx_ycbcr_yuv__row__arm.S) = b0a01fed529bbbea8e1ca06d8154f9cf331f844d
50SHA1 (patch-mozilla_image_Downscaler.h) = 9d1915b1b9cbdedb6082f6d6796d9ad6e4a8e411 50SHA1 (patch-mozilla_image_Downscaler.h) = 9d1915b1b9cbdedb6082f6d6796d9ad6e4a8e411
51SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = 8b92f3f59dba8928462264b9e0da1d02dc4c8c5f 51SHA1 (patch-mozilla_image_decoders_nsJPEGDecoder.cpp) = 8b92f3f59dba8928462264b9e0da1d02dc4c8c5f
52SHA1 (patch-mozilla_intl_hyphenation_glue_hnjalloc.h) = 9159bfaa44bf70c04602a1ac10f698ef4f4a5187 52SHA1 (patch-mozilla_intl_hyphenation_glue_hnjalloc.h) = 9159bfaa44bf70c04602a1ac10f698ef4f4a5187
cvs diff -r1.2 -r1.3 pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp 2017/04/27 13:32:40 1.2
+++ pkgsrc/mail/thunderbird/patches/Attic/patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp 2018/03/29 10:19:31 1.3
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.2 2017/04/27 13:32:40 ryoon Exp $ 1$NetBSD: patch-mozilla_extensions_spellcheck_hunspell_glue_mozHunspell.cpp,v 1.3 2018/03/29 10:19:31 wiz Exp $
2 2
3--- mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2017-04-14 04:53:08.000000000 +0000 3--- mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp.orig 2017-04-14 04:53:08.000000000 +0000
4+++ mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp 4+++ mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp
5@@ -381,6 +381,14 @@ mozHunspell::LoadDictionaryList(bool aNo 5@@ -381,6 +381,14 @@ mozHunspell::LoadDictionaryList(bool aNo
6 } 6 }
7 } 7 }
8  8
9+ // load system hunspell dictionaries 9+ // load system hunspell dictionaries
10+ nsCOMPtr<nsIFile> hunDir; 10+ nsCOMPtr<nsIFile> hunDir;
11+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("%%LOCALBASE%%/share/hunspell"), 11+ NS_NewNativeLocalFile(NS_LITERAL_CSTRING("@LOCALBASE@/share/hunspell"),
12+ true, getter_AddRefs(hunDir)); 12+ true, getter_AddRefs(hunDir));
13+ if (hunDir) { 13+ if (hunDir) {
14+ LoadDictionariesFromDir(hunDir); 14+ LoadDictionariesFromDir(hunDir);
15+ } 15+ }
16+ 16+
17 // find dictionaries from extensions requiring restart 17 // find dictionaries from extensions requiring restart
18 nsCOMPtr<nsISimpleEnumerator> dictDirs; 18 nsCOMPtr<nsISimpleEnumerator> dictDirs;
19 rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, 19 rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,