Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge 1.11 branch to master #4152

Merged
merged 2 commits into from
Jan 23, 2025
Merged

Merge 1.11 branch to master #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d297ecb
Fixed qaseprite compile on Windows (#4147)
bjorn Jan 17, 2025
aca6370
CI: Updated to qaseprite 1.0.1 (#4151)
bjorn Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .github/workflows/packages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:
with:
repository: mapeditor/qaseprite
path: qaseprite
submodules: 'recursive'
ref: '1.0.1'

- name: Install dependencies
run: |
Expand Down Expand Up @@ -128,8 +128,10 @@ jobs:
- name: Install qaseprite plugin
working-directory: qaseprite
run: |
./update-submodules.sh --minimal
cmake -B build -DCMAKE_BUILD_TYPE=Release \
-DUSE_SHARED_ZLIB=on \
-DUSE_SHARED_LIBPNG=on \
-DUSE_SHARED_PIXMAN=on \
-DUSE_SHARED_FREETYPE=on \
-DUSE_SHARED_HARFBUZZ=on
Expand Down Expand Up @@ -242,7 +244,7 @@ jobs:
with:
repository: mapeditor/qaseprite
path: qaseprite
submodules: 'recursive'
ref: '1.0.1'

- name: Install Qt
uses: jurplel/install-qt-action@v4
Expand All @@ -268,6 +270,7 @@ jobs:
- name: Install qaseprite plugin
working-directory: qaseprite
run: |
./update-submodules.sh --no-zlib
cmake -B build -DCMAKE_BUILD_TYPE=Release \
-DUSE_SHARED_ZLIB=on \
-DCMAKE_OSX_ARCHITECTURES='${{ matrix.cmake_architectures }}'
Expand Down Expand Up @@ -369,7 +372,7 @@ jobs:
with:
repository: mapeditor/qaseprite
path: qaseprite
submodules: 'recursive'
ref: '1.0.1'

- name: Install Qt
uses: jurplel/install-qt-action@v4
Expand Down Expand Up @@ -406,9 +409,7 @@ jobs:
- name: Install qaseprite plugin
working-directory: qaseprite
run: |
pushd aseprite
patch -p1 < ../aseprite-msvc-dynamic-runtime.patch
popd
./update-submodules.sh
pushd aseprite/laf
patch -p1 < ../../laf-msvc-dynamic-runtime.patch
popd
Expand Down
7 changes: 2 additions & 5 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,8 @@ build_script:
- if defined MINGW git clone --depth 1 -b release https://github.com/facebook/zstd.git
- if defined MINGW cd zstd/lib & set CC=gcc & mingw32-make -j2 libzstd.a & cd ../../
- echo Building qaseprite
- git clone --depth 1 --recurse-submodules https://github.com/mapeditor/qaseprite.git
- cd qaseprite
- cd aseprite
- patch -p1 < ..\aseprite-msvc-dynamic-runtime.patch
- cd laf
- git clone --depth 1 --recurse-submodules --shallow-submodules --branch 1.0.1 https://github.com/mapeditor/qaseprite.git
- cd qaseprite\aseprite\laf
- patch -p1 < ..\..\laf-msvc-dynamic-runtime.patch
- cd ..\..
- if defined MINGW cmake -B build -DCMAKE_BUILD_TYPE=Release -G "MinGW Makefiles"
Expand Down
4 changes: 1 addition & 3 deletions dist/win/installer.qbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,7 @@ WindowsInstallerPackage {
defs.push("RpMap");

var imageFormatsPath = FileInfo.joinPaths(Qt.core.pluginPath, "imageformats")
if (File.exists(FileInfo.joinPaths(imageFormatsPath, "libqaseprite.dll")))
defs.push("AsepriteImageFormatPlugin=libqaseprite.dll");
else if (File.exists(FileInfo.joinPaths(imageFormatsPath, "qaseprite.dll")))
if (File.exists(FileInfo.joinPaths(imageFormatsPath, "qaseprite.dll")))
defs.push("AsepriteImageFormatPlugin=qaseprite.dll");

// Since Qt 6.2 we rely on the schannel backend.
Expand Down
3 changes: 2 additions & 1 deletion snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,12 @@ parts:
after: [desktop-qt5]

qaseprite:
source: https://github.com/mapeditor/qaseprite.git
source: https://github.com/mapeditor/qaseprite/releases/download/1.0/qaseprite-1.0-source.tar.gz
plugin: cmake
cmake-parameters:
- -DCMAKE_BUILD_TYPE=Release
- -DUSE_SHARED_ZLIB=on
- -DUSE_SHARED_LIBPNG=on
- -DUSE_SHARED_PIXMAN=on
- -DUSE_SHARED_FREETYPE=on
- -DUSE_SHARED_HARFBUZZ=on
Expand Down
Loading