From 400b478305876606a767ac469964c171f9948ed9 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 3 Sep 2014 16:45:05 -0300 Subject: icedove: remove libre and nonprism suffixes, remove Social API support -> https://lists.parabolagnulinux.org/pipermail/dev/2014-August/002291.html --- nonprism/icedove-libre-nonprism/PKGBUILD | 150 ------------------------ nonprism/icedove-libre-nonprism/icedove.desktop | 13 -- nonprism/icedove-libre-nonprism/icedove.install | 12 -- nonprism/icedove-libre-nonprism/mozconfig | 47 -------- nonprism/icedove-libre-nonprism/vendor.js | 9 -- 5 files changed, 231 deletions(-) delete mode 100644 nonprism/icedove-libre-nonprism/PKGBUILD delete mode 100644 nonprism/icedove-libre-nonprism/icedove.desktop delete mode 100644 nonprism/icedove-libre-nonprism/icedove.install delete mode 100644 nonprism/icedove-libre-nonprism/mozconfig delete mode 100644 nonprism/icedove-libre-nonprism/vendor.js (limited to 'nonprism/icedove-libre-nonprism') diff --git a/nonprism/icedove-libre-nonprism/PKGBUILD b/nonprism/icedove-libre-nonprism/PKGBUILD deleted file mode 100644 index 41673a8f9..000000000 --- a/nonprism/icedove-libre-nonprism/PKGBUILD +++ /dev/null @@ -1,150 +0,0 @@ -# Maintainer : André Silva -# Contributor : Márcio Silva - -# We're getting this from Debian Sid -_debname=icedove -_debver=31.0 -_debrel=deb1 -_debrepo=http://ftp.debian.org/debian/pool/main/ -debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; } - -_pkgname=${_debname} -pkgname=${_debname}-libre-nonprism -epoch=1 -pkgver=${_debver}.${_debrel} -pkgrel=1 -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}" -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 -source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.xz" - "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel#deb}.debian.tar.xz" - mozconfig - vendor.js - ${_pkgname}.desktop) -options=(!emptydirs) -md5sums=('1ea1f4340b1ab29a29aed74f4d6197bd' - '95d95340ba614657a22298dea97886b6' - '5f2297712c3dab7b15d7d5c8a6fa22d2' - '5a53179d14ae9631b7afe5e4d0fc0b25' - 'e785e0c267f4435ae1a9aa0b03bcacfb') - -prepare() { - export DEBIAN_BUILD="comm-esr31" - - export QUILT_PATCHES=debian/patches - export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index' - export QUILT_DIFF_ARGS='--no-timestamps' - - mv debian "${srcdir}/${DEBIAN_BUILD}" - cd "${srcdir}/${DEBIAN_BUILD}" - - mv debian/${_pkgname}-branding "${srcdir}/${DEBIAN_BUILD}/mail/branding/${_pkgname}" - - 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" - 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" - done - - # Fix orthographic issue ("Icdove" to "Icedove") in MOZ_APP_BASENAME line for confvars.sh. - sed -i 's|Icdove|Icedove|' debian/patches/debian-hacks/Icedove-branding.patch - - quilt push -av - - # Fix paths on makefile - sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/|topsrcdir = @top_srcdir@|; - s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; - s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; - ' mail/branding/icedove/Makefile.in - - sed -i 's|topsrcdir = [.][.]/[.][.]/[.][.]/[.][.]|topsrcdir = @top_srcdir@|; - s|include $(topsrcdir)/config/autoconf.mk|include $(DEPTH)/config/autoconf.mk|; - s|include $(DEPTH)/config/rules.mk|include $(topsrcdir)/config/rules.mk|; - ' mail/branding/icedove/locales/Makefile.in - - # Fix package-manifest.in - sed -i '\|; Phishing Protection| s|$|\n#ifdef MOZ_SAFE_BROWSING|; - \|@BINPATH@/components/url-classifier[.]xpt| s|$|\n#endif| - ' mail/installer/package-manifest.in - - # Fix branding - sed -i 's|Icedove Mail/News|Icedove|' mail/branding/icedove/locales/en-US/brand.{dtd,properties} - - # 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; - \|extensions[.]getAddons[.]search[.]url| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; - \|extensions[.]webservice[.]discoverURL| s|https://services[.]addons[.]mozilla[.]org.\+["][)][;]|http://directory.fsf.org/wiki/Icedove");|g; - ' mail/app/profile/all-thunderbird.js - - # Remove support for unsafe and dangerous for privacy protocols - sed -i '\|facebook|d - \|gtalk|d - \|twitter|d - ' chat/moz.build - sed -i '\|facebook[.]js|d - \|facebook[.]manifest|d - \|gtalk[.]js|d - \|gtalk[.]manifest|d - \|twitter[.]js|d - \|twitter[.]manifest|d - ' mail/installer/package-manifest.in - rm -r chat/protocols/{facebook,gtalk,twitter} - - cp "${srcdir}/mozconfig" .mozconfig - - # configure script misdetects the preprocessor without an optimization level - # https://bugs.archlinux.org/task/34644 - sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' mozilla/configure - - # Add symlinks to use jquery files built for us - ln -s /usr/share/javascript/jquery/jquery.min.js mail/jquery - ln -s /usr/share/javascript/jquery-ui/jquery-ui.min.js mail/jquery -} - -build() { - export DEBIAN_BUILD="comm-esr31" - - cd "${srcdir}/${DEBIAN_BUILD}" - - export LDFLAGS="${LDFLAGS} -Wl,-rpath,/usr/lib/${_pkgname}" - export PYTHON="/usr/bin/python2" - - make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" -} - -package() { - export DEBIAN_BUILD="comm-esr31" - - cd "${srcdir}/${DEBIAN_BUILD}" - - make -j1 -f client.mk DESTDIR="${pkgdir}" install - - 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" - done - 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" - - 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} -} diff --git a/nonprism/icedove-libre-nonprism/icedove.desktop b/nonprism/icedove-libre-nonprism/icedove.desktop deleted file mode 100644 index ef2cd76e9..000000000 --- a/nonprism/icedove-libre-nonprism/icedove.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Version=1.0 -Name=Icedove -Comment=Mail & News Reader -GenericName=Mail Client & News Reader -Exec=icedove %u -TryExec=icedove -Icon=icedove -Terminal=false -Type=Application -Categories=Network;Email; -MimeType=message/rfc822;x-scheme-handler/mailto; -StartupNotify=true diff --git a/nonprism/icedove-libre-nonprism/icedove.install b/nonprism/icedove-libre-nonprism/icedove.install deleted file mode 100644 index 4d4a283db..000000000 --- a/nonprism/icedove-libre-nonprism/icedove.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/nonprism/icedove-libre-nonprism/mozconfig b/nonprism/icedove-libre-nonprism/mozconfig deleted file mode 100644 index 3987c2c5a..000000000 --- a/nonprism/icedove-libre-nonprism/mozconfig +++ /dev/null @@ -1,47 +0,0 @@ -mk_add_options MOZ_CO_PROJECT=mail -ac_add_options --enable-application=mail - -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib - -# Icedove -ac_add_options --disable-official-branding -ac_add_options --with-branding=mail/branding/icedove - -# System libraries -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --with-system-libvpx -ac_add_options --enable-system-hunspell -ac_add_options --enable-system-sqlite -ac_add_options --enable-system-ffi -ac_add_options --enable-system-cairo -ac_add_options --enable-system-pixman -ac_add_options --with-pthreads - -# Features -ac_add_options --enable-startup-notification -ac_add_options --enable-gio - -ac_add_options --disable-gstreamer -ac_add_options --disable-gnomevfs -ac_add_options --disable-crashreporter -ac_add_options --disable-updater -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer -ac_add_options --disable-debug-symbols - -# Optimization -ac_add_options --enable-optimize - -export MOZILLA_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 - -# Parabola features -ac_add_options --disable-safe-browsing diff --git a/nonprism/icedove-libre-nonprism/vendor.js b/nonprism/icedove-libre-nonprism/vendor.js deleted file mode 100644 index 170b505a8..000000000 --- a/nonprism/icedove-libre-nonprism/vendor.js +++ /dev/null @@ -1,9 +0,0 @@ -// Use LANG environment variable to choose locale -pref("intl.locale.matchOS", true); - -// Disable default mailer checking. -pref("mail.shell.checkDefaultMail", false); - -// Don't disable our bundled extensions in the application directory -pref("extensions.autoDisableScopes", 11); -pref("extensions.shownSelectionUI", true); -- cgit v1.2.3