From 062d51bad04773c55d79d5f673a0d77a174e187d Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 2 Oct 2024 13:14:36 -0500 Subject: [PATCH] upgpkg: aseprite 1.3.9-1 upstream release --- .SRCINFO | 14 +++++++------- PKGBUILD | 10 +++++----- shared-libarchive.patch | 7 ++++--- shared-libwebp.patch | 10 +++++++--- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 37934e9..c1f6678 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.8.1 - pkgrel = 2 + pkgver = 1.3.9 + pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA @@ -32,9 +32,9 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.3.8.1-Source.zip + noextract = Aseprite-v1.3.9-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.8.1/Aseprite-v1.3.8.1-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.9/Aseprite-v1.3.9-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz source = desktop.patch source = shared-fmt.patch @@ -42,12 +42,12 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = fc13536a9e14551245028d578493aa63f9978b943250936735dc62a5abfbee53 + sha256sums = 672c8ddb12d4c180f6c27b33ec4b0faefe5df321c7d40c03cb62ad3182e584ff sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 - sha256sums = bed004cdbe61793c759a30c4afa5d844ce08c55a321d5c3625426f059f98b503 - sha256sums = 320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d + sha256sums = 89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb + sha256sums = 0f8adb959d7000697af453d6cf5aaf9984b74868008382aad541d2c29871c751 sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 diff --git a/PKGBUILD b/PKGBUILD index e51fb8c..7d4e5e5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,10 +9,10 @@ # Contributor: Kamil BiduĊ› pkgname=aseprite -pkgver=1.3.8.1 +pkgver=1.3.9 _skiaver=m102 _skiahash=861e4743af -pkgrel=2 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -52,12 +52,12 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit optional-pixman.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root -sha256sums=('fc13536a9e14551245028d578493aa63f9978b943250936735dc62a5abfbee53' +sha256sums=('672c8ddb12d4c180f6c27b33ec4b0faefe5df321c7d40c03cb62ad3182e584ff' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' - 'bed004cdbe61793c759a30c4afa5d844ce08c55a321d5c3625426f059f98b503' - '320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d' + '89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb' + '0f8adb959d7000697af453d6cf5aaf9984b74868008382aad541d2c29871c751' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') diff --git a/shared-libarchive.patch b/shared-libarchive.patch index 955e36c..47a3131 100644 --- a/shared-libarchive.patch +++ b/shared-libarchive.patch @@ -43,14 +43,15 @@ index e1e3bc1ae3..4a37838e95 100644 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -651,8 +651,8 @@ target_link_libraries(app-lib + ${GIF_LIBRARIES} + ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} - ${FREETYPE_LIBRARIES} - ${HARFBUZZ_LIBRARIES} + ${LibArchive_LIBRARIES} json11 - archive_static ${FMT_LIBRARIES} - tinyexpr) + tinyexpr + qoi) diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index ffd1c0cfcd..4839d4097c 100644 diff --git a/shared-libwebp.patch b/shared-libwebp.patch index bdeb0d0..4a1a44f 100644 --- a/shared-libwebp.patch +++ b/shared-libwebp.patch @@ -22,7 +22,7 @@ index af077f6..fed17ff 100644 option(ENABLE_ASEPRITE_EXE "Compile main Aseprite executable" on) option(ENABLE_MEMLEAK "Enable memory-leaks detector (only for developers)" off) option(ENABLE_NEWS "Enable the news in Home tab" on) -@@ -328,14 +351,17 @@ add_subdirectory(laf) +@@ -352,7 +352,13 @@ add_subdirectory(laf) # libwebp if(ENABLE_WEBP) # Use libwebp from Skia @@ -37,13 +37,17 @@ index af077f6..fed17ff 100644 find_library(WEBP_LIBRARIES webp NAMES libwebp # required for Windows PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) - set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src") +@@ -362,10 +368,6 @@ if(ENABLE_WEBP) + else() + set(WEBP_FOUND OFF) + endif() - else() +- set(WEBP_FOUND ON) - set(WEBP_LIBRARIES webp webpdemux libwebpmux) - set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) endif() - include_directories(${WEBP_INCLUDE_DIR}) endif() + message(STATUS "aseprite libwebp: ${WEBP_LIBRARIES}") diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt index 4839d4097c..e8c3e83cbc 100644 --- a/third_party/CMakeLists.txt