mirror of
https://github.com/pentoo/pentoo-overlay
synced 2026-02-08 16:35:10 +01:00
rdd: first attempt to fix https://github.com/pentoo/pentoo-overlay/issues/227
This commit is contained in:
parent
11a7d93071
commit
42b18275f8
2 changed files with 34 additions and 3 deletions
24
app-forensics/rdd/files/rdd-3.0.4-ewf.patch
Normal file
24
app-forensics/rdd/files/rdd-3.0.4-ewf.patch
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
diff -urN rdd-3.0.4.orig/src/ewfwriter.c rdd-3.0.4/src/ewfwriter.c
|
||||
--- rdd-3.0.4.orig/src/ewfwriter.c 2011-02-05 17:48:07.000000000 +0800
|
||||
+++ rdd-3.0.4/src/ewfwriter.c 2017-08-10 09:09:23.912154321 +0800
|
||||
@@ -51,7 +51,7 @@
|
||||
#include "rdd.h"
|
||||
#include "writer.h"
|
||||
|
||||
-#include "libewf.h"
|
||||
+#include <libewf.h>
|
||||
|
||||
|
||||
|
||||
diff -urN rdd-3.0.4.orig/test/Makefile.am rdd-3.0.4/test/Makefile.am
|
||||
--- rdd-3.0.4.orig/test/Makefile.am 2010-12-13 05:34:46.000000000 +0800
|
||||
+++ rdd-3.0.4/test/Makefile.am 2017-08-10 09:24:36.081215559 +0800
|
||||
@@ -178,7 +178,7 @@
|
||||
tmsgprinter_LDADD= -L${top_builddir}/src -lrdd
|
||||
|
||||
tewfwriter_SOURCES= tewfwriter.c testhelper.h
|
||||
-tewfwriter_LDADD= -L${top_builddir}/src -lrdd
|
||||
+tewfwriter_LDADD= -L${top_builddir}/src -lrdd -lewf
|
||||
|
||||
tfaultyreader_SOURCES= tfaultyreader.c testhelper.h mockreader.c mockreader.h
|
||||
tfaultyreader_LDADD= -L${top_builddir}/src -lrdd
|
||||
|
|
@ -25,8 +25,12 @@ DEPEND="${RDEPEND}
|
|||
doc? ( app-doc/doxygen )"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/rdd-3.0.4-sandbox-fix.patch"
|
||||
epatch "${FILESDIR}/${P}-sandbox-fix.patch"
|
||||
epatch "${FILESDIR}/${P}-ewf.patch"
|
||||
sed -i 's/AM_PATH_GTK_2_0//' configure.ac || die
|
||||
#the following fixes cflags but breaks include path (the code is that bad)
|
||||
sed -i -e '/NFI_CFLAGS/d' configure.ac || die
|
||||
rm m4/nfi_cflags.m4
|
||||
|
||||
#libewf 2017 api fix
|
||||
sed -i 's/libewf_get_flags_write/libewf_get_access_flags_write/' src/ewfwriter.c || die
|
||||
|
|
@ -38,6 +42,9 @@ src_prepare() {
|
|||
|
||||
eapply_user
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
|
||||
#fix include path for test dir
|
||||
sed -i -e "s|-I.@am__isrc@|-I../src|" test/Makefile.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
|
|
@ -55,6 +62,6 @@ src_install() {
|
|||
emake install DESTDIR="${D}"
|
||||
dobin src/rddi.py
|
||||
dosym rdd-copy /usr/bin/rdd
|
||||
#this causes a warning about not being recursive, no clue why
|
||||
dohtml -r doxygen-doc/html/*
|
||||
#go online if you want html
|
||||
#dohtml -r doxygen-doc/html/*
|
||||
}
|
||||
Loading…
Reference in a new issue