| 1 |
commit: 07340c794c69a86d20f9b14d46f24b847923a813 |
| 2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 29 07:00:03 2020 +0000 |
| 4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 29 07:02:13 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07340c79 |
| 7 |
|
| 8 |
media-gfx/scrot: Update live ebuild |
| 9 |
|
| 10 |
- Add libXcomposite |
| 11 |
- Remove libXcursor[0] |
| 12 |
|
| 13 |
[0] https://github.com/resurrecting-open-source-projects/scrot/pull/47 |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
| 16 |
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 17 |
|
| 18 |
media-gfx/scrot/files/scrot-9999-Xcursor.patch | 18 ++++++++++++++++++ |
| 19 |
media-gfx/scrot/scrot-9999.ebuild | 5 ++++- |
| 20 |
2 files changed, 22 insertions(+), 1 deletion(-) |
| 21 |
|
| 22 |
diff --git a/media-gfx/scrot/files/scrot-9999-Xcursor.patch b/media-gfx/scrot/files/scrot-9999-Xcursor.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000000..dbb935219b3 |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-gfx/scrot/files/scrot-9999-Xcursor.patch |
| 27 |
@@ -0,0 +1,18 @@ |
| 28 |
+--- a/src/Makefile.am |
| 29 |
++++ b/src/Makefile.am |
| 30 |
+@@ -34,4 +34,4 @@ |
| 31 |
+ bin_PROGRAMS = scrot |
| 32 |
+ scrot_SOURCES = main.c getopt.c getopt1.c getopt.h scrot.h \ |
| 33 |
+ options.c options.h debug.h imlib.c structs.h note.c note.h |
| 34 |
+-scrot_LDADD = -lX11 -lXfixes -lXcursor -lXcomposite @GIBLIB_LIBS@ |
| 35 |
++scrot_LDADD = -lX11 -lXfixes -lXcomposite @GIBLIB_LIBS@ |
| 36 |
+--- a/src/scrot.h |
| 37 |
++++ b/src/scrot.h |
| 38 |
+@@ -40,7 +40,6 @@ |
| 39 |
+ #include <X11/cursorfont.h> |
| 40 |
+ #include <X11/extensions/Xfixes.h> |
| 41 |
+ #include <X11/extensions/Xcomposite.h> |
| 42 |
+-#include <X11/Xcursor/Xcursor.h> |
| 43 |
+ |
| 44 |
+ #include <stdio.h> |
| 45 |
+ #include <string.h> |
| 46 |
|
| 47 |
diff --git a/media-gfx/scrot/scrot-9999.ebuild b/media-gfx/scrot/scrot-9999.ebuild |
| 48 |
index a3ef577a9be..82d865e83c5 100644 |
| 49 |
--- a/media-gfx/scrot/scrot-9999.ebuild |
| 50 |
+++ b/media-gfx/scrot/scrot-9999.ebuild |
| 51 |
@@ -15,7 +15,7 @@ KEYWORDS="" |
| 52 |
RDEPEND=" |
| 53 |
>=media-libs/giblib-1.2.3 |
| 54 |
x11-libs/libX11 |
| 55 |
- x11-libs/libXcursor |
| 56 |
+ x11-libs/libXcomposite |
| 57 |
x11-libs/libXfixes |
| 58 |
|| ( |
| 59 |
media-libs/imlib2[gif] |
| 60 |
@@ -31,6 +31,9 @@ DEPEND=" |
| 61 |
DOCS=( |
| 62 |
AUTHORS ChangeLog CONTRIBUTING.md README.md TODO |
| 63 |
) |
| 64 |
+PATCHES=( |
| 65 |
+ "${FILESDIR}"/${PN}-9999-Xcursor.patch |
| 66 |
+) |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
sed -i -e 's#-g -O3##g' src/Makefile.am || die |
Archives