diff options
| author |   Sam James <sam@gentoo.org> | 2021-04-20 02:35:16 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-04-20 02:42:24 +0100 |
| commit | 672127fc4ca2d4e4e9e9cab61c580b8f057393b4 (patch) | |
| tree | 4bdbfe8ec80020b36d0a8053aadaf6da357670f0 /x11-plugins | |
| parent | x11-plugins/pidgin-xmpp-receipts: port to EAPI 7 (diff) | |
| download | gentoo-672127fc4ca2d4e4e9e9cab61c580b8f057393b4.tar.gz gentoo-672127fc4ca2d4e4e9e9cab61c580b8f057393b4.tar.bz2 gentoo-672127fc4ca2d4e4e9e9cab61c580b8f057393b4.zip | |
x11-plugins/wmSpaceWeather: epatch->eapply
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-plugins')
4 files changed, 19 insertions, 20 deletions
diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch index f95e7e5ccbe0..e40682abf8d2 100644 --- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch +++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gcc-10.patch @@ -1,6 +1,5 @@ -diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h ---- wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h 1999-04-11 07:35:53.000000000 +0200 -+++ wmspaceweather-1.04.orig/wmgeneral/wmgeneral.h 2020-03-01 16:13:29.843346352 +0100 +--- a/wmgeneral/wmgeneral.h ++++ b/wmgeneral/wmgeneral.h @@ -28,7 +28,7 @@ /* Global variable */ /*******************/ @@ -10,9 +9,8 @@ diff -Naur wmspaceweather-1.04.orig.orig/wmgeneral/wmgeneral.h wmspaceweather-1. /***********************/ /* Function Prototypes */ -diff -Naur wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c ---- wmspaceweather-1.04.orig.orig/wmSpaceWeather/wmSpaceWeather.c 1999-04-11 07:35:53.000000000 +0200 -+++ wmspaceweather-1.04.orig/wmSpaceWeather/wmSpaceWeather.c 2020-03-01 16:13:38.172348429 +0100 +--- a/wmSpaceWeather/wmSpaceWeather.c ++++ b/wmSpaceWeather/wmSpaceWeather.c @@ -91,6 +91,7 @@ char URL[1024]; int ForceUpdate2; diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch index 29cb5f984f13..104003a9b4f0 100644 --- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch +++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-gentoo.patch @@ -1,5 +1,5 @@ ---- wmSpaceWeather/Makefile.orig 2008-01-28 02:45:07.000000000 +0100 -+++ wmSpaceWeather/Makefile 2008-01-28 02:46:04.000000000 +0100 +--- wmSpaceWeather/Makefile ++++ wmSpaceWeather/Makefile @@ -1,8 +1,8 @@ -CC = gcc -CFLAGS = -O2 -Wall @@ -48,8 +48,8 @@ + install -m 0755 GetKp $(DESTDIR)$(PREFIX)/share/wmspaceweather + install -m 0644 wmSpaceWeather.1 $(DESTDIR)$(PREFIX)/share/man/man1 ---- wmSpaceWeather/wmSpaceWeather.c.orig 2008-01-28 03:16:36.000000000 +0100 -+++ wmSpaceWeather/wmSpaceWeather.c 2008-01-28 03:22:12.000000000 +0100 +--- wmSpaceWeather/wmSpaceWeather.c ++++ wmSpaceWeather/wmSpaceWeather.c @@ -663,7 +663,7 @@ if (GotDoubleClick1) { GotFirstClick1 = 0; diff --git a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch index 6d6d90137feb..aaea89f8ae05 100644 --- a/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch +++ b/x11-plugins/wmSpaceWeather/files/wmSpaceWeather-1.04_p19-getkp.patch @@ -1,5 +1,5 @@ ---- wmSpaceWeather/GetKp.orig 2008-01-28 14:20:43.000000000 +0100 -+++ wmSpaceWeather/GetKp 2008-01-28 14:22:48.000000000 +0100 +--- wmSpaceWeather/GetKp ++++ wmSpaceWeather/GetKp @@ -17,10 +17,10 @@ unlink(CUR_INDEX); diff --git a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild index 66f4ca8ec602..7fdcae9bcf96 100644 --- a/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild +++ b/x11-plugins/wmSpaceWeather/wmSpaceWeather-1.04_p19-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit epatch toolchain-funcs +inherit toolchain-funcs MY_PN="wmspaceweather" MY_PV_ORIG="${PV/_p*}" @@ -33,16 +33,17 @@ RDEPEND="${CDEPEND} S="${WORKDIR}/${MY_P_ORIG/_/-}/${PN}" -src_unpack() { - unpack ${MY_P_ORIG}.tar.gz - epatch "${DISTDIR}"/${MY_P_PATCH}.gz - epatch "${FILESDIR}"/${P}-gcc-10.patch +src_prepare() { + default + + cd .. || die + + eapply "${WORKDIR}"/${MY_P_PATCH} + eapply "${FILESDIR}"/${P}-gcc-10.patch # need to apply patches from Debian first, do NOT change the order cd "${S}" || die - mv ../debian/patches "${WORKDIR}"/patch || die - EPATCH_SUFFIX="dpatch" EPATCH_FORCE="yes" \ - EPATCH_MULTI_MSG="Applying Debian patches ..." epatch + eapply -p2 ../debian/patches/*.dpatch eapply "${FILESDIR}"/${P}-gentoo.patch eapply "${FILESDIR}"/${P}-getkp.patch } |