Mercurial > vanilla
changeset 807:2e0fe4608012
vanilla: add many missing files
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Sun, 18 Aug 2019 22:22:21 +0200 |
| parents | 58438f6471cf |
| children | 9272b38b063d |
| files | core/consolekit2/consolekit2.sh games/supertux/patch-boost.patch games/wesnoth/patch-boost.patch games/wesnoth/patch-clang.patch graphics/glbinding/glbinding.sh qt/qtlocation/patch-disable-mapbox.patch |
| diffstat | 6 files changed, 128 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/core/consolekit2/consolekit2.sh Sun Aug 18 21:22:25 2019 +0200 +++ b/core/consolekit2/consolekit2.sh Sun Aug 18 22:22:21 2019 +0200 @@ -79,6 +79,7 @@ --sysconfdir=/etc \ --localstatedir=/var \ --with-pid-file=/var/run/consolekit2.pid \ + --sbindir=/bin \ $with_pam \ $with_polkit \ $with_selinux \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/games/supertux/patch-boost.patch Sun Aug 18 22:22:21 2019 +0200 @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2018-12-23 19:11:31.000000000 +0000 ++++ CMakeLists.txt 2019-08-10 12:10:06.238118039 +0000 +@@ -724,7 +724,7 @@ + else() + add_executable(supertux2 src/main.cpp) + endif(WIN32) +-target_link_libraries(supertux2 supertux2_lib) ++target_link_libraries(supertux2 supertux2_lib Boost::filesystem Boost::locale) + set_target_properties(supertux2_lib PROPERTIES OUTPUT_NAME supertux2_lib) + set_target_properties(supertux2_lib PROPERTIES COMPILE_FLAGS "${SUPERTUX2_EXTRA_WARNING_FLAGS}") +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/games/wesnoth/patch-boost.patch Sun Aug 18 22:22:21 2019 +0200 @@ -0,0 +1,76 @@ +--- src/CMakeLists.txt.orig 2019-08-12 14:47:12.719715645 +0000 ++++ src/CMakeLists.txt 2019-08-12 15:16:25.083769473 +0000 +@@ -55,11 +55,10 @@ + + set(common-external-libs + ${sdl-lib} +- ${Boost_IOSTREAMS_LIBRARY} +- ${Boost_REGEX_LIBRARY} +- ${Boost_PROGRAM_OPTIONS_LIBRARY} +- ${Boost_FILESYSTEM_LIBRARY} +- ${Boost_LOCALE_LIBRARY} ++ Boost::iostreams ++ Boost::regex ++ Boost::filesystem ++ Boost::locale + ) + + if(CMAKE_SYSTEM_NAME STREQUAL "Linux") +@@ -72,9 +71,10 @@ + set(game-external-libs + ${common-external-libs} + ${CRYPTO_LIBRARY} +- ${Boost_SYSTEM_LIBRARIES} +- ${Boost_RANDOM_LIBRARY} +- ${Boost_THREAD_LIBRARY} ++ Boost::system ++ Boost::thread ++ Boost::program_options ++ Boost::random + ${sdl_image-lib} + ${sdl_mixer-lib} + ${sdl_ttf-lib} +@@ -94,16 +94,14 @@ + + set(server-external-libs + ${common-external-libs} +- ${Boost_SYSTEM_LIBRARIES} ++ Boost::system + -lpthread + ) + + set(tools-external-libs + ${common-external-libs} + ${sdl_image-lib} +- ${Boost_FILESYSTEM_LIBRARY} +- ${Boost_SYSTEM_LIBRARIES} +- ${Boost_RANDOM_LIBRARY} ++ Boost::filesystem + ) + + if(ENABLE_FRIBIDI AND FRIBIDI_FOUND) +@@ -142,7 +140,7 @@ + # a 'lib' is automatically set in front when creating the library (as in the filename) + # internal reference is the name given here + add_library(wesnoth-core ${LIBRARY_TYPE} EXCLUDE_FROM_ALL ${libwesnoth-core_STAT_SRC}) +-target_link_libraries(wesnoth-core ${Boost_FILESYSTEM_LIBRARY}) ++target_link_libraries(wesnoth-core Boost::filesystem) + + # Depending on the flag create a real file or an empty dummy. + # +@@ -331,7 +329,6 @@ + target_link_libraries(wesnothd + wesnoth-core + ${server-external-libs} +- ${Boost_RANDOM_LIBRARY} + ${CRYPTO_LIBRARY} + ${MYSQL_LIBS} + ) +@@ -358,7 +355,6 @@ + wesnoth-core + ${server-external-libs} + ${CRYPTO_LIBRARY} +- ${Boost_RANDOM_LIBRARY} + ${MYSQL_LIBS} + ) + set_target_properties(campaignd PROPERTIES OUTPUT_NAME ${BINARY_PREFIX}campaignd${BINARY_SUFFIX})
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/games/wesnoth/patch-clang.patch Sun Aug 18 22:22:21 2019 +0200 @@ -0,0 +1,20 @@ +--- ./src/game_initialization/lobby_data.hpp.orig 2019-08-12 12:25:18.339232933 +0200 ++++ ./src/game_initialization/lobby_data.hpp 2019-08-12 12:25:31.003233322 +0200 +@@ -14,6 +14,7 @@ + + #pragma once + ++#include <ctime> + #include <set> + #include <deque> + #include <functional> +--- src/replay.hpp.orig 2019-08-12 12:17:12.083439164 +0000 ++++ src/replay.hpp 2019-08-12 12:17:23.703439521 +0000 +@@ -21,6 +21,7 @@ + + #include "map/location.hpp" + ++#include <ctime> + #include <deque> + #include <iterator> + #include <map>
--- a/graphics/glbinding/glbinding.sh Sun Aug 18 21:22:25 2019 +0200 +++ b/graphics/glbinding/glbinding.sh Sun Aug 18 22:22:21 2019 +0200 @@ -57,6 +57,7 @@ tar xvf v$PKGVERSION.tar.gz cd $PKGNAME-$PKGVERSION + patch -p0 < ../patch-fhs.patch mkdir build && cd build cmake .. \ -DBUILD_SHARED_LIBS=On \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/qt/qtlocation/patch-disable-mapbox.patch Sun Aug 18 22:22:21 2019 +0200 @@ -0,0 +1,19 @@ +--- src/plugins/geoservices/geoservices.pro.orig 2019-08-12 17:10:00.331757655 +0200 ++++ src/plugins/geoservices/geoservices.pro 2019-08-12 17:10:14.575758092 +0200 +@@ -3,16 +3,6 @@ + QT_FOR_CONFIG += location-private # pulls in the features defined in configure.json + + qtConfig(geoservices_here): SUBDIRS += nokia +-qtConfig(geoservices_mapbox): SUBDIRS += mapbox + qtConfig(geoservices_esri): SUBDIRS += esri + qtConfig(geoservices_itemsoverlay): SUBDIRS += itemsoverlay + qtConfig(geoservices_osm): SUBDIRS += osm +- +-qtConfig(geoservices_mapboxgl) { +- !exists(../../3rdparty/mapbox-gl-native/mapbox-gl-native.pro) { +- warning("Submodule mapbox-gl-native does not exist. Run 'git submodule update --init' on qtlocation.") +- } else { +- SUBDIRS += mapboxgl ../../3rdparty/mapbox-gl-native +- mapboxgl.depends = ../../3rdparty/mapbox-gl-native +- } +-}