Compare commits
5 Commits
f915cec339
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 612b542e2a | |||
| d74db66ab5 | |||
| 9dd34b3fce | |||
| adfe6c51da | |||
| 96565b2ccf |
2
.github/workflows/macos.yml
vendored
2
.github/workflows/macos.yml
vendored
@ -12,7 +12,7 @@ jobs:
|
||||
- name: Install Qt
|
||||
uses: jurplel/install-qt-action@v4
|
||||
with:
|
||||
version: '6.9.3'
|
||||
version: '6.10.1'
|
||||
modules: 'qtimageformats'
|
||||
cache: true
|
||||
- name: Install Conan and Dependencies
|
||||
|
||||
14
.github/workflows/windows.yml
vendored
14
.github/workflows/windows.yml
vendored
@ -8,7 +8,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- qt_ver: '6.9.3'
|
||||
- qt_ver: '6.10.1'
|
||||
vs: '2022'
|
||||
aqt_arch: 'win64_msvc2022_64'
|
||||
msvc_arch: 'x64'
|
||||
@ -45,7 +45,7 @@ jobs:
|
||||
strategy:
|
||||
matrix:
|
||||
include:
|
||||
- qt_ver: '6.9.3'
|
||||
- qt_ver: '6.10.1'
|
||||
vs: '2022'
|
||||
aqt_arch: 'win64_msvc2022_64'
|
||||
msvc_arch: 'x64'
|
||||
@ -94,7 +94,7 @@ jobs:
|
||||
curl -fsSL -o libavif-v1_3_0.zip https://github.com/AOMediaCodec/libavif/archive/v1.3.0.zip
|
||||
7z x libavif-v1_3_0.zip -y -o"dependencies_src"
|
||||
ren .\dependencies_src\libavif-1.3.0 libavif || goto :error
|
||||
cmake ./dependencies_src/libavif -Bbuild_dependencies/libavif -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DAVIF_CODEC_AOM=ON -DAVIF_LIBYUV=LOCAL
|
||||
cmake ./dependencies_src/libavif -Bbuild_dependencies/libavif -DCMAKE_INSTALL_PREFIX="dependencies_bin" -DAVIF_CODEC_AOM=SYSTEM -DAVIF_CODEC_AOM_DECODE=ON -DAVIF_CODEC_AOM_ENCODE=ON -DAVIF_LIBYUV=LOCAL
|
||||
cmake --build build_dependencies/libavif --config Release --target=install || goto :error
|
||||
echo ::endgroup::
|
||||
echo ::group::===== expat =====
|
||||
@ -120,11 +120,13 @@ jobs:
|
||||
cmake --build build_dependencies/kimageformats --config Release --target=install || goto :error
|
||||
echo ::endgroup::
|
||||
:: ------ app ------
|
||||
cmake -Bbuild . -DCMAKE_INSTALL_PREFIX="%PWD%\build\"
|
||||
echo ::group::===== App (Build'n'Install) =====
|
||||
cmake -Bbuild .
|
||||
cmake --build build --config Release
|
||||
cmake --build build --config Release --target=install
|
||||
cmake --install build --config Release --prefix "%PWD%\build"
|
||||
echo ::endgroup::
|
||||
:: ------ pkg ------
|
||||
windeployqt --verbose=2 --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation build\bin\ppic.exe
|
||||
windeployqt --verbose=2 --no-compiler-runtime --no-quick-import --no-translations --no-opengl-sw --no-system-d3d-compiler --no-system-dxc-compiler --skip-plugin-types tls,networkinformation build\bin\ppic.exe
|
||||
robocopy ./dependencies_bin/bin build/bin *.dll
|
||||
if ErrorLevel 8 (exit /B 1)
|
||||
copy LICENSE build\bin
|
||||
|
||||
4
.gitignore
vendored
4
.gitignore
vendored
@ -16,3 +16,7 @@ cmake-build-*/
|
||||
# IDE/Editor config folders
|
||||
.vscode/
|
||||
.idea/
|
||||
.qtcreator/
|
||||
|
||||
# Clangd cache
|
||||
.cache/
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
cmake_minimum_required(VERSION 3.16)
|
||||
|
||||
project(pineapple-pictures VERSION 1.2.0) # don't forget to update NEWS file and AppStream metadata.
|
||||
project(pineapple-pictures VERSION 1.2.1) # don't forget to update NEWS file and AppStream metadata.
|
||||
|
||||
include(GNUInstallDirs)
|
||||
include(FeatureSummary)
|
||||
|
||||
16
NEWS
16
NEWS
@ -1,3 +1,19 @@
|
||||
Version 1.2.1
|
||||
~~~~~~~~~~~~~
|
||||
Released: 2025-11-22
|
||||
|
||||
Bugfixes:
|
||||
* Fix incorrect color when display some CMYK images.
|
||||
|
||||
Miscellaneous:
|
||||
* Now use Qt 6.10.1 for pre-built binary
|
||||
* Update README description and AppStream metainfo
|
||||
* Update translations
|
||||
* Update libavif, AOM and expat version for Windows binary build
|
||||
|
||||
Contributors:
|
||||
albanobattistella
|
||||
|
||||
Version 1.2.0
|
||||
~~~~~~~~~~~~~
|
||||
Released: 2025-09-21
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
|
||||
// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
|
||||
//
|
||||
// SPDX-License-Identifier: MIT
|
||||
|
||||
@ -105,7 +105,7 @@ AboutDialog::AboutDialog(QWidget *parent)
|
||||
|
||||
const QString mitLicense(QStringLiteral(R"(Expat/MIT License
|
||||
|
||||
Copyright (c) 2025 BLumia
|
||||
Copyright © 2025 BLumia
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
||||
@ -321,7 +321,7 @@
|
||||
<message>
|
||||
<location filename="../actionmanager.cpp" line="105"/>
|
||||
<source>Fit long image</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Adatta immagine lunga</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../actionmanager.cpp" line="108"/>
|
||||
|
||||
@ -79,7 +79,7 @@ build_script:
|
||||
- cd libavif-1.3.0
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DAVIF_CODEC_AOM=ON -DAVIF_LIBYUV=LOCAL
|
||||
- cmake .. -G "Ninja" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CMAKE_INSTALL_PREFIX% -DAVIF_CODEC_AOM=SYSTEM -DAVIF_CODEC_AOM_DECODE=ON -DAVIF_CODEC_AOM_ENCODE=ON -DAVIF_LIBYUV=LOCAL
|
||||
- cmake --build . --config Release
|
||||
- cmake --build . --config Release --target install/strip
|
||||
- cd %APPVEYOR_BUILD_FOLDER%
|
||||
|
||||
@ -81,6 +81,23 @@
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
<releases>
|
||||
<release type="stable" version="1.2.1" date="2025-11-22T00:00:00Z">
|
||||
<description>
|
||||
<p>This release fixes the following bug:</p>
|
||||
<ul>
|
||||
<li>Fix incorrect color when display some CMYK images.</li>
|
||||
</ul>
|
||||
<p>This release includes the following changes:</p>
|
||||
<ul>
|
||||
<li>Now use Qt 6.10.1 for pre-built binary</li>
|
||||
<li>Update README description and AppStream metainfo</li>
|
||||
<li>Update translations</li>
|
||||
<li>Update libavif, AOM and expat version for Windows binary build</li>
|
||||
</ul>
|
||||
<p>With contributions from:</p>
|
||||
<p>albanobattistella</p>
|
||||
</description>
|
||||
</release>
|
||||
<release type="stable" version="1.2.0" date="2025-09-21T00:00:00Z">
|
||||
<description>
|
||||
<p>This release adds the following features:</p>
|
||||
|
||||
Reference in New Issue
Block a user