Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	libre/thunderbird-libre/PKGBUILD

5 files changed, 117 insertions, 78 deletions

diff --git a/libre/thunderbird-libre/PKGBUILD b/libre/thunderbird-libre/PKGBUILD
index d62ffd324..06aff86fd 100644
--- a/libre/thunderbird-libre/PKGBUILD
+++ b/libre/thunderbird-libre/PKGBUILD
@@ -3,72 +3,65 @@
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom@home.se>
 pkgname=thunderbird-libre
-pkgver=3.1.10
-pkgrel=3
-pkgdesc="Standalone Mail/News reader, with GNUZilla addons"
+pkgver=8.0
+pkgrel=1
+pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64' 'mips64el')
 license=('MPL' 'GPL')
-url="http://www.mozilla.org/projects/thunderbird"
-depends=('gtk2' 'gcc-libs' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils' 'libnotify')
-makedepends=('zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'autoconf2.13')
+url="http://www.mozilla.org/thunderbird/"
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
+makedepends=('p7zip-libre' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'yasm' 'mesa')
 optdepends=('libcanberra: for sound support')
 replaces=('thunderbird')
 conflicts=('thunderbird')
 provides=("thunderbird=$pkgver")
 install=thunderbird.install
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/${pkgver}/source/thunderbird-${pkgver}.source.tar.bz2
+source=(ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.bz2
         mozconfig
         thunderbird.desktop
         thunderbird-3.0-lang.patch
-        thunderbird-appversion.patch
-        thunderbird-shared-error.patch
-        xulrunner-png14.patch
-        python2.7.patch
-        gcc46.patch
-        gnuzilla-addons.patch)
+        thunderbird-install-dir.patch
+        channel-prefs.js)
+md5sums=('332f60036aebdce7dec6ee2b1af4941d'
+         'ca98c2bf1017b33e19dae22fdcef2e73'
+         'af3e5b344d2edf1c7d61bb0a5a96de9a'
+         '25b6fe16ac24cd5c852213e5c1adb272'
+         'aea906acf72c43dd82ead2fabcc1c6db'
+         '476ec205162340fb0679f522c9d31c3b')
 
 build() {
-  cd "${srcdir}/comm-1.9.2"
-  patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch"
-  patch -Np1 -i "${srcdir}/thunderbird-appversion.patch"
-  patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch"
-  patch -Np1 -i "${srcdir}/gcc46.patch"
-  patch -Np0 -i "${srcdir}/xulrunner-png14.patch"
-  patch -Np0 -i "${srcdir}/python2.7.patch"
+  cd "$srcdir/comm-release"
+  patch -Np1 -i "$srcdir/thunderbird-3.0-lang.patch"
+  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
 
-  pushd mail/app/profile >/dev/null
-  patch -Np0 -i "${srcdir}/gnuzilla-addons.patch"
-  popd >/dev/null
+  cp "$srcdir/mozconfig" .mozconfig
 
-  cp "${srcdir}/mozconfig" .mozconfig
-  unset CXXFLAGS
-  unset CFLAGS
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
+  export PYTHON="/usr/bin/python2"
 
-  export CXXFLAGS="-fpermissive"
-  export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.1"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
 }
 
 package() {
-  cd "${srcdir}/comm-1.9.2"
-  make -j1 DESTDIR="${pkgdir}" install
-
-  #Remove included dictionaries, add symlink to system myspell path.
-  #Note: this will cause file conflicts when users have installed dictionaries in the old location
-  rm -rf "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
-  ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/thunderbird-3.1/dictionaries"
-
-  rm -rf "${pkgdir}/usr/bin/defaults"
-
-  install -m755 -d "${pkgdir}/usr/share/applications"
+  cd "$srcdir/comm-release"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
 
   for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -d "$pkgdir/usr/share/icons/hicolor/$i/apps"
-      cp other-licenses/branding/thunderbird/mailicon${i/x*/}.png "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
+          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
   done
 
-  install -m644 "${srcdir}/thunderbird.desktop" "${pkgdir}/usr/share/applications/"
+  install -Dm644 "$srcdir/thunderbird.desktop" \
+      "$pkgdir/usr/share/applications/thunderbird.desktop"
+
+  rm -rf "$pkgdir"/usr/lib/thunderbird/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/thunderbird/dictionaries"
+  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/thunderbird/hyphenation"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/thunderbird-devel,share/idl}
 
-  rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${pkgdir}/usr/lib/thunderbird/defaults/pref/channel-prefs.js"
 }
diff --git a/libre/thunderbird-libre/channel-prefs.js b/libre/thunderbird-libre/channel-prefs.js
new file mode 100644
index 000000000..13b1ba388
--- /dev/null
+++ b/libre/thunderbird-libre/channel-prefs.js
@@ -0,0 +1,9 @@
+//@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/thunderbird-libre/mozconfig b/libre/thunderbird-libre/mozconfig
index 9cdf366f5..85ed8a648 100644
--- a/libre/thunderbird-libre/mozconfig
+++ b/libre/thunderbird-libre/mozconfig
@@ -1,45 +1,40 @@
 mk_add_options MOZ_CO_PROJECT=mail
 ac_add_options --enable-application=mail
 
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# 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-mng
+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 --with-pthreads
-ac_add_options --disable-debug
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-ac_add_options --disable-updater
-ac_add_options --disable-crashreporter
-ac_add_options --disable-official-branding
-ac_add_options --disable-xprint
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-ac_add_options --enable-xft
+ac_add_options --enable-system-ffi
 ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-optimize
-ac_add_options --prefix=/usr
-#ac_add_options --with-branding=mail/branding/unofficial
-ac_add_options --enable-official-branding
-
-ac_add_options --disable-pedantic
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
 
+# Features
+ac_add_options --enable-official-branding
+ac_add_options --enable-safe-browsing
+ac_add_options --enable-startup-notification
 ac_add_options --enable-gio
+
 ac_add_options --disable-gnomevfs
-ac_add_options --enable-gconf
-ac_add_options --enable-libnotify
+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
+
+# Optimization
+ac_add_options --enable-optimize
 
-export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
-mk_add_options BUILD_OFFICIAL=1
 mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
-
diff --git a/libre/thunderbird-libre/rePKGBUILD b/libre/thunderbird-libre/rePKGBUILD
index e71f6ad78..1e382761c 100644
--- a/libre/thunderbird-libre/rePKGBUILD
+++ b/libre/thunderbird-libre/rePKGBUILD
@@ -12,16 +12,15 @@ options=(!strip)
 source=(PKGBUILD
 	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
 	# files for pkg modifications
-        gnuzilla-addons.patch)
+    channel-prefs.js)
 
 build() {
   cd "${srcdir}/"
   rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
 
-  pushd usr/lib/${pkgname%-libre}-3.1/defaults/pref/ >/dev/null
-  patch -Np0 -i "${srcdir}/gnuzilla-addons.patch"
-  popd >/dev/null
-  rm "${srcdir}/gnuzilla-addons.patch"
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${srcdir}/usr/lib/thunderbird/defaults/pref/channel-prefs.js"
 }
 
 package() {
diff --git a/libre/thunderbird-libre/thunderbird-install-dir.patch b/libre/thunderbird-libre/thunderbird-install-dir.patch
new file mode 100644
index 000000000..fc6e24c4c
--- /dev/null
+++ b/libre/thunderbird-libre/thunderbird-install-dir.patch
@@ -0,0 +1,43 @@
+diff -Nur comm-beta.orig/config/autoconf.mk.in comm-beta/config/autoconf.mk.in
+--- comm-beta.orig/config/autoconf.mk.in	2011-11-06 14:39:51.064983780 +0000
++++ comm-beta/config/autoconf.mk.in	2011-11-06 14:42:57.216735333 +0000
+@@ -65,8 +65,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist
+diff -Nur comm-beta.orig/mozilla/config/autoconf.mk.in comm-beta/mozilla/config/autoconf.mk.in
+--- comm-beta.orig/mozilla/config/autoconf.mk.in	2011-11-06 14:39:41.771562967 +0000
++++ comm-beta/mozilla/config/autoconf.mk.in	2011-11-06 14:44:18.404165515 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur comm-beta.orig/mozilla/js/src/config/autoconf.mk.in comm-beta/mozilla/js/src/config/autoconf.mk.in
+--- comm-beta.orig/mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:39:48.014955070 +0000
++++ comm-beta/mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:44:32.977635875 +0000
+@@ -61,8 +61,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+ 
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+ 
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
+