[arch-commits] Commit in seamonkey/trunk (5 files)

Sun Jun 19 13:37:39 UTC 2011

Date: Sunday, June 19, 2011 @ 09:37:39
  Author: ibiru
Revision: 127899

upgpkg: seamonkey 2.1-1
update to 2.1

Modified:
  seamonkey/trunk/PKGBUILD
  seamonkey/trunk/mozconfig
  seamonkey/trunk/seamonkey-appversion.patch
Deleted:
  seamonkey/trunk/gcc46.patch
  seamonkey/trunk/python27.patch

----------------------------+
 PKGBUILD                   |   43 +++++++++++++++++++++++--------------------
 gcc46.patch                |   12 ------------
 mozconfig                  |   43 ++++++++++++++++++++++---------------------
 python27.patch             |   11 -----------
 seamonkey-appversion.patch |   14 +++++++-------
 5 files changed, 52 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2011-06-19 12:31:07 UTC (rev 127898)
+++ PKGBUILD	2011-06-19 13:37:39 UTC (rev 127899)
@@ -1,49 +1,52 @@
 # $Id$
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=seamonkey
-pkgver=2.0.14
-pkgrel=2
+pkgver=2.1
+pkgrel=1
 pkgdesc="SeaMonkey internet suite"
 arch=('i686' 'x86_64')
 license=('MPL')
-depends=('gtk2' 'mozilla-common' 'nss' 'libxt' 'gcc-libs' 'alsa-lib' 'dbus-glib' 'desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'libgnomeui' 'python2' 'libidl2' 'autoconf2.13')
+depends=('gtk2' 'mozilla-common' 'hunspell' 'libxt' 'startup-notification' 'alsa-lib' 'dbus-glib' 'libnotify' 'desktop-file-utils')
+makedepends=('zip' 'pkg-config'  'python2' 'libidl2' 'yasm' 'wireless_tools' 'mesa')
 install=$pkgname.install
 url="http://www.mozilla.org/projects/seamonkey"
+options=(!buildflags)
 source=(http://releases.mozilla.org/pub/mozilla.org/${pkgname}/releases/${pkgver}/source/${pkgname}-${pkgver}.source.tar.bz2
         mozconfig
         seamonkey.desktop
         seamonkey-appversion.patch
-        seamonkey-2.0-lang.patch
-        python27.patch
-        gcc46.patch)
-md5sums=('2099ec0b71f950faad297a140b2702bc'
-         '4978159e4921892e34dcd7e9804f0437'
+        seamonkey-2.0-lang.patch)
+md5sums=('336d75d8891950a2aca253b7f64cada9'
+         '7100aebd5590f7a9681dd06383a29ab1'
          '6119a2254716752c9d08e366f8d4c048'
-         'a4275fc48361c80f676e96fdb28bd74e'
-         '25b6fe16ac24cd5c852213e5c1adb272'
-         '47e57931d65c71baafcf0e4f9160e876'
-         '6fa81e4bb54120254efa29b6d2ccc7fb')
+         '41afe51e9cc56c35bb877743b790f3f6'
+         '25b6fe16ac24cd5c852213e5c1adb272')
 
 build() {
-  cd "${srcdir}/comm-1.9.1"
+  cd "${srcdir}/comm-2.0"
   patch -Np1 -i "${srcdir}/seamonkey-appversion.patch"
   patch -Np1 -i "${srcdir}/seamonkey-2.0-lang.patch"
-  patch -Np1 -i "${srcdir}/gcc46.patch"
-  patch -Np0 -i "${srcdir}/python27.patch"
 
   cp "${srcdir}/mozconfig" .mozconfig
-  unset CFLAGS
-  unset CXXFLAGS
   export CXXFLAGS="-fpermissive"
-  export LDFLAGS="-Wl,-rpath,/usr/lib/seamonkey-2.0"
+  export LDFLAGS="-Wl,-rpath,/usr/lib/seamonkey-2.1"
 
   make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
+}
+
+package() {
+  cd "${srcdir}/comm-2.0"
+
   make -j1 -f client.mk 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/seamonkey-2.1/dictionaries"
+  ln -sf /usr/share/myspell/dicts "${pkgdir}/usr/lib/seamonkey-2.1/dictionaries"
+
   install -m755 -d "${pkgdir}/usr/share/applications"
   install -m755 -d "${pkgdir}/usr/share/pixmaps"
-  install -m644 "${srcdir}/comm-1.9.1/suite/branding/icons/gtk/seamonkey.png" \
+  install -m644 suite/branding/nightly/icons/gtk/seamonkey.png \
                 "${pkgdir}/usr/share/pixmaps/"
   install -m644 "${srcdir}/seamonkey.desktop" "${pkgdir}/usr/share/applications/"
 

Deleted: gcc46.patch
===================================================================
--- gcc46.patch	2011-06-19 12:31:07 UTC (rev 127898)
+++ gcc46.patch	2011-06-19 13:37:39 UTC (rev 127899)
@@ -1,12 +0,0 @@
-diff -Nur comm-1.9.1.orig//mozilla/gfx/ots/src/os2.cc comm-1.9.1/mozilla/gfx/ots/src/os2.cc
---- comm-1.9.1.orig//mozilla/gfx/ots/src/os2.cc	2011-04-20 22:57:49.000000000 -0700
-+++ comm-1.9.1/mozilla/gfx/ots/src/os2.cc	2011-04-29 09:14:58.929150027 -0700
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include <cstddef>
-+
- #include "os2.h"
- 
- #include "head.h"

Modified: mozconfig
===================================================================
--- mozconfig	2011-06-19 12:31:07 UTC (rev 127898)
+++ mozconfig	2011-06-19 13:37:39 UTC (rev 127899)
@@ -1,29 +1,30 @@
-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 --enable-application=suite
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-cairo
+ac_add_options --enable-startup-notification
 ac_add_options --with-pthreads
+
+ac_add_options --enable-default-toolkit=cairo-gtk2
+
+ac_add_options --disable-javaxpcom
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
 ac_add_options --disable-tests
+ac_add_options --disable-xprint
+ac_add_options --disable-mochitest
 ac_add_options --disable-debug
 ac_add_options --disable-installer
-ac_add_options --disable-crashreporter
-ac_add_options --enable-optimize
-ac_add_options --enable-xinerama
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --disable-xprint
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-#disabled due to bugs with cairo 1.10
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --prefix=/usr
-ac_add_options --mandir=/usr/share/man
-ac_add_options --enable-crypto
-ac_add_options --enable-application=suite
-ac_cv_visibility_pragma=no
+ac_add_options --disable-pedantic
 
+ac_add_options --enable-gio
+ac_add_options --disable-gnomevfs
+ac_add_options --enable-gconf
+ac_add_options --enable-libnotify
+
 export BUILD_OFFICIAL=1
 export MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1

Deleted: python27.patch
===================================================================
--- python27.patch	2011-06-19 12:31:07 UTC (rev 127898)
+++ python27.patch	2011-06-19 13:37:39 UTC (rev 127899)
@@ -1,11 +0,0 @@
---- configure.in~	2010-10-20 17:43:42.843358798 -0700
-+++ configure.in	2010-10-20 17:43:16.373359032 -0700
-@@ -874,7 +874,7 @@
-     AC_MSG_RESULT([yes])    
- fi
- 
--AC_PATH_PROGS(PYTHON, $PYTHON python2.5 python2.4 python)
-+AC_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.5 python2.4 python)
- if test -z "$PYTHON"; then
-     AC_MSG_ERROR([python was not found in \$PATH])
- fi

Modified: seamonkey-appversion.patch
===================================================================
--- seamonkey-appversion.patch	2011-06-19 12:31:07 UTC (rev 127898)
+++ seamonkey-appversion.patch	2011-06-19 13:37:39 UTC (rev 127899)
@@ -1,12 +1,12 @@
-diff -Nur comm-1.9.1.orig/suite/installer/Makefile.in comm-1.9.1/suite/installer/Makefile.in
---- comm-1.9.1.orig/suite/installer/Makefile.in	2010-01-04 23:01:34.000000000 +0200
-+++ comm-1.9.1/suite/installer/Makefile.in	2010-01-11 22:38:44.000000000 +0200
+diff -Nur comm-2.0.orig//suite/installer/Makefile.in comm-2.0/suite/installer/Makefile.in
+--- comm-2.0.orig//suite/installer/Makefile.in	2011-06-18 19:04:41.592250768 +0000
++++ comm-2.0/suite/installer/Makefile.in	2011-06-18 19:05:40.416090761 +0000
 @@ -42,6 +42,8 @@
  
  include $(DEPTH)/config/autoconf.mk
  
-+MOZ_APP_VERSION="2.0"
++MOZ_APP_VERSION="2.1"
 +
- NO_PKG_FILES = \
- 	$(MOZ_APP_NAME)-config \
- 	xpcshell* \
+ include $(topsrcdir)/config/rules.mk
+ 
+ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in


