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

Ionut Biru ibiru at archlinux.org
Thu Dec 10 12:25:31 UTC 2009 

    Date: Thursday, December 10, 2009 @ 07:25:31
  Author: ibiru
Revision: 61037

Merged revisions 53494,61035 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/thunderbird/trunk

........
  r53494 | thomas | 2009-10-01 13:45:13 +0300 (Thu, 01 Oct 2009) | 2 lines
  
  upgpkg: thunderbird 2.0.0.23-1
      Fix i686 build
........
  r61035 | ibiru | 2009-12-10 14:23:40 +0200 (Thu, 10 Dec 2009) | 2 lines
  
  upgpkg: thunderbird 3.0-1
      new major release
........

Added:
  thunderbird/repos/extra-x86_64/thunderbird-3.0-lang.patch
    (from rev 61035, thunderbird/trunk/thunderbird-3.0-lang.patch)
  thunderbird/repos/extra-x86_64/thunderbird-shared-error.patch
    (from rev 61035, thunderbird/trunk/thunderbird-shared-error.patch)
Modified:
  thunderbird/repos/extra-x86_64/	(properties)
  thunderbird/repos/extra-x86_64/PKGBUILD
  thunderbird/repos/extra-x86_64/mozconfig
  thunderbird/repos/extra-x86_64/thunderbird-appversion.patch
Deleted:
  thunderbird/repos/extra-x86_64/firefox-2.0-link-layout.patch
  thunderbird/repos/extra-x86_64/thunderbird-1.5-lang.patch
  thunderbird/repos/extra-x86_64/xulrunner-elif.patch

--------------------------------+
 PKGBUILD                       |   47 +++++++++++++++------------------------
 firefox-2.0-link-layout.patch  |   19 ---------------
 mozconfig                      |    6 +++-
 thunderbird-1.5-lang.patch     |   11 ---------
 thunderbird-3.0-lang.patch     |   11 +++++++++
 thunderbird-appversion.patch   |   31 +++++++++----------------
 thunderbird-shared-error.patch |   15 ++++++++++++
 xulrunner-elif.patch           |   12 ---------
 8 files changed, 60 insertions(+), 92 deletions(-)


Property changes on: thunderbird/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /thunderbird/trunk:1-53492
   + /thunderbird/trunk:1-61036

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-12-10 12:24:19 UTC (rev 61036)
+++ extra-x86_64/PKGBUILD	2009-12-10 12:25:31 UTC (rev 61037)
@@ -3,7 +3,7 @@
 # Contributor: Dale Blount <dale at archlinux.org>
 # Contributor: Anders Bostrom <anders.bostrom at home.se>
 pkgname=thunderbird
-pkgver=2.0.0.23
+pkgver=3.0
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
@@ -12,43 +12,35 @@
 provides=('mozilla-thunderbird')
 conflicts=('mozilla-thunderbird')
 replaces=('mozilla-thunderbird')
-depends=('gtk2>=2.16.5' 'gcc-libs>=4.4' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.3' 'libxt' 'shared-mime-info')
+depends=('gtk2>=2.18.4' 'gcc-libs>=4.4' 'libidl2>=0.8.13' 'mozilla-common' 'nss>=3.12.3' 'libxt' 'shared-mime-info'
+	 'alsa-lib>=1.0.21.a' 'dbus-glib>=0.82')
 makedepends=('zip' 'pkgconfig' 'imagemagick>=6.5.3.10-1' 'libgnomeui')
 options=('!makeflags')
-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-1.5-lang.patch
-        firefox-2.0-link-layout.patch
+        thunderbird-3.0-lang.patch
         thunderbird-appversion.patch
-        xulrunner-elif.patch)
-md5sums=('2e118fcf752ee60ce994f1471f9632d1'
-         '17e3015259da53f40bc445b27078f693'
-         'ea4e3c3dee98e3891bef16409551eb6e'
-         'bc6f10a06407faee6494acad546aabf9'
-         'b933c00957ea793fe940f4d46a85e10e'
-         '63dd0436e43e2de71abcf9160a1a6f44'
-         '38457261a6355365079dbe5c2342ec68')
+	thunderbird-shared-error.patch)
+md5sums=('9a564ac2489b1b0f9348dc298b913f6c' '7552d546b9d88331806965100454fa0d'
+         'ea4e3c3dee98e3891bef16409551eb6e' '25b6fe16ac24cd5c852213e5c1adb272'
+         '69a0134af6466c021a3f515022b7fb67' '3dca714ee8054634e6dfdb059464dc42')
 
 build() {
-  # -Wl,--as-needed seems to fail here
-  unset LDFLAGS
-
-  cd "${srcdir}/mozilla"
-  patch -Np1 -i "${srcdir}/thunderbird-1.5-lang.patch" || return 1
-  patch -Np1 -i "${srcdir}/firefox-2.0-link-layout.patch" || return 1
+  cd "${srcdir}/comm-1.9.1"
+  patch -Np1 -i "${srcdir}/thunderbird-3.0-lang.patch" || return 1
   patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" || return 1
-  patch -Np1 -i "${srcdir}/xulrunner-elif.patch" || return 1
+  patch -Np1 -i "${srcdir}/thunderbird-shared-error.patch" || return 1
   cp "${srcdir}/mozconfig" .mozconfig
 
-  if [ "${CARCH}" = "x86_64" ]; then
-    echo "ac_cv_visibility_pragma=no" >> .mozconfig
-  fi
+  echo "ac_cv_visibility_pragma=no" >> .mozconfig
 
   export MOZ_PROJECT=mail
   unset CXXFLAGS
   unset CFLAGS
 
+  export LDFLAGS="-Wl,-rpath,/usr/lib/thunderbird-3.0"
+
   make -f client.mk build || return 1
   make DESTDIR="${pkgdir}" install || return 1
 
@@ -56,13 +48,12 @@
 
   install -m755 -d "${pkgdir}/usr/share/applications"
   install -m755 -d "${pkgdir}/usr/share/pixmaps"
-  convert "${srcdir}/mozilla/mail/app/default.xpm" \
-      "${pkgdir}/usr/share/pixmaps/thunderbird.png" || return 1
+
+  install -m644 "${srcdir}/comm-1.9.1/mail/branding/nightly/mailicon48.png" \
+  	"${pkgdir}/usr/share/pixmaps/thunderbird.png" || return 1
+
   install -m644 "${srcdir}/thunderbird.desktop" \
       "${pkgdir}/usr/share/applications/" || return 1
 
-  install -m644 "${srcdir}/mozilla/mail/app/default.xpm" \
-      "${pkgdir}/usr/lib/thunderbird-2.0/icons/" || return 1
-
   rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
 }

Deleted: extra-x86_64/firefox-2.0-link-layout.patch
===================================================================
--- extra-x86_64/firefox-2.0-link-layout.patch	2009-12-10 12:24:19 UTC (rev 61036)
+++ extra-x86_64/firefox-2.0-link-layout.patch	2009-12-10 12:25:31 UTC (rev 61037)
@@ -1,19 +0,0 @@
-Index: mozilla/layout/build/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/layout/build/Makefile.in,v
-retrieving revision 1.127.8.7
-diff -d -u -p -r1.127.8.7 Makefile.in
---- mozilla/layout/build/Makefile.in	17 Jul 2006 19:05:13 -0000	1.127.8.7
-+++ mozilla/layout/build/Makefile.in	10 Oct 2006 04:29:16 -0000
-@@ -240,6 +240,11 @@ EXTRA_DSO_LDOPTS += \
- 	$(NULL)
- endif
- 
-+# Add explicit X11 dependency when building against X11 toolkits
-+ifneq (,$(filter gtk gtk2 qt xlib,$(MOZ_WIDGET_TOOLKIT)))
-+EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) -lXrender
-+endif
-+
- include $(topsrcdir)/config/rules.mk
- 
- LOCAL_INCLUDES	+= -I$(srcdir)/../base \

Modified: extra-x86_64/mozconfig
===================================================================
--- extra-x86_64/mozconfig	2009-12-10 12:24:19 UTC (rev 61036)
+++ extra-x86_64/mozconfig	2009-12-10 12:25:31 UTC (rev 61037)
@@ -1,4 +1,5 @@
-. $topsrcdir/mail/config/mozconfig
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
 
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
@@ -10,7 +11,7 @@
 ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --disable-installer
-ac_add_options --enable-default-toolkit=gtk2 
+ac_add_options --enable-default-toolkit=cairo-gtk2
 ac_add_options --disable-official-branding
 ac_add_options --disable-xprint
 ac_add_options --enable-strip
@@ -19,4 +20,5 @@
 ac_add_options --enable-system-cairo
 ac_add_options --enable-svg
 ac_add_options --enable-canvas
+ac_add_options --disable-crashreporter
 ac_add_options --prefix=/usr

Deleted: extra-x86_64/thunderbird-1.5-lang.patch
===================================================================
--- extra-x86_64/thunderbird-1.5-lang.patch	2009-12-10 12:24:19 UTC (rev 61036)
+++ extra-x86_64/thunderbird-1.5-lang.patch	2009-12-10 12:25:31 UTC (rev 61037)
@@ -1,11 +0,0 @@
---- mozilla/mail/app/profile/all-thunderbird.js.lang	2006-06-15 17:33:58.000000000 +0000
-+++ mozilla/mail/app/profile/all-thunderbird.js	2006-06-15 17:34:50.000000000 +0000
-@@ -245,6 +245,8 @@
- pref("font.language.group", "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
- pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
- 
- pref("signon.rememberSignons",              true);
- pref("signon.expireMasterPassword",         false);

Copied: thunderbird/repos/extra-x86_64/thunderbird-3.0-lang.patch (from rev 61035, thunderbird/trunk/thunderbird-3.0-lang.patch)
===================================================================
--- extra-x86_64/thunderbird-3.0-lang.patch	                        (rev 0)
+++ extra-x86_64/thunderbird-3.0-lang.patch	2009-12-10 12:25:31 UTC (rev 61037)
@@ -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

Modified: extra-x86_64/thunderbird-appversion.patch
===================================================================
--- extra-x86_64/thunderbird-appversion.patch	2009-12-10 12:24:19 UTC (rev 61036)
+++ extra-x86_64/thunderbird-appversion.patch	2009-12-10 12:25:31 UTC (rev 61037)
@@ -1,21 +1,12 @@
---- mozilla/config/autoconf.mk.in.orig	2008-12-05 22:26:33.000000000 +0000
-+++ mozilla/config/autoconf.mk.in	2008-12-05 22:27:01.000000000 +0000
-@@ -57,14 +57,14 @@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZ_APP_NAME)-2.0
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= @datadir@/idl/$(MOZ_APP_NAME)-2.0
+diff -Nur comm-1.9.1.orig/config/autoconf.mk.in comm-1.9.1/config/autoconf.mk.in
+--- comm-1.9.1.orig/config/autoconf.mk.in	2009-12-05 03:53:46.000000000 +0200
++++ comm-1.9.1/config/autoconf.mk.in	2009-12-09 20:29:31.654892550 +0200
+@@ -54,7 +54,7 @@
+ MOZ_BUILD_APP = @MOZ_BUILD_APP@
+ MOZ_APP_NAME	= @MOZ_APP_NAME@
+ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNAME@
+-MOZ_APP_VERSION = @MOZ_APP_VERSION@
++MOZ_APP_VERSION="3.0"
+ MOZ_APP_VERSION_TXT = @MOZ_APP_VERSION_TXT@
  
--mozappdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--mredir		= $(libdir)/mre/mre-$(MOZ_APP_VERSION)
-+mozappdir	= $(libdir)/$(MOZ_APP_NAME)-2.0
-+mredir		= $(libdir)/mre/mre-2.0
- mrelibdir	= $(mredir)/lib
- 
- DIST		= $(DEPTH)/dist
+ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@

Copied: thunderbird/repos/extra-x86_64/thunderbird-shared-error.patch (from rev 61035, thunderbird/trunk/thunderbird-shared-error.patch)
===================================================================
--- extra-x86_64/thunderbird-shared-error.patch	                        (rev 0)
+++ extra-x86_64/thunderbird-shared-error.patch	2009-12-10 12:25:31 UTC (rev 61037)
@@ -0,0 +1,15 @@
+diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in
+--- comm-central/mail/installer/Makefile.in.shared-error	2009-09-16 13:47:43.000000000 +0200
++++ comm-central/mail/installer/Makefile.in	2009-09-16 13:48:25.000000000 +0200
+@@ -95,9 +95,11 @@ endif
+ # mozconfig instead.
+ ifndef MAIL_PKG_SHARED
+ ifndef BUILD_STATIC_LIBS
++ifeq (BUILD_STATIC_LIBS, 1)
+ $(error you need an "--enable-static" build to package a build)
+ endif
+ endif
++endif
+ 
+ # On mozilla-central, packager.mk uses core_abspath to redefine DIST
+ # As the comm-central config.mk doesn't set it, do it ourselves instead

Deleted: extra-x86_64/xulrunner-elif.patch
===================================================================
--- extra-x86_64/xulrunner-elif.patch	2009-12-10 12:24:19 UTC (rev 61036)
+++ extra-x86_64/xulrunner-elif.patch	2009-12-10 12:25:31 UTC (rev 61037)
@@ -1,12 +0,0 @@
-diff -up mozilla/toolkit/xre/nsAppRunner.cpp.old mozilla/toolkit/xre/nsAppRunner.cpp
---- mozilla/toolkit/xre/nsAppRunner.cpp.old	2008-12-10 20:07:01.000000000 +0100
-+++ mozilla/toolkit/xre/nsAppRunner.cpp	2009-02-27 17:17:59.000000000 +0100
-@@ -1475,7 +1475,7 @@ XRE_GetBinaryPath(const char* argv0, nsI
-   if (NS_FAILED(rv))
-     return rv;
- 
--#elif
-+#else
- #error Oops, you need platform-specific code here
- #endif
-

More information about the arch-commits mailing list