From 8ac7a096247793563b416076cf5711601180f79f Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 22 May 2024 23:44:59 -0500 Subject: [PATCH] upgpkg: aseprite 1.3.7-1 upstream release --- .SRCINFO | 10 +++-- ENABLE_UPDATER-fix.patch | 95 ++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 12 +++-- 3 files changed, 109 insertions(+), 8 deletions(-) create mode 100644 ENABLE_UPDATER-fix.patch diff --git a/.SRCINFO b/.SRCINFO index e1659a0..9141c2c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.6 + pkgver = 1.3.7 pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 @@ -32,9 +32,9 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.3.6-Source.zip + noextract = Aseprite-v1.3.7-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.6/Aseprite-v1.3.6-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.7/Aseprite-v1.3.7-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,7 +42,8 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 5e974aa2786297981cd5ebe81f040a49b722bddfe33d70def207ad06cb0d34fc + source = ENABLE_UPDATER-fix.patch + sha256sums = 6524b4dd38adac22f954122846ccca7377983cee2e0f17c1482294cf09cbdcfc sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 @@ -50,5 +51,6 @@ pkgbase = aseprite sha256sums = 320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 + sha256sums = 31369a5063d5f7839699fea00235b70057b0f2619592ba1db5af6d12c4f1171c pkgname = aseprite diff --git a/ENABLE_UPDATER-fix.patch b/ENABLE_UPDATER-fix.patch new file mode 100644 index 0000000..815dab1 --- /dev/null +++ b/ENABLE_UPDATER-fix.patch @@ -0,0 +1,95 @@ +From 8fce589069090bb086d7ad7b0b50340171c98b17 Mon Sep 17 00:00:00 2001 +From: David Capello +Date: Wed, 22 May 2024 12:41:23 -0300 +Subject: [PATCH] Now updater-lib is always compiled as it's required for + app.os.fullName in scripts (fix #4486) + +ENABLE_UPDATER flag now only controls the "check update" portion of +the updater-lib. Probably the user agent string could be moved to the +ver-lib in the future. +--- + src/CMakeLists.txt | 8 ++++---- + src/app/CMakeLists.txt | 5 +---- + src/updater/CMakeLists.txt | 22 +++++++++++----------- + 3 files changed, 16 insertions(+), 19 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0f676af1e3..3b44e9e55e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -117,6 +117,10 @@ if(REQUIRE_CURL) + add_subdirectory(net) + endif() + ++# We need the updater library to check for updates (when ++# ENABLE_UPDATER) or for the app.os object (ENABLE_SCRIPTING). ++add_subdirectory(updater) ++ + if(GEN_EXE) + add_executable(gen IMPORTED) + set_target_properties(gen PROPERTIES IMPORTED_LOCATION ${GEN_EXE}) +@@ -127,10 +131,6 @@ else() + set(GEN_DEP gen) + endif() + +-if(ENABLE_UPDATER) +- add_subdirectory(updater) +-endif() +- + if(ENABLE_STEAM) + add_subdirectory(steam) + endif() +diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt +index 0db978e882..63b60a9aed 100644 +--- a/src/app/CMakeLists.txt ++++ b/src/app/CMakeLists.txt +@@ -717,6 +717,7 @@ target_link_libraries(app-lib + laf-os + ui-lib + ver-lib ++ updater-lib + undo + ${CMARK_LIBRARIES} + ${TINYXML_LIBRARY} +@@ -756,10 +757,6 @@ if(ENABLE_SCRIPTING) + endif() + endif() + +-if(ENABLE_UPDATER) +- target_link_libraries(app-lib updater-lib) +-endif() +- + if(ENABLE_STEAM) + # We need the ENABLE_STEAM flag in main module too so AppOptions are + # equal in both modules, app-lib and main (that's why this flag is +diff --git a/src/updater/CMakeLists.txt b/src/updater/CMakeLists.txt +index 6dc818caf3..15e6b4c8f2 100644 +--- a/src/updater/CMakeLists.txt ++++ b/src/updater/CMakeLists.txt +@@ -1,15 +1,15 @@ + # ASEPRITE +-# Copyright (C) 2020-2021 Igara Studio S.A. ++# Copyright (C) 2020-2024 Igara Studio S.A. + # Copyright (C) 2001-2017 David Capello + +-set(UPDATER_LIB_SOURCES +- check_update.cpp +- user_agent.cpp) ++# By default the updater-lib will contain only the functions related ++# the user agent string. ++add_library(updater-lib user_agent.cpp) ++target_link_libraries(updater-lib laf-base ver-lib) + +-add_library(updater-lib ${UPDATER_LIB_SOURCES}) +- +-target_link_libraries(updater-lib +- laf-base +- net-lib +- ver-lib +- ${TINYXML_LIBRARY}) ++# Only when ENABLE_UPDATER is ON we'll enable the "check for update" ++# portion of the library. ++if(ENABLE_UPDATER) ++ target_sources(updater-lib PRIVATE check_update.cpp) ++ target_link_libraries(updater-lib net-lib ${TINYXML_LIBRARY}) ++endif() diff --git a/PKGBUILD b/PKGBUILD index cedab28..ecfb130 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil BiduĊ› pkgname=aseprite -pkgver=1.3.6 +pkgver=1.3.7 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -49,17 +49,19 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch shared-libwebp.patch shared-skia-deps.patch - optional-pixman.patch) + optional-pixman.patch + ENABLE_UPDATER-fix.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root -sha256sums=('5e974aa2786297981cd5ebe81f040a49b722bddfe33d70def207ad06cb0d34fc' +sha256sums=('6524b4dd38adac22f954122846ccca7377983cee2e0f17c1482294cf09cbdcfc' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' '320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' - 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') + 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654' + '31369a5063d5f7839699fea00235b70057b0f2619592ba1db5af6d12c4f1171c') prepare() { # Extract Aseprite's sources @@ -78,6 +80,8 @@ prepare() { # Their "FindSkia" module forcefully tries to use Skia's FreeType and HarfBuzz, # but we don't clone those because we use the shared ones. Avoid overwriting the settings instead. env -C aseprite patch -tp1