Add pango and other patches from fedora in effort to try and resolve bug
authorMartin Schlemmer <azarah@gentoo.org>
Wed, 28 Sep 2005 10:04:24 +0000 (10:04 +0000)
committerMartin Schlemmer <azarah@gentoo.org>
Wed, 28 Sep 2005 10:04:24 +0000 (10:04 +0000)
#107372. Update patch set with patch from bug #96869 (comment #48).

Package-Manager: portage-2.0.52-r1

www-client/mozilla/ChangeLog
www-client/mozilla/Manifest
www-client/mozilla/files/digest-mozilla-1.7.12-r2 [new file with mode: 0644]
www-client/mozilla/mozilla-1.7.12-r1.ebuild
www-client/mozilla/mozilla-1.7.12-r2.ebuild [new file with mode: 0644]

index 46caf062e70c566c79094782a29b1ca0fd0de3b6..fdf84f120f5777fade0dd44d6d87f0b9fc1c3cc2 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/mozilla
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.78 2005/09/26 22:12:50 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/ChangeLog,v 1.79 2005/09/28 10:04:24 azarah Exp $
+
+*mozilla-1.7.12-r2 (28 Sep 2005)
+
+  28 Sep 2005; Martin Schlemmer <azarah@gentoo.org>
+  mozilla-1.7.12-r1.ebuild, +mozilla-1.7.12-r2.ebuild:
+  Add pango and other patches from fedora in effort to try and resolve bug
+  #107372. Update patch set with patch from bug #96869 (comment #48).
 
 *mozilla-1.7.12-r1 (26 Sep 2005)
 
index c4d3451b0311b97866e44c37c6111d694e060464..44146f4d2158218ddd432fbe55d2bad39abade94 100644 (file)
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 1a242e5dd432f1fc4b5396b7593c1cb8 mozilla-1.7.10-r1.ebuild 12594
 MD5 8ec7ef0da3f09354431718988cde3776 mozilla-1.7.12-r1.ebuild 13623
 MD5 efb11836f2b5c8f484f743a401229c53 mozilla-1.7.11-r2.ebuild 12246
@@ -39,3 +42,10 @@ MD5 d0e52abf109fe61c4195f0cbf002ae18 files/google.src 706
 MD5 e3c488f3226f61adbb11d6a73ae84209 files/icon/mozilla.desktop 153
 MD5 6d52ff4ce4567db1cad08ea40157a65d files/icon/mozilla-icon.png 2350
 MD5 068edb8c46e34027f9c3febc19656c70 files/1.3/mozilla-1.3-fix-RAW-target.patch 328
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDOmsi1ZcsMnZjRyIRAneIAJ4/GQbyKnWo8DavRhFrohAt01uSdQCdHopE
+ZxmX3E97S97Jm5crs7NEF+E=
+=u6+0
+-----END PGP SIGNATURE-----
diff --git a/www-client/mozilla/files/digest-mozilla-1.7.12-r2 b/www-client/mozilla/files/digest-mozilla-1.7.12-r2
new file mode 100644 (file)
index 0000000..726fae6
--- /dev/null
@@ -0,0 +1,5 @@
+MD5 f1ad6adbbc0510eb76d352c94c801fac mozilla-1.7.12-source.tar.bz2 30446836
+MD5 64ba4c6e3b52568468c4f6680ec7e679 ipc-1.1.3.tar.gz 102593
+MD5 50c369ce6d6fcb2d275cd30319a601ff enigmail-0.92.0.tar.gz 377123
+MD5 b4355a5746dde47cf0a7981df1dff998 moz_libart_lgpl-2.3.10p1.tar.bz2 103063
+MD5 8260c8412cda7f33b0a4dade34494772 mozilla-1.7.12-patches-1.1.tar.bz2 107977
index 6b585948550f3c21ba307d147c049c5222a2f7cb..c8e91400bdee89ae0a58491e8fecabddf2f016f1 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.12-r1.ebuild,v 1.1 2005/09/26 22:12:50 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.12-r1.ebuild,v 1.2 2005/09/28 10:04:24 azarah Exp $
 
 unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
 MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
@@ -147,7 +147,7 @@ src_unpack() {
 
        # Fix scripts that call for /usr/local/bin/perl #51916
        ebegin "Patching smime to call perl from /usr/bin"
-       sed -i -e '1s,usr/local/bin,usr/bin,' security/nss/cmd/smimetools/smime
+       sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
        eend $? || die "sed failed"
 
        # look in /usr/lib/nsplugins for plugins, in addition to the usual places
diff --git a/www-client/mozilla/mozilla-1.7.12-r2.ebuild b/www-client/mozilla/mozilla-1.7.12-r2.ebuild
new file mode 100644 (file)
index 0000000..efcd036
--- /dev/null
@@ -0,0 +1,368 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/mozilla/mozilla-1.7.12-r2.ebuild,v 1.1 2005/09/28 10:04:24 azarah Exp $
+
+unset ALLOWED_FLAGS  # Stupid extra-functions.sh ... bug 49179
+MOZ_FREETYPE2="no"   # Need to disable for newer .. remove here and in mozconfig
+                        # when older is removed from tree.
+MOZ_PANGO="yes"      # Need to enable for newer .. remove here and in mozconfig
+                        # when older is removed from tree.
+inherit flag-o-matic toolchain-funcs eutils mozconfig mozilla-launcher makeedit multilib
+
+PVER="1.1"
+EMVER="0.92.0"
+IPCVER="1.1.3"
+SVGVER="2.3.10p1"
+
+# handle _rc versions
+MY_PV=${PV/_alpha/a}   # handle alpha
+MY_PV=${MY_PV/_beta/b} # handle beta
+MY_PV=${MY_PV/_rc/rc}  # handle rc
+
+DESCRIPTION="Mozilla Application Suite - web browser, email, HTML editor, IRC"
+HOMEPAGE="http://www.mozilla.org"
+SRC_URI="http://ftp.${PN}.org/pub/${PN}.org/${PN}/releases/${PN}${MY_PV}/source/${PN}-${MY_PV}-source.tar.bz2
+       crypt? ( !moznomail? (
+               http://www.${PN}-enigmail.org/downloads/src/ipc-${IPCVER}.tar.gz
+               http://www.${PN}-enigmail.org/downloads/src/enigmail-${EMVER}.tar.gz
+       ) )
+       mozsvg? (
+               mirror://gentoo/moz_libart_lgpl-${SVGVER}.tar.bz2
+               http://dev.gentoo.org/~azarah/${PN}/moz_libart_lgpl-${SVGVER}.tar.bz2
+       )
+       mirror://gentoo/${P}-patches-${PVER}.tar.bz2
+       http://dev.gentoo.org/~azarah/${PN}/${P}-patches-${PVER}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="MPL-1.1 NPL-1.1"
+IUSE="crypt gnome java ldap mozcalendar mozdevelop moznocompose moznoirc moznomail mozsvg postgres ssl"
+
+# xrender.pc appeared for the first time in xorg-x11-6.7.0-r2
+# and is required to build with support for cairo.  #71504
+RDEPEND="java? ( virtual/jre )
+       mozsvg? ( !<x11-base/xorg-x11-6.7.0-r2 )
+       crypt? ( !moznomail? ( >=app-crypt/gnupg-1.2.1 ) )
+       >=www-client/mozilla-launcher-1.42"
+
+DEPEND="${RDEPEND}
+       ~sys-devel/autoconf-2.13
+       java? ( >=dev-java/java-config-0.2.0 )
+       dev-lang/perl
+       postgres? ( >=dev-db/postgresql-7.2.0 )"
+
+S=${WORKDIR}/${PN}
+
+# Needed by src_compile() and src_install().
+# Would do in pkg_setup but that loses the export attribute, they
+# become pure shell variables.
+#
+# NB: We can't export these vars until enigmail is installed separately instead
+# of integrated into this ebuild.
+#
+#export BUILD_OFFICIAL=1
+#export MOZILLA_OFFICIAL=1
+
+src_unpack() {
+       unpack ${PN}-${MY_PV}-source.tar.bz2 ${P}-patches-${PVER}.tar.bz2
+       cd ${S} || die
+
+       # Unpack the enigmail plugin
+       if use crypt && ! use moznomail; then
+               cd ${S}/extensions || die
+               unpack ipc-${IPCVER}.tar.gz enigmail-${EMVER}.tar.gz
+               for x in ipc enigmail; do
+                       cd ${S}/extensions/${x} || die "cd failed"
+                       makemake        # from mozconfig.eclass
+               done
+       fi
+       if use mozsvg; then
+               cd ${S}/other-licenses
+               unpack moz_libart_lgpl-${SVGVER}.tar.bz2
+       fi
+       cd ${S}
+
+       ####################################
+       #
+       # patch collection
+       #
+       ####################################
+
+       # Firefox only patches
+       rm -f ${WORKDIR}/patch/{093,094,402,407}*
+       # Need pango-1.10.0 stable
+       rm -f ${WORKDIR}/patch/03[67]*
+       epatch ${WORKDIR}/patch
+
+       # Without 03[67]* patches, we need to link to pangoxft
+       epatch ${FILESDIR}/${PN}-1.7.12-gtk2xft-link-pangoxft.patch
+
+       # Fix scripts that call for /usr/local/bin/perl #51916
+       ebegin "Patching smime to call perl from /usr/bin"
+       sed -i -e '1s,usr/local/bin,usr/bin,' ${S}/security/nss/cmd/smimetools/smime
+       eend $? || die "sed failed"
+
+       # Needed by some of the patches
+       WANT_AUTOCONF=2.1 autoconf || die "WANT_AUTOCONF failed"
+}
+
+src_compile() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+       declare x
+
+       ####################################
+       #
+       # mozconfig, CFLAGS and CXXFLAGS setup
+       #
+       ####################################
+
+       mozconfig_init
+
+       # Bug 60668: Galeon doesn't build without oji enabled, so enable it
+       # regardless of java setting.
+       mozconfig_annotate '' --enable-oji --enable-mathml
+
+       # Other moz-specific settings
+       mozconfig_use_enable mozdevelop jsd
+       mozconfig_use_enable mozdevelop xpctools
+       mozconfig_use_extension mozdevelop venkman
+       mozconfig_use_enable gnome gnomevfs
+       mozconfig_use_extension gnome gnomevfs
+       mozconfig_use_extension !moznoirc irc
+       mozconfig_use_extension postgres sql
+       if use postgres ; then
+               export MOZ_ENABLE_PGSQL=1
+               export MOZ_PGSQL_INCLUDES=/usr/include
+               export MOZ_PGSQL_LIBS=/usr/$(get_libdir)
+       fi
+       mozconfig_use_enable mozcalendar calendar
+       mozconfig_use_enable ldap
+       mozconfig_use_enable ldap ldap-experimental
+       mozconfig_use_enable mozsvg svg
+       mozconfig_use_enable mozsvg svg-renderer-libart
+       use mozsvg && export MOZ_INTERNAL_LIBART_LGPL=1
+       mozconfig_annotate '' --with-default-mozilla-five-home=${MOZILLA_FIVE_HOME}
+       mozconfig_annotate '' --with-user-appdir=.mozilla
+
+       if use moznomail && ! use mozcalendar; then
+               mozconfig_annotate "+moznomail -mozcalendar" --disable-mailnews
+       fi
+       if use moznocompose && use moznomail; then
+               mozconfig_annotate "+moznocompose +moznomail" --disable-composer
+       fi
+
+       # Finalize and report settings
+       mozconfig_final
+
+       # hardened GCC uses -fstack-protector-all by default, which breaks us
+       has_hardened && append-flags -fno-stack-protector-all
+       replace-flags -fstack-protector-all -fstack-protector
+
+       ####################################
+       #
+       #  Configure and build
+       #
+       ####################################
+
+       CPPFLAGS="${CPPFLAGS} -DARON_WAS_HERE" \
+       CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+       econf || die
+
+       # It would be great if we could pass these in via CPPFLAGS or CFLAGS prior
+       # to econf, but the quotes cause configure to fail.
+       sed -i -e \
+               's|-DARON_WAS_HERE|-DGENTOO_NSPLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsplugins\\\" -DGENTOO_NSBROWSER_PLUGINS_DIR=\\\"/usr/'"$(get_libdir)"'/nsbrowser/plugins\\\"|' \
+               ${S}/config/autoconf.mk \
+               ${S}/nsprpub/config/autoconf.mk \
+               ${S}/xpfe/global/buildconfig.html
+
+       # Fixup the RPATH
+       sed -i -e \
+               's|#RPATH_FIXER|'"${MOZILLA_FIVE_HOME}"'|' \
+               ${S}/config/rules.mk \
+               ${S}/nsprpub/config/rules.mk \
+               ${S}/security/coreconf/rules.mk \
+               ${S}/security/coreconf/rules.mk
+
+       # This removes extraneous CFLAGS from the Makefiles to reduce RAM
+       # requirements while compiling
+       edit_makefiles
+
+       emake || die
+
+       ####################################
+       #
+       #  Build Mozilla NSS
+       #
+       ####################################
+
+       # Build the NSS/SSL support
+       if use ssl; then
+               einfo "Building Mozilla NSS..."
+
+               # Fix #include problem
+               cd ${S}/security/coreconf || die "cd coreconf failed"
+               echo 'INCLUDES += -I$(DIST)/include/nspr -I$(DIST)/include/dbm'\
+                       >>headers.mk
+               emake -j1 || die "make security headers failed"
+
+               cd ${S}/security/nss || die "cd nss failed"
+               emake -j1 moz_import || die "make moz_import failed"
+               emake -j1 || die "make nss failed"
+       fi
+
+       ####################################
+       #
+       #  Build Enigmail extension
+       #
+       ####################################
+
+       if use crypt && ! use moznomail; then
+               for x in ipc enigmail; do
+                       emake -C ${S}/extensions/${x} || die "emake ${x} failed"
+               done
+       fi
+}
+
+src_install() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Most of the installation happens here
+       dodir ${MOZILLA_FIVE_HOME}
+       cp -RL ${S}/dist/bin/* ${D}${MOZILLA_FIVE_HOME}
+
+       # Create directory structure to support portage-installed extensions.
+       # See update_chrome() in mozilla-launcher
+       keepdir ${MOZILLA_FIVE_HOME}/chrome.d
+       keepdir ${MOZILLA_FIVE_HOME}/extensions.d
+       cp ${D}${MOZILLA_FIVE_HOME}/chrome/installed-chrome.txt \
+               ${D}${MOZILLA_FIVE_HOME}/chrome.d/0_base-chrome.txt
+
+       # Create /usr/bin/mozilla
+       install_mozilla_launcher_stub mozilla ${MOZILLA_FIVE_HOME}
+
+       # Install icon and .desktop for menu entry
+       insinto /usr/share/pixmaps
+       doins ${FILESDIR}/icon/${PN}-icon.png
+
+       # Fix bug 54179: Install .desktop file into /usr/share/applications
+       # instead of /usr/share/gnome/apps/Internet (18 Jun 2004 agriffis)
+       insinto /usr/share/applications
+       doins ${FILESDIR}/icon/${PN}.desktop
+
+       # Fix icons to look the same everywhere
+       insinto ${MOZILLA_FIVE_HOME}/icons
+       doins ${S}/widget/src/gtk/mozicon16.xpm
+       doins ${S}/widget/src/gtk/mozicon50.xpm
+
+       ####################################
+       #
+       # Install files necessary for applications to build against mozilla
+       #
+       ####################################
+
+       einfo "Installing includes and idl files..."
+       dodir ${MOZILLA_FIVE_HOME}/{include,idl} /usr/include
+       cd ${S}/dist
+       cp -LfR include/* ${D}${MOZILLA_FIVE_HOME}/include
+       cp -LfR idl/* ${D}${MOZILLA_FIVE_HOME}/idl
+
+       # Install the NSS/SSL libs, headers and tools
+       if use ssl; then
+               einfo "Installing Mozilla NSS..."
+               # Install the headers ('make install' do not work for headers ...)
+               insinto ${MOZILLA_FIVE_HOME}/include/nss
+               [ -d ${S}/dist/public/nss ] && doins ${S}/dist/public/nss/*.h
+               [ -d ${S}/dist/public/seccmd ] && doins ${S}/dist/public/seccmd/*.h
+               [ -d ${S}/dist/public/security ] && doins ${S}/dist/public/security/*.h
+               # These come with zlib ...
+               rm -f ${D}${MOZILLA_FIVE_HOME}/include/nss/{zconf.h,zlib.h}
+
+               cd ${S}/security/nss
+
+               mkdir -p ${WORKDIR}/nss/{bin,lib}
+               export SOURCE_BIN_DIR=${WORKDIR}/nss/bin
+               export SOURCE_LIB_DIR=${WORKDIR}/nss/lib
+
+               make install || die "make failed"
+               # Gets installed as symbolic links ...
+               cp -Lf ${WORKDIR}/nss/bin/* ${D}/usr/bin
+               cp -Lf ${WORKDIR}/nss/lib/* ${D}${MOZILLA_FIVE_HOME}
+
+               # Need to unset these incase we want to rebuild, else the build
+               # gets newked.
+               unset SOURCE_LIB_DIR
+               unset SOURCE_BIN_DIR
+       fi
+
+       # Fix mozilla-config and install it
+       sed -i -e "s|/usr/$(get_libdir)/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}|g
+               s|/usr/include/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}/include|g
+               s|/usr/share/idl/${PN}-${MY_PV}|${MOZILLA_FIVE_HOME}/idl|g
+               s|\(echo -L.*\)\($\)|\1 -Wl,-rpath,${MOZILLA_FIVE_HOME}\2|" \
+               ${S}/build/unix/${PN}-config
+       exeinto ${MOZILLA_FIVE_HOME}
+       doexe ${S}/build/unix/${PN}-config
+
+       # Fix pkgconfig files and install them
+       insinto /usr/$(get_libdir)/pkgconfig
+       for x in ${S}/build/unix/*.pc; do
+               sed -i -e "s|^libdir=.*|libdir=${MOZILLA_FIVE_HOME}|
+                       s|^includedir=.*|includedir=${MOZILLA_FIVE_HOME}/include|
+                       s|^idldir=.*|idldir=${MOZILLA_FIVE_HOME}/idl|
+                       s|\(Libs:.*\)\($\)|\1 -Wl,-rpath,\${libdir}\2|" ${x}
+               doins ${x}
+       done
+
+       # Install env.d snippet, which isn't necessary for running mozilla, but
+       # might be necessary for programs linked against firefox
+       insinto /etc/env.d
+       doins ${FILESDIR}/10${PN}
+       dosed "s|/usr/lib|/usr/$(get_libdir)|" /etc/env.d/10${PN}
+
+       # Install rebuild script since mozilla-bin doesn't support registration yet
+       exeinto ${MOZILLA_FIVE_HOME}
+       doexe ${FILESDIR}/${PN}-rebuild-databases.pl
+       dosed -e 's|/lib/|/'"$(get_libdir)"'/|g' \
+               ${MOZILLA_FIVE_HOME}/${PN}-rebuild-databases.pl
+
+       # Install docs
+       dodoc ${S}/{LEGAL,LICENSE}
+
+       # Update Google search plugin to use UTF8 charset ...
+       insinto ${MOZILLA_FIVE_HOME}/searchplugins
+       doins ${FILESDIR}/google.src
+}
+
+pkg_preinst() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Remove entire installed instance to solve various problems,
+       # for example see bug 27719
+       rm -rf ${ROOT}${MOZILLA_FIVE_HOME}
+}
+
+pkg_postinst() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Update the component registry
+       MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+               /usr/libexec/mozilla-launcher -register
+
+       # This should be called in the postinst and postrm of all the
+       # mozilla, mozilla-bin, firefox, firefox-bin, thunderbird and
+       # thunderbird-bin ebuilds.
+       update_mozilla_launcher_symlinks
+}
+
+pkg_postrm() {
+       declare MOZILLA_FIVE_HOME=/usr/$(get_libdir)/${PN}
+
+       # Update the component registry
+       if [[ -x ${MOZILLA_FIVE_HOME}/${PN}-bin ]]; then
+               MOZILLA_LIBDIR=${ROOT}${MOZILLA_FIVE_HOME} MOZILLA_LAUNCHER=${PN} \
+                       /usr/libexec/mozilla-launcher -register
+       fi
+
+       update_mozilla_launcher_symlinks
+}