From 1394b2fa735086b13e8af4b51a4904174e18897f Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Fri, 9 Apr 2010 03:56:59 +0000 Subject: [PATCH] Update for dictionaries to be found properly Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- www-client/seamonkey/ChangeLog | 9 +- www-client/seamonkey/Manifest | 4 +- ..._fix-system-hunspell-dict-detections.patch | 112 +++++++ .../seamonkey/seamonkey-2.0.4-r1.ebuild | 279 ++++++++++++++++++ 4 files changed, 402 insertions(+), 2 deletions(-) create mode 100644 www-client/seamonkey/files/1002_fix-system-hunspell-dict-detections.patch create mode 100644 www-client/seamonkey/seamonkey-2.0.4-r1.ebuild diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index 5a530c0a7014..12568588918f 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.216 2010/04/08 21:44:22 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.217 2010/04/09 03:56:59 polynomial-c Exp $ + +*seamonkey-2.0.4-r1 (09 Apr 2010) + + 09 Apr 2010; Lars Wendler + +files/1002_fix-system-hunspell-dict-detections.patch, + +seamonkey-2.0.4-r1.ebuild: + Update for dictionaries to be found properly 08 Apr 2010; Lars Wendler -files/enigmail/0.95.0-replytolist.patch: diff --git a/www-client/seamonkey/Manifest b/www-client/seamonkey/Manifest index 35b7a29abf5c..23c648699e5b 100644 --- a/www-client/seamonkey/Manifest +++ b/www-client/seamonkey/Manifest @@ -1,3 +1,4 @@ +AUX 1002_fix-system-hunspell-dict-detections.patch 3466 RMD160 f8fa846e5d7c80a15d0abf0c6aedb7302ead1f83 SHA1 091febd913c09c86c9242b1be8960fb012ee7c8d SHA256 7ce51cae6bbd6655c8bc543365370627e37d2fc5aa7f7e1270671f7482df344a AUX 10seamonkey 26 RMD160 156c113dfd25a106d5b72c4e6320bbf155d8775a SHA1 31aa4216dcb9140c625647c8654e2baefb3e9d1a SHA256 e3af11f2fefe5d7375b2ef136ab9f5de7d2f9a697b08f9a0744a49bac3fe2de7 AUX all-gentoo.js 712 RMD160 9c8352b0780ee3ac1e6f372dccb15975dfa09212 SHA1 5825d4485807fe53ddf8bbee70c7352f16c5ea45 SHA256 dfe92f212383bb79b3e2aebb03763c1ad179b3cbc90b22eb4b6aeddba98d100b AUX enigmail/70_enigmail-fix.patch 343 RMD160 a81caaa4cb6507b5a41b2593e26b984c8748a8b8 SHA1 7028cd7cf09c60325887fd0fb68a20ba3bb98b12 SHA256 895c5ffec6aa321290115f2c995658ae87f9bde027ac0414e5d76a7c9d451165 @@ -34,6 +35,7 @@ DIST seamonkey-2.0.4-sv-SE.xpi 508994 RMD160 888056bdace0aefbcd637373cfe8618f99e DIST seamonkey-2.0.4-tr.xpi 493809 RMD160 6a109b14fa720117136b69bfe7e7e733e19e532c SHA1 ea11f4dfff7911b2f0cd1621259e75b9f48dc8de SHA256 5c0597fdad25a5f9a0c4e9a325779d4182c2807aa48d42c5d734c23ec1ec7251 DIST seamonkey-2.0.4.source.tar.bz2 61574927 RMD160 ee0fd6efd1d14a84626f6d597c6dee17af946add SHA1 8bbf46520725b3fae0d057821a4e7cd89baa8031 SHA256 b0b08e801878abdb0b114f86f8aca0ea7c00c45e50c509cbd421932dd1ff858b EBUILD seamonkey-1.1.18.ebuild 8466 RMD160 bb9a6edac01774c529f935debb12fe3035924448 SHA1 27d523923b685467a79ed5a9c9de68169011288c SHA256 ba5a5d1b72c4e157f8667e69457843b3ad6c02841c8cf75c67edb0752ef25938 +EBUILD seamonkey-2.0.4-r1.ebuild 8049 RMD160 6abad8da036e9d2b00d3a89c676dbf7df8dc02a9 SHA1 119d1c8ebc11c7a683ce206d04d6576f0a78a16d SHA256 c65fc8e89454a4c763472d08bd1f9f5f0a017c64da083862420094636462803a EBUILD seamonkey-2.0.4.ebuild 7976 RMD160 ea41072721ffcdd10cc00507d98adf51885176be SHA1 ecc9bd4ee8eddc9f1afe4822e3a3c5d51d07922b SHA256 38159b5aa9711315a0655f6f09e3458935ee6347b5a6a30c41b6adb91065c3a9 -MISC ChangeLog 27185 RMD160 79b5127b36d5c1b2023e406af0013a78907a5873 SHA1 54b17b2416c489b8e4b80bb5b898cdf9f0c3bcc8 SHA256 9b0a1b98693f0bc5c251488a31f3118219fc67efcff3fda4c1bd7f5ed5c0a6a9 +MISC ChangeLog 27409 RMD160 5e2c81149a0a39e5d93614a7a6b5c96372a7888f SHA1 e8c6e98bdf3ac4f5baac023262dcb397a1a69326 SHA256 988d77c5d8f3745f4b58cd06bb5385f1d450d7d7d44b19844035c3062f2587ca MISC metadata.xml 1460 RMD160 817d48a1d51261cd3ee2c5e453b71b3f379d87bf SHA1 fbaaf2d38c77d98df0a5a703ca6fb699a423f5b0 SHA256 48e24d8264172e410756f50e402142394363e31eb2c9250b9189f3ff63e3666e diff --git a/www-client/seamonkey/files/1002_fix-system-hunspell-dict-detections.patch b/www-client/seamonkey/files/1002_fix-system-hunspell-dict-detections.patch new file mode 100644 index 000000000000..5a905aaf4ac0 --- /dev/null +++ b/www-client/seamonkey/files/1002_fix-system-hunspell-dict-detections.patch @@ -0,0 +1,112 @@ +diff -r e06632956519 mozilla/extensions/spellcheck/Makefile.in +--- a/mozilla/extensions/spellcheck/Makefile.in Sun Apr 04 07:02:14 2010 +0300 ++++ b/mozilla/extensions/spellcheck/Makefile.in Tue Apr 06 23:07:03 2010 -0500 +@@ -42,13 +42,19 @@ + include $(DEPTH)/config/autoconf.mk + + MODULE = spellchecker ++ifndef MOZ_NATIVE_HUNSPELL + DIRS = idl locales ++else ++DIRS = idl ++endif + + ifeq (camino,$(MOZ_BUILD_APP)) + DIRS += osxspell + else ++ifndef MOZ_NATIVE_HUNSPELL + DIRS += hunspell + endif ++endif + + DIRS += src + +diff -r e06632956519 mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp +--- a/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp Sun Apr 04 07:02:14 2010 +0300 ++++ b/mozilla/extensions/spellcheck/hunspell/src/mozHunspell.cpp Tue Apr 06 23:07:03 2010 -0500 +@@ -63,6 +63,9 @@ + #include "nsISimpleEnumerator.h" + #include "nsIDirectoryEnumerator.h" + #include "nsIFile.h" ++#ifdef MOZ_NATIVE_HUNSPELL ++#include "nsILocalFile.h" ++#endif + #include "nsDirectoryServiceUtils.h" + #include "nsDirectoryServiceDefs.h" + #include "mozISpellI18NManager.h" +@@ -307,7 +310,16 @@ + return; + + nsCOMPtr dictDir; +- rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY, ++ #ifdef MOZ_NATIVE_HUNSPELL ++ nsCOMPtr localFile; ++ rv = NS_NewNativeLocalFile(nsDependentCString("/usr/share/myspell"),PR_TRUE, getter_AddRefs(localFile)); ++ if (localFile && NS_SUCCEEDED(rv)) { ++ localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(dictDir)); ++ LoadDictionariesFromDir(dictDir); ++ } ++ else { ++ #endif ++ rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY, + NS_GET_IID(nsIFile), getter_AddRefs(dictDir)); + if (NS_SUCCEEDED(rv)) { + LoadDictionariesFromDir(dictDir); +@@ -332,6 +344,9 @@ + LoadDictionariesFromDir(appDir); + } + } ++#ifdef MOZ_NATIVE_HUNSPELL ++ } ++#endif + + nsCOMPtr dictDirs; + rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST, +diff -r e06632956519 mozilla/extensions/spellcheck/src/Makefile.in +--- a/mozilla/extensions/spellcheck/src/Makefile.in Sun Apr 04 07:02:14 2010 +0300 ++++ b/mozilla/extensions/spellcheck/src/Makefile.in Tue Apr 06 23:07:03 2010 -0500 +@@ -63,9 +63,15 @@ + txtsvc \ + uconv \ + unicharutil \ ++ xulapp \ + $(NULL) + +-CPPSRCS = \ ++ifdef MOZ_NATIVE_HUNSPELL ++CPPSRCS += mozHunspell.cpp \ ++ mozHunspellDirProvider.cpp ++endif ++ ++CPPSRCS += \ + mozSpellCheckerFactory.cpp \ + mozSpellChecker.cpp \ + mozPersonalDictionary.cpp \ +@@ -80,8 +86,15 @@ + SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX) + LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src + else ++ifndef MOZ_NATIVE_HUNSPELL + SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX) + LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src ++else ++LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS) \ ++ -I$(srcdir)/../hunspell/src \ ++ -DMOZ_NATIVE_HUNSPELL \ ++ $(NULL) ++endif + endif + + EXTRA_DSO_LDOPTS = \ +@@ -96,3 +109,11 @@ + LOCAL_INCLUDES += \ + -I$(topsrcdir)/xpcom/io \ + $(NULL) ++ ++ifdef MOZ_NATIVE_HUNSPELL ++export:: $(srcdir)/../hunspell/src/mozHunspell.cpp $(srcdir)/../hunspell/src/mozHunspellDirProvider.cpp ++ $(INSTALL) $(srcdir)/../hunspell/src/mozHunspell.* $(srcdir)/../hunspell/src/mozHunspellDirProvider.* . ++GARBAGE += mozHunspell.$(OBJ_SUFFIX) mozHunspell.cpp mozHunspellDirProvider.$(OBJ_SUFFIX) mozHunspellDirProvider.cpp ++clean:: ++ rm -f mozHunspell.* mozHunspellDirProvider.* ++endif diff --git a/www-client/seamonkey/seamonkey-2.0.4-r1.ebuild b/www-client/seamonkey/seamonkey-2.0.4-r1.ebuild new file mode 100644 index 000000000000..4e21b24bd2c8 --- /dev/null +++ b/www-client/seamonkey/seamonkey-2.0.4-r1.ebuild @@ -0,0 +1,279 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-2.0.4-r1.ebuild,v 1.1 2010/04/09 03:56:59 polynomial-c Exp $ + +EAPI="2" +WANT_AUTOCONF="2.1" + +inherit flag-o-matic toolchain-funcs eutils mozconfig-3 makeedit multilib fdo-mime autotools mozextension java-pkg-opt-2 + +PATCH="${PN}-2.0.3-patches-0.1" +EMVER="1.0.1" + +LANGS="be ca cs de en-US es-AR es-ES fr gl hu it ja ka lt nb-NO nl pl pt-PT ru sk sv-SE tr" +NOSHORTLANGS="es-AR es-ES nb-NO pt-PT sv-SE" + +MY_PV="${PV/_rc/rc}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="Seamonkey Web Browser" +HOMEPAGE="http://www.seamonkey-project.org" + +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +SLOT="0" +LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )" +IUSE="+alsa +chatzilla +composer +crypt java ldap +mailclient +roaming system-sqlite" + +REL_URI="http://releases.mozilla.org/pub/mozilla.org/${PN}/releases" +SRC_URI="${REL_URI}/${MY_PV}/source/${MY_P}.source.tar.bz2 + http://dev.gentoo.org/~polynomial-c/${PATCH}.tar.bz2 + crypt? ( mailclient? ( http://www.mozilla-enigmail.org/download/source/enigmail-${EMVER}.tar.gz ) )" + +for X in ${LANGS} ; do + if [ "${X}" != "en" ] && [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X/-/_}? ( ${REL_URI}/${MY_PV}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X/-/_}" + # english is handled internally + if [ "${#X}" == 5 ] && ! has ${X} ${NOSHORTLANGS}; then + if [ "${X}" != "en-US" ]; then + SRC_URI="${SRC_URI} + linguas_${X%%-*}? ( ${REL_URI}/${MY_PV}/langpack/${MY_P}.${X}.langpack.xpi -> ${MY_P}-${X}.xpi )" + fi + IUSE="${IUSE} linguas_${X%%-*}" + fi +done + +RDEPEND="java? ( virtual/jre ) + >=sys-devel/binutils-2.16.1 + >=dev-libs/nss-3.12.2 + >=dev-libs/nspr-4.8 + alsa? ( media-libs/alsa-lib ) + system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) + >=app-text/hunspell-1.2 + >=x11-libs/gtk+-2.10.0 + >=x11-libs/cairo-1.8.8[X] + >=x11-libs/pango-1.14.0[X] + crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig + java? ( >=virtual/jdk-1.4 )" + +S="${WORKDIR}/comm-1.9.1" + +linguas() { + local LANG SLANG + for LANG in ${LINGUAS}; do + if has ${LANG} en en_US; then + has en ${linguas} || linguas="${linguas:+"${linguas} "}en" + continue + elif has ${LANG} ${LANGS//-/_}; then + has ${LANG//_/-} ${linguas} || linguas="${linguas:+"${linguas} "}${LANG//_/-}" + continue + elif [[ " ${LANGS} " == *" ${LANG}-"* ]]; then + for X in ${LANGS}; do + if [[ "${X}" == "${LANG}-"* ]] && \ + [[ " ${NOSHORTLANGS} " != *" ${X} "* ]]; then + has ${X} ${linguas} || linguas="${linguas:+"${linguas} "}${X}" + continue 2 + fi + done + fi + ewarn "Sorry, but ${PN} does not support the ${LANG} LINGUA" + done +} + +src_unpack() { + unpack ${A} + + linguas + for X in ${linguas}; do + # FIXME: Add support for unpacking xpis to portage + [[ ${X} != "en" ]] && xpi_unpack "${MY_P}-${X}.xpi" + done + if [[ ${linguas} != "" && ${linguas} != "en" ]]; then + einfo "Selected language packs (first will be default): ${linguas}" + fi +} + +pkg_setup() { + export BUILD_OFFICIAL=1 + export MOZILLA_OFFICIAL=1 + + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + java-pkg-opt-2_src_prepare + + # Apply our patches + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + epatch "${WORKDIR}" + + epatch "${FILESDIR}"/1002_fix-system-hunspell-dict-detections.patch + + if use crypt && use mailclient ; then + mv "${WORKDIR}"/enigmail "${S}"/mailnews/extensions/enigmail + cd "${S}"/mailnews/extensions/enigmail || die + epatch "${FILESDIR}"/enigmail/70_enigmail-fix.patch + makemake2 + cd "${S}" + fi + + eautoreconf +} + +src_configure() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + MEXTENSIONS="" + + #################################### + # + # mozconfig, CFLAGS and CXXFLAGS setup + # + #################################### + + mozconfig_init + mozconfig_config + + # It doesn't compile on alpha without this LDFLAGS + use alpha && append-ldflags "-Wl,--no-relax" + + if ! use chatzilla ; then + MEXTENSIONS="${MEXTENSIONS},-irc" + fi + if ! use roaming ; then + MEXTENSIONS="${MEXTENSIONS},-sroaming" + fi + + if ! use gnome ; then + MEXTENSIONS="${MEXTENSIONS},-gnomevfs" + fi + + if ! use composer ; then + if ! use chatzilla && ! use mailclient ; then + mozconfig_annotate '-composer' --disable-composer + fi + fi + + mozconfig_annotate '' --enable-extensions="${MEXTENSIONS}" + mozconfig_annotate '' --enable-application=suite + mozconfig_annotate 'broken' --disable-mochitest + mozconfig_annotate 'broken' --disable-crashreporter + mozconfig_annotate '' --enable-system-hunspell + mozconfig_annotate '' --enable-jsd + mozconfig_annotate '' --enable-image-encoder=all + mozconfig_annotate '' --enable-canvas + mozconfig_annotate '' --with-system-nspr + mozconfig_annotate '' --with-system-nss + mozconfig_annotate '' --enable-system-lcms + mozconfig_annotate '' --with-system-bz2 + mozconfig_annotate '' --enable-oji --enable-mathml + mozconfig_annotate 'places' --enable-storage --enable-places --enable-places_bookmarks + mozconfig_annotate '' --disable-installer + mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME} + + # Enable/Disable based on USE flags + mozconfig_use_enable alsa ogg + mozconfig_use_enable alsa wave + mozconfig_use_enable java javaxpcom + mozconfig_use_enable ldap + mozconfig_use_enable ldap ldap-experimental + mozconfig_use_enable mailclient mailnews + mozconfig_use_enable system-sqlite + + # Finalize and report settings + mozconfig_final + + if [[ $(gcc-major-version) -lt 4 ]]; then + append-cxxflags -fno-stack-protector + fi + + #################################### + # + # Configure and build + # + #################################### + + # Work around breakage in makeopts with --no-print-directory + MAKEOPTS="${MAKEOPTS/--no-print-directory/}" + + CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" econf +} + +src_compile() { + # Should the build use multiprocessing? Not enabled by default, as it tends to break. + [ "${WANT_MP}" = "true" ] && jobs=${MAKEOPTS} || jobs="-j1" + emake ${jobs} || die + + # Only build enigmail extension if conditions are met. + if use crypt && use mailclient ; then + emake -C "${S}"/mailnews/extensions/enigmail || die "make enigmail failed" + emake -j1 -C "${S}"/mailnews/extensions/enigmail xpi || die "make enigmail xpi failed" + fi +} + +src_install() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + declare emid + + emake DESTDIR="${D}" install || die "emake install failed" + + if use crypt && use mailclient ; then + cd "${T}" + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi install.rdf + emid=$(sed -n '//!d; s/.*\({.*}\).*/\1/; p; q' install.rdf) + + dodir ${MOZILLA_FIVE_HOME}/extensions/${emid} + cd "${D}"${MOZILLA_FIVE_HOME}/extensions/${emid} + unzip "${S}"/mozilla/dist/bin/enigmail*.xpi + fi + + linguas + for X in ${linguas}; do + [[ ${X} != "en" ]] && xpi_install "${WORKDIR}"/"${MY_P}-${X}" + done + + # Install icon and .desktop for menu entry + newicon "${S}"/suite/branding/content/icon64.png seamonkey.png + domenu "${FILESDIR}"/icon/seamonkey.desktop + + # Add StartupNotify=true bug 290401 + if use startup-notification ; then + echo "StartupNotify=true" >> "${D}"/usr/share/applications/seamonkey.desktop + fi + + # Add our default prefs + sed "s|SEAMONKEY_PVR|${PVR}|" "${FILESDIR}"/all-gentoo.js \ + > "${D}"${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js + + # Plugins dir + rm -rf "${D}"${MOZILLA_FIVE_HOME}/plugins || die "failed to remove existing plugins dir" + dosym ../nsbrowser/plugins "${MOZILLA_FIVE_HOME}"/plugins + + # shiny new man page + doman "${S}"/suite/app/${PN}.1 +} + +pkg_preinst() { + declare MOZILLA_FIVE_HOME="${ROOT}/usr/$(get_libdir)/${PN}" + + if [ -d ${MOZILLA_FIVE_HOME}/plugins ] ; then + rm ${MOZILLA_FIVE_HOME}/plugins -rf + fi +} + +pkg_postinst() { + declare MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}" + + # Update mimedb for the new .desktop file + fdo-mime_desktop_database_update + + if use chatzilla ; then + elog "chatzilla is now an extension which can be en-/disabled and configured via" + elog "the Add-on manager." + fi +} -- 2.26.2