diff --git a/app-text/odt2txt/odt2txt-0.5.recipe b/app-text/odt2txt/odt2txt-0.5.recipe index bb7f9054c..6f4e2dffc 100644 --- a/app-text/odt2txt/odt2txt-0.5.recipe +++ b/app-text/odt2txt/odt2txt-0.5.recipe @@ -8,7 +8,7 @@ LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/dstosberg/odt2txt/archive/v$portVersion.tar.gz" CHECKSUM_SHA256="23a889109ca9087a719c638758f14cc3b867a5dcf30a6c90bf6a0985073556dd" -PATCHES="odt2txt-$portVersion.patch" +PATCHES="odt2txt-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" diff --git a/app-text/odt2txt/patches/odt2txt-0.5.patch b/app-text/odt2txt/patches/odt2txt-0.5.patch deleted file mode 100644 index af4436db3..000000000 --- a/app-text/odt2txt/patches/odt2txt-0.5.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -54,6 +54,11 @@ - ifeq ($(UNAME_S),NetBSD) - CFLAGS += -DICONV_CHAR="const char" - endif -+ifeq ($(UNAME_S),Haiku) -+ # libzip installs headers to a non-standard dir on Haiku -+ CFLAGS += $(shell pkg-config --cflags libzip) -+ LIBS += -liconv -+endif - ifeq ($(UNAME_S),SunOS) - ifeq ($(CC),cc) - ifdef DEBUG diff --git a/app-text/odt2txt/patches/odt2txt-0.5.patchset b/app-text/odt2txt/patches/odt2txt-0.5.patchset new file mode 100644 index 000000000..b87f31abe --- /dev/null +++ b/app-text/odt2txt/patches/odt2txt-0.5.patchset @@ -0,0 +1,23 @@ +From 2480813b6cba0f418fbe2591af947702c2075f2d Mon Sep 17 00:00:00 2001 +From: begasus +Date: Sun, 4 Jun 2017 09:47:36 +0200 +Subject: add libiconv to LIBS + + +diff --git a/Makefile b/Makefile +index 3f8730a..fcfb7ba 100644 +--- a/Makefile ++++ b/Makefile +@@ -54,6 +54,9 @@ endif + ifeq ($(UNAME_S),NetBSD) + CFLAGS += -DICONV_CHAR="const char" + endif ++ifeq ($(UNAME_S),Haiku) ++ LIBS += -liconv ++endif + ifeq ($(UNAME_S),SunOS) + ifeq ($(CC),cc) + ifdef DEBUG +-- +2.7.0 +