This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository planetblupi.
commit ab297b675d3d5170df43ef3d0ec4cecded79e898 Merge: fa4673f 38f7702 Author: Didier Raboud <[email protected]> Date: Sun Oct 22 18:43:21 2017 +0200 merge patched-debian/master into debian/master CMakeLists.txt | 3 ++- debian/.git-dpm | 4 +-- ...lupi-executable-goes-to-usr-games-not-usr.patch | 22 --------------- ...allDirs-to-let-the-BINDIR-be-overriden-by.patch | 31 ++++++++++++++++++++++ ...RL-dependency-optional-through-the-PB_HTT.patch | 16 +++++------ debian/patches/0003-Install-a-desktop-file.patch | 12 ++++----- debian/patches/series | 2 +- 7 files changed, 50 insertions(+), 40 deletions(-) diff --cc debian/.git-dpm index ee102ef,0000000..89c9c1a mode 100644,000000..100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@@ -1,8 -1,0 +1,8 @@@ +# see git-dpm(1) from git-dpm package - 0e6b80c841ea01e8fea35ff3307db4ee239dde29 - 0e6b80c841ea01e8fea35ff3307db4ee239dde29 ++38f7702189b39c6dc4cad59ad6ef154c8cdcb58c ++38f7702189b39c6dc4cad59ad6ef154c8cdcb58c +e0ace8819512553d3680e912e419a5df1b8295ab +e0ace8819512553d3680e912e419a5df1b8295ab +planetblupi_1.11.0.orig.tar.xz +d62eb5661224b1859f3b23afdbfbe03349e2f789 +23135816 diff --cc debian/patches/0001-Use-GNUInstallDirs-to-let-the-BINDIR-be-overriden-by.patch index 0000000,0000000..37a5de9 new file mode 100644 --- /dev/null +++ b/debian/patches/0001-Use-GNUInstallDirs-to-let-the-BINDIR-be-overriden-by.patch @@@ -1,0 -1,0 +1,31 @@@ ++From 359d1f9e70a4c0124621b3ad9e2a28ad18023400 Mon Sep 17 00:00:00 2001 ++From: Didier Raboud <[email protected]> ++Date: Sun, 15 Oct 2017 17:46:30 +0200 ++Subject: Use GNUInstallDirs to let the BINDIR be overriden by the build ++ options ++ ++--- ++ CMakeLists.txt | 3 ++- ++ 1 file changed, 2 insertions(+), 1 deletion(-) ++ ++diff --git a/CMakeLists.txt b/CMakeLists.txt ++index 1a0a456..3238a72 100644 ++--- a/CMakeLists.txt +++++ b/CMakeLists.txt ++@@ -4,6 +4,7 @@ cmake_minimum_required (VERSION 3.2) ++ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake") ++ set (CMAKE_CXX_STANDARD 11) ++ +++include (GNUInstallDirs) ++ include (${CMAKE_ROOT}/Modules/ExternalProject.cmake) ++ ++ include_directories (${CMAKE_INSTALL_PREFIX}/include) ++@@ -219,7 +220,7 @@ endforeach (file) ++ ############## ++ ++ install (TARGETS planetblupi ++- RUNTIME DESTINATION bin +++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ ) ++ ++ install ( diff --cc debian/patches/0002-Make-the-CURL-dependency-optional-through-the-PB_HTT.patch index 27bf521,0000000..18544b4 mode 100644,000000..100644 --- a/debian/patches/0002-Make-the-CURL-dependency-optional-through-the-PB_HTT.patch +++ b/debian/patches/0002-Make-the-CURL-dependency-optional-through-the-PB_HTT.patch @@@ -1,144 -1,0 +1,144 @@@ - From a08c4dc1a1666f6ed7558f29cfc0d57c4d8d723e Mon Sep 17 00:00:00 2001 ++From deec7d625caba8510a69f33776d77ef3e725fcdf Mon Sep 17 00:00:00 2001 +From: Didier Raboud <[email protected]> +Date: Fri, 20 Oct 2017 16:04:46 +0200 +Subject: Make the CURL dependency optional, through the PB_HTTP_VERSION_CHECK + CMake option + +This is the following serie of commits: + - 6134edc96ef3952936570ec5c3fae79e1ad8a0f8 Make the CURL dependency optional, through the PLANETBLUPI_HTTP_VERSION_CHECK CMake option + - 433768147bbe86d24dfe9e3b3fbe34ffd2be2b0d Follow coding rules (space before bracket) + - cce3961fc8413e5d58ae068425e2ef2dad5b0319 CMake: use list(APPEND) instead of set + - a7018dbc5019be06fe10916deaeec9d700fce17d Fix warning of unused function + - b523641b869e3097ce7cd19ab457d273c3b8c8b7 Cosmetics +--- + CMakeLists.txt | 24 +++++++++++++++++++++--- + src/blupi.cxx | 8 ++++++++ + 2 files changed, 29 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt - index 66e8f7d..278c4f1 100644 ++index 3238a72..40d6c85 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt - @@ -18,6 +18,8 @@ set (PB_PRODUCT_NAME "Planet Blupi") ++@@ -19,6 +19,8 @@ set (PB_PRODUCT_NAME "Planet Blupi") + set (PB_PACKAGE_NAME "planetblupi") + set (PB_DESCRIPTION "Planet Blupi - A delerious spell-binding game") + ++option (PB_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) ++ + configure_file ( + "${PROJECT_SOURCE_DIR}/src/config.h.in" + "${PROJECT_BINARY_DIR}/include/config.h" - @@ -115,7 +117,10 @@ find_package (PkgConfig REQUIRED) ++@@ -116,7 +118,10 @@ find_package (PkgConfig REQUIRED) + pkg_search_module (SDL2 REQUIRED sdl2) + pkg_search_module (SDL2_MIXER REQUIRED SDL2_mixer) + pkg_search_module (SDL2_IMAGE REQUIRED SDL2_image) +-pkg_search_module (CURL REQUIRED libcurl) ++if (${PB_HTTP_VERSION_CHECK}) ++ pkg_search_module (CURL REQUIRED libcurl) ++ add_definitions (-DUSE_CURL) ++endif () + + if ("${STATIC_BUILD}") + pkg_search_module (PNG REQUIRED libpng) - @@ -131,7 +136,9 @@ if ("${STATIC_BUILD}") ++@@ -132,7 +137,9 @@ if ("${STATIC_BUILD}") + pkg_search_module (PULSE REQUIRED libpulse) + endif () + +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB") ++ if (${PB_HTTP_VERSION_CHECK}) ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB") ++ endif () + endif () + + ########################### - @@ -147,7 +154,6 @@ if ("${STATIC_BUILD}") ++@@ -148,7 +155,6 @@ if ("${STATIC_BUILD}") + ${SDL2_STATIC_LIBRARIES} + ${SDL2_MIXER_STATIC_LIBRARIES} + ${SDL2_IMAGE_STATIC_LIBRARIES} +- ${CURL_STATIC_LIBRARIES} + ${SDLKitchensink_STATIC_LIBRARIES} + ${PNG_STATIC_LIBRARIES} + ${AVCODEC_STATIC_LIBRARIES} - @@ -157,6 +163,12 @@ if ("${STATIC_BUILD}") ++@@ -158,6 +164,12 @@ if ("${STATIC_BUILD}") + ${SWRESAMPLE_STATIC_LIBRARIES} + ) + ++ if (${PB_HTTP_VERSION_CHECK}) ++ list (APPEND planetblupi_DEPS ++ ${CURL_STATIC_LIBRARIES} ++ ) ++ endif () ++ + if (UNIX AND NOT APPLE) + list (APPEND planetblupi_DEPS + ${ALSA_STATIC_LIBRARIES} - @@ -173,6 +185,12 @@ else () ++@@ -174,6 +186,12 @@ else () + ${SDLKitchensink_LIBRARIES} + pthread + ) ++ ++ if (${PB_HTTP_VERSION_CHECK}) ++ list (APPEND planetblupi_DEPS ++ ${CURL_LIBRARIES} ++ ) ++ endif () + endif () + + target_link_libraries (planetblupi PUBLIC ${planetblupi_DEPS}) +diff --git a/src/blupi.cxx b/src/blupi.cxx +index 461fbd2..b8c6fd7 100644 +--- a/src/blupi.cxx ++++ b/src/blupi.cxx +@@ -30,7 +30,9 @@ + + #include <SDL2/SDL_image.h> + #include <argagg/argagg.hpp> ++#ifdef USE_CURL + #include <curl/curl.h> ++#endif /* USE_CURL */ + + #include "json/json.hpp" + +@@ -81,11 +83,13 @@ bool g_bTermInit = false; // initialisation en cours + Uint32 g_lastPhase = 999; + static bool g_pause; + ++#ifdef USE_CURL + struct url_data { + CURLcode status; + char * buffer; + size_t size; + }; ++#endif + + template <typename Out> + static void +@@ -458,6 +462,7 @@ InitFail (const char * msg) + FinishObjects (); + } + ++#ifdef USE_CURL + static size_t + updateCallback (void * ptr, size_t size, size_t nmemb, void * data) + { +@@ -475,10 +480,12 @@ updateCallback (void * ptr, size_t size, size_t nmemb, void * data) + + return realsize; + } ++#endif /* USE_CURL */ + + static void + CheckForUpdates () + { ++#ifdef USE_CURL + url_data chunk; + + chunk.buffer = nullptr; /* we expect realloc(NULL, size) to work */ +@@ -515,6 +522,7 @@ CheckForUpdates () + free (chunk.buffer); + + curl_easy_cleanup (curl); ++#endif /* USE_CURL */ + } + + static int diff --cc debian/patches/0003-Install-a-desktop-file.patch index d34943b,0000000..7a1617a mode 100644,000000..100644 --- a/debian/patches/0003-Install-a-desktop-file.patch +++ b/debian/patches/0003-Install-a-desktop-file.patch @@@ -1,85 -1,0 +1,85 @@@ - From 0e6b80c841ea01e8fea35ff3307db4ee239dde29 Mon Sep 17 00:00:00 2001 ++From 38f7702189b39c6dc4cad59ad6ef154c8cdcb58c Mon Sep 17 00:00:00 2001 +From: Mathieu Schroeter <[email protected]> +Date: Fri, 20 Oct 2017 17:57:21 +0200 +Subject: Install a desktop file + +This is the following serie of commits: +- d3986d5d4aea44e43462ef875e47add8bb0cb3f7 Add a category in the desktop file +- a50e648d634493793a8aa8aa2e266ad890b121a6 WIP: add desktop file for standard build +- 29ad6c30f4ff1011097abb206457c5038839a67d Fix deploy of desktop file with non-appimage builds + +Also use @PB_ICON@ +--- + CMakeLists.txt | 19 ++++++++++++++++++- + resources/linux/application.desktop.in | 10 +++++----- + 2 files changed, 23 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt - index 278c4f1..d812d61 100644 ++index 40d6c85..ab0bca6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt - @@ -16,6 +16,8 @@ set (PB_VERSION_PATCH 0) ++@@ -17,6 +17,8 @@ set (PB_VERSION_PATCH 0) + set (PB_VERSION_EXTRA "") + set (PB_PRODUCT_NAME "Planet Blupi") + set (PB_PACKAGE_NAME "planetblupi") ++set (PB_EXEC "planetblupi") ++set (PB_ICON_REF "blupi") + set (PB_DESCRIPTION "Planet Blupi - A delerious spell-binding game") + + option (PB_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) - @@ -34,6 +36,14 @@ if (APPIMAGE_APPRUN_PROGRAM AND APPIMAGE_ASSISTANT_PROGRAM) ++@@ -35,6 +37,14 @@ if (APPIMAGE_APPRUN_PROGRAM AND APPIMAGE_ASSISTANT_PROGRAM) + set (USE_APPIMAGE ON) + endif () + ++if (NOT USE_APPIMAGE) ++ configure_file ( ++ "${PROJECT_SOURCE_DIR}/resources/linux/application.desktop.in" ++ "${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop" ++ @ONLY ++ ) ++endif () ++ + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11 -L${CMAKE_INSTALL_PREFIX}/lib") + endif () - @@ -261,6 +271,13 @@ if (UNIX AND NOT APPLE) ++@@ -262,6 +272,13 @@ if (UNIX AND NOT APPLE) + install (DIRECTORY resources/icon/hicolor DESTINATION share/icons) + endif () + ++if (NOT USE_APPIMAGE) ++ install ( ++ FILES ${CMAKE_CURRENT_BINARY_DIR}/${PB_PACKAGE_NAME}.desktop ++ DESTINATION share/applications ++ ) ++endif () ++ + # Copy libwinpthread-1.dll which seems not be linkable statically + if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND MINGW) + execute_process (COMMAND cygpath.exe --windows /mingw64 OUTPUT_VARIABLE MINGW64_PATH) - @@ -288,7 +305,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND "${STATIC_BUILD}") ++@@ -289,7 +306,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND "${STATIC_BUILD}") + if (USE_APPIMAGE) + include (LinuxAppImageBuild) + set (CMAKE_PACKAGED_OUTPUT_PREFIX ${CMAKE_INSTALL_PREFIX}) +- APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" "blupi") ++ APPIMAGE_PACKAGE (planetblupi ${PB_PACKAGE_NAME} ${PB_PRODUCT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/resources/linux" "${CMAKE_BINARY_DIR}/share" "" "" ${PB_ICON_REF}) + elseif (MINGW) + set (INSTALLER_FILE_NAME "${PB_PACKAGE_NAME}-${PB_VERSION_MAJOR}.${PB_VERSION_MINOR}.${PB_VERSION_PATCH}${PB_VERSION_EXTRA}") + set (CPACK_PACKAGE_FILE_NAME "${INSTALLER_FILE_NAME}") +diff --git a/resources/linux/application.desktop.in b/resources/linux/application.desktop.in +index 038b99c..db29df3 100644 +--- a/resources/linux/application.desktop.in ++++ b/resources/linux/application.desktop.in +@@ -3,8 +3,8 @@ Version=1.0 + Type=Application + Name=@PB_PRODUCT_NAME@ + GenericName=Video Game +-Comment=@CPACK_PACKAGE_DESCRIPTION_SUMMARY@ +-Exec=@APPIMAGE_EXEC@ +-StartupWMClass=@APPIMAGE_EXEC_WM@ +-Icon=@APPIMAGE_ICON_REF@ +-Categories=Game; ++Comment=@PB_DESCRIPTION@ ++Exec=@PB_EXEC@ ++StartupWMClass=@PB_EXEC@ ++Icon=@PB_ICON_REF@ ++Categories=Game;StrategyGame; diff --cc debian/patches/series index 3521a13,0000000..cf9f8f9 mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,3 -1,0 +1,3 @@@ - 0001-The-planetblupi-executable-goes-to-usr-games-not-usr.patch ++0001-Use-GNUInstallDirs-to-let-the-BINDIR-be-overriden-by.patch +0002-Make-the-CURL-dependency-optional-through-the-PB_HTT.patch +0003-Install-a-desktop-file.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/planetblupi.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
