diff options
| author | Leo <thinkabit.ukim@gmail.com> | 2019-11-29 13:22:36 +0100 |
|---|---|---|
| committer | Leo <thinkabit.ukim@gmail.com> | 2019-11-29 13:22:36 +0100 |
| commit | 17852542cb4fe99c9bb940e57dc227856c2d09e6 (patch) | |
| tree | 2a2eeb9b524ab7208b747e381f51ef421934e14e /testing/widelands | |
| parent | f1ee04773b81ec9ea05592d0e669cbb04d20cb38 (diff) | |
| download | aports-17852542cb4fe99c9bb940e57dc227856c2d09e6.tar.bz2 aports-17852542cb4fe99c9bb940e57dc227856c2d09e6.tar.xz | |
testing/widelands: Import patch from Arch Linux to fix linking GL
Diffstat (limited to 'testing/widelands')
| -rw-r--r-- | testing/widelands/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch | 23 | ||||
| -rw-r--r-- | testing/widelands/APKBUILD | 6 |
2 files changed, 27 insertions, 2 deletions
diff --git a/testing/widelands/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch b/testing/widelands/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch new file mode 100644 index 0000000000..bd949392cc --- /dev/null +++ b/testing/widelands/45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch @@ -0,0 +1,23 @@ +From 45249a2c7172fdc2d5cd856a1ee05670f21f0db7 Mon Sep 17 00:00:00 2001 +From: franku <somal@arcor.de> +Date: Thu, 18 Jul 2019 19:30:34 +0200 +Subject: [PATCH] use link_libraries instead of set(CMAKE_EXE_LINKER_FLAGS... + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b59171f112..acb5f2c1d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -182,7 +182,7 @@ endif(OPTION_ASAN) + + # This is set to avoid linker errors when using GLVND-libs on Linux + if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND") +- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL") ++ link_libraries("GL") + add_compile_definitions(WL_USE_GLVND) + message(STATUS "Adding linker flags for GLVND.") + endif() + diff --git a/testing/widelands/APKBUILD b/testing/widelands/APKBUILD index 10a03ba69b..bde7f2f635 100644 --- a/testing/widelands/APKBUILD +++ b/testing/widelands/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Leo <thinkabit.ukim@gmail.com> pkgname=widelands pkgver=20 -pkgrel=1 +pkgrel=2 pkgdesc="Real-time strategy game inspired by The Settlers II" url="http://www.widelands.org" arch="all" @@ -15,6 +15,7 @@ source="https://launchpad.net/widelands/build$pkgver/build$pkgver/+download/wide fix-execinfo.patch widelands.desktop search-for-libintl.patch + 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch " builddir="$srcdir/widelands-build$pkgver" @@ -54,4 +55,5 @@ sha512sums="25280db6a57adeb37d13db35ce9eb41a5478534b04772240f6228c180f5a41a55fc4 1254437952230b90db23d1fd7dd285a1d8a5b24483316065bfc96e01450cbb6f164d7ffc6fe48a96e5e5e2a9501cd6df5d1ba53c6d2b8c3a76dd47263b495e6b fix_nl_msg_cat_cntr.patch 90d3068c822d021f7323db7f1e6a92ee8defce7f0b9ead4d11a248fb1396e49f565fa3e351ffbaa3df56f8ba976c90becc28fb2da016317d9a8ff0a3d697840c fix-execinfo.patch 2c45958bd7f5af273663431e02c8e2f1a6cc389c174d427032dca707cfc938181c95614d1feb743dd4c677ecb442feffb2fb7d3d41e856c5bdc12033c7d2c0d8 widelands.desktop -8b2fb971bc282bacaa2727cdf49b55d0bee3697d02fdb2b9f7d0cad5bd1ffe6467e865515d0c13b7efff2fb1f257d91ef073ae935e9c062d8dc5aade0713feb1 search-for-libintl.patch" +8b2fb971bc282bacaa2727cdf49b55d0bee3697d02fdb2b9f7d0cad5bd1ffe6467e865515d0c13b7efff2fb1f257d91ef073ae935e9c062d8dc5aade0713feb1 search-for-libintl.patch +4e3d1026189cd278d6ae310a7279a1d5dbfaf1bda582589c27e4cc1e4212e1c27de9e1cd3d487f7f2f794f6fd0f1f57fea1b96bb6a9594ad82940825581b2fe8 45249a2c7172fdc2d5cd856a1ee05670f21f0db7.patch" |