dwarfpp: package with headers

libdwarfpp/PKGBUILD

@@ -13,9 +13,11 @@ depends=(libcxxfileno libsrk31cxx libdwarf)
 makedepends=('git' 'make' 'autoconf')
 install=
 source=("git+https://github.com/stephenrkell/libdwarfpp"
-        "https://tobast.fr/files/libdwarfpp-dies.patch")
+        "https://tobast.fr/files/libdwarfpp-dies.patch"
+        "https://tobast.fr/files/libdwarfpp-headers.patch")
 sha1sums=('SKIP'
-          '1bfc0b66e1c6bb4b0e284e29a50a1b4be6b3aa50')
+          '1bfc0b66e1c6bb4b0e284e29a50a1b4be6b3aa50'
+          'bb6d91dc75981484814412382102c3c32664eeb5')
 
 pkgver() {
     cd "$srcdir/${_pkgname}"
@@ -25,6 +27,8 @@ pkgver() {
 prepare() {
     cd "$srcdir/${_pkgname}"
     git apply ../libdwarfpp-dies.patch
+    git apply ../libdwarfpp-headers.patch
+    sed -i 's@libdwarf.h@libdwarf/libdwarf.h@' include/dwarfpp/libdwarf.hpp
 }
 
 build() {
@@ -65,7 +69,7 @@ build() {
         --with-libdwarf-libs="$libdwarf_lib"
 	make -j
 
-    rm -f "$pydir"
+    rm -fr "$pydir"
 }
 
 package() {