[aseprite] 124/128: 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 e4906a6333c455c030a180b59e239d59725c9259
Author: Tobias Hansen <thansen at debian.org>
Date:   Mon May 9 21:50:14 2016 +0100

    Refresh patches.
---
 debian/patches/libx11-underlinkage.patch |  2 +-
 debian/patches/shared_modp_b64.patch     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/debian/patches/libx11-underlinkage.patch b/debian/patches/libx11-underlinkage.patch
index 941a2ae..e03abd1 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
-@@ -153,7 +153,7 @@
+@@ -150,7 +150,7 @@
    main/main.cpp
    ${win32_resources}
    ${x11_resources})
diff --git a/debian/patches/shared_modp_b64.patch b/debian/patches/shared_modp_b64.patch
index 4b878b3..474b370 100644
--- a/debian/patches/shared_modp_b64.patch
+++ b/debian/patches/shared_modp_b64.patch
@@ -5,15 +5,15 @@ Author: Tobias Hansen <thansen at debian.org>
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -49,6 +49,7 @@
+@@ -58,6 +58,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)
 +option(USE_SHARED_MODP_B64 "Use shared modp_b64 library" off)
  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)
-@@ -262,6 +263,14 @@
+ option(ENABLE_MEMLEAK     "Enable memory-leaks detector (only for developers)" off)
+ option(ENABLE_UPDATER     "Enable automatic check for updates" on)
+@@ -278,6 +279,14 @@
  endif()
  include_directories(${CURL_INCLUDE_DIRS})
  
@@ -30,7 +30,7 @@ Author: Tobias Hansen <thansen at debian.org>
  
 --- a/third_party/CMakeLists.txt
 +++ b/third_party/CMakeLists.txt
-@@ -88,5 +88,8 @@
+@@ -89,5 +89,8 @@
    endif()
  endif()
  
@@ -52,7 +52,7 @@ Author: Tobias Hansen <thansen at debian.org>
  
 --- a/src/base/CMakeLists.txt
 +++ b/src/base/CMakeLists.txt
-@@ -48,7 +48,9 @@
+@@ -25,7 +25,9 @@
      CACHE STRING "modp_b64 directory")
  
  include_directories(${BASE_INCLUDE_DIR})
@@ -63,7 +63,7 @@ Author: Tobias Hansen <thansen at debian.org>
  
  set(BASE_SOURCES
    base64.cpp
-@@ -89,7 +91,7 @@
+@@ -66,7 +68,7 @@
  endif()
  
  add_library(base-lib ${BASE_SOURCES})

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