summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-03-09 09:02:33 +0000
committerSam James <sam@gentoo.org>2021-03-09 09:44:21 +0000
commiteeebb28751a2e854126a77a0a0959b6d9581f215 (patch)
tree6150f6b93a0b8186acda8e4ba87ff1b0f37ea493
parentprofiles/package.mask: mask shorturl for removal (diff)
downloadgentoo-eeebb28751a2e854126a77a0a0959b6d9581f215.tar.gz
gentoo-eeebb28751a2e854126a77a0a0959b6d9581f215.tar.bz2
gentoo-eeebb28751a2e854126a77a0a0959b6d9581f215.zip
dev-libs/libofx: docdir, libdir patches upstreamed
Bug: https://bugs.gentoo.org/693458 Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--dev-libs/libofx/files/libofx-0.10.1-docdir.patch5
-rw-r--r--dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch4
-rw-r--r--dev-libs/libofx/libofx-0.10.1-r1.ebuild4
3 files changed, 3 insertions, 10 deletions
diff --git a/dev-libs/libofx/files/libofx-0.10.1-docdir.patch b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
index f99730daa02b..1e73e6ea104a 100644
--- a/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
+++ b/dev-libs/libofx/files/libofx-0.10.1-docdir.patch
@@ -1,6 +1,4 @@
-https://github.com/libofx/libofx/pull/40
-
-From 379745ff481f2cc99f96836de0307b8074bf0788 Mon Sep 17 00:00:00 2001
+From ee296908c23a944b9b034c9b1f8b974edcb44b80 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 6 Mar 2021 06:09:11 +0000
Subject: [PATCH] Makefile.am, doc/Makefile.am: don't override docdir
@@ -15,7 +13,6 @@ where ${PF} represents the upstream version combined with any
internal distribution changes made.
Signed-off-by: Sam James <sam@gentoo.org>
-
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,6 @@ endif
diff --git a/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
index da37a6ee49fd..9dd2160f74ce 100644
--- a/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
+++ b/dev-libs/libofx/files/libofx-0.10.1-opensp-libdir.patch
@@ -1,6 +1,3 @@
-https://github.com/libofx/libofx/pull/40
-https://bugs.gentoo.org/693458
-
From a647c1db417459bded7fb47af69dff375eae83c1 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sat, 6 Mar 2021 05:57:49 +0000
@@ -22,7 +19,6 @@ search for OpenSP in the right place.
Bug: https://bugs.gentoo.org/693458
Signed-off-by: Sam James <sam@gentoo.org>
-
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,7 @@ AC_ARG_WITH(opensp-libs,
diff --git a/dev-libs/libofx/libofx-0.10.1-r1.ebuild b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
index 11e25cba6ddf..e2f99a67303d 100644
--- a/dev-libs/libofx/libofx-0.10.1-r1.ebuild
+++ b/dev-libs/libofx/libofx-0.10.1-r1.ebuild
@@ -32,8 +32,8 @@ RDEPEND="
DEPEND="${RDEPEND}"
PATCHES=(
- "${FILESDIR}"/libofx-0.10.1-opensp-libdir.patch
- "${FILESDIR}"/libofx-0.10.1-docdir.patch
+ "${FILESDIR}"/${P}-opensp-libdir.patch
+ "${FILESDIR}"/${P}-docdir.patch
)
src_prepare() {