Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/files/
Date: Sat, 30 Apr 2016 10:59:05
Message-Id: 1462012931.0d6608f6921b4a6a9b029f7a6351d31e18071f80.monsieurp@gentoo
1 commit: 0d6608f6921b4a6a9b029f7a6351d31e18071f80
2 Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 30 10:41:06 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 30 10:42:11 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d6608f6
7
8 dev-games/aseprite: Mend patch format.
9
10 Gentoo-Bug: https://bugs.gentoo.org/581298
11
12 Package-Manager: portage-2.2.26
13
14 .../files/aseprite-1.1.4.1_underlinking.patch | 26 +++++++++++-----------
15 1 file changed, 13 insertions(+), 13 deletions(-)
16
17 diff --git a/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch b/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
18 index 8481657..e62cc15 100644
19 --- a/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
20 +++ b/dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
21 @@ -4,25 +4,25 @@ Date: Fri, 22 Apr 2016 13:42:26 +0500
22 Subject: [PATCH] Fixing underlinking for gcc 4.9
23
24 Allegro4 backend uses XGrabPointer() from libX11.
25 -Added ${X11_LIBRARIES} for she to resolve underlinking.
26 +Added ${X11_LIBRARIES} to resolve underlinking.
27 ---
28 src/she/CMakeLists.txt | 3 ++-
29 1 file changed, 2 insertions(+), 1 deletion(-)
30
31 diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
32 index cddf5bc..1841aa6 100644
33 ---- a/src/she/CMakeLists.txt
34 -+++ b/src/she/CMakeLists.txt
35 -@@ -242,7 +242,8 @@ if(USE_ALLEG4_BACKEND)
36 - target_link_libraries(she
37 - ${LOADPNG_LIBRARY}
38 - ${LIBALLEGRO4_LINK_FLAGS}
39 -- ${DXGUID_LIBRARIES})
40 -+ ${DXGUID_LIBRARIES}
41 -+ ${X11_LIBRARIES})
42 - endif()
43 -
44 - if(USE_SKIA_BACKEND)
45 +--- a/src/she/CMakeLists.txt.orig 2016-04-30 10:36:25.198000000 +0000
46 ++++ b/src/she/CMakeLists.txt 2016-04-30 10:37:01.163000000 +0000
47 +@@ -241,7 +241,8 @@
48 + target_link_libraries(she
49 + ${LOADPNG_LIBRARY}
50 + ${LIBALLEGRO4_LINK_FLAGS}
51 +- ${DXGUID_LIBRARIES})
52 ++ ${DXGUID_LIBRARIES},
53 ++ ${X11_LIBRARIES})
54 + endif()
55 +
56 + if(USE_SKIA_BACKEND)
57 --
58 2.7.3