Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b022ebe011a75c2aabce400f4a50b0977104371e
commit b022ebe011a75c2aabce400f4a50b0977104371e Author: Devil505 <devil505li...@gmail.com> Date: Fri Jul 1 08:42:58 2011 +0200 seamonkey-2.1-1-i686 * added patches * fixing build diff --git a/source/xapps-extra/seamonkey/FrugalBuild b/source/xapps-extra/seamonkey/FrugalBuild index b68934f..0926d2f 100644 --- a/source/xapps-extra/seamonkey/FrugalBuild +++ b/source/xapps-extra/seamonkey/FrugalBuild @@ -9,40 +9,32 @@ 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') -options=('scriptlet') +_F_gnome_desktop="y" +_F_gnome_iconcache="y" +Finclude gnome-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) + config $pkgname.desktop \ + seamonkey-appversion.patch \ + seamonkey-2.0-lang.patch) build() { unset MAKEFLAGS Fcd comm-2.0 Fsed "png_voidp_NULL" "NULL" mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp - export CFLAGS="$CFLAGS -fno-strict-aliasing" - export CXXFLAGS="$CXXFLAGS -fno-strict-aliasing" + export CXXFLAGS="-fpermissive" + export LDFLAGS="-Wl,-rpath,/usr/lib/seamonkey-2.1" sed "s/-march=i686 -O2 -pipe/$CFLAGS/" $startdir/src/config > .mozconfig Fpatchall - 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 + make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}" || Fdie + make -j1 -f client.mk DESTDIR="$Fdestdir" install || Fdie # Install icon for the menu file. - Fmkdir /usr/share/pixmaps/ - Ffile comm-1.9.1/suite/branding/icons/gtk/$pkgname.png /usr/share/pixmaps/$pkgname.png + Ficonrel suite/branding/nightly/icons/gtk/seamonkey.png # Install menu file. Ffile /usr/share/applications/$pkgname.desktop @@ -50,9 +42,21 @@ 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' \ - '1864fa4117650bb9a576664943aaf4ab56b7d248' \ - 'b0e0bdd676758e19cac4a0429257a92183328f0e') + '6ee0fac73c28d6e5b3e5b556d75ca4e3f78fa321' \ + 'cdac1339b9ad74fe53a0d18dae5c5d75c2a2e053' \ + '25df3708d0be95a3e601ddb2270b2c87d8df01ed' \ + '84cc67671e9fa4dc660590eed21be54a2af06720') # optimization OK diff --git a/source/xapps-extra/seamonkey/config b/source/xapps-extra/seamonkey/config index 947870e..a2adcb2 100644 --- a/source/xapps-extra/seamonkey/config +++ b/source/xapps-extra/seamonkey/config @@ -30,3 +30,7 @@ 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 new file mode 100644 index 0000000..b9f4a5c --- /dev/null +++ b/source/xapps-extra/seamonkey/seamonkey-2.0-lang.patch @@ -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 diff --git a/source/xapps-extra/seamonkey/seamonkey-appversion.patch b/source/xapps-extra/seamonkey/seamonkey-appversion.patch new file mode 100644 index 0000000..f7d6b05 --- /dev/null +++ b/source/xapps-extra/seamonkey/seamonkey-appversion.patch @@ -0,0 +1,12 @@ +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.1" ++ + include $(topsrcdir)/config/rules.mk + + MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in diff --git a/source/xapps-extra/seamonkey/seamonkey.desktop b/source/xapps-extra/seamonkey/seamonkey.desktop index 2b650f7..2b8af5b 100644 --- a/source/xapps-extra/seamonkey/seamonkey.desktop +++ b/source/xapps-extra/seamonkey/seamonkey.desktop @@ -10,3 +10,6 @@ X-KDE-StartupNotify=true Terminal=false Categories=Application;Network; MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml; +mailto; +StartupNotify=false +Categories=Application;Network; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
