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

[Jan de Groot]

    Date: Saturday, December 6, 2008 @ 06:14:15
  Author: jgc
Revision: 20695

Merged revisions 20600 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/thunderbird/trunk

........
  r20600 | jgc | 2008-12-05 23:14:53 +0000 (Fri, 05 Dec 2008) | 2 lines
  
  upgpkg: thunderbird 2.0.0.18-1
      Install to fixed path
........

Added:
  thunderbird/repos/extra-x86_64/thunderbird-appversion.patch
    (from rev 20600, thunderbird/trunk/thunderbird-appversion.patch)
Modified:
  thunderbird/repos/extra-x86_64/	(properties)
  thunderbird/repos/extra-x86_64/PKGBUILD

------------------------------+
 PKGBUILD                     |   29 ++++++++++-------------------
 thunderbird-appversion.patch |   21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 19 deletions(-)


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

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-06 11:12:06 UTC (rev 20694)
+++ extra-x86_64/PKGBUILD	2008-12-06 11:14:15 UTC (rev 20695)
@@ -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.17
+pkgver=2.0.0.18
 pkgrel=1
 pkgdesc="Standalone Mail/News reader"
 arch=('i686' 'x86_64')
@@ -12,24 +12,27 @@
 provides=('mozilla-thunderbird')
 conflicts=('mozilla-thunderbird')
 replaces=('mozilla-thunderbird')
-depends=('gtk2>=2.12.11' 'gcc-libs>=4.3.1' 'libidl2' 'mozilla-common' 'nss>=3.12' 'libxt' 'shared-mime-info' 'mime-types')
-makedepends=('zip' 'pkgconfig' 'imagemagick' 'diffutils' 'patch' 'make' 'gcc' 'libgnomeui')
+depends=('gtk2>=2.14.5' 'gcc-libs>=4.3.1' 'libidl2' 'mozilla-common' 'nss>=3.12.1' 'libxt' 'shared-mime-info')
+makedepends=('zip' 'pkgconfig' 'imagemagick' 'libgnomeui')
 options=('!makeflags')
 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)
-md5sums=('3adb8fabdc26a5859c55b9ce241edb3f'
+	firefox-2.0-link-layout.patch
+	thunderbird-appversion.patch)
+md5sums=('1d131408b2338132a154700cc92a1d58'
          '17e3015259da53f40bc445b27078f693'
          'ea4e3c3dee98e3891bef16409551eb6e'
          'bc6f10a06407faee6494acad546aabf9'
-         'b933c00957ea793fe940f4d46a85e10e')
+         'b933c00957ea793fe940f4d46a85e10e'
+	 '63dd0436e43e2de71abcf9160a1a6f44')
 
 build() {
   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
+  patch -Np1 -i "${srcdir}/thunderbird-appversion.patch" || return 1
   cp "${srcdir}/mozconfig" .mozconfig
 
   if [ "${CARCH}" = "x86_64" ]; then
@@ -43,16 +46,6 @@
   make -f client.mk build || return 1
   make DESTDIR="${pkgdir}" install || return 1
 
-  cd "${pkgdir}/usr/lib/thunderbird-${pkgver}"
-  export MOZ_DISABLE_GNOME=1
-  export MOZTMP=`mktemp -d -p ${srcdir}`
-  LD_PRELOAD="" LD_LIBRARY_PATH="`pwd`" HOME="${MOZTMP}" ./thunderbird-bin -register || return 1
-  rm -rf "${MOZTMP}"
-
-  ln -sf thunderbird-${pkgver} "${pkgdir}/usr/lib/thunderbird" || return 1
-  ln -sf thunderbird-${pkgver} "${pkgdir}/usr/include/thunderbird" || return 1
-  ln -sf thunderbird-${pkgver} "${pkgdir}/usr/share/idl/thunderbird" || return 1
-  
   rm -rf "${pkgdir}/usr/bin/defaults"
 
   install -m755 -d "${pkgdir}/usr/share/applications"
@@ -63,9 +56,7 @@
       "${pkgdir}/usr/share/applications/" || return 1
 
   install -m644 "${srcdir}/mozilla/mail/app/default.xpm" \
-      "${pkgdir}/usr/lib/thunderbird/icons/" || return 1
+      "${pkgdir}/usr/lib/thunderbird-2.0/icons/" || return 1
 
   rm -f ${pkgdir}/usr/lib/pkgconfig/thunderbird-ns{s,pr}.pc
-  sed -e "s/thunderbird-${pkgver}/thunderbird/g" \
-      -i ${pkgdir}/usr/lib/pkgconfig/*.pc || return 1
 }

Copied: thunderbird/repos/extra-x86_64/thunderbird-appversion.patch (from rev 20600, thunderbird/trunk/thunderbird-appversion.patch)
===================================================================
--- extra-x86_64/thunderbird-appversion.patch	                        (rev 0)
+++ extra-x86_64/thunderbird-appversion.patch	2008-12-06 11:14:15 UTC (rev 20695)
@@ -0,0 +1,21 @@
+--- 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
+ 
+-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