diff options
Diffstat (limited to 'nonprism')
-rw-r--r-- | nonprism/icedove/PKGBUILD (renamed from nonprism/icedove-libre-nonprism/PKGBUILD) | 55 | ||||
-rw-r--r-- | nonprism/icedove/icedove.desktop (renamed from nonprism/icedove-libre-nonprism/icedove.desktop) | 0 | ||||
-rw-r--r-- | nonprism/icedove/icedove.install (renamed from nonprism/icedove-libre-nonprism/icedove.install) | 0 | ||||
-rw-r--r-- | nonprism/icedove/libre.patch | 23 | ||||
-rw-r--r-- | nonprism/icedove/mozconfig (renamed from nonprism/icedove-libre-nonprism/mozconfig) | 0 | ||||
-rw-r--r-- | nonprism/icedove/vendor.js (renamed from nonprism/icedove-libre-nonprism/vendor.js) | 0 |
6 files changed, 52 insertions, 26 deletions
diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove/PKGBUILD index 41673a8f9..a3d6e697b 100644 --- a/nonprism/icedove-libre-nonprism/PKGBUILD +++ b/nonprism/icedove/PKGBUILD @@ -4,35 +4,36 @@ # We're getting this from Debian Sid _debname=icedove _debver=31.0 -_debrel=deb1 +_debrel=deb2 _debrepo=http://ftp.debian.org/debian/pool/main/ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } -_pkgname=${_debname} -pkgname=${_debname}-libre-nonprism +pkgname=${_debname} epoch=1 pkgver=${_debver}.${_debrel} -pkgrel=1 +pkgrel=1.nonprism1 pkgdesc="A libre version of Debian Icedove, the standalone mail/news reader based on Mozilla Thunderbird, without support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64' 'mips64el') license=('MPL' 'GPL' 'LGPL') -url="http://packages.debian.org/sid/${_pkgname}" +url="http://packages.debian.org/sid/${pkgname}" depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'mozilla-searchplugins' 'nss' 'sqlite' 'startup-notification') makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'libpulse' 'autoconf2.13' 'quilt' 'jquery-ui') optdepends=('libcanberra: for sound support') -replaces=('thunderbird' "${pkgname%-nonprism}") -conflicts=('thunderbird' "${pkgname%-nonprism}") -provides=('thunderbird' "${pkgname%-nonprism}=$epoch:$pkgver") -install=${_pkgname}.install +replaces=('thunderbird' "${pkgname}-libre" "${pkgname}-libre-nonprism") +conflicts=('thunderbird' "${pkgname}-libre" "${pkgname}-libre-nonprism") +provides=('thunderbird') +install=${pkgname}.install source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz" mozconfig + libre.patch vendor.js - ${_pkgname}.desktop) + ${pkgname}.desktop) options=(!emptydirs) md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd' - '95d95340ba614657a22298dea97886b6' + '93495bc2fa6e6887a6d0799b0aac02be' '5f2297712c3dab7b15d7d5c8a6fa22d2' + 'e09d0e461c99e348358aa135d5a207a1' '5a53179d14ae9631b7afe5e4d0fc0b25' 'e785e0c267f4435ae1a9aa0b03bcacfb') @@ -46,14 +47,14 @@ prepare() { mv debian "${srcdir}/${DEBIAN_BUILD}" cd "${srcdir}/${DEBIAN_BUILD}" - mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}" + mv debian/${pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}" - cp -a debian/app-icons/${_pkgname}big.svg debian/app-icons/${_pkgname}_icon.svg + cp -a debian/app-icons/${pkgname}big.svg debian/app-icons/${pkgname}_icon.svg for i in 16x16 22x22 24x24 32x32 48x48 256x256; do - install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/mailicon${i/x*/}.png" + install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/mailicon${i/x*/}.png" done for i in 48x48 64x64; do - install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}/content/icon${i/x*/}.png" + install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${srcdir}/${DEBIAN_BUILD}/mail/branding/${pkgname}/content/icon${i/x*/}.png" done # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh. @@ -80,6 +81,8 @@ prepare() { # Fix branding sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} + # Patch and remove anything that's left + patch -Np1 -i "$srcdir/libre.patch" # Replace common URLs sed -i '\|extensions[.]getAddons[.]get[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; \|extensions[.]getAddons[.]search[.]browseURL| s|https://addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; @@ -117,7 +120,7 @@ build() { cd "${srcdir}/${DEBIAN_BUILD}" - export LDFLAGS="${LDFLAGS} -Wl,-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}" @@ -130,21 +133,21 @@ package() { make -j1 -f client.mk DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${_pkgname}/defaults/preferences/vendor.js" + install -Dm644 "${srcdir}/vendor.js" "${pkgdir}/usr/lib/${pkgname}/defaults/preferences/vendor.js" for i in 16x16 22x22 24x24 32x32 48x48 64x64 128x128 256x256; do - install -Dm644 "debian/app-icons/${_pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${_pkgname}.png" + install -Dm644 "debian/app-icons/${pkgname}${i/x*/}.png" "${pkgdir}/usr/share/icons/hicolor/$i/apps/${pkgname}.png" done - install -Dm644 "debian/app-icons/${_pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${_pkgname}.svg" + install -Dm644 "debian/app-icons/${pkgname}_icon.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/${pkgname}.svg" - install -Dm644 "${srcdir}/${_pkgname}.desktop" \ - "${pkgdir}/usr/share/applications/${_pkgname}.desktop" + install -Dm644 "${srcdir}/${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" - rm -rf "${pkgdir}"/usr/lib/${_pkgname}/{dictionaries,hyphenation,searchplugins} - 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" + rm -rf "${pkgdir}"/usr/lib/${pkgname}/{dictionaries,hyphenation,searchplugins} + 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} + rm -r "${pkgdir}"/usr/{include,lib/${pkgname}-devel,share/idl} } diff --git a/nonprism/icedove-libre-nonprism/icedove.desktop b/nonprism/icedove/icedove.desktop index ef2cd76e9..ef2cd76e9 100644 --- a/nonprism/icedove-libre-nonprism/icedove.desktop +++ b/nonprism/icedove/icedove.desktop diff --git a/nonprism/icedove-libre-nonprism/icedove.install b/nonprism/icedove/icedove.install index 4d4a283db..4d4a283db 100644 --- a/nonprism/icedove-libre-nonprism/icedove.install +++ b/nonprism/icedove/icedove.install diff --git a/nonprism/icedove/libre.patch b/nonprism/icedove/libre.patch new file mode 100644 index 000000000..495d6bf0d --- /dev/null +++ b/nonprism/icedove/libre.patch @@ -0,0 +1,23 @@ +diff -Nur comm-esr31.orig/mozilla/modules/libpref/src/init/all.js comm-esr31/mozilla/modules/libpref/src/init/all.js +--- comm-esr31.orig/mozilla/modules/libpref/src/init/all.js 2014-09-03 06:47:59.758285255 -0300 ++++ comm-esr31/mozilla/modules/libpref/src/init/all.js 2014-09-03 06:52:11.826590662 -0300 +@@ -4268,19 +4268,6 @@ + // Number of stack frames to capture in createObjectURL for about:memory. + pref("memory.blob_report.stack_frames", 0); + +-// comma separated list of domain origins (e.g. https://domain.com) for +-// providers that can install from their own website without user warnings. +-// entries are +-pref("social.whitelist", "https://mozsocial.cliqz.com,https://now.msn.com,https://mixi.jp"); +-// comma separated list of domain origins (e.g. https://domain.com) for +-// directory websites (e.g. AMO) that can install providers for other sites +-pref("social.directories", "https://activations.cdn.mozilla.net"); +-// remote-install allows any website to activate a provider, with extended UI +-// notifying user of installation. we can later pref off remote install if +-// necessary. This does not affect whitelisted and directory installs. +-pref("social.remote-install.enabled", true); +-pref("social.toast-notifications.enabled", true); +- + // Disable idle observer fuzz, because only privileged content can access idle + // observers (bug 780507). + pref("dom.idle-observers-api.fuzz_time.disabled", true); diff --git a/nonprism/icedove-libre-nonprism/mozconfig b/nonprism/icedove/mozconfig index 3987c2c5a..3987c2c5a 100644 --- a/nonprism/icedove-libre-nonprism/mozconfig +++ b/nonprism/icedove/mozconfig diff --git a/nonprism/icedove-libre-nonprism/vendor.js b/nonprism/icedove/vendor.js index 170b505a8..170b505a8 100644 --- a/nonprism/icedove-libre-nonprism/vendor.js +++ b/nonprism/icedove/vendor.js |