This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 395d64764c85050c4e0537768060a6f61b5cad96 Author: Tobias Hansen <[email protected]> Date: Wed Apr 20 19:24:05 2016 +0100 Refresh patches. --- debian/changelog | 2 ++ debian/patches/disable-resize_image_tests.patch | 6 +++--- debian/patches/find-static-gtest.patch | 8 ++++---- debian/patches/find_freetype.patch | 21 --------------------- debian/patches/ftbfs-hurd.patch | 8 +++----- debian/patches/libx11-underlinkage.patch | 4 +++- debian/patches/series | 1 - debian/patches/shared_modp_b64.patch | 18 +++++++++--------- debian/patches/third_party_cmakelists.patch | 2 +- 9 files changed, 25 insertions(+), 45 deletions(-) diff --git a/debian/changelog b/debian/changelog index e01b082..8a5fa87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ aseprite (1.1.4.1+ds-1) UNRELEASED; urgency=medium * New upstream release. + * Refresh patches. + * Remove find_freetype.patch, applied upstream. -- Tobias Hansen <[email protected]> Wed, 20 Apr 2016 19:11:17 +0100 diff --git a/debian/patches/disable-resize_image_tests.patch b/debian/patches/disable-resize_image_tests.patch index 9010091..cdabf65 100644 --- a/debian/patches/disable-resize_image_tests.patch +++ b/debian/patches/disable-resize_image_tests.patch @@ -7,9 +7,9 @@ Author: Tobias Hansen <[email protected]> Bug: https://github.com/aseprite/aseprite/issues/502 Bug-Debian: https://bugs.debian.org/765291 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -181,6 +181,10 @@ +--- a/cmake/FindTests.cmake ++++ b/cmake/FindTests.cmake +@@ -16,6 +16,10 @@ foreach(testsourcefile ${tests}) get_filename_component(testname ${testsourcefile} NAME_WE) diff --git a/debian/patches/find-static-gtest.patch b/debian/patches/find-static-gtest.patch index 0556d05..6d42a6c 100644 --- a/debian/patches/find-static-gtest.patch +++ b/debian/patches/find-static-gtest.patch @@ -3,10 +3,10 @@ Description: Find the static gtest library This linker flag is necessary for this library to be found. Author: Tobias Hansen <[email protected]> ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -190,7 +190,11 @@ - PROPERTIES LINK_FLAGS -ENTRY:"mainCRTStartup") +--- a/cmake/FindTests.cmake ++++ b/cmake/FindTests.cmake +@@ -25,7 +25,11 @@ + PROPERTIES LINK_FLAGS -ENTRY:"mainCRTStartup") endif() - target_link_libraries(${testname} gtest ${ARGV} ${PLATFORM_LIBS}) diff --git a/debian/patches/find_freetype.patch b/debian/patches/find_freetype.patch deleted file mode 100644 index 9c1ad97..0000000 --- a/debian/patches/find_freetype.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Find Freetype - Use a better way to look for freetype that works. -Author: Tobias Hansen <[email protected]> - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -220,8 +220,12 @@ - - # freetype - if(USE_SHARED_FREETYPE) -- find_library(FREETYPE_LIBRARY NAMES freetype) -- find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h) -+ find_package(Freetype REQUIRED) -+ if(NOT FREETYPE_FOUND) -+ message(FATAL_ERROR "freetype not found") -+ endif() -+ set(FREETYPE_LIBRARY ${FREETYPE_LIBRARIES}) -+ set(FREETYPE_INCLUDE_DIR ${FREETYPE_INCLUDE_DIR_freetype2}) - else() - set(FREETYPE_LIBRARY freetype) - set(FREETYPE_INCLUDE_DIR ${FREETYPE_DIR}/include) diff --git a/debian/patches/ftbfs-hurd.patch b/debian/patches/ftbfs-hurd.patch index d74f9d2..570f1a0 100644 --- a/debian/patches/ftbfs-hurd.patch +++ b/debian/patches/ftbfs-hurd.patch @@ -8,11 +8,9 @@ Forwarded: no Last-Update: 2016-04-19 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: aseprite-1.1.3+ds/src/base/fs_unix.h -=================================================================== ---- aseprite-1.1.3+ds.orig/src/base/fs_unix.h -+++ aseprite-1.1.3+ds/src/base/fs_unix.h -@@ -157,9 +157,16 @@ std::string get_user_docs_folder() +--- a/src/base/fs_unix.h ++++ b/src/base/fs_unix.h +@@ -159,9 +159,16 @@ std::string get_canonical_path(const std::string& path) { diff --git a/debian/patches/libx11-underlinkage.patch b/debian/patches/libx11-underlinkage.patch index 9ff6c90..941a2ae 100644 --- a/debian/patches/libx11-underlinkage.patch +++ b/debian/patches/libx11-underlinkage.patch @@ -13,7 +13,9 @@ Author: Daniel T Chen <[email protected]> add_dependencies(aseprite copy_data) install(TARGETS aseprite -@@ -191,7 +191,7 @@ +--- a/cmake/FindTests.cmake ++++ b/cmake/FindTests.cmake +@@ -26,7 +26,7 @@ endif() if(USE_SHARED_GTEST) diff --git a/debian/patches/series b/debian/patches/series index 49d2051..b4340df 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,7 +3,6 @@ undef-major-and-minor.patch libx11-underlinkage.patch find-pixman-combine32.patch third_party_cmakelists.patch -find_freetype.patch shared_modp_b64.patch disable-resize_image_tests.patch ftbfs-hurd.patch diff --git a/debian/patches/shared_modp_b64.patch b/debian/patches/shared_modp_b64.patch index a9dbbef..4b878b3 100644 --- a/debian/patches/shared_modp_b64.patch +++ b/debian/patches/shared_modp_b64.patch @@ -5,7 +5,7 @@ Author: Tobias Hansen <[email protected]> --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -47,6 +47,7 @@ +@@ -49,6 +49,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) option(USE_SHARED_FREETYPE "Use shared FreeType library" off) @@ -13,9 +13,9 @@ Author: Tobias Hansen <[email protected]> option(USE_SHARED_ALLEGRO4 "Use shared Allegro 4 library (without resize support)" off) option(USE_ALLEG4_BACKEND "Use Allegro 4 backend" on) option(USE_SKIA_BACKEND "Use Skia backend" off) -@@ -274,6 +275,14 @@ +@@ -262,6 +263,14 @@ endif() - include_directories(${LIBCURL_INCLUDE_DIR}) + include_directories(${CURL_INCLUDE_DIRS}) +if(USE_SHARED_MODP_B64) + find_library(LIBMODP_LIBRARY NAMES modpbase64) @@ -30,8 +30,8 @@ Author: Tobias Hansen <[email protected]> --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt -@@ -58,5 +58,8 @@ - add_subdirectory(freetype2) +@@ -88,5 +88,8 @@ + endif() endif() +if(NOT USE_SHARED_MODP_B64) @@ -52,8 +52,8 @@ Author: Tobias Hansen <[email protected]> --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt -@@ -39,7 +39,9 @@ - CACHE INTERNAL "Extra include directory for base lib") +@@ -48,7 +48,9 @@ + CACHE STRING "modp_b64 directory") include_directories(${BASE_INCLUDE_DIR}) -include_directories(${MODP_B64_DIR}) @@ -63,7 +63,7 @@ Author: Tobias Hansen <[email protected]> set(BASE_SOURCES base64.cpp -@@ -80,7 +82,7 @@ +@@ -89,7 +91,7 @@ endif() add_library(base-lib ${BASE_SOURCES}) @@ -71,4 +71,4 @@ Author: Tobias Hansen <[email protected]> +target_link_libraries(base-lib ${LIBMODP_LIBRARY}) if(WIN32) - target_link_libraries(base-lib dbghelp shlwapi) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) diff --git a/debian/patches/third_party_cmakelists.patch b/debian/patches/third_party_cmakelists.patch index ed82d15..798142c 100644 --- a/debian/patches/third_party_cmakelists.patch +++ b/debian/patches/third_party_cmakelists.patch @@ -4,7 +4,7 @@ Author: Tobias Hansen <[email protected]> --- a/third_party/CMakeLists.txt +++ b/third_party/CMakeLists.txt -@@ -39,8 +39,6 @@ +@@ -48,8 +48,6 @@ # CMakeLists.txt modifies some MSVC flags. include_directories(${CMAKE_CURRENT_SOURCE_DIR}/gtest ${CMAKE_CURRENT_SOURCE_DIR}/gtest/include) add_library(gtest ${CMAKE_CURRENT_SOURCE_DIR}/gtest/src/gtest-all.cc) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
