[arch-commits] Commit in thunderbird/repos (12 files)

Ionut Biru ibiru at archlinux.org
Tue Nov 8 18:25:16 UTC 2011


    Date: Tuesday, November 8, 2011 @ 13:25:15
  Author: ibiru
Revision: 142343

db-move: moved thunderbird from [testing] to [extra] (i686)

Added:
  thunderbird/repos/extra-i686/PKGBUILD
    (from rev 142340, thunderbird/repos/testing-i686/PKGBUILD)
  thunderbird/repos/extra-i686/mozconfig
    (from rev 142340, thunderbird/repos/testing-i686/mozconfig)
  thunderbird/repos/extra-i686/thunderbird-3.0-lang.patch
    (from rev 142340, thunderbird/repos/testing-i686/thunderbird-3.0-lang.patch)
  thunderbird/repos/extra-i686/thunderbird-install-dir.patch
    (from rev 142340, thunderbird/repos/testing-i686/thunderbird-install-dir.patch)
  thunderbird/repos/extra-i686/thunderbird.desktop
    (from rev 142340, thunderbird/repos/testing-i686/thunderbird.desktop)
  thunderbird/repos/extra-i686/thunderbird.install
    (from rev 142340, thunderbird/repos/testing-i686/thunderbird.install)
Deleted:
  thunderbird/repos/extra-i686/PKGBUILD
  thunderbird/repos/extra-i686/mozconfig
  thunderbird/repos/extra-i686/thunderbird-3.0-lang.patch
  thunderbird/repos/extra-i686/thunderbird.desktop
  thunderbird/repos/extra-i686/thunderbird.install
  thunderbird/repos/testing-i686/

-------------------------------+
 PKGBUILD                      |  115 ++++++++++++++++++++--------------------
 mozconfig                     |   83 +++++++++++++---------------
 thunderbird-3.0-lang.patch    |   22 +++----
 thunderbird-install-dir.patch |   42 ++++++++++++++
 thunderbird.desktop           |   26 ++++-----
 thunderbird.install           |   24 ++++----
 6 files changed, 177 insertions(+), 135 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2011-11-08 18:25:10 UTC (rev 142342)
+++ extra-i686/PKGBUILD	2011-11-08 18:25:15 UTC (rev 142343)
@@ -1,56 +0,0 @@
-# $Id$
-# Contributor: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Dale Blount <dale at archlinux.org>
-# Contributor: Anders Bostrom <anders.bostrom at home.se>
-pkgname=thunderbird
-pkgver=7.0.1
-pkgrel=1
-pkgdesc="Standalone Mail/News reader"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL')
-url="http://www.mozilla.org/thunderbird/"
-depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'shared-mime-info' 'alsa-lib' 'dbus-glib' 'hunspell' 'sqlite3>=3.7.4' 'desktop-file-utils' 'libnotify' 'libevent' 'hicolor-icon-theme')
-makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'yasm' 'mesa')
-optdepends=('libcanberra: for sound support')
-install=thunderbird.install
-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)
-md5sums=('ad177fe5202deabda44882ff5c871f1b'
-         'a53394cfe721b5ff743ae2918fab2798'
-         'af3e5b344d2edf1c7d61bb0a5a96de9a'
-         '25b6fe16ac24cd5c852213e5c1adb272')
-
-build() {
-  cd "${srcdir}/comm-release"
-  patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch"
-
-  cp "${srcdir}/mozconfig" .mozconfig
-
-  export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-${pkgver} -Wl,-O1,--sort-common,--hash-style=gnu,--as-needed"
-  export PYTHON="/usr/bin/python2"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "${srcdir}/comm-release"
-  make -j1 -f client.mk DESTDIR="${pkgdir}" install
-
-  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
-      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
-          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
-  done
-
-  install -Dm644 "${srcdir}/thunderbird.desktop" \
-      "${pkgdir}/usr/share/applications/thunderbird.desktop"
-
-  rm -rf "${pkgdir}"/usr/lib/thunderbird-${pkgver}/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "${pkgdir}/usr/lib/thunderbird-${pkgver}/dictionaries"
-  ln -sf /usr/share/hyphen "${pkgdir}/usr/lib/thunderbird-${pkgver}/hyphenation"
-
-  # We don't want the development stuff
-  rm -r "${pkgdir}"/usr/{include,lib/thunderbird-devel-${pkgver},share/idl}
-}
-

Copied: thunderbird/repos/extra-i686/PKGBUILD (from rev 142340, thunderbird/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2011-11-08 18:25:15 UTC (rev 142343)
@@ -0,0 +1,59 @@
+# $Id$
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Anders Bostrom <anders.bostrom at home.se>
+
+pkgname=thunderbird
+pkgver=8.0
+pkgrel=1
+pkgdesc="Standalone Mail/News reader"
+arch=('i686' 'x86_64')
+license=('MPL' 'GPL')
+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=('unzip' 'zip' 'pkg-config' 'python2' 'libidl2' 'wireless_tools' 'yasm' 'mesa')
+optdepends=('libcanberra: for sound support')
+install=thunderbird.install
+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-install-dir.patch)
+md5sums=('332f60036aebdce7dec6ee2b1af4941d'
+         'ca98c2bf1017b33e19dae22fdcef2e73'
+         'af3e5b344d2edf1c7d61bb0a5a96de9a'
+         '25b6fe16ac24cd5c852213e5c1adb272'
+         'aea906acf72c43dd82ead2fabcc1c6db')
+
+build() {
+  cd "$srcdir/comm-release"
+  patch -Np1 -i "$srcdir/thunderbird-3.0-lang.patch"
+  patch -Np1 -i "$srcdir/thunderbird-install-dir.patch"
+
+  cp "$srcdir/mozconfig" .mozconfig
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/thunderbird"
+  export PYTHON="/usr/bin/python2"
+
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+}
+
+package() {
+  cd "$srcdir/comm-release"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+      install -Dm644 other-licenses/branding/thunderbird/mailicon${i/x*/}.png \
+          "$pkgdir/usr/share/icons/hicolor/$i/apps/thunderbird.png"
+  done
+
+  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}
+}

Deleted: extra-i686/mozconfig
===================================================================
--- extra-i686/mozconfig	2011-11-08 18:25:10 UTC (rev 142342)
+++ extra-i686/mozconfig	2011-11-08 18:25:15 UTC (rev 142343)
@@ -1,43 +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
-
-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-png
-ac_add_options --with-system-mng
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --with-system-libevent
-ac_add_options --enable-system-cairo
-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-xprint
-ac_add_options --disable-pedantic
-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-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-optimize
-ac_add_options --enable-official-branding
-
-ac_add_options --enable-gio
-ac_add_options --disable-gnomevfs
-ac_add_options --enable-libnotify
-
-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

Copied: thunderbird/repos/extra-i686/mozconfig (from rev 142340, thunderbird/repos/testing-i686/mozconfig)
===================================================================
--- extra-i686/mozconfig	                        (rev 0)
+++ extra-i686/mozconfig	2011-11-08 18:25:15 UTC (rev 142343)
@@ -0,0 +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-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-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 --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 MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1

Deleted: extra-i686/thunderbird-3.0-lang.patch
===================================================================
--- extra-i686/thunderbird-3.0-lang.patch	2011-11-08 18:25:10 UTC (rev 142342)
+++ extra-i686/thunderbird-3.0-lang.patch	2011-11-08 18:25:15 UTC (rev 142343)
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS",                 false);
-+pref("intl.locale.matchOS",                 true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1

Copied: thunderbird/repos/extra-i686/thunderbird-3.0-lang.patch (from rev 142340, thunderbird/repos/testing-i686/thunderbird-3.0-lang.patch)
===================================================================
--- extra-i686/thunderbird-3.0-lang.patch	                        (rev 0)
+++ extra-i686/thunderbird-3.0-lang.patch	2011-11-08 18:25:15 UTC (rev 142343)
@@ -0,0 +1,11 @@
+--- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
++++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
+@@ -890,7 +890,7 @@
+ pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
+ pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
+ pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
+-pref("intl.locale.matchOS",                 false);
++pref("intl.locale.matchOS",                 true);
+ // fallback charset list for Unicode conversion (converting from Unicode)
+ // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
+ // for ISO-8859-1

Copied: thunderbird/repos/extra-i686/thunderbird-install-dir.patch (from rev 142340, thunderbird/repos/testing-i686/thunderbird-install-dir.patch)
===================================================================
--- extra-i686/thunderbird-install-dir.patch	                        (rev 0)
+++ extra-i686/thunderbird-install-dir.patch	2011-11-08 18:25:15 UTC (rev 142343)
@@ -0,0 +1,42 @@
+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)))

Deleted: extra-i686/thunderbird.desktop
===================================================================
--- extra-i686/thunderbird.desktop	2011-11-08 18:25:10 UTC (rev 142342)
+++ extra-i686/thunderbird.desktop	2011-11-08 18:25:15 UTC (rev 142343)
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=Thunderbird
-Comment=Mail & News Reader
-GenericName=Mail Client & News Reader
-Exec=thunderbird %u
-TryExec=thunderbird
-Icon=thunderbird
-Terminal=false
-Type=Application
-Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;
-StartupNotify=true

Copied: thunderbird/repos/extra-i686/thunderbird.desktop (from rev 142340, thunderbird/repos/testing-i686/thunderbird.desktop)
===================================================================
--- extra-i686/thunderbird.desktop	                        (rev 0)
+++ extra-i686/thunderbird.desktop	2011-11-08 18:25:15 UTC (rev 142343)
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Thunderbird
+Comment=Mail & News Reader
+GenericName=Mail Client & News Reader
+Exec=thunderbird %u
+TryExec=thunderbird
+Icon=thunderbird
+Terminal=false
+Type=Application
+Categories=Network;Email;
+MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true

Deleted: extra-i686/thunderbird.install
===================================================================
--- extra-i686/thunderbird.install	2011-11-08 18:25:10 UTC (rev 142342)
+++ extra-i686/thunderbird.install	2011-11-08 18:25:15 UTC (rev 142343)
@@ -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
-}

Copied: thunderbird/repos/extra-i686/thunderbird.install (from rev 142340, thunderbird/repos/testing-i686/thunderbird.install)
===================================================================
--- extra-i686/thunderbird.install	                        (rev 0)
+++ extra-i686/thunderbird.install	2011-11-08 18:25:15 UTC (rev 142343)
@@ -0,0 +1,12 @@
+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
+}




More information about the arch-commits mailing list