Updated aseprite submodule

Removed patches which were accepted upstream. Also removed unused 'mingw_dir' variable. We don't need it since MinGW is already added to the path.
mapeditor · Jan 10, 2025 · dae570c · dae570c
1 parent 7761f01
commit dae570c
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 46 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -116,13 +116,11 @@ jobs:
           qt_arch: win32_mingw81
           qt_tools: tools_mingw,qt.tools.win32_mingw810
           cmake_args: -G "MinGW Makefiles"
-          mingw_dir: mingw810_32
         - windows_version: 2022
           qt_version: 6.8.1
           qt_arch: win64_mingw
           qt_tools: tools_mingw1310,qt.tools.win64_mingw1310
           cmake_args: -G "MinGW Makefiles"
-          mingw_dir: mingw1310_64
 
     defaults:
       run:
@@ -145,15 +143,10 @@ jobs:
     - name: Build
       run: |
         pushd aseprite
-        patch -p1 < ../aseprite-fix-zlib-include.patch
         patch -p1 < ../aseprite-msvc-dynamic-runtime.patch
         popd
         pushd aseprite/laf
         patch -p1 < ../../laf-msvc-dynamic-runtime.patch
-        patch -p1 < ../../laf-include-cstdint.patch
-        popd
-        pushd aseprite/third_party/cityhash
-        patch -p1 < ../../../cityhash-fix-byteswap.patch
         popd
         cmake -B build -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_args }}
         cmake --build build --config Release

diff --git a/aseprite b/aseprite
diff --git a/aseprite-fix-zlib-include.patch b/aseprite-fix-zlib-include.patch
diff --git a/cityhash-fix-byteswap.patch b/cityhash-fix-byteswap.patch
diff --git a/laf-include-cstdint.patch b/laf-include-cstdint.patch
+1 −0		.clang-tidy
+1 −1		.github/workflows/build.yml
+1 −1		CMakeLists.txt
+ −		data/extensions/aseprite-theme/sheet.png
+1 −1		data/widgets/about.xml
+1 −1		laf
+4 −3		src/app/commands/cmd_keyboard_shortcuts.cpp
+4 −3		src/app/commands/cmd_layer_lock.cpp
+13 −0		src/app/doc.cpp
+7 −0		src/app/doc.h
+3 −0		src/app/doc_observer.h
+2 −2		src/app/script/api_version.h
+7 −1		src/app/ui/editor/editor.cpp
+2 −1		src/app/ui/editor/editor.h
+3 −0		src/app/ui/editor/editor_state.h
+25 −6		src/app/ui/editor/moving_pixels_state.cpp
+4 −0		src/app/ui/editor/moving_pixels_state.h
+1 −1		src/app/ui/export_file_window.cpp
+1 −1		src/app/ui/key.h
+2 −2		src/app/ui/keyboard_shortcuts.cpp
+17 −12		src/app/ui/timeline/timeline.cpp
+1 −1		src/main/resources_win32.rc
+27 −0		src/ui/window.cpp
+1 −0		src/ui/window.h
+1 −1		src/ver/info.c
+1 −1		third_party/cityhash