[aseprite] 49/51: Refresh patches.

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 1d85a730aaf8e1e1e1bbdbea5fbf19615f90a9a7
Author: Tobias Hansen <thansen at debian.org>
Date:   Mon Jul 11 19:45:13 2016 +0100

    Refresh patches.
---
 debian/changelog                                |  1 +
 debian/patches/disable-resize_image_tests.patch |  2 +-
 debian/patches/find-static-gtest.patch          |  4 ++--
 debian/patches/libx11-underlinkage.patch        |  6 +++---
 debian/patches/shared_modp_b64.patch            | 12 ++++++------
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 348b388..0b843b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 aseprite (1.1.6+ds-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Refresh patches.
 
  -- Tobias Hansen <thansen at debian.org>  Mon, 11 Jul 2016 19:40:58 +0100
 
diff --git a/debian/patches/disable-resize_image_tests.patch b/debian/patches/disable-resize_image_tests.patch
index cdabf65..53ac02d 100644
--- a/debian/patches/disable-resize_image_tests.patch
+++ b/debian/patches/disable-resize_image_tests.patch
@@ -9,7 +9,7 @@ Bug-Debian: https://bugs.debian.org/765291
 
 --- a/cmake/FindTests.cmake
 +++ b/cmake/FindTests.cmake
-@@ -16,6 +16,10 @@
+@@ -17,6 +17,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 6d42a6c..d998bfe 100644
--- a/debian/patches/find-static-gtest.patch
+++ b/debian/patches/find-static-gtest.patch
@@ -5,8 +5,8 @@ Author: Tobias Hansen <thansen at debian.org>
 
 --- a/cmake/FindTests.cmake
 +++ b/cmake/FindTests.cmake
-@@ -25,7 +25,11 @@
-       PROPERTIES LINK_FLAGS -ENTRY:"mainCRTStartup")
+@@ -26,7 +26,11 @@
+         PROPERTIES LINK_FLAGS -ENTRY:"mainCRTStartup")
      endif()
  
 -    target_link_libraries(${testname} gtest ${ARGV} ${PLATFORM_LIBS})
diff --git a/debian/patches/libx11-underlinkage.patch b/debian/patches/libx11-underlinkage.patch
index e03abd1..7a264a5 100644
--- a/debian/patches/libx11-underlinkage.patch
+++ b/debian/patches/libx11-underlinkage.patch
@@ -4,7 +4,7 @@ Author: Daniel T Chen <crimsun at ubuntu.com>
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -150,7 +150,7 @@
+@@ -156,7 +156,7 @@
    main/main.cpp
    ${win32_resources}
    ${x11_resources})
@@ -12,10 +12,10 @@ Author: Daniel T Chen <crimsun at ubuntu.com>
 +target_link_libraries(aseprite app-lib ${PLATFORM_LIBS} X11)
  add_dependencies(aseprite copy_data)
  
- install(TARGETS aseprite
+ if(MSVC AND USE_SKIA_BACKEND)
 --- a/cmake/FindTests.cmake
 +++ b/cmake/FindTests.cmake
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
      endif()
  
      if(USE_SHARED_GTEST)
diff --git a/debian/patches/shared_modp_b64.patch b/debian/patches/shared_modp_b64.patch
index 474b370..83b0e68 100644
--- a/debian/patches/shared_modp_b64.patch
+++ b/debian/patches/shared_modp_b64.patch
@@ -5,7 +5,7 @@ Author: Tobias Hansen <thansen at debian.org>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -58,6 +58,7 @@
+@@ -63,6 +63,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,7 +13,7 @@ Author: Tobias Hansen <thansen at debian.org>
  option(USE_SHARED_ALLEGRO4 "Use shared Allegro 4 library (without resize support)" off)
  option(ENABLE_MEMLEAK     "Enable memory-leaks detector (only for developers)" off)
  option(ENABLE_UPDATER     "Enable automatic check for updates" on)
-@@ -278,6 +279,14 @@
+@@ -282,6 +283,14 @@
  endif()
  include_directories(${CURL_INCLUDE_DIRS})
  
@@ -63,12 +63,12 @@ Author: Tobias Hansen <thansen at debian.org>
  
  set(BASE_SOURCES
    base64.cpp
-@@ -66,7 +68,7 @@
- endif()
+@@ -71,7 +73,7 @@
  
+ # TODO remove dependency with observable library
  add_library(base-lib ${BASE_SOURCES})
--target_link_libraries(base-lib modp_b64)
-+target_link_libraries(base-lib ${LIBMODP_LIBRARY})
+-target_link_libraries(base-lib obs modp_b64)
++target_link_libraries(base-lib obs ${LIBMODP_LIBRARY})
  
  if(WIN32)
    add_definitions(-D_CRT_SECURE_NO_WARNINGS)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git