diff options
author | 2018-05-11 19:15:36 +0200 | |
---|---|---|
committer | 2018-05-11 19:15:36 +0200 | |
commit | b2003677d0ecc08df735cf5f16a4c1ad8f85e56d (patch) | |
tree | b050e23c00b93fc27cac5837e5962c4118dd223d | |
parent | Save media-gfx/ipe from removal. games-puzzle/fish-fillets for USE=lua-split (diff) | |
download | mv-b2003677d0ecc08df735cf5f16a4c1ad8f85e56d.tar.gz mv-b2003677d0ecc08df735cf5f16a4c1ad8f85e56d.tar.bz2 mv-b2003677d0ecc08df735cf5f16a4c1ad8f85e56d.zip |
media-gfx/ipe: xlocale.patch from https://bugs.gentoo.org/489190
-rw-r--r-- | media-gfx/ipe/files/xlocale.patch | 12 | ||||
-rw-r--r-- | media-gfx/ipe/ipe-7.2.7.ebuild | 5 |
2 files changed, 15 insertions, 2 deletions
diff --git a/media-gfx/ipe/files/xlocale.patch b/media-gfx/ipe/files/xlocale.patch new file mode 100644 index 00000000..0d66ff28 --- /dev/null +++ b/media-gfx/ipe/files/xlocale.patch @@ -0,0 +1,12 @@ +# https://bugs.gentoo.org/489190 +--- a/ipelib/ipeplatform.cpp ++++ b/ipelib/ipeplatform.cpp +@@ -38,7 +38,7 @@ + #include <gdiplus.h> + #else + #include <sys/wait.h> +-#include <xlocale.h> ++#include_next <locale.h> + #include <dirent.h> + #endif + #ifdef __APPLE__ diff --git a/media-gfx/ipe/ipe-7.2.7.ebuild b/media-gfx/ipe/ipe-7.2.7.ebuild index 16dd7cc2..5f0cf04b 100644 --- a/media-gfx/ipe/ipe-7.2.7.ebuild +++ b/media-gfx/ipe/ipe-7.2.7.ebuild @@ -3,7 +3,7 @@ EAPI=7 RESTRICT="mirror" -inherit desktop flag-o-matic qmake-utils toolchain-funcs +inherit desktop flag-o-matic toolchain-funcs DESCRIPTION="Drawing editor for creating figures in PDF or PS formats" HOMEPAGE="http://ipe.otfried.org/" @@ -27,11 +27,12 @@ BDEPEND="virtual/pkgconfig" S="${WORKDIR}/${P}/src" +PATCHES=("${FILESDIR}"/xlocale.patch) + src_prepare() { filter-flags -fPIE -pie '-flto*' -fwhole-program +D_GLIBCXX_ASSERTIONS sed -i \ -e 's/fpic/fPIC/' \ - -e 's/moc-qt4/moc/' \ -e "s'\$(IPEPREFIX)/lib'\$(IPEPREFIX)/$(get_libdir)'g" \ -e "s'\(LUA_CFLAGS.*=\).*'\1 -I${EROOT}/usr/include/lua5.3'" \ -e 's/\(LUA_LIBS.*=\).*/\1 -llua5.3/' \ |