| 1 |
commit: 52155d6d37358cf677ed451dffc8201d81123ca7 |
| 2 |
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Mar 3 23:43:04 2019 +0000 |
| 4 |
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 3 23:43:24 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52155d6d |
| 7 |
|
| 8 |
x11-wm/windowmaker: drop imagemagick-7 patch in live ebuild |
| 9 |
|
| 10 |
A similar fix is now in upstream git |
| 11 |
Also switch git checkout to https |
| 12 |
|
| 13 |
Closes: https://bugs.gentoo.org/678630 |
| 14 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 15 |
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org> |
| 16 |
|
| 17 |
x11-wm/windowmaker/windowmaker-9999.ebuild | 10 +++------- |
| 18 |
1 file changed, 3 insertions(+), 7 deletions(-) |
| 19 |
|
| 20 |
diff --git a/x11-wm/windowmaker/windowmaker-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild |
| 21 |
index 5378b5e3d34..18bfa9f85a4 100644 |
| 22 |
--- a/x11-wm/windowmaker/windowmaker-9999.ebuild |
| 23 |
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild |
| 24 |
@@ -1,4 +1,4 @@ |
| 25 |
-# Copyright 1999-2017 Gentoo Foundation |
| 26 |
+# Copyright 1999-2019 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=6 |
| 30 |
@@ -7,7 +7,7 @@ inherit autotools eutils git-r3 |
| 31 |
DESCRIPTION="The fast and light GNUstep window manager" |
| 32 |
HOMEPAGE="http://www.windowmaker.org/" |
| 33 |
SRC_URI="http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz" |
| 34 |
-EGIT_REPO_URI="git://repo.or.cz/wmaker-crm.git" |
| 35 |
+EGIT_REPO_URI="https://repo.or.cz/wmaker-crm.git" |
| 36 |
EGIT_BRANCH="next" |
| 37 |
|
| 38 |
SLOT="0" |
| 39 |
@@ -22,7 +22,7 @@ DEPEND="media-libs/fontconfig |
| 40 |
x11-libs/libXt |
| 41 |
x11-libs/libXv |
| 42 |
gif? ( >=media-libs/giflib-4.1.0-r3 ) |
| 43 |
- imagemagick? ( media-gfx/imagemagick:0= ) |
| 44 |
+ imagemagick? ( >=media-gfx/imagemagick-7:0= ) |
| 45 |
jpeg? ( virtual/jpeg:0= ) |
| 46 |
png? ( media-libs/libpng:0= ) |
| 47 |
tiff? ( media-libs/tiff:0 ) |
| 48 |
@@ -49,10 +49,6 @@ src_prepare() { |
| 49 |
fi; |
| 50 |
done; |
| 51 |
|
| 52 |
- if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then |
| 53 |
- eapply "${FILESDIR}/${PN}-0.95.8-imagemagick7.patch" |
| 54 |
- fi |
| 55 |
- |
| 56 |
default |
| 57 |
eautoreconf |
| 58 |
} |
Archives