diff options
Diffstat (limited to 'gnustep-apps')
| -rw-r--r-- | gnustep-apps/gnumail/ChangeLog | 10 | ||||
| -rw-r--r-- | gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-index.patch | 37 | ||||
| -rw-r--r-- | gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch | 33 | ||||
| -rw-r--r-- | gnustep-apps/gnumail/gnumail-1.2.0.ebuild | 10 | ||||
| -rw-r--r-- | gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild | 92 |
5 files changed, 13 insertions, 169 deletions
diff --git a/gnustep-apps/gnumail/ChangeLog b/gnustep-apps/gnumail/ChangeLog index db9fff7063a4..b4653bd807d5 100644 --- a/gnustep-apps/gnumail/ChangeLog +++ b/gnustep-apps/gnumail/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnustep-apps/gnumail -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.37 2012/08/24 07:15:29 xmw Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/ChangeLog,v 1.38 2014/10/20 13:33:58 voyageur Exp $ + + 20 Oct 2014; Bernard Cafarelli <voyageur@gentoo.org> + -gnumail-1.2.0_pre3-r1.ebuild, gnumail-1.2.0.ebuild, + -files/gnumail-1.2.0_pre3-index.patch, + -files/gnumail-1.2.0_pre3-pgpversion.patch: + Drop old version, relax pantomime dependency 24 Aug 2012; Michael Weber <xmw@gentoo.org> gnumail-1.2.0.ebuild: ppc stable (bug 421335). diff --git a/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-index.patch b/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-index.patch deleted file mode 100644 index 384911cc57b8..000000000000 --- a/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-index.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- Framework/GNUMail/MailWindowController.m.orig 2007-06-22 17:21:42.000000000 +0200 -+++ Framework/GNUMail/MailWindowController.m 2007-06-22 17:23:39.000000000 +0200 -@@ -2372,14 +2372,8 @@ - - // We set any vertical mouse motion has being dragging - [dataView setVerticalMotionCanBeginDrag: NO]; -- -- // FIXME: Should we really make that work under OS X and MingW? -- // Find the right * y ratio --#if !defined(MACOSX) && !defined(__MINGW32__) -- // We set the table row height, depending on the current font -- aSize = [[NSFont seenMessageFont] maximumAdvancement]; -- [dataView setRowHeight: aSize.height]; --#endif -+ -+ [dataView setRowHeight: [[NSFont seenMessageFont] defaultLineHeightForFont]]; - - // We load the right set of columns - [self _reloadTableColumns: self]; -@@ -2854,16 +2848,7 @@ - // - - (void) _fontValuesHaveChanged - { -- // FIXME: Should we really make that work under OS X? -- // Find the right * y ratio --#ifndef MACOSX -- NSSize aSize; -- -- // We set the table row height, depending on the current font -- aSize = [[NSFont seenMessageFont] maximumAdvancement]; -- [dataView setRowHeight: aSize.height]; --#endif -- -+ [dataView setRowHeight: [[NSFont seenMessageFont] defaultLineHeightForFont]]; - [self _showMessage: self]; - } - diff --git a/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch b/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch deleted file mode 100644 index 6fd1d333a00b..000000000000 --- a/gnustep-apps/gnumail/files/gnumail-1.2.0_pre3-pgpversion.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- Bundles/PGP/PGPController.h.orig 2007-09-21 13:51:25.000000000 -0700 -+++ Bundles/PGP/PGPController.h 2007-09-21 13:58:22.000000000 -0700 -@@ -69,6 +69,7 @@ - // other methods - // - - (void) updateAndRestartTimer; -+- (NSString *) myVersion; - - @end - ---- Bundles/PGP/PGPController.m.orig 2007-09-21 13:51:37.000000000 -0700 -+++ Bundles/PGP/PGPController.m 2007-09-21 13:58:19.000000000 -0700 -@@ -274,7 +274,7 @@ - // - // - // --- (NSString *) version -+- (NSString *) myVersion - { - return @"v0.9.1"; - } ---- Bundles/PGP/PGPViewController.m.orig 2007-09-25 11:42:10.000000000 -0700 -+++ Bundles/PGP/PGPViewController.m 2007-09-25 11:42:30.000000000 -0700 -@@ -71,7 +71,7 @@ - - // We set the version label value - [versionLabel setStringValue: [NSString stringWithFormat: _(@"Version: %@"), -- [[PGPController singleInstance] version]]]; -+ [[PGPController singleInstance] myVersion]]]; - - return self; - } - diff --git a/gnustep-apps/gnumail/gnumail-1.2.0.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0.ebuild index bddb165c7816..c1da43950dfa 100644 --- a/gnustep-apps/gnumail/gnumail-1.2.0.ebuild +++ b/gnustep-apps/gnumail/gnumail-1.2.0.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0.ebuild,v 1.4 2012/08/24 07:15:29 xmw Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0.ebuild,v 1.5 2014/10/20 13:33:58 voyageur Exp $ EAPI=4 inherit gnustep-2 @@ -17,9 +17,9 @@ LICENSE="GPL-2" SLOT="0" IUSE="crypt +emoticon +xface" -DEPEND="~gnustep-libs/pantomime-${PV} - >=gnustep-base/gnustep-gui-0.11.0 - || ( gnustep-apps/addresses gnustep-libs/addresseskit )" +DEPEND=">=gnustep-base/gnustep-gui-0.11.0 + =gnustep-libs/pantomime-1.2* + gnustep-apps/addresses" RDEPEND="crypt? ( app-crypt/gnupg )" src_prepare() { diff --git a/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild b/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild deleted file mode 100644 index 06cd4d4a7817..000000000000 --- a/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnustep-apps/gnumail/gnumail-1.2.0_pre3-r1.ebuild,v 1.8 2011/06/06 09:09:49 voyageur Exp $ - -inherit gnustep-2 - -MY_PN=${PN/gnum/GNUM} - -S="${WORKDIR}"/${MY_PN} - -DESCRIPTION="A fully featured mail application for GNUstep" -HOMEPAGE="http://www.collaboration-world.com/gnumail/" -SRC_URI="http://www.collaboration-world.com/gnumail.data/releases/Stable/${MY_PN}-${PV/_/}.tar.gz" - -KEYWORDS="amd64 ppc x86 ~x86-fbsd" -LICENSE="GPL-2" -SLOT="0" - -IUSE="crypt emoticon xface" -DEPEND="~gnustep-libs/pantomime-${PV} - >=gnustep-base/gnustep-gui-0.11.0 - || ( gnustep-apps/addresses gnustep-libs/addresseskit )" -RDEPEND="crypt? ( app-crypt/gnupg )" - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-index.patch - epatch "${FILESDIR}"/${P}-pgpversion.patch - sed -i -e 's|GNUMail_GUI_LIBS =|LIBRARIES_DEPEND_UPON +=|' \ - Framework/GNUMail/GNUmakefile || die "as-needed sed failed" - sed -i -e \ - 's|$(GNUSTEP_INSTALLATION_DIR)/Library|$(DESTDIR)$(GNUSTEP_SYSTEM_LIBRARY)|' \ - Bundles/*/GNUmakefile || die "gnustep-make-2 sed failed" -} - -src_compile() { - egnustep_env - egnustep_make - - cd Bundles/Clock - egnustep_make - cd "${S}" - - if use xface ; then - cd Bundles/Face - egnustep_make - cd "${S}" - fi - - if use crypt ; then - cd Bundles/PGP - egnustep_make - cd "${S}" - fi - - if use emoticon ; then - cd Bundles/Emoticon - egnustep_make - cd "${S}" - fi -} - -src_install() { - gnustep-base_src_install - - cd Bundles/Clock - egnustep_install - cd "${S}" - - if use xface ; then - cd Bundles/Face - egnustep_install - cd "${S}" - fi - if use crypt ; then - cd Bundles/PGP - egnustep_install - cd "${S}" - fi - if use emoticon ; then - cd Bundles/Emoticon - egnustep_install - cd "${S}" - fi - - dodoc "${S}"/Documentation/* - - # FIX ? - rm -rf "${D}"$(egnustep_install_domain)/Applications/GNUMail.app/Resources/Resources -} |