This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit f97ba63ccbb2753da7b783cb419d20e3b95c89fa Author: Tobias Hansen <[email protected]> Date: Sat Mar 14 16:08:44 2015 +0100 Refresh patches. --- debian/patches/disable-file-and-gif-tests.patch | 2 +- debian/patches/disable-resize_image_tests.patch | 2 +- debian/patches/find-static-gtest.patch | 6 +++--- debian/patches/giflib-4.1.6.patch | 20 ++------------------ debian/patches/libx11-underlinkage.patch | 14 +++++++------- debian/patches/no-third_party-dir.patch | 2 +- debian/patches/resizing_from_options_gui.patch | 14 +++++++------- 7 files changed, 22 insertions(+), 38 deletions(-) diff --git a/debian/patches/disable-file-and-gif-tests.patch b/debian/patches/disable-file-and-gif-tests.patch index 17901c5..527e3f3 100644 --- a/debian/patches/disable-file-and-gif-tests.patch +++ b/debian/patches/disable-file-and-gif-tests.patch @@ -6,7 +6,7 @@ Author: Tobias Hansen <[email protected]> --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -301,7 +301,9 @@ +@@ -307,7 +307,9 @@ string(REGEX MATCH "_ui_tests" test_requires_ui ${testname}) if (NOT test_requires_ui STREQUAL "_ui_tests") diff --git a/debian/patches/disable-resize_image_tests.patch b/debian/patches/disable-resize_image_tests.patch index 66557ee..bf10ba5 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/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -302,8 +302,10 @@ +@@ -308,8 +308,10 @@ string(REGEX MATCH "_ui_tests" test_requires_ui ${testname}) if (NOT test_requires_ui STREQUAL "_ui_tests") if (NOT (${testname} STREQUAL "file_tests" OR ${testname} STREQUAL "gif_tests")) diff --git a/debian/patches/find-static-gtest.patch b/debian/patches/find-static-gtest.patch index 7a62fbe..6a48465 100644 --- a/debian/patches/find-static-gtest.patch +++ b/debian/patches/find-static-gtest.patch @@ -5,10 +5,10 @@ Author: Tobias Hansen <[email protected]> --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -278,7 +278,12 @@ - get_filename_component(testname ${testsourcefile} NAME_WE) +@@ -284,7 +284,12 @@ + PROPERTIES LINK_FLAGS -ENTRY:"mainCRTStartup") + endif() - add_executable(${testname} ${testsourcefile}) - target_link_libraries(${testname} gtest ${ARGV}) + if(USE_SHARED_GTEST) + target_link_libraries(${testname} -L${CMAKE_BINARY_DIR}/gtest gtest ${ARGV}) diff --git a/debian/patches/giflib-4.1.6.patch b/debian/patches/giflib-4.1.6.patch index 8ac16e6..dbcc7b3 100644 --- a/debian/patches/giflib-4.1.6.patch +++ b/debian/patches/giflib-4.1.6.patch @@ -77,7 +77,7 @@ Author: Tobias Hansen <[email protected]> if (color_map == NULL) throw std::bad_alloc(); -@@ -689,35 +665,29 @@ +@@ -689,21 +665,18 @@ // Specify loop extension. if (frame_num == 0 && loop >= 0) { @@ -102,23 +102,7 @@ Author: Tobias Hansen <[email protected]> throw Exception("Error writing GIF graphics extension record (trailer section)."); } - // Add Aseprite block (at this moment, it's empty). - if (frame_num == 0) { -- if (EGifPutExtensionLeader(gif_file, APPLICATION_EXT_FUNC_CODE) == GIF_ERROR) -- throw Exception("Error writing GIF comment (header section)."); -- - unsigned char extension_bytes[11]; - memcpy(extension_bytes, "ASEPRITE1.0", 11); -- if (EGifPutExtensionBlock(gif_file, sizeof(extension_bytes), extension_bytes) == GIF_ERROR) -+ if (EGifPutExtensionFirst(gif_file, APPLICATION_EXT_FUNC_CODE, sizeof(extension_bytes), extension_bytes) == GIF_ERROR) - throw Exception("Error writing GIF comment (first block)."); - -- if (EGifPutExtensionTrailer(gif_file) == GIF_ERROR) -+ if (EGifPutExtensionLast(gif_file, APPLICATION_EXT_FUNC_CODE, 0, NULL) == GIF_ERROR) - throw Exception("Error writing GIF comment (trailer section)."); - } - -@@ -743,7 +713,7 @@ +@@ -729,7 +702,7 @@ if ((!color_map && frame_num == 0) || (current_palette.countDiff(&previous_palette, NULL, NULL) > 0)) { if (!image_color_map) { diff --git a/debian/patches/libx11-underlinkage.patch b/debian/patches/libx11-underlinkage.patch index 4f862e8..f7d5c20 100644 --- a/debian/patches/libx11-underlinkage.patch +++ b/debian/patches/libx11-underlinkage.patch @@ -4,18 +4,18 @@ Author: Daniel T Chen <[email protected]> --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -220,7 +220,7 @@ - endif(UNIX) - - add_executable(aseprite WIN32 main/main.cpp ${win32_resources} ${x11_resources}) +@@ -246,7 +246,7 @@ + main/main.cpp + ${win32_resources} + ${x11_resources}) -target_link_libraries(aseprite ${all_libs}) +target_link_libraries(aseprite ${all_libs} X11) + add_dependencies(aseprite copy_data) install(TARGETS aseprite - RUNTIME DESTINATION bin) -@@ -279,7 +279,7 @@ +@@ -285,7 +285,7 @@ + endif() - add_executable(${testname} ${testsourcefile}) if(USE_SHARED_GTEST) - target_link_libraries(${testname} -L${CMAKE_BINARY_DIR}/gtest gtest ${ARGV}) + target_link_libraries(${testname} -L${CMAKE_BINARY_DIR}/gtest gtest ${ARGV} X11) diff --git a/debian/patches/no-third_party-dir.patch b/debian/patches/no-third_party-dir.patch index eaa14b8..32deca4 100644 --- a/debian/patches/no-third_party-dir.patch +++ b/debian/patches/no-third_party-dir.patch @@ -4,7 +4,7 @@ Author: Tobias Hansen <[email protected]> --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -278,4 +278,3 @@ +@@ -298,4 +298,3 @@ ###################################################################### # Third party libraries diff --git a/debian/patches/resizing_from_options_gui.patch b/debian/patches/resizing_from_options_gui.patch index 49b64f0..d0d6865 100644 --- a/debian/patches/resizing_from_options_gui.patch +++ b/debian/patches/resizing_from_options_gui.patch @@ -15,11 +15,11 @@ - </hbox> + </grid> <check text="Show timeline automatically" id="autotimeline" tooltip="Show the timeline automatically when a new frame or layer is added." /> - <separator horizontal="true" /> - <link id="locate_file" text="Locate Configuration File" /> + <check text="Expand menu bar items on mouseover" id="expand_menubar_on_mouseover" tooltip="Check this option to get this old menus behavior." /> + <check text="Center editor when zoom with keys or zoom tool" id="center_on_zoom" /> --- a/src/app/commands/cmd_options.cpp +++ b/src/app/commands/cmd_options.cpp -@@ -80,6 +80,9 @@ +@@ -90,6 +90,9 @@ if (m_settings->getShowSpriteEditorScrollbars()) showScrollbars()->setSelected(true); @@ -29,8 +29,8 @@ // Checked background size screenScale()->addItem("1:1"); screenScale()->addItem("2:1"); -@@ -163,11 +166,36 @@ - m_settings->experimental()->setUseNativeCursor(nativeCursor()->isSelected()); +@@ -180,11 +183,36 @@ + m_settings->experimental()->setFlashLayer(flashLayer()->isSelected()); int new_screen_scaling = screenScale()->getSelectedItemIndex()+1; + @@ -69,7 +69,7 @@ --- a/src/app/modules/gui.cpp +++ b/src/app/modules/gui.cpp -@@ -264,13 +264,43 @@ +@@ -204,13 +204,43 @@ she::Display* display = Manager::getDefault()->getDisplay(); if (display) { set_config_bool("GfxMode", "Maximized", display->isMaximized()); @@ -117,7 +117,7 @@ return screen_scaling; --- a/src/app/modules/gui.h +++ b/src/app/modules/gui.h -@@ -54,6 +54,12 @@ +@@ -45,6 +45,12 @@ int init_module_gui(); void exit_module_gui(); -- 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
