Apply debian patches to fix compilation errors like gcc-4.7 compat issues, also install a desktop entry.

Package-Manager: portage-2.1.11.17/cvs/Linux x86_64

5 files changed, 71 insertions, 11 deletions

diff --git a/app-editors/lfhex/ChangeLog b/app-editors/lfhex/ChangeLog
index 09b054d9332b..581cdecb11fd 100644
--- a/app-editors/lfhex/ChangeLog
+++ b/app-editors/lfhex/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/lfhex
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/ChangeLog,v 1.29 2010/03/26 23:58:39 yngwin Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/ChangeLog,v 1.30 2012/09/16 09:30:39 pacho Exp $
+
+  16 Sep 2012; Pacho Ramos <pacho@gentoo.org> +files/01-abs-llabs.dpatch,
+  +files/02-gcc-4.7.dpatch, lfhex-0.42.ebuild:
+  Apply debian patches to fix compilation errors like gcc-4.7 compat issues,
+  also install a desktop entry.
 
   26 Mar 2010; Ben de Groot <yngwin@gentoo.org> lfhex-0.42.ebuild:
   Use qt4-r2.eclass (bug #311481). Formatting.
@@ -115,4 +120,3 @@
   +lfhex-0.3.7.ebuild:
   Initial import. Ebuild thanks to CJ Kucera <gentoo@apocalyptech.com> in bug
   #52295
-
diff --git a/app-editors/lfhex/Manifest b/app-editors/lfhex/Manifest
index d9c82aa63c65..8bbbf747f214 100644
--- a/app-editors/lfhex/Manifest
+++ b/app-editors/lfhex/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX 01-abs-llabs.dpatch 792 SHA256 7f552da0fca853da2a7e7ae8cfd9c31b17f130b3f74daffa9f65110030226bed SHA512 cb23e3541b3ff93ceb86d52fdee6028588bd79f0270bd2bae78ba9c8e729bb7d2fd50ab08b83b6546935b67c4076593f8c5457166c81e1e4ee65adc10b034965 WHIRLPOOL e9d5400c45c16f031c414dbd330c90a940cb1fa67b1fdcacca40af6dff94d591e9882b6de66f89c59003613f2b1ecebbec92502402a33a9aa389e4e19f8a0098
+AUX 02-gcc-4.7.dpatch 717 SHA256 14c726a5e235262979a72f2957d8624d9979094726b16554b5f6ed6cfd70045b SHA512 4f934f4a63b1530e672d59ca3ee5a2304b2be5404d2e4ac708d4e51af69b6f4b5ed818005409ce831701fa92db8f634b06a4cc69ea002205f7985931fd06fc53 WHIRLPOOL 7a81639680f336d794680561db2f7fd0bb25740545d18447934e2308002bcb3aadc168a25e9005fe13a529e9fff730c384e533376ac11b4b1e5fe4a7d46ba3d4
 DIST lfhex-0.42.tar.gz 868287 SHA256 4e8f8b99eb271242937037a3af2fe07369b653f7f7d8becbd84554118bf8baba SHA512 5b0d61f732b4b3a0ff2d73ae3ea551af78047a2edd45916d6ad61fb6d89c18faa4e28ed321e51e034519635c3310ce7b0b67fb809ed67d6c37cb252b78696c88 WHIRLPOOL 720e812edb8d33968d7c89ccaf85096b80dd377743819111c436ce5315d36e070ac37727d4422bb982cf0f6aba69e41335a58a76b1e4d5f143a0948feb26aba5
-EBUILD lfhex-0.42.ebuild 715 SHA256 80d1d4d4c1843897739d43526a742db61f9b7425f5bfcbaf39ebe541760f264f SHA512 a4fa72459710b56cde501bd5ef46333c60d3656767ddfba3ea05b8754014e727a615cfe6b6fe9d563055e859e633688fee86db0a5d3fdd4309cf2f881209f022 WHIRLPOOL d21a6bc9c84fecf99de4f854b561ecd14e7a14f538ded8c8bb447729ac557c31053cf4b56d88489d2f799dbc58e741a2b930c013c6f1559a820bee7241ced8b0
-MISC ChangeLog 4051 SHA256 a062212499d16acc7fce1e4b47e7091346e36a389b0c0a994ecbd2ebffae54f5 SHA512 5b91ab30994f8500b7874d9f3f0f0ddeb71864f89a5b39cdb4408eb238a892446d1e40d40131f8429b5dd3061df29ae378787b9d89b3e803e06222b716d9f5ef WHIRLPOOL 6abf32fdf1d2e155501b08c4df0484a0d1b257a98890532ed3769886b245dd759236584ccc4a198ce10a2f310ffad0a7220270461bf16575c32bf673e3e474ef
+EBUILD lfhex-0.42.ebuild 856 SHA256 03c07c00deea97dd32320fe0cac076eadec27856033158cfd484aaa923b6ca0b SHA512 d6b40f3835dd194da730757bc2b563d5a41cea1964ac56dccfff717b0d2893f32ffbd9ffc480d834964a7abd8053443403f92578a188e034b711ee02f1266b66 WHIRLPOOL 015c1427cbb848a8a695a7dcedc11a70c5d7a72b74bd9bd472af06cb3e979255a7bc090696c5b07d6d3e4154a0fd560b5e82641cab63181108a5ef2d7d38c567
+MISC ChangeLog 4280 SHA256 4b9f688c51bbf89d8f95c8b123e56ff6fa145b5c6585fbe3e4af8a6ee58d65b4 SHA512 9b84da2d0df96745f7528d17351dd9fb1d6961c2346afe6efcb9b2fc62da4cb63ecbb1e7cf377efa00a2c33e4e8841da50f3252639e92810abb27d909c13df46 WHIRLPOOL 1826e66908823eb12b68f2846e1ca6714c6531a540a254f34ae2e784b8d444a03104c3ebc1214adcf3a6d0f20feb613fb7ddbd0aae4d7322f75b50c15be64fa6
 MISC metadata.xml 211 SHA256 84ff2341253cdd21a6782e14ebc076a8bcae11428aacfe2454f4b32165504727 SHA512 a9385b7dc02a9537080a9b1bf59ae2caacd84cab2e3ef1fee15e4f10d5518ae9f71e4ce07d99104e643d18a79ca05116d74e97ec7d230d21b340656701547078 WHIRLPOOL 4309ff085fbfd1a91434c0a9dd4c23b7ad8b10b0559beedcb4d911745543745691abe91bb1e361dd88b6383678f020c95deb9359876319a6407ac0ef2dcbd221
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlBVnEQACgkQCaWpQKGI+9QhEwCfVPYcgr9GA3J8hWFROuRiJhA2
+njYAn37B2J9YeLbnWLEtQbCaJS2X+oSD
+=ssvq
+-----END PGP SIGNATURE-----
diff --git a/app-editors/lfhex/files/01-abs-llabs.dpatch b/app-editors/lfhex/files/01-abs-llabs.dpatch
new file mode 100644
index 000000000000..74ffcbce7299
--- /dev/null
+++ b/app-editors/lfhex/files/01-abs-llabs.dpatch
@@ -0,0 +1,19 @@
+#!/bin/sh /usr/share/dpatch/dpatch-run
+## 01-abs-llabs.dpatch by Thiemo Seufer
+##
+## DP: Fixes FTBFS due to abs() not being in the global anymore since g++ 4.3
+## (#495467)
+
+diff -up lfhex-0.42.orig/src/reader.cpp lfhex-0.42/src/reader.cpp
+--- lfhex-0.42.orig/src/reader.cpp	2008-10-08 19:25:57.000000000 +0200
++++ lfhex-0.42/src/reader.cpp	2008-10-08 19:26:16.000000000 +0200
+@@ -238,7 +238,7 @@ bool Reader::loadPage(off_t pageIdx)
+     // free the page which is the furthest away from the page we are loading
+ 
+     // this could be trouble if off_t is unsigned!
+-    if( abs(_firstPage - pageIdx) > abs(_lastPage - pageIdx) ) 
++    if( ::llabs(_firstPage - pageIdx) > ::llabs(_lastPage - pageIdx) ) 
+       while(!freePage(_firstPage++));
+     else
+       while(!freePage(_lastPage--));
+
diff --git a/app-editors/lfhex/files/02-gcc-4.7.dpatch b/app-editors/lfhex/files/02-gcc-4.7.dpatch
new file mode 100644
index 000000000000..0d58072d9574
--- /dev/null
+++ b/app-editors/lfhex/files/02-gcc-4.7.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-gcc-4.7.dpatch by gregor herrmann <gregoa@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add missing include to avoid FTBFS with gcc 4.7
+## DP: Bug-Debian: http://bugs.debian.org/667238
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lfhex-0.42~/src/expr.h lfhex-0.42/src/expr.h
+--- lfhex-0.42~/src/expr.h	2008-09-19 02:36:49.000000000 +0200
++++ lfhex-0.42/src/expr.h	2012-05-07 17:03:22.788794002 +0200
+@@ -19,6 +19,7 @@
+  */
+ 
+ #include <string>
++#include <sys/types.h>
+ 
+ bool expr_eval( const std::string &str, off_t &value );
+ 
diff --git a/app-editors/lfhex/lfhex-0.42.ebuild b/app-editors/lfhex/lfhex-0.42.ebuild
index 30720a516a62..34966f194be6 100644
--- a/app-editors/lfhex/lfhex-0.42.ebuild
+++ b/app-editors/lfhex/lfhex-0.42.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/lfhex-0.42.ebuild,v 1.7 2010/03/26 23:58:39 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/lfhex/lfhex-0.42.ebuild,v 1.8 2012/09/16 09:30:39 pacho Exp $
 
-EAPI="2"
-inherit base qt4-r2
+EAPI=4
+inherit eutils qt4-r2
 
 DESCRIPTION="A fast, efficient hex-editor with support for large files and comparing binary files"
 HOMEPAGE="http://stoopidsimple.com/lfhex"
@@ -22,11 +22,17 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${P}/src
 
+src_prepare() {
+	# Apply Debian patches to fix compilation errors like gcc-4.7 compat
+	epatch "${FILESDIR}"/*.dpatch
+}
+
 src_configure() {
 	eqmake4
 }
 
 src_install() {
-	dobin lfhex || die
-	dodoc ../README || die
+	dobin lfhex
+	dodoc ../README
+	make_desktop_entry "${PN}" "${PN}"
 }