From 3c8e2363930cb68339ab5ae0e9f63cbc2d07ca24 Mon Sep 17 00:00:00 2001 From: Ryan Hill Date: Sun, 10 Dec 2006 13:55:11 +0000 Subject: [PATCH] Fix building with GCC 4.1. Bug #149758. Package-Manager: portage-2.1.2_rc3 --- app-editors/geresh/ChangeLog | 8 +++-- app-editors/geresh/Manifest | 36 ++++++++++--------- app-editors/geresh/files/digest-geresh-0.4.1 | 2 ++ .../geresh/files/geresh-0.4.1-gcc4.patch | 21 +++++++++++ app-editors/geresh/geresh-0.4.1.ebuild | 14 ++++++-- app-editors/geresh/metadata.xml | 7 ++-- 6 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 app-editors/geresh/files/geresh-0.4.1-gcc4.patch diff --git a/app-editors/geresh/ChangeLog b/app-editors/geresh/ChangeLog index 006bf0c1325e..92ef9775280b 100644 --- a/app-editors/geresh/ChangeLog +++ b/app-editors/geresh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/geresh -# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/ChangeLog,v 1.7 2005/07/08 16:02:53 dholm Exp $ +# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/ChangeLog,v 1.8 2006/12/10 13:55:11 dirtyepic Exp $ + + 10 Dec 2006; Ryan Hill + +files/geresh-0.4.1-gcc4.patch, metadata.xml, geresh-0.4.1.ebuild: + Fix building with GCC 4.1. Bug #149758. 08 Jul 2005; David Holm geresh-0.4.1.ebuild: Added to ~ppc. diff --git a/app-editors/geresh/Manifest b/app-editors/geresh/Manifest index 222bc8f3c599..258bd9e1d4e1 100644 --- a/app-editors/geresh/Manifest +++ b/app-editors/geresh/Manifest @@ -1,16 +1,20 @@ -DIST geresh-0.4.1.tar.gz 160030 -EBUILD geresh-0.4.1.ebuild 651 RMD160 7805ad78db7595a2f7aef6f9845d92ff9a79ebcc SHA1 738722a1cc0ba21ec053b0f23d1f142ee9dd6e63 SHA256 bba8fca4b601fcb40aafc80c26814dde249f796a486556cdaf1be6c62ad5f9f1 -MD5 c457f114e371b12f8fe67a53d12149c1 geresh-0.4.1.ebuild 651 -RMD160 7805ad78db7595a2f7aef6f9845d92ff9a79ebcc geresh-0.4.1.ebuild 651 -SHA256 bba8fca4b601fcb40aafc80c26814dde249f796a486556cdaf1be6c62ad5f9f1 geresh-0.4.1.ebuild 651 -MISC ChangeLog 793 RMD160 33dc01e586aba1c727d91ab3369c26a60f1d4fdd SHA1 163effc485083ce535a2970e31c705e57ebaca41 SHA256 87e9dce8f64736830ffaad6544250287b35a86c953dc5e4bd50088a1e6aaccd5 -MD5 91e78629c4642d773ab9b433fbd14121 ChangeLog 793 -RMD160 33dc01e586aba1c727d91ab3369c26a60f1d4fdd ChangeLog 793 -SHA256 87e9dce8f64736830ffaad6544250287b35a86c953dc5e4bd50088a1e6aaccd5 ChangeLog 793 -MISC metadata.xml 210 RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 SHA1 efa00493ddec7289a21bc4cbcc6e95ec4de749d5 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 -MD5 c667f921ee8d48ce17ebef0f8d601ea4 metadata.xml 210 -RMD160 c9fe92a44d079ef04bcdd31de9867de5bb9f26e5 metadata.xml 210 -SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 metadata.xml 210 -MD5 80b0cf2f406d75deb9b6e3ca041db966 files/digest-geresh-0.4.1 64 -RMD160 ce0c309315940f80ff902cc4db2947557f7b6789 files/digest-geresh-0.4.1 64 -SHA256 3b51dc86be1a3b9589afebf4e34c84362935ccd03d82b597fd5fa560661b813a files/digest-geresh-0.4.1 64 +AUX geresh-0.4.1-gcc4.patch 625 RMD160 8c8f3e40c72b6b7b3e60c0c8dd7e24c31f0add85 SHA1 7422977fe7ac1ea4c67a17d5d5f3879db23c9062 SHA256 93c24f77e23dca559b4325031788a9f0e1a9d78a742d90f7188da7d8f80d593a +MD5 c621fe661bfa965a1d4f762634acff0f files/geresh-0.4.1-gcc4.patch 625 +RMD160 8c8f3e40c72b6b7b3e60c0c8dd7e24c31f0add85 files/geresh-0.4.1-gcc4.patch 625 +SHA256 93c24f77e23dca559b4325031788a9f0e1a9d78a742d90f7188da7d8f80d593a files/geresh-0.4.1-gcc4.patch 625 +DIST geresh-0.4.1.tar.gz 160030 RMD160 df7688de34eb5fff93e55962b22feac83ec8fd08 SHA1 c34ad5290a0954912ef47ab2ddb494350f2cdfcb SHA256 510070fd0521783dbc210bd47452fb22c965ded4dc687793e8624503d52b2ff2 +EBUILD geresh-0.4.1.ebuild 767 RMD160 8c9ebc1c8f052a2dcbf3ceef547127940bf872be SHA1 dc4b52a8beae01a19dda63634266687607a44777 SHA256 b959aa45570331d830236f7cdf612e583b415ce8c36bf194e5d100e9f658075c +MD5 b50c98d6b324a782510e4d304589864f geresh-0.4.1.ebuild 767 +RMD160 8c9ebc1c8f052a2dcbf3ceef547127940bf872be geresh-0.4.1.ebuild 767 +SHA256 b959aa45570331d830236f7cdf612e583b415ce8c36bf194e5d100e9f658075c geresh-0.4.1.ebuild 767 +MISC ChangeLog 958 RMD160 7f897acbda2fb1358c01b553944afc97649162c2 SHA1 12a931402e749da809a65159c279ca73b3b0b6a6 SHA256 4ca32fc43c0166e48932b42250458cdcdf3db5818d6b4cd84ac21e8da645d4eb +MD5 64c5813bcd17a571bd4b953d65e94ad4 ChangeLog 958 +RMD160 7f897acbda2fb1358c01b553944afc97649162c2 ChangeLog 958 +SHA256 4ca32fc43c0166e48932b42250458cdcdf3db5818d6b4cd84ac21e8da645d4eb ChangeLog 958 +MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 +MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236 +RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236 +SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 metadata.xml 236 +MD5 f87a56bb11577e47f6f0e8fe3cf57089 files/digest-geresh-0.4.1 238 +RMD160 03a950ff09a20265847a2d25528c2095fdfc584c files/digest-geresh-0.4.1 238 +SHA256 395648906c89de937d5d7b95aefc8d05999038c6af972ebb2dcd323ee3246e4e files/digest-geresh-0.4.1 238 diff --git a/app-editors/geresh/files/digest-geresh-0.4.1 b/app-editors/geresh/files/digest-geresh-0.4.1 index a36509d19487..9107e6549acf 100644 --- a/app-editors/geresh/files/digest-geresh-0.4.1 +++ b/app-editors/geresh/files/digest-geresh-0.4.1 @@ -1 +1,3 @@ MD5 25e2cc7aed0b1273ca66a50a4e4d2de4 geresh-0.4.1.tar.gz 160030 +RMD160 df7688de34eb5fff93e55962b22feac83ec8fd08 geresh-0.4.1.tar.gz 160030 +SHA256 510070fd0521783dbc210bd47452fb22c965ded4dc687793e8624503d52b2ff2 geresh-0.4.1.tar.gz 160030 diff --git a/app-editors/geresh/files/geresh-0.4.1-gcc4.patch b/app-editors/geresh/files/geresh-0.4.1-gcc4.patch new file mode 100644 index 000000000000..10e6c4912127 --- /dev/null +++ b/app-editors/geresh/files/geresh-0.4.1-gcc4.patch @@ -0,0 +1,21 @@ +diff -Naur geresh-0.4.1-orig/editbox.h geresh-0.4.1/editbox.h +--- geresh-0.4.1-orig/editbox.h 2006-12-10 07:42:48.000000000 -0600 ++++ geresh-0.4.1/editbox.h 2006-12-10 07:43:09.000000000 -0600 +@@ -671,7 +671,7 @@ + int para_num + ); + +- void EditBox::redraw_unwrapped_paragraph( ++ void redraw_unwrapped_paragraph( + Paragraph &p, + int window_start_line, + bool only_cursor, +@@ -683,7 +683,7 @@ + bool eop_is_selected + ); + +- void EditBox::redraw_wrapped_paragraph( ++ void redraw_wrapped_paragraph( + Paragraph &p, + int window_start_line, + bool only_cursor, diff --git a/app-editors/geresh/geresh-0.4.1.ebuild b/app-editors/geresh/geresh-0.4.1.ebuild index 91be8cdbd5f0..357ac0c3d79d 100644 --- a/app-editors/geresh/geresh-0.4.1.ebuild +++ b/app-editors/geresh/geresh-0.4.1.ebuild @@ -1,6 +1,8 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/geresh-0.4.1.ebuild,v 1.8 2005/07/08 16:02:53 dholm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/geresh/geresh-0.4.1.ebuild,v 1.9 2006/12/10 13:55:11 dirtyepic Exp $ + +inherit eutils DESCRIPTION="A simple multi-lingual console text editor with bidi & utf support" HOMEPAGE="http://www.typo.co.il/~mooffie/geresh/" @@ -18,6 +20,14 @@ DEPEND="dev-libs/fribidi virtual/aspell-dict )" +src_unpack() { + unpack ${A} + cd "${S}" + + # Bug #149758 + epatch "${FILESDIR}"/${P}-gcc4.patch +} + src_install() { make install DESTDIR="${D}" || die } diff --git a/app-editors/geresh/metadata.xml b/app-editors/geresh/metadata.xml index d9cd2cad66c2..9f3fdee2246b 100644 --- a/app-editors/geresh/metadata.xml +++ b/app-editors/geresh/metadata.xml @@ -1,7 +1,8 @@ - -maintainer-needed@gentoo.org - + no-herd + + maintainer-needed@gentoo.org + -- 2.26.2