diff options
| -rw-r--r-- | libre/icedove-l10n/PKGBUILD | 116 | ||||
| -rw-r--r-- | libre/icedove-libre/PKGBUILD | 26 | ||||
| -rw-r--r-- | libre/icedove-libre/channel-prefs.js | 9 | ||||
| -rw-r--r-- | libre/icedove-libre/replace-urls.txt | 25 |
4 files changed, 102 insertions, 74 deletions
diff --git a/libre/icedove-l10n/PKGBUILD b/libre/icedove-l10n/PKGBUILD index 5b102846c..f3135dc8b 100644 --- a/libre/icedove-l10n/PKGBUILD +++ b/libre/icedove-l10n/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgbase=icedove-l10n -_pkgver=17.0.4 -pkgver=17.0.4.1 +_pkgver=17.0.5 +pkgver=17.0.5.1 _langpacks=(ar ast be bg bn-BD br ca cs da de el en-GB en-US es-AR es-ES et eu fi fr fy-NL ga-IE gd gl he hr hu hy-AM id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW) @@ -11,7 +11,7 @@ pkgname=($(for lang in ${_langpacks[@]} do echo $pkgbase-$lang | tr A-Z a-z done)) -pkgrel=2 +pkgrel=1 pkgdesc="Language packs for Debian Icedove." arch=('any') url="http://packages.debian.org/experimental/icedove" @@ -64,58 +64,58 @@ done md5sums=('d5b2567a8cc8f64591f313a6efdaaffc' 'f3719964e893c1002b7a923e8f95f923' - '206f1ef0917d6c072edef7e5d77a9ec6' - 'dfcdea2b4ae57a3fa98a60fd1d90beff' - '25271fbc262c9379b7b9c04798d9a57e' - 'cef8ef756ae9bd611d8c92435ce3d550' - 'aee21b8e9835361d7fad9cabc26176ec' - '9cc55cfc826cfebdb52d471d4683e2ad' - 'efb76f4fc5b66e6936a3a64ebb6a11b9' - '365ca3b65ec2ca0f6aba405172f909fc' - '02e296fa634c03dc1b8d71dd7c2e445f' - 'e300d530881628b012e4071c5b1ac1e7' - '5bd79ebfb86e8939d480b49abd484370' - '09acd6af201f415d169b8019c0bb3929' - '9205fbc01cee7caf8578cd845596542a' - '7fd2672aa378a5c6b3d4d33eb71dff9d' - '8babeccaefc144d7798fb22446a72395' - '834b93522fb7875bc6fc3551d90a9b75' - 'd690f9d0e0f3317ab500e711692c5684' - 'bfe0b4a94a02e0ca8da411b58c17a5a1' - '4156b699bb0dbbf073893cbef96db478' - '1f8527f158f5bcacfde1e9b259769c14' - 'c7fb6f52652ffeb7b7c09f27c73ee32b' - '6b57787b83b27a80c175b197d9a0fd8f' - '9a30b1017efa98e4c392a367341e7d5b' - '6e5d20da97211e9f72cc537327783f4d' - '0d0cd95f0e1765c1f56a39609533efa3' - '34773b8acd0e23d99918969a3a86159e' - 'bc1b94e53e3f6d5e716ceb7d4979e278' - 'bf577e83fc52e94164426d7a9dcc10b0' - '4328456c0a54334e020b643c37328eec' - '7232b4d0faf2f10f7fd6c7e05ef84d7a' - '11ada83816bcdea125dff74022acd715' - '0d6100971791dbac333cb24f8fa81c7b' - '685315fce2d77b64f58133d5d405200f' - 'e5f15fc603190c6bb0a0cdfe6bf5e863' - 'f2d4a099467f09b49f1bed06812d60d6' - '88b0177d8342a6aae79c1cba74e6c041' - 'e19d3f90b9d41f9e7749875a1e2c037b' - '8e956438b49d548431728758206a101e' - '6597b2bbf2c9bf8af88d4b707400df24' - '794a9831d1f3c43156ec3f85f155f1e2' - '9b8e8f1fcc2bf891c1273b9470f95af5' - '7b423d358869c35dde53015f800e0dbd' - 'a8258e8427d4961a509dc980f9a56986' - 'f7be2a19d5046c5ec537b3248d0107b0' - '2d892a7f25a10d4607b76e2ce65743e5' - '6f2391fdfc198177f65c407ac3d10ce2' - '7e53185c09b5672f08573e3e96150ad1' - 'fa4528be1f856b9f612af643ff2d1675' - '983b51b70b7e57a8bf3b956adc309f88' - 'efc16a35ab9cff05473ff3e5f2cbf7ee' - 'f9456837c567d422ac2e69fd72598089' - '9dcbf6fc85bfc768d784cb3bd764c103' - '302d409e53f598e830d8b180f108586e' - '5e21d7621b87a639c41c5fc6245203df' - '317e9a8bc1ca22a1f89d6898cca19500') + 'ef463b3772f804beb4108e15917485fd' + '6125a2e91119afe4cd4fb78909bc2168' + '990067ee981db3bf9873e4bd9b2b1eba' + 'e32d496230cba49a435775359d4485ce' + 'd212d8bc244184e816cf36a9b654e7e6' + '4a83b506d1b81dfffa0b33bc0f12b24f' + '6349985a77b2db81a43cb22291bfd972' + 'dd4a259bfa4ce6816c55e9d7ff7f1172' + 'dc3ec06ccb5e98cfa332fca40af77470' + 'e81e63d8fac6c61cbbe72b1c8b0ce05c' + 'f0850f83f396c33a4e69abd00bda0e55' + 'ffc5de6b5409cf7cdd411ae853e0ba05' + '169780df5d160a04221dd80c92dd131a' + '8d1eacb770748156dbe02e493c41a5a6' + 'a3a0d856da6af722a6444567b684eb14' + '798415f06ce916eb6c84ea4cf97e1253' + 'c8eefe6a65295d354beb59e8f1b3116e' + '3ec1490226e064bc1145072ecdf031b4' + 'a3ff2959c9375084683b0741797103f9' + '99ea64506470bf7938e169bfe5f569b3' + '8170d58dcbb1b84820ef0ace6dc23965' + '24ba56f81446d551101d1848ed660682' + '53b9b22f7ad5916c8dfccd8b758828dc' + '0bdcd2f628dff58a4544e93a88344b76' + '87d516fbb68ae06d5ee7439a8a4d3d96' + 'c3cfa07d55fec1eb558e11c63ebd2a97' + '9845802371f603cb70df77a63088c16d' + '552e297a315a1b6f308604da4b492c53' + 'dc6755c33351b95f9e883c8e64fab7b6' + 'f3a67c52f5c5ca8cd5484250617f1aff' + '48fc583c7e67e87113fb73243da46313' + '4450b7753336f279296260e444cb0ba2' + '3a639521e20e5fb936f6d1b7679becd9' + '241a29846743f4dbcd5704e470193f30' + '71d71192e076a889da26129efd5f2f3d' + 'efc91beb8c199d459e1f24164066d75e' + 'ed717c1b94618faa8304796f1ff0acd7' + '8fc0aea02c1373f0ac0b7fa7eac2fa0c' + '808c60d4af8ee7b6bbbd82a5079c293e' + '6f0e4c6fe66e6d0e98f2fc444b59d629' + 'bc5e9972f5a092f4f28f577f7ade7ad7' + '2f852610ddc1550200965d4be6320879' + '6ad80cd433ef69c3577bfea9fd26cedc' + '0dd02b5317c9656c64543067956940bf' + '9e0d2f288130f048358135a89732ca85' + '936dbda4758d9a65f8c27603a2dee3bd' + '820d70ce31ca9731c162ab942b0daea1' + 'd737350d9edb73c15096e867fbdd8f3c' + 'b1896502d411dd6037f141d3561461d4' + '491a3a386c4963f162e050c370ffa140' + 'aa9f4e83501e624e4054f3ff61b71db3' + '257ee623933cfda550a8643a1a0b1d1c' + 'c3a8fa4fc511d914892e08fa17fab8a9' + '44be6381519c6c5ea785a4f5a5122a64' + '6693c752bf6272caed2e204556fc69b8') diff --git a/libre/icedove-libre/PKGBUILD b/libre/icedove-libre/PKGBUILD index a6825ea97..43212c413 100644 --- a/libre/icedove-libre/PKGBUILD +++ b/libre/icedove-libre/PKGBUILD @@ -3,7 +3,7 @@ # We're getting this from Debian Experimental _debname=icedove -_debver=17.0.4 +_debver=17.0.5 _debrel=1 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } @@ -11,7 +11,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } _pkgname=${_debname} pkgname=${_debname}-libre pkgver=${_debver}.${_debrel} -pkgrel=3 +pkgrel=1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird." arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') @@ -26,17 +26,17 @@ install=${_pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz" mozconfig - channel-prefs.js + replace-urls.txt vendor.js makefile.patch branding.patch ${_pkgname}.desktop Icedove-branding.patch) options=(!emptydirs) -md5sums=('26ce85189f3b55cc2c97c57e18c1e2de' - 'fafa558c1940a48c3f29de61dc27d737' +md5sums=('0c68298c17757257da79b6bb39e3fd10' + 'eb2a5e1877d87a16e10388f533c081a6' '5cf95ea94f69cdd36604890cfbf7b954' - '476ec205162340fb0679f522c9d31c3b' + 'a8fc4658d45b6bf9350023e5c3f34e56' '4eecc4fc5aafaf0da651a09eadc90bee' 'c4ed43e85945e180a89cce03e45ec62c' '126b1446212396c33220936c01d9592d' @@ -72,6 +72,17 @@ prepare() { patch -Np1 -i "${srcdir}/branding.patch" # fixing branding patch -Np1 -i "${srcdir}/Icedove-branding.patch" # debian patch fixed version + # Replace common URLs + sed '/^#/d' ../replace-urls.txt | while read -r moz_url gnu_url; do + if [[ -n $moz_url ]]; then + printf 'liberating: %s -> %s\n' "$moz_url" "$gnu_url" + grep -Erl "${moz_url}" \ + --exclude='*.'{patch,orig,rej} \ + --exclude-dir={.pc,test,tests,testing} \ + | xargs -d '\n' --no-run-if-empty sed -ri "s<${moz_url}<${gnu_url}<g" + fi + done + cp "${srcdir}/mozconfig" .mozconfig # configure script misdetects the preprocessor without an optimization level @@ -82,7 +93,7 @@ prepare() { build() { cd "${srcdir}/${DEBIAN_BUILD}" - export LDFLAGS="${LDFLAGS} -Wl,--as-needed,-rpath,/usr/lib/${_pkgname}" + export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" export PYTHON="/usr/bin/python2" make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" @@ -110,6 +121,7 @@ package() { ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/${_pkgname}/dictionaries" ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/${_pkgname}/hyphenation" ln -sf /usr/lib/mozilla/searchplugins "${pkgdir}/usr/lib/${_pkgname}/searchplugins" + # We don't want the development stuff rm -r "${pkgdir}"/usr/{include,lib/$_pkgname-devel,share/idl} } diff --git a/libre/icedove-libre/channel-prefs.js b/libre/icedove-libre/channel-prefs.js deleted file mode 100644 index 13b1ba388..000000000 --- a/libre/icedove-libre/channel-prefs.js +++ /dev/null @@ -1,9 +0,0 @@ -//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js" -pref("app.update.channel", "default"); - -//Recommend free addons -pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html"); -pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html"); diff --git a/libre/icedove-libre/replace-urls.txt b/libre/icedove-libre/replace-urls.txt new file mode 100644 index 000000000..fc13e32fb --- /dev/null +++ b/libre/icedove-libre/replace-urls.txt @@ -0,0 +1,25 @@ +# These are replaced in order, so if one is a subset of another, the smaller one should be last +# These are whitespace-separated EREs, comments are lines starting with '#' + +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/dictionaries/?(\?[^"']*)? https://parabolagnulinux.org/packages/\?repo=Extra\&q=hunspell- +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/plugins/?(\?[^"']*)? https://gnuzilla.gnu.org/plugins/ +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/personas/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/recommended/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search-engines/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#search%20engines +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/search/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/themes/?(\?[^"']*)? https://www.gnu.org/software/gnuzilla/addons.html#themes +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?" https://www.gnu.org/software/gnuzilla/addons.html" +https?://addons\.mozilla\.org/((%LOCALE%|@AB_CD@|en-US|ru)/)?([a-zA-Z%-]+)/?(\?[^"']*)?$ https://www.gnu.org/software/gnuzilla/addons.html + +https://addons.mozilla.org/firefox/collections/mozilla/webdeveloper/ https://www.gnu.org/software/gnuzilla/addons.html + +https?://services\.addons\.mozilla\.org/(%LOCALE%|@AB_CD@|en-US|ru)/([a-zA-Z%-]+)/ https://www.gnu.org/software/gnuzilla/addons.html#bogus-services.\2/ + +https?://pfs\.mozilla\.org/plugins/PluginFinderService\.php https://gnuzilla.gnu.org/plugins/PluginFinderService.php +#https?://versioncheck\.addons\.mozilla\.org/update/VersionCheck\.php +#https?://versioncheck-bg\.addons\.mozilla\.org/update/VersionCheck\.php + +"https?://addons\.mozilla\.org/" "https://www.gnu.org/software/gnuzilla/addons.html" + +# hack: these aren't URLs, per se +(addonsBrowseAll\.description\s*=.*)addons\.mozilla\.org \1gnu.org/software/gnuzilla/addons.html |