Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev-games/aseprite: Correct patch for 1.1.4.1 #1322

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev-games/aseprite/aseprite-1.1.4.1.ebuild
Expand Up @@ -22,9 +22,9 @@ IUSE="debug test webp"
RDEPEND="dev-libs/tinyxml
media-libs/allegro:0[X,png]
media-libs/freetype
media-libs/giflib
media-libs/giflib:=
webp? ( media-libs/libwebp )
media-libs/libpng:0
media-libs/libpng:0=
net-misc/curl
sys-libs/zlib
virtual/jpeg:0
Expand Down
34 changes: 25 additions & 9 deletions dev-games/aseprite/files/aseprite-1.1.4.1_underlinking.patch
@@ -1,12 +1,28 @@
From e7883b7d6428662077fa88c8dfa4e0fdee28ff46 Mon Sep 17 00:00:00 2001
From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
Date: Fri, 22 Apr 2016 13:42:26 +0500
Subject: [PATCH] Fixing underlinking for gcc 4.9

Allegro4 backend uses XGrabPointer() from libX11.
Added ${X11_LIBRARIES} for she to resolve underlinking.
---
src/she/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/she/CMakeLists.txt b/src/she/CMakeLists.txt
index eddf386..d1b8ce5 100644
index cddf5bc..1841aa6 100644
--- a/src/she/CMakeLists.txt
+++ b/src/she/CMakeLists.txt
@@ -205,6 +205,7 @@ endif()
add_library(she ${SHE_SOURCES})

target_link_libraries(she
+ ${PLATFORM_LIBS}
gfx-lib
base-lib)

@@ -242,7 +242,8 @@ if(USE_ALLEG4_BACKEND)
target_link_libraries(she
${LOADPNG_LIBRARY}
${LIBALLEGRO4_LINK_FLAGS}
- ${DXGUID_LIBRARIES})
+ ${DXGUID_LIBRARIES}
+ ${X11_LIBRARIES})
endif()

if(USE_SKIA_BACKEND)
--
2.7.3