[arch-commits] Commit in seamonkey/repos (8 files)
Ionut Biru
ibiru at archlinux.org
Mon Jan 30 18:50:38 UTC 2012
Date: Monday, January 30, 2012 @ 13:50:38
Author: ibiru
Revision: 148305
db-move: moved seamonkey from [staging] to [testing] (x86_64)
Added:
seamonkey/repos/testing-x86_64/
seamonkey/repos/testing-x86_64/PKGBUILD
(from rev 148047, seamonkey/repos/staging-x86_64/PKGBUILD)
seamonkey/repos/testing-x86_64/libpng15.patch
(from rev 148047, seamonkey/repos/staging-x86_64/libpng15.patch)
seamonkey/repos/testing-x86_64/mozconfig
(from rev 148047, seamonkey/repos/staging-x86_64/mozconfig)
seamonkey/repos/testing-x86_64/seamonkey-2.0-lang.patch
(from rev 148047, seamonkey/repos/staging-x86_64/seamonkey-2.0-lang.patch)
seamonkey/repos/testing-x86_64/seamonkey.desktop
(from rev 148047, seamonkey/repos/staging-x86_64/seamonkey.desktop)
seamonkey/repos/testing-x86_64/seamonkey.install
(from rev 148047, seamonkey/repos/staging-x86_64/seamonkey.install)
Deleted:
seamonkey/repos/staging-x86_64/
--------------------------+
PKGBUILD | 51 ++++++++++++++++++++++++++++++++++++++++++++
libpng15.patch | 52 +++++++++++++++++++++++++++++++++++++++++++++
mozconfig | 35 ++++++++++++++++++++++++++++++
seamonkey-2.0-lang.patch | 11 +++++++++
seamonkey.desktop | 11 +++++++++
seamonkey.install | 12 ++++++++++
6 files changed, 172 insertions(+)
Copied: seamonkey/repos/testing-x86_64/PKGBUILD (from rev 148047, seamonkey/repos/staging-x86_64/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-01-30 18:50:38 UTC (rev 148305)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+pkgname=seamonkey
+pkgver=2.6.1
+pkgrel=2
+pkgdesc="SeaMonkey internet suite"
+arch=('i686' 'x86_64')
+license=('MPL')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'yasm' 'wireless_tools' 'mesa')
+install=$pkgname.install
+url="http://www.mozilla.org/projects/seamonkey"
+source=(ftp://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2
+ mozconfig
+ seamonkey.desktop
+ seamonkey-2.0-lang.patch
+ libpng15.patch)
+md5sums=('69a43877107f97cfc7504829405ba319'
+ 'd02b5f002a7cdf8d15dccd2548d09256'
+ '6119a2254716752c9d08e366f8d4c048'
+ '25b6fe16ac24cd5c852213e5c1adb272'
+ 'dc77000ddcbb6d9e17220c759fdcb94e')
+
+build() {
+ cd "$srcdir/comm-release"
+ patch -Np1 -i "$srcdir/seamonkey-2.0-lang.patch"
+ patch -Np1 -i "$srcdir/libpng15.patch"
+
+ cp "$srcdir/mozconfig" .mozconfig
+ export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
+
+ make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+}
+
+package() {
+ cd "$srcdir/comm-release"
+
+ make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+ rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation}
+ ln -sf /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries"
+ ln -sf /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation"
+
+ install -m755 -d "$pkgdir/usr/share/applications"
+ install -m755 -d "$pkgdir/usr/share/pixmaps"
+ install -m644 suite/branding/nightly/icons/gtk/seamonkey.png \
+ "$pkgdir/usr/share/pixmaps/"
+ install -m644 "$srcdir/seamonkey.desktop" "$pkgdir/usr/share/applications/"
+
+ rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
+}
Copied: seamonkey/repos/testing-x86_64/libpng15.patch (from rev 148047, seamonkey/repos/staging-x86_64/libpng15.patch)
===================================================================
--- testing-x86_64/libpng15.patch (rev 0)
+++ testing-x86_64/libpng15.patch 2012-01-30 18:50:38 UTC (rev 148305)
@@ -0,0 +1,52 @@
+diff -Nur comm-release.orig/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp comm-release/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp
+--- comm-release.orig/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp 2012-01-29 19:29:28.121217854 +0000
++++ comm-release/mozilla/modules/libpr0n/decoders/nsICODecoder.cpp 2012-01-29 19:32:05.489944419 +0000
+@@ -385,8 +385,7 @@
+
+ // Raymond Chen says that 32bpp only are valid PNG ICOs
+ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
+- if (static_cast<nsPNGDecoder*>(mContainedDecoder.get())->HasValidInfo() &&
+- static_cast<nsPNGDecoder*>(mContainedDecoder.get())->GetPixelDepth() != 32) {
++ if (!static_cast<nsPNGDecoder*>(mContainedDecoder.get())->IsValidICO()) {
+ PostDataError();
+ }
+ return;
+diff -Nur comm-release.orig/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h comm-release/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h
+--- comm-release.orig/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h 2012-01-29 19:29:28.121217854 +0000
++++ comm-release/mozilla/modules/libpr0n/decoders/nsPNGDecoder.h 2012-01-29 19:32:05.489944419 +0000
+@@ -73,19 +73,25 @@
+
+ void EndImageFrame();
+
+- // Checks if the info header contains valid information
+- bool HasValidInfo() const
++ // Check if PNG is valid ICO (32bpp RGBA)
++ // http://blogs.msdn.com/b/oldnewthing/archive/2010/10/22/10079192.aspx
++ bool IsValidICO() const
+ {
+- return mInfo && mInfo->valid;
+- }
++ png_uint_32
++ png_width, // Unused
++ png_height; // Unused
+
+- // Obtain the pixel depth if available or 0 otherwise
+- PRInt32 GetPixelDepth() const
+- {
+- if (!mInfo) {
+- return 0;
++ int png_bit_depth,
++ png_color_type;
++
++ if (png_get_IHDR(mPNG, mInfo, &png_width, &png_height, &png_bit_depth,
++ &png_color_type, NULL, NULL, NULL)) {
++
++ return (png_color_type == PNG_COLOR_TYPE_RGB_ALPHA &&
++ png_bit_depth == 8);
++ } else {
++ return false;
+ }
+- return mInfo->pixel_depth;
+ }
+
+ public:
Copied: seamonkey/repos/testing-x86_64/mozconfig (from rev 148047, seamonkey/repos/staging-x86_64/mozconfig)
===================================================================
--- testing-x86_64/mozconfig (rev 0)
+++ testing-x86_64/mozconfig 2012-01-30 18:50:38 UTC (rev 148305)
@@ -0,0 +1,35 @@
+ac_add_options --enable-application=suite
+
+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-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-cairo
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-safe-browsing
+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
Copied: seamonkey/repos/testing-x86_64/seamonkey-2.0-lang.patch (from rev 148047, seamonkey/repos/staging-x86_64/seamonkey-2.0-lang.patch)
===================================================================
--- testing-x86_64/seamonkey-2.0-lang.patch (rev 0)
+++ testing-x86_64/seamonkey-2.0-lang.patch 2012-01-30 18:50:38 UTC (rev 148305)
@@ -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: seamonkey/repos/testing-x86_64/seamonkey.desktop (from rev 148047, seamonkey/repos/staging-x86_64/seamonkey.desktop)
===================================================================
--- testing-x86_64/seamonkey.desktop (rev 0)
+++ testing-x86_64/seamonkey.desktop 2012-01-30 18:50:38 UTC (rev 148305)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Exec=seamonkey %u
+Icon=seamonkey
+Type=Application
+Terminal=false
+MultipleArgs=false
+Name=SeaMonkey internet suite
+MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto;
+StartupNotify=false
+Categories=Application;Network;
Copied: seamonkey/repos/testing-x86_64/seamonkey.install (from rev 148047, seamonkey/repos/staging-x86_64/seamonkey.install)
===================================================================
--- testing-x86_64/seamonkey.install (rev 0)
+++ testing-x86_64/seamonkey.install 2012-01-30 18:50:38 UTC (rev 148305)
@@ -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 $1
+}
+
+post_remove() {
+ post_install $1
+}
More information about the arch-commits
mailing list