Gentoo Archives: gentoo-commits

From: Jeroen Roovers <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/scrot/, media-gfx/scrot/files/
Date: Tue, 30 Jun 2020 08:08:06
Message-Id: 1593504481.9bd197af7cd916182acc234ccb2b6aeb8a413f82.jer@gentoo
1 commit: 9bd197af7cd916182acc234ccb2b6aeb8a413f82
2 Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 30 08:07:43 2020 +0000
4 Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 30 08:08:01 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd197af
7
8 media-gfx/scrot: Drop accepted patch
9
10 Package-Manager: Portage-2.3.103, Repoman-2.3.23
11 Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
12
13 media-gfx/scrot/files/scrot-9999-Xcursor.patch | 18 ------------------
14 media-gfx/scrot/scrot-9999.ebuild | 3 ---
15 2 files changed, 21 deletions(-)
16
17 diff --git a/media-gfx/scrot/files/scrot-9999-Xcursor.patch b/media-gfx/scrot/files/scrot-9999-Xcursor.patch
18 deleted file mode 100644
19 index dbb935219b3..00000000000
20 --- a/media-gfx/scrot/files/scrot-9999-Xcursor.patch
21 +++ /dev/null
22 @@ -1,18 +0,0 @@
23 ---- a/src/Makefile.am
24 -+++ b/src/Makefile.am
25 -@@ -34,4 +34,4 @@
26 - bin_PROGRAMS = scrot
27 - scrot_SOURCES = main.c getopt.c getopt1.c getopt.h scrot.h \
28 - options.c options.h debug.h imlib.c structs.h note.c note.h
29 --scrot_LDADD = -lX11 -lXfixes -lXcursor -lXcomposite @GIBLIB_LIBS@
30 -+scrot_LDADD = -lX11 -lXfixes -lXcomposite @GIBLIB_LIBS@
31 ---- a/src/scrot.h
32 -+++ b/src/scrot.h
33 -@@ -40,7 +40,6 @@
34 - #include <X11/cursorfont.h>
35 - #include <X11/extensions/Xfixes.h>
36 - #include <X11/extensions/Xcomposite.h>
37 --#include <X11/Xcursor/Xcursor.h>
38 -
39 - #include <stdio.h>
40 - #include <string.h>
41
42 diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild
43 index 82d865e83c5..3bf57b1445b 100644
44 --- a/media-gfx/scrot/scrot-9999.ebuild
45 +++ b/media-gfx/scrot/scrot-9999.ebuild
46 @@ -31,9 +31,6 @@ DEPEND="
47 DOCS=(
48 AUTHORS ChangeLog CONTRIBUTING.md README.md TODO
49 )
50 -PATCHES=(
51 - "${FILESDIR}"/${PN}-9999-Xcursor.patch
52 -)
53
54 src_prepare() {
55 sed -i -e 's#-g -O3##g' src/Makefile.am || die