From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 86E01138350 for ; Thu, 12 Mar 2020 17:31:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B632FE08B0; Thu, 12 Mar 2020 17:31:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9B393E08B0 for ; Thu, 12 Mar 2020 17:31:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3964734EFDC for ; Thu, 12 Mar 2020 17:31:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 37A2D176 for ; Thu, 12 Mar 2020 17:31:07 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1584034252.be975d4634d9e9dbbc257d4b632d5d2c67d37112.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/, games-strategy/widelands/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-strategy/widelands/files/widelands-0.20-glvnd.patch games-strategy/widelands/widelands-0.20-r1.ebuild games-strategy/widelands/widelands-0.20.ebuild X-VCS-Directories: games-strategy/widelands/files/ games-strategy/widelands/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: be975d4634d9e9dbbc257d4b632d5d2c67d37112 X-VCS-Branch: master Date: Thu, 12 Mar 2020 17:31:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 00cca3da-dfef-4718-a3f3-ce6f686ed336 X-Archives-Hash: 193d78415ce3baf21fd07d8289bbeb57 commit: be975d4634d9e9dbbc257d4b632d5d2c67d37112 Author: Lars Wendler gentoo org> AuthorDate: Thu Mar 12 17:30:52 2020 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Mar 12 17:30:52 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be975d46 games-strategy/widelands: Fixed build with media-libs/libglvnd Package-Manager: Portage-2.3.93, Repoman-2.3.20 Signed-off-by: Lars Wendler gentoo.org> .../widelands/files/widelands-0.20-glvnd.patch | 25 ++++++++++++++++++++++ ...elands-0.20.ebuild => widelands-0.20-r1.ebuild} | 1 + 2 files changed, 26 insertions(+) diff --git a/games-strategy/widelands/files/widelands-0.20-glvnd.patch b/games-strategy/widelands/files/widelands-0.20-glvnd.patch new file mode 100644 index 00000000000..94d1aa3850c --- /dev/null +++ b/games-strategy/widelands/files/widelands-0.20-glvnd.patch @@ -0,0 +1,25 @@ +From 4661768699c4651df1668fbfe0e24bb02bf10db1 Mon Sep 17 00:00:00 2001 +From: franku +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 5c5ca8a60b..bcff2db2ff 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -181,7 +181,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() +-- +2.25.1 + diff --git a/games-strategy/widelands/widelands-0.20.ebuild b/games-strategy/widelands/widelands-0.20-r1.ebuild similarity index 97% rename from games-strategy/widelands/widelands-0.20.ebuild rename to games-strategy/widelands/widelands-0.20-r1.ebuild index e714c6e11a9..335598744fe 100644 --- a/games-strategy/widelands/widelands-0.20.ebuild +++ b/games-strategy/widelands/widelands-0.20-r1.ebuild @@ -44,6 +44,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/${PN}-0.20_rc1-cxxflags.patch" + "${FILESDIR}/${PN}-0.20-glvnd.patch" ) src_prepare() {