| 1 |
commit: cd0b93ea9adcc7148bdc12202a1d25455fb4f825 |
| 2 |
Author: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
| 3 |
AuthorDate: Wed May 18 03:20:32 2022 +0000 |
| 4 |
Commit: Samuel Bauer <samuel.bauer <AT> yahoo <DOT> fr> |
| 5 |
CommitDate: Wed May 18 03:20:32 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cd0b93ea |
| 7 |
|
| 8 |
games-emulation/mupen64plus-qt: rework quazip includes |
| 9 |
|
| 10 |
Signed-off-by: Samuel Bauer <samuel.bauer <AT> yahoo.fr> |
| 11 |
|
| 12 |
games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild | 7 ++++--- |
| 13 |
games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild | 7 ++++--- |
| 14 |
2 files changed, 8 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild b/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild |
| 17 |
index bb5dbf0c0..baea82b25 100644 |
| 18 |
--- a/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild |
| 19 |
+++ b/games-emulation/mupen64plus-qt/mupen64plus-qt-1.15.ebuild |
| 20 |
@@ -1,7 +1,7 @@ |
| 21 |
-# Copyright 2018-2021 Gentoo Authors |
| 22 |
+# Copyright 2018-2022 Gentoo Authors |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
-EAPI=7 |
| 26 |
+EAPI=8 |
| 27 |
|
| 28 |
inherit desktop qmake-utils |
| 29 |
|
| 30 |
@@ -25,7 +25,7 @@ DEPEND=">=games-emulation/mupen64plus-core-2.5 |
| 31 |
${RDEPEND}" |
| 32 |
|
| 33 |
src_prepare() { |
| 34 |
- sed -i -e '/include.*quazip5/s/quazip5/QuaZip-Qt5-1.1\/quazip/' \ |
| 35 |
+ sed -i -e '/include.*quazip5/s:quazip5/::' \ |
| 36 |
src/emulation/emulatorhandler.cpp src/common.cpp || die |
| 37 |
sed -i -e 's/lquazip5/lquazip1-qt5/' mupen64plus-qt.pro || die |
| 38 |
default |
| 39 |
@@ -33,6 +33,7 @@ src_prepare() { |
| 40 |
|
| 41 |
src_configure() { |
| 42 |
eqmake5 |
| 43 |
+ sed -i -e "/INCPATH/s:\$: $(pkg-config --cflags-only-I quazip1-qt5):" Makefile || die |
| 44 |
} |
| 45 |
|
| 46 |
src_install() { |
| 47 |
|
| 48 |
diff --git a/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild b/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild |
| 49 |
index 778646412..f4de6352d 100644 |
| 50 |
--- a/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild |
| 51 |
+++ b/games-emulation/mupen64plus-qt/mupen64plus-qt-9999.ebuild |
| 52 |
@@ -1,7 +1,7 @@ |
| 53 |
-# Copyright 2018-2021 Gentoo Authors |
| 54 |
+# Copyright 2018-2022 Gentoo Authors |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
|
| 57 |
-EAPI=7 |
| 58 |
+EAPI=8 |
| 59 |
|
| 60 |
inherit desktop git-r3 qmake-utils |
| 61 |
|
| 62 |
@@ -25,7 +25,7 @@ DEPEND=">=games-emulation/mupen64plus-core-2.5 |
| 63 |
${RDEPEND}" |
| 64 |
|
| 65 |
src_prepare() { |
| 66 |
- sed -i -e '/include.*quazip5/s/quazip5/QuaZip-Qt5-1.1\/quazip/' \ |
| 67 |
+ sed -i -e '/include.*quazip5/s:quazip5/::' \ |
| 68 |
src/emulation/emulatorhandler.cpp src/common.cpp || die |
| 69 |
sed -i -e 's/lquazip5/lquazip1-qt5/' mupen64plus-qt.pro || die |
| 70 |
default |
| 71 |
@@ -33,6 +33,7 @@ src_prepare() { |
| 72 |
|
| 73 |
src_configure() { |
| 74 |
eqmake5 |
| 75 |
+ sed -i -e "/INCPATH/s:\$: $(pkg-config --cflags-only-I quazip1-qt5):" Makefile || die |
| 76 |
} |
| 77 |
|
| 78 |
src_install() { |
Archives