[Frugalware-git] frugalware-current: Revert seamonkey-2.1-1-i686

2011-07-02 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=25f4983c1e9a844e8dd262fcc1930627f007d1de

commit 25f4983c1e9a844e8dd262fcc1930627f007d1de
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jul 2 07:56:44 2011 +0200

Revert seamonkey-2.1-1-i686

This reverts commit 79b9f4c0a5efa63892fcf340631928458a6a92ae.

diff --git a/source/xapps-extra/seamonkey/FrugalBuild 
b/source/xapps-extra/seamonkey/FrugalBuild
index 7b43402..51fb29e 100644
--- a/source/xapps-extra/seamonkey/FrugalBuild
+++ b/source/xapps-extra/seamonkey/FrugalBuild
@@ -8,7 +8,7 @@ pkgdesc=Seamonkey all-in-one internet application suite
url=http://www.mozilla.org/projects/seamonkey/;
depends=('libstdc++' 'gtk+2=2.20.0-2' 'libxau=1.0.4' 'libxdmcp' 'libxdamage' 
'libxml2' 'libidl' 'libxt' 'libice' 'nss=3.12.9' 'libxft' 'dbus-glib' 
'alsa-lib' \
'libnotify')
-makedepends=('zip' 'yasm')
+makedepends=('zip')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: Revert seamonkey-2.1-1-i686

2011-07-02 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=69012c40d5d22bb249a549cfb68f2303d638aea0

commit 69012c40d5d22bb249a549cfb68f2303d638aea0
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jul 2 07:56:28 2011 +0200

Revert seamonkey-2.1-1-i686

This reverts commit e272d09704246510e3ce2a78f31f4219ba191b5d.

diff --git a/source/xapps-extra/seamonkey/FrugalBuild 
b/source/xapps-extra/seamonkey/FrugalBuild
index b68934f..7b43402 100644
--- a/source/xapps-extra/seamonkey/FrugalBuild
+++ b/source/xapps-extra/seamonkey/FrugalBuild
@@ -8,7 +8,7 @@ pkgdesc=Seamonkey all-in-one internet application suite
url=http://www.mozilla.org/projects/seamonkey/;
depends=('libstdc++' 'gtk+2=2.20.0-2' 'libxau=1.0.4' 'libxdmcp' 'libxdamage' 
'libxml2' 'libidl' 'libxt' 'libice' 'nss=3.12.9' 'libxft' 'dbus-glib' 
'alsa-lib' \
'libnotify')
-makedepends=('zip' 'yasm' 'wireless_tools')
+makedepends=('zip' 'yasm')
options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: Revert seamonkey-2.1-1-i686

2011-07-02 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=35758f548cb4d0f22578a889b840c3a8988fdaa8

commit 35758f548cb4d0f22578a889b840c3a8988fdaa8
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jul 2 07:57:03 2011 +0200

Revert seamonkey-2.1-1-i686

This reverts commit 8f96dfeb7b477a483f646b8b0a36baf26f38b3ae.

diff --git a/source/xapps-extra/seamonkey/FrugalBuild 
b/source/xapps-extra/seamonkey/FrugalBuild
index 51fb29e..97ff8bf 100644
--- a/source/xapps-extra/seamonkey/FrugalBuild
+++ b/source/xapps-extra/seamonkey/FrugalBuild
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc=Seamonkey all-in-one internet application suite
url=http://www.mozilla.org/projects/seamonkey/;
depends=('libstdc++' 'gtk+2=2.20.0-2' 'libxau=1.0.4' 'libxdmcp' 'libxdamage' 
'libxml2' 'libidl' 'libxt' 'libice' 'nss=3.12.9' 'libxft' 'dbus-glib' 
'alsa-lib' \
-'libnotify')
+'ibnotify')
makedepends=('zip')
options=('scriptlet')
groups=('xapps-extra')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: Revert seamonkey-2.1-1-i686

2011-07-02 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=d98f356ac56b553cb312c17114262bd34b44250a

commit d98f356ac56b553cb312c17114262bd34b44250a
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jul 2 07:57:19 2011 +0200

Revert seamonkey-2.1-1-i686

This reverts commit 5769b5e930b44191ac193a9f4542e9810d1a118f.

diff --git a/source/xapps-extra/seamonkey/FrugalBuild 
b/source/xapps-extra/seamonkey/FrugalBuild
index 97ff8bf..035f020 100644
--- a/source/xapps-extra/seamonkey/FrugalBuild
+++ b/source/xapps-extra/seamonkey/FrugalBuild
@@ -6,8 +6,7 @@ pkgver=2.1
pkgrel=1
pkgdesc=Seamonkey all-in-one internet application suite
url=http://www.mozilla.org/projects/seamonkey/;
-depends=('libstdc++' 'gtk+2=2.20.0-2' 'libxau=1.0.4' 'libxdmcp' 'libxdamage' 
'libxml2' 'libidl' 'libxt' 'libice' 'nss=3.12.9' 'libxft' 'dbus-glib' 
'alsa-lib' \
-'ibnotify')
+depends=('libstdc++' 'gtk+2=2.20.0-2' 'libxau=1.0.4' 'libxdmcp' 'libxdamage' 
'libxml2' 'libidl' 'libxt' 'libice' 'nss=3.12.9' 'libxft' 'dbus-glib' 
'alsa-lib')
makedepends=('zip')
options=('scriptlet')
groups=('xapps-extra')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: Revert seamonkey-2.1-1-i686

2011-07-02 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00bc337b17de099d24ffdafac620377cef57c1e6

commit 00bc337b17de099d24ffdafac620377cef57c1e6
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jul 2 08:06:59 2011 +0200

Revert seamonkey-2.1-1-i686

This reverts commit 863c296e67a6e5bbfe79e26c79f7f43abd30aa64.

diff --git a/source/xapps-extra/seamonkey/FrugalBuild 
b/source/xapps-extra/seamonkey/FrugalBuild
index d1d1cca..ea858f5 100644
--- a/source/xapps-extra/seamonkey/FrugalBuild
+++ b/source/xapps-extra/seamonkey/FrugalBuild
@@ -2,7 +2,7 @@
# Maintainer: voroskoi voros...@frugalware.org

pkgname=seamonkey
-pkgver=2.1
+pkgver=2.0.13
pkgrel=1
pkgdesc=Seamonkey all-in-one internet application suite
url=http://www.mozilla.org/projects/seamonkey/;
@@ -50,7 +50,7 @@ build()
Frm usr/bin/seamonkey
Fwrapper '/usr/lib/seamonkey/seamonkey $@' $pkgname
}
-sha1sums=('8d48aaf5ff3a5e88bf8c93b8414776a085f370d5' \
+sha1sums=('bba3b5caa0a64d3ac401b216a1a7a41d20003ecd' \
'1864fa4117650bb9a576664943aaf4ab56b7d248' \
'b0e0bdd676758e19cac4a0429257a92183328f0e')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

[Frugalware-git] frugalware-current: Revert seamonkey-2.1-1-i686

2011-07-01 Thread Devil505 
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=bd02a93aa31ae1542cf3d4e6739b22a61bdfb4a2

commit bd02a93aa31ae1542cf3d4e6739b22a61bdfb4a2
Author: Devil505 devil505li...@gmail.com
Date:   Sat Jul 2 07:54:27 2011 +0200

Revert seamonkey-2.1-1-i686

This reverts commit b022ebe011a75c2aabce400f4a50b0977104371e.

diff --git a/source/xapps-extra/seamonkey/FrugalBuild 
b/source/xapps-extra/seamonkey/FrugalBuild
index 0926d2f..b68934f 100644
--- a/source/xapps-extra/seamonkey/FrugalBuild
+++ b/source/xapps-extra/seamonkey/FrugalBuild
@@ -9,32 +9,40 @@ url=http://www.mozilla.org/projects/seamonkey/;
depends=('libstdc++' 'gtk+2=2.20.0-2' 'libxau=1.0.4' 'libxdmcp' 'libxdamage' 
'libxml2' 'libidl' 'libxt' 'libice' 'nss=3.12.9' 'libxft' 'dbus-glib' 
'alsa-lib' \
'libnotify')
makedepends=('zip' 'yasm' 'wireless_tools')
-_F_gnome_desktop=y
-_F_gnome_iconcache=y
-Finclude gnome-scriptlet
+options=('scriptlet')
groups=('xapps-extra')
archs=('i686' 'x86_64' 'ppc')
up2date=lynx -dump $url |grep SeaMonkey -m4 |sed -ne 's/.*Monkey \(.*\)/\1/;$ 
p'
source=(http://releases.mozilla.org/pub/mozilla.org/$pkgname/releases/$pkgver/source/$pkgname-$pkgver.source.tar.bz2
 \
-   config $pkgname.desktop \
-seamonkey-appversion.patch \
-seamonkey-2.0-lang.patch)
+   config $pkgname.desktop)

build()
{
unset MAKEFLAGS
Fcd comm-2.0
Fsed png_voidp_NULL NULL 
mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
-export CXXFLAGS=-fpermissive
-export LDFLAGS=-Wl,-rpath,/usr/lib/seamonkey-2.1
+   export CFLAGS=$CFLAGS -fno-strict-aliasing
+   export CXXFLAGS=$CXXFLAGS -fno-strict-aliasing
sed s/-march=i686 -O2 -pipe/$CFLAGS/ $startdir/src/config  .mozconfig
Fpatchall

-   make -j1 -f client.mk build MOZ_MAKE_FLAGS=${MAKEFLAGS} || Fdie
-   make -j1 -f client.mk DESTDIR=$Fdestdir install || Fdie
+   make -f client.mk build || Fdie
+   make || Fdie
+
+   Fmkdir /usr
+   Fmakeinstall
+
+   # Get rid of versions in path names.
+   Fmv /usr/lib/$pkgname-$pkgver /usr/lib/$pkgname
+   Fln $pkgname /usr/lib/$pkgname-$pkgver
+
+   # Plugins.
+   Fmv /usr/lib/$pkgname/plugins /usr/lib/$pkgname/plugins.orig
+   Fln ../mozilla/plugins/ /usr/lib/$pkgname/plugins

# Install icon for the menu file.
-   Ficonrel suite/branding/nightly/icons/gtk/seamonkey.png
+   Fmkdir /usr/share/pixmaps/
+   Ffile comm-1.9.1/suite/branding/icons/gtk/$pkgname.png 
/usr/share/pixmaps/$pkgname.png

# Install menu file.
Ffile /usr/share/applications/$pkgname.desktop
@@ -42,21 +50,9 @@ build()
#broken link
Frm usr/bin/seamonkey
Fwrapper '/usr/lib/seamonkey/seamonkey $@' $pkgname
-
-   Fbuild_gnome_scriptlet
-
-#Remove included dictionaries, add symlink to system myspell path.
-#Note: this will cause file conflicts when users have installed
-dictionaries in the old location
-Frm usr/lib/seamonkey-2.1/dictionaries
-Fln /usr/share/myspell/dicts usr/lib/seamonkey-$pkgver/dictionaries
-
-Frm usr/lib/pkgconfig/seamonkey-ns{s,pr}.pc
}
sha1sums=('8d48aaf5ff3a5e88bf8c93b8414776a085f370d5' \
-  '6ee0fac73c28d6e5b3e5b556d75ca4e3f78fa321' \
-  'cdac1339b9ad74fe53a0d18dae5c5d75c2a2e053' \
-  '25df3708d0be95a3e601ddb2270b2c87d8df01ed' \
-  '84cc67671e9fa4dc660590eed21be54a2af06720')
+  '1864fa4117650bb9a576664943aaf4ab56b7d248' \
+  'b0e0bdd676758e19cac4a0429257a92183328f0e')

# optimization OK
diff --git a/source/xapps-extra/seamonkey/config 
b/source/xapps-extra/seamonkey/config
index a2adcb2..947870e 100644
--- a/source/xapps-extra/seamonkey/config
+++ b/source/xapps-extra/seamonkey/config
@@ -30,7 +30,3 @@ ac_add_options --enable-mathml
ac_add_options --disable-crashreporter
ac_add_options --mandir=/usr/share/man
ac_cv_visibility_pragma=no
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/source/xapps-extra/seamonkey/seamonkey-2.0-lang.patch 
b/source/xapps-extra/seamonkey/seamonkey-2.0-lang.patch
deleted file mode 100644
index b9f4a5c..000
--- a/source/xapps-extra/seamonkey/seamonkey-2.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 
02:12:44.0 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 
02:56:45.0 +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,