diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2012-09-16 09:30:39 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2012-09-16 09:30:39 +0000 |
| commit | 79ce037d74aab4d1b500f38d6281f322200f32ca (patch) | |
| tree | 19e2f679a859479eb836d172c8d84762ba80a9ff /app-editors/lfhex/files | |
| parent | Initial commit, ebuild by me (bug #191494). (diff) | |
| download | gentoo-2-79ce037d74aab4d1b500f38d6281f322200f32ca.tar.gz gentoo-2-79ce037d74aab4d1b500f38d6281f322200f32ca.tar.bz2 gentoo-2-79ce037d74aab4d1b500f38d6281f322200f32ca.zip | |
Apply debian patches to fix compilation errors like gcc-4.7 compat issues, also install a desktop entry.
(Portage version: 2.1.11.17/cvs/Linux x86_64)
Diffstat (limited to 'app-editors/lfhex/files')
| -rw-r--r-- | app-editors/lfhex/files/01-abs-llabs.dpatch | 19 | ||||
| -rw-r--r-- | app-editors/lfhex/files/02-gcc-4.7.dpatch | 19 |
2 files changed, 38 insertions, 0 deletions
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 ); + |