Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/files/
Date: Sun, 13 Jun 2021 13:14:01
Message-Id: 1623589976.273be50ad54501ff636bee6cff45852c25855594.ionen@gentoo
1 commit: 273be50ad54501ff636bee6cff45852c25855594
2 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jun 13 13:09:10 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sun Jun 13 13:12:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=273be50a
7
8 games-strategy/widelands: remove unused patches
9
10 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
11
12 .../files/widelands-0.20-boost-1.73.patch | 22 -------------------
13 .../widelands/files/widelands-0.20-glvnd.patch | 25 ----------------------
14 2 files changed, 47 deletions(-)
15
16 diff --git a/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch b/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch
17 deleted file mode 100644
18 index 99a8c51190b..00000000000
19 --- a/games-strategy/widelands/files/widelands-0.20-boost-1.73.patch
20 +++ /dev/null
21 @@ -1,22 +0,0 @@
22 ---- a/src/editor/ui_menus/categorized_item_selection_menu.h
23 -+++ b/src/editor/ui_menus/categorized_item_selection_menu.h
24 -@@ -124,7 +124,7 @@
25 -
26 - UI::Checkbox* cb = create_checkbox(horizontal, descriptions_.get(i));
27 - cb->set_state(tool_->is_enabled(i));
28 -- cb->changedto.connect(boost::bind(&CategorizedItemSelectionMenu::selected, this, i, _1));
29 -+ cb->changedto.connect(boost::bind(&CategorizedItemSelectionMenu::selected, this, i, boost::placeholders::_1));
30 - checkboxes_[i] = cb;
31 - horizontal->add(cb);
32 - horizontal->add_space(kSpacing);
33 ---- a/src/ui_basic/box.cc
34 -+++ b/src/ui_basic/box.cc
35 -@@ -104,7 +104,7 @@
36 - int maxbreadth = mindesiredbreadth_;
37 -
38 - for (uint32_t idx = 0; idx < items_.size(); ++idx) {
39 -- int depth, breadth = 0;
40 -+ int depth = 0, breadth = 0;
41 - get_item_desired_size(idx, &depth, &breadth);
42 -
43 - totaldepth += depth;
44
45 diff --git a/games-strategy/widelands/files/widelands-0.20-glvnd.patch b/games-strategy/widelands/files/widelands-0.20-glvnd.patch
46 deleted file mode 100644
47 index 94d1aa3850c..00000000000
48 --- a/games-strategy/widelands/files/widelands-0.20-glvnd.patch
49 +++ /dev/null
50 @@ -1,25 +0,0 @@
51 -From 4661768699c4651df1668fbfe0e24bb02bf10db1 Mon Sep 17 00:00:00 2001
52 -From: franku <somal@×××××.de>
53 -Date: Thu, 18 Jul 2019 19:30:34 +0200
54 -Subject: [PATCH] use link_libraries instead of set(CMAKE_EXE_LINKER_FLAGS...
55 -
56 ----
57 - CMakeLists.txt | 2 +-
58 - 1 file changed, 1 insertion(+), 1 deletion(-)
59 -
60 -diff --git a/CMakeLists.txt b/CMakeLists.txt
61 -index 5c5ca8a60b..bcff2db2ff 100644
62 ---- a/CMakeLists.txt
63 -+++ b/CMakeLists.txt
64 -@@ -181,7 +181,7 @@ endif(OPTION_ASAN)
65 -
66 - # This is set to avoid linker errors when using GLVND-libs on Linux
67 - if("${OpenGL_GL_PREFERENCE}" STREQUAL "GLVND")
68 -- set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lGL")
69 -+ link_libraries("GL")
70 - add_compile_definitions(WL_USE_GLVND)
71 - message(STATUS "Adding linker flags for GLVND.")
72 - endif()
73 ---
74 -2.25.1
75 -