From 8a0109c8971e99f4a385be3074619e24e0204b84 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Fri, 26 Jun 2015 07:55:52 +0200 Subject: [PATCH 001/154] Initial import --- .AURINFO | 22 ++++++++++++++++++++++ .SRCINFO | 24 ++++++++++++++++++++++++ PKGBUILD | 46 ++++++++++++++++++++++++++++++++++++++++++++++ aseprite.desktop | 9 +++++++++ 4 files changed, 101 insertions(+) create mode 100644 .AURINFO create mode 100644 .SRCINFO create mode 100644 PKGBUILD create mode 100644 aseprite.desktop diff --git a/.AURINFO b/.AURINFO new file mode 100644 index 0000000..5104273 --- /dev/null +++ b/.AURINFO @@ -0,0 +1,22 @@ +pkgbase = aseprite + pkgdesc = Create animated sprites and pixel art + pkgver = 1.0.9 + pkgrel = 1 + url = http://www.aseprite.org/ + arch = x86_64 + arch = i686 + license = GPL + makedepends = cmake + depends = allegro + depends = pixman + depends = curl + depends = giflib + depends = zlib + depends = libpng + depends = tinyxml + depends = gtest + source = git+https://github.com/aseprite/aseprite.git#tag=v1.0.9 + source = aseprite.desktop + +pkgname = aseprite + diff --git a/.SRCINFO b/.SRCINFO new file mode 100644 index 0000000..0088c5c --- /dev/null +++ b/.SRCINFO @@ -0,0 +1,24 @@ +pkgbase = aseprite + pkgdesc = Create animated sprites and pixel art + pkgver = 1.0.9 + pkgrel = 1 + url = http://www.aseprite.org/ + arch = x86_64 + arch = i686 + license = GPL + makedepends = cmake + depends = allegro + depends = pixman + depends = curl + depends = giflib + depends = zlib + depends = libpng + depends = tinyxml + depends = gtest + source = git+https://github.com/aseprite/aseprite.git#tag=v1.0.9 + source = aseprite.desktop + sha256sums = SKIP + sha256sums = c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa + +pkgname = aseprite + diff --git a/PKGBUILD b/PKGBUILD new file mode 100644 index 0000000..15a34fc --- /dev/null +++ b/PKGBUILD @@ -0,0 +1,46 @@ +# Maintainer: Benoit Favre +# Contributor: Alexander Rødseth +# Contributor: Kamil Biduś + +pkgname=aseprite +pkgver=1.0.9 +pkgrel=1 +pkgdesc='Create animated sprites and pixel art' +arch=('x86_64' 'i686') +url='http://www.aseprite.org/' +license=('GPL') +depends=('allegro' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'gtest') +makedepends=('cmake') +source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" + "aseprite.desktop") +sha256sums=('SKIP' + 'c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa') + +build() { + cd "$pkgname" + + cmake -DUSE_SHARED_PIXMAN=ON -DLIBPIXMAN_LIBRARY=/usr/lib/libpixman-1.so -DLIBPIXMAN_INCLUDE_DIR=/usr/include/pixman-1/ \ + -DUSE_SHARED_CURL=ON \ + -DUSE_SHARED_GIFLIB=ON \ + -DUSE_SHARED_JPEGLIB=OFF \ + -DUSE_SHARED_ZLIB=ON \ + -DUSE_SHARED_LIBPNG=OFF \ + -DUSE_SHARED_LIBLOADPNG=OFF \ + -DUSE_SHARED_TINYXML=ON \ + -DUSE_SHARED_GTEST=ON \ + -DENABLE_UPDATER=OFF \ + -DCMAKE_INSTALL_PREFIX:STRING=/usr . + make aseprite +} + +package() { + cd "$pkgname" + + make DESTDIR="$pkgdir/" install/fast + install -Dm644 "$srcdir/$pkgname.desktop" \ + "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "data/icons/ase48.png" \ + "$pkgdir/usr/share/pixmaps/$pkgname.png" +} + +# vim:set ts=2 sw=2 et: diff --git a/aseprite.desktop b/aseprite.desktop new file mode 100644 index 0000000..b000fa0 --- /dev/null +++ b/aseprite.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=Application +Encoding=UTF-8 +Name=Aseprite +Comment=Pixel-art paint program +Exec=aseprite +Terminal=false +Categories=Graphics;2DGraphics;RasterGraphics +Icon=aseprite From df8fc656180392ff5781411db58df0c7feaa5ae5 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Wed, 9 Sep 2015 16:11:09 +0200 Subject: [PATCH 002/154] update to 1.1.0.1 --- .SRCINFO | 7 +++---- PKGBUILD | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0088c5c..41439cc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,21 +1,20 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.0.9 + pkgver = 1.1.0.1 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 license = GPL makedepends = cmake - depends = allegro depends = pixman depends = curl depends = giflib depends = zlib depends = libpng + depends = libjpeg-turbo depends = tinyxml - depends = gtest - source = git+https://github.com/aseprite/aseprite.git#tag=v1.0.9 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.0.1 source = aseprite.desktop sha256sums = SKIP sha256sums = c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa diff --git a/PKGBUILD b/PKGBUILD index 15a34fc..989cf7c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,13 +3,13 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.0.9 +pkgver=1.1.0.1 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' license=('GPL') -depends=('allegro' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'gtest') +depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml') makedepends=('cmake') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" "aseprite.desktop") @@ -18,28 +18,28 @@ sha256sums=('SKIP' build() { cd "$pkgname" - - cmake -DUSE_SHARED_PIXMAN=ON -DLIBPIXMAN_LIBRARY=/usr/lib/libpixman-1.so -DLIBPIXMAN_INCLUDE_DIR=/usr/include/pixman-1/ \ + mkdir -p build && cd build + git submodule update --init --recursive + cmake -DUSE_SHARED_PIXMAN=ON \ -DUSE_SHARED_CURL=ON \ -DUSE_SHARED_GIFLIB=ON \ - -DUSE_SHARED_JPEGLIB=OFF \ + -DUSE_SHARED_JPEGLIB=ON \ -DUSE_SHARED_ZLIB=ON \ - -DUSE_SHARED_LIBPNG=OFF \ + -DUSE_SHARED_LIBPNG=ON \ -DUSE_SHARED_LIBLOADPNG=OFF \ -DUSE_SHARED_TINYXML=ON \ - -DUSE_SHARED_GTEST=ON \ -DENABLE_UPDATER=OFF \ - -DCMAKE_INSTALL_PREFIX:STRING=/usr . + -DCMAKE_INSTALL_PREFIX:STRING=/usr .. make aseprite } package() { - cd "$pkgname" + cd "$pkgname"/build make DESTDIR="$pkgdir/" install/fast install -Dm644 "$srcdir/$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "data/icons/ase48.png" \ + install -Dm644 "../data/icons/ase48.png" \ "$pkgdir/usr/share/pixmaps/$pkgname.png" } From 3e9e4745d10d427d499fb837f8370af7a426c8b4 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Sun, 8 Nov 2015 21:50:09 +0100 Subject: [PATCH 003/154] update to 1.1.1 --- .SRCINFO | 4 ++-- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 41439cc..a77d2fe 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.0.1 + pkgver = 1.1.1 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -14,7 +14,7 @@ pkgbase = aseprite depends = libpng depends = libjpeg-turbo depends = tinyxml - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.0.1 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.1 source = aseprite.desktop sha256sums = SKIP sha256sums = c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa diff --git a/PKGBUILD b/PKGBUILD index 989cf7c..8f436af 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.0.1 +pkgver=1.1.1 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') From 08c49454815675b48aad417bb489813e6051701b Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Mon, 9 Nov 2015 09:15:40 +0100 Subject: [PATCH 004/154] add freetype dependency --- .SRCINFO | 3 ++- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a77d2fe..372747f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.1 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -14,6 +14,7 @@ pkgbase = aseprite depends = libpng depends = libjpeg-turbo depends = tinyxml + depends = freetype source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.1 source = aseprite.desktop sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 8f436af..c1cef46 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,12 +4,12 @@ pkgname=aseprite pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' license=('GPL') -depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml') +depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype') makedepends=('cmake') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" "aseprite.desktop") From 3bcf189c37a81b30486655a1484551e4186e8fa3 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Mon, 9 Nov 2015 10:01:03 +0100 Subject: [PATCH 005/154] fix overwritten freetype files --- .SRCINFO | 4 ++-- PKGBUILD | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 372747f..7f999c1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.1 - pkgrel = 2 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -14,7 +14,7 @@ pkgbase = aseprite depends = libpng depends = libjpeg-turbo depends = tinyxml - depends = freetype + depends = freetype2 source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.1 source = aseprite.desktop sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index c1cef46..daa29c8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,12 +4,12 @@ pkgname=aseprite pkgver=1.1.1 -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' license=('GPL') -depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype') +depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2') makedepends=('cmake') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" "aseprite.desktop") @@ -29,6 +29,8 @@ build() { -DUSE_SHARED_LIBLOADPNG=OFF \ -DUSE_SHARED_TINYXML=ON \ -DENABLE_UPDATER=OFF \ + -DUSE_SHARED_FREETYPE=ON \ + -DFREETYPE_INCLUDE_DIR=/usr/include/freetype2 \ -DCMAKE_INSTALL_PREFIX:STRING=/usr .. make aseprite } From 241db8054026f7c86ba9bdecffbbe6ff5f922083 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Mon, 29 Feb 2016 11:43:02 +0100 Subject: [PATCH 006/154] update to 1.1.2 --- .SRCINFO | 8 +++++--- PKGBUILD | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7f999c1..45e0571 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,9 @@ +# Generated by mksrcinfo v8 +# Mon Feb 29 10:41:04 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.1 - pkgrel = 3 + pkgver = 1.1.2 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -15,7 +17,7 @@ pkgbase = aseprite depends = libjpeg-turbo depends = tinyxml depends = freetype2 - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.1 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.2 source = aseprite.desktop sha256sums = SKIP sha256sums = c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa diff --git a/PKGBUILD b/PKGBUILD index daa29c8..9c513df 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.1 -pkgrel=3 +pkgver=1.1.2 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' From cf7b407078b61a423ffe2d57ee0641dc1ed55789 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Mon, 29 Feb 2016 18:11:37 +0100 Subject: [PATCH 007/154] bump to 1.1.3 --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 45e0571..c7f9070 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon Feb 29 10:41:04 UTC 2016 +# Mon Feb 29 17:11:27 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.2 + pkgver = 1.1.3 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -17,7 +17,7 @@ pkgbase = aseprite depends = libjpeg-turbo depends = tinyxml depends = freetype2 - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.2 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.3 source = aseprite.desktop sha256sums = SKIP sha256sums = c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa diff --git a/PKGBUILD b/PKGBUILD index 9c513df..8b5ea57 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.2 +pkgver=1.1.3 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') From 8d601df91ea752cbded7bfb49dd4bb5715f733bc Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Tue, 29 Mar 2016 14:48:44 +0200 Subject: [PATCH 008/154] add support for webp; add mimetype in .desktop file --- .SRCINFO | 7 ++++--- PKGBUILD | 8 +++++--- aseprite.desktop | 6 ++++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c7f9070..7508841 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Feb 29 17:11:27 UTC 2016 +# Tue Mar 29 12:48:23 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.3 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -17,10 +17,11 @@ pkgbase = aseprite depends = libjpeg-turbo depends = tinyxml depends = freetype2 + depends = libwebp source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.3 source = aseprite.desktop sha256sums = SKIP - sha256sums = c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa + sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 8b5ea57..759dcef 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,23 +4,25 @@ pkgname=aseprite pkgver=1.1.3 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' license=('GPL') -depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2') +depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') makedepends=('cmake') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" "aseprite.desktop") sha256sums=('SKIP' - 'c9e624b9fd095ebb3eec8220a58d4a9422f39d68477bafcc0047d773814ba0aa') + '4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490') build() { cd "$pkgname" mkdir -p build && cd build git submodule update --init --recursive cmake -DUSE_SHARED_PIXMAN=ON \ + -DWITH_WEBP_SUPPORT=ON \ + -DUSE_SHARED_LIBWEBP=ON \ -DUSE_SHARED_CURL=ON \ -DUSE_SHARED_GIFLIB=ON \ -DUSE_SHARED_JPEGLIB=ON \ diff --git a/aseprite.desktop b/aseprite.desktop index b000fa0..137951d 100644 --- a/aseprite.desktop +++ b/aseprite.desktop @@ -3,7 +3,9 @@ Type=Application Encoding=UTF-8 Name=Aseprite Comment=Pixel-art paint program -Exec=aseprite +MimeType=image/bmp;image/gif;image/jpeg;image/png;image/x-pcx;image/x-tga;image/vnd.microsoft.icon;video/x-flic;image/webp;image/x-aseprite; +Exec=aseprite %U Terminal=false -Categories=Graphics;2DGraphics;RasterGraphics +Categories=Graphics;2DGraphics;RasterGraphics; Icon=aseprite +X-Desktop-File-Install-Version=0.22 From 9f47afc1445aa906d69ebc21cd556691ff223a93 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Tue, 12 Apr 2016 20:22:22 +0200 Subject: [PATCH 009/154] bump to 1.1.4 --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7508841..cff12d0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Mar 29 12:48:23 UTC 2016 +# Tue Apr 12 18:22:12 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.3 + pkgver = 1.1.4 pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = aseprite depends = tinyxml depends = freetype2 depends = libwebp - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.3 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.4 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 759dcef..596719b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.3 +pkgver=1.1.4 pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') From 9481f0f6bfd6bf0cae0a630fa1523264a7730943 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Tue, 19 Apr 2016 10:31:08 +0200 Subject: [PATCH 010/154] bump to 1.1.4.1 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cff12d0..be07b89 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Apr 12 18:22:12 UTC 2016 +# Tue Apr 19 08:30:51 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.4 - pkgrel = 2 + pkgver = 1.1.4.1 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -18,7 +18,7 @@ pkgbase = aseprite depends = tinyxml depends = freetype2 depends = libwebp - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.4 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.4.1 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 596719b..85495c2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.4 -pkgrel=2 +pkgver=1.1.4.1 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' From 3216b95e47293973ee81b3ca6665e4de0e0e41bb Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Wed, 4 May 2016 21:46:54 +0200 Subject: [PATCH 011/154] bump to 1.1.5 --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index be07b89..a14bc62 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Tue Apr 19 08:30:51 UTC 2016 +# Wed May 4 19:46:15 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.4.1 + pkgver = 1.1.5 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = aseprite depends = tinyxml depends = freetype2 depends = libwebp - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.4.1 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.5 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 85495c2..7ac4d68 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.4.1 +pkgver=1.1.5 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') From f21a076d5185920a5ae2f80ed78a0fe148bacffb Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Mon, 16 May 2016 17:39:57 +0200 Subject: [PATCH 012/154] update to 1.1.5.4 --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a14bc62..6f8f9e1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed May 4 19:46:15 UTC 2016 +# Mon May 16 15:39:22 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.5 + pkgver = 1.1.5.4 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = aseprite depends = tinyxml depends = freetype2 depends = libwebp - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.5 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.5.4 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 7ac4d68..691a28d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.5 +pkgver=1.1.5.4 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') From c071ace64daa12754506815fa5968e103daa9002 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Thu, 7 Jul 2016 08:26:40 +0200 Subject: [PATCH 013/154] update to 1.1.6 --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6f8f9e1..770bcb7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Mon May 16 15:39:22 UTC 2016 +# Thu Jul 7 06:26:15 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.5.4 + pkgver = 1.1.6 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = aseprite depends = tinyxml depends = freetype2 depends = libwebp - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.5.4 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.6 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 691a28d..71bcd3a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.5.4 +pkgver=1.1.6 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') From e20f36faa97089eb750079e0b6dbbcd6cd605a40 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Sun, 31 Jul 2016 15:07:01 +0200 Subject: [PATCH 014/154] update to 1.1.7 --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 770bcb7..f6959bc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Thu Jul 7 06:26:15 UTC 2016 +# Sun Jul 31 13:06:52 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.6 + pkgver = 1.1.7 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -18,7 +18,7 @@ pkgbase = aseprite depends = tinyxml depends = freetype2 depends = libwebp - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.6 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.7 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 71bcd3a..5f9635c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.6 +pkgver=1.1.7 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') From 429827020c08dc37b47b941571ade28fefa83b20 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Fri, 2 Sep 2016 14:18:58 +0200 Subject: [PATCH 015/154] reflect new EULA --- .SRCINFO | 6 +++--- PKGBUILD | 10 ++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f6959bc..cd92d71 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,13 @@ # Generated by mksrcinfo v8 -# Sun Jul 31 13:06:52 UTC 2016 +# Fri Sep 2 12:18:39 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.7 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 - license = GPL + license = custom makedepends = cmake depends = pixman depends = curl diff --git a/PKGBUILD b/PKGBUILD index 5f9635c..19a45e3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,11 +4,11 @@ pkgname=aseprite pkgver=1.1.7 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' -license=('GPL') +license=('custom') depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') makedepends=('cmake') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" @@ -18,6 +18,12 @@ sha256sums=('SKIP' build() { cd "$pkgname" + + less EULA.txt + echo "Do you accept the EULA? yes/NO" + read reply + [ "$reply" == "yes" ] || exit 1 + mkdir -p build && cd build git submodule update --init --recursive cmake -DUSE_SHARED_PIXMAN=ON \ From 0eba7a583eac035b04b76d013903e7bf88574467 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Fri, 2 Sep 2016 14:24:09 +0200 Subject: [PATCH 016/154] install EULA --- .SRCINFO | 6 ++++-- PKGBUILD | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cd92d71..89ce02f 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Sep 2 12:18:39 UTC 2016 +# Fri Sep 2 12:23:54 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.7 - pkgrel = 2 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -18,6 +18,8 @@ pkgbase = aseprite depends = tinyxml depends = freetype2 depends = libwebp + conflicts = aseprite-git + conflicts = aseprite-gpl source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.7 source = aseprite.desktop sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 19a45e3..8f89d67 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,13 +4,14 @@ pkgname=aseprite pkgver=1.1.7 -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' license=('custom') depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') makedepends=('cmake') +conflicts=('aseprite-git' 'aseprite-gpl') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" "aseprite.desktop") sha256sums=('SKIP' @@ -51,6 +52,7 @@ package() { "$pkgdir/usr/share/applications/$pkgname.desktop" install -Dm644 "../data/icons/ase48.png" \ "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "../EULA.txt" "/usr/share/licenses/$pkgname/EULA.txt" } # vim:set ts=2 sw=2 et: From 1cbf212d6b423fb369f2b437fcdedcb557b75859 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Fri, 2 Sep 2016 14:24:49 +0200 Subject: [PATCH 017/154] wrong install path --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 8f89d67..207b33a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -52,7 +52,7 @@ package() { "$pkgdir/usr/share/applications/$pkgname.desktop" install -Dm644 "../data/icons/ase48.png" \ "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "../EULA.txt" "/usr/share/licenses/$pkgname/EULA.txt" + install -Dm644 "../EULA.txt" "$pkgdir/usr/share/licenses/$pkgname/EULA.txt" } # vim:set ts=2 sw=2 et: From 72bf70388fad338f4a28bf9f26c0d55ac97e620c Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Wed, 21 Sep 2016 10:56:30 +0200 Subject: [PATCH 018/154] update to 1.1.8 --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 89ce02f..974a772 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Sep 2 12:23:54 UTC 2016 +# Wed Sep 21 08:56:17 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.7 - pkgrel = 3 + pkgver = 1.1.8 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -20,7 +20,7 @@ pkgbase = aseprite depends = libwebp conflicts = aseprite-git conflicts = aseprite-gpl - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.7 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.8 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 207b33a..1bcdea0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,8 +3,8 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.7 -pkgrel=3 +pkgver=1.1.8 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' From cdf8471f44c8226d1d3f26afe39f31d8fd6439bd Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Sun, 23 Oct 2016 20:45:04 +0200 Subject: [PATCH 019/154] bump version to 1.1.9 --- .SRCINFO | 6 +++--- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 974a772..922e24c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Wed Sep 21 08:56:17 UTC 2016 +# Sun Oct 23 18:44:16 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.8 + pkgver = 1.1.9 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -20,7 +20,7 @@ pkgbase = aseprite depends = libwebp conflicts = aseprite-git conflicts = aseprite-gpl - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.8 + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.9 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 1bcdea0..4cee68e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.8 +pkgver=1.1.9 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') From 53bb60b0c9d731b6a0f9e3039d6c161a355688fa Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Sat, 10 Dec 2016 16:09:24 +0100 Subject: [PATCH 020/154] bump version to 1.1.11, WARNING: upstream installs files from other projects --- .SRCINFO | 8 +++++--- PKGBUILD | 18 ++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 922e24c..8942bac 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sun Oct 23 18:44:16 UTC 2016 +# Sat Dec 10 15:08:29 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.9 + pkgver = 1.1.11 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -20,7 +20,9 @@ pkgbase = aseprite depends = libwebp conflicts = aseprite-git conflicts = aseprite-gpl - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.9 + conflicts = cmark + conflicts = gtest + source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.11 source = aseprite.desktop sha256sums = SKIP sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 diff --git a/PKGBUILD b/PKGBUILD index 4cee68e..e230714 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.9 +pkgver=1.1.11 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') @@ -11,7 +11,7 @@ url='http://www.aseprite.org/' license=('custom') depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') makedepends=('cmake') -conflicts=('aseprite-git' 'aseprite-gpl') +conflicts=('aseprite-git' 'aseprite-gpl' 'cmark' 'gtest') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" "aseprite.desktop") sha256sums=('SKIP' @@ -20,10 +20,12 @@ sha256sums=('SKIP' build() { cd "$pkgname" - less EULA.txt - echo "Do you accept the EULA? yes/NO" - read reply - [ "$reply" == "yes" ] || exit 1 + if [ -z "$ASEPRITE_ACCEPT_EULA" ]; then + less EULA.txt + echo "Do you accept the EULA? yes/NO (set ASEPRITE_ACCEPT_EULA=yes to skip this message)" + read reply + [ "$reply" == "yes" ] || exit 1 + fi mkdir -p build && cd build git submodule update --init --recursive @@ -41,13 +43,13 @@ build() { -DUSE_SHARED_FREETYPE=ON \ -DFREETYPE_INCLUDE_DIR=/usr/include/freetype2 \ -DCMAKE_INSTALL_PREFIX:STRING=/usr .. - make aseprite + make } package() { cd "$pkgname"/build - make DESTDIR="$pkgdir/" install/fast + make DESTDIR="$pkgdir/" install install -Dm644 "$srcdir/$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" install -Dm644 "../data/icons/ase48.png" \ From 09d3e38579bf7b0f882aeeb40602af749c0446c8 Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Mon, 19 Dec 2016 21:37:17 +0100 Subject: [PATCH 021/154] remove cmark/gtest conflict --- .SRCINFO | 6 ++---- PKGBUILD | 6 ++++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8942bac..06f1967 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Dec 10 15:08:29 UTC 2016 +# Mon Dec 19 20:37:03 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.11 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -20,8 +20,6 @@ pkgbase = aseprite depends = libwebp conflicts = aseprite-git conflicts = aseprite-gpl - conflicts = cmark - conflicts = gtest source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.11 source = aseprite.desktop sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index e230714..e11a51e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,14 +4,14 @@ pkgname=aseprite pkgver=1.1.11 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' license=('custom') depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') makedepends=('cmake') -conflicts=('aseprite-git' 'aseprite-gpl' 'cmark' 'gtest') +conflicts=('aseprite-git' 'aseprite-gpl') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" "aseprite.desktop") sha256sums=('SKIP' @@ -55,6 +55,8 @@ package() { install -Dm644 "../data/icons/ase48.png" \ "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "../EULA.txt" "$pkgdir/usr/share/licenses/$pkgname/EULA.txt" + # WARNING: fix for upstream including gtest and cmark in "make install" + rm -rf "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/man" "$pkgdir/usr/bin/cmark" } # vim:set ts=2 sw=2 et: From 3e04164a4918f9a172954b0d4305fd704df44ccd Mon Sep 17 00:00:00 2001 From: Benoit Favre Date: Tue, 20 Dec 2016 13:44:34 +0100 Subject: [PATCH 022/154] add git dependency --- .SRCINFO | 5 +++-- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 06f1967..54152ef 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,15 @@ # Generated by mksrcinfo v8 -# Mon Dec 19 20:37:03 UTC 2016 +# Tue Dec 20 12:44:19 UTC 2016 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.11 - pkgrel = 2 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 arch = i686 license = custom makedepends = cmake + makedepends = git depends = pixman depends = curl depends = giflib diff --git a/PKGBUILD b/PKGBUILD index e11a51e..9b4af88 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,13 +4,13 @@ pkgname=aseprite pkgver=1.1.11 -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url='http://www.aseprite.org/' license=('custom') depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') -makedepends=('cmake') +makedepends=('cmake' 'git') conflicts=('aseprite-git' 'aseprite-gpl') source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" "aseprite.desktop") From c8db0980870fdb1d58ac76d31d3004092471c0a0 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Thu, 2 Mar 2017 02:26:04 -0400 Subject: [PATCH 023/154] aseprite v1.1.13 --- .SRCINFO | 10 +++++----- PKGBUILD | 23 ++++++++++++----------- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 54152ef..ac41696 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Dec 20 12:44:19 UTC 2016 +# Thu Mar 2 06:25:25 UTC 2017 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.11 - pkgrel = 3 + pkgver = 1.1.13 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -21,9 +21,9 @@ pkgbase = aseprite depends = libwebp conflicts = aseprite-git conflicts = aseprite-gpl - source = git+https://github.com/aseprite/aseprite.git#tag=v1.1.11 + source = https://github.com/aseprite/aseprite/releases/download/v1.1.13/Aseprite-v1.1.13-Source.zip source = aseprite.desktop - sha256sums = SKIP + sha256sums = f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 9b4af88..f55f4f8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,24 +1,25 @@ -# Maintainer: Benoit Favre +# Maintainer: Wilson E. Alvarez +# Contributor: Benoit Favre # Contributor: Alexander Rødseth # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.11 -pkgrel=3 +pkgver=1.1.13 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') -url='http://www.aseprite.org/' +url="http://www.aseprite.org/" license=('custom') depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') makedepends=('cmake' 'git') -conflicts=('aseprite-git' 'aseprite-gpl') -source=("git+https://github.com/aseprite/aseprite.git#tag=v${pkgver}" - "aseprite.desktop") -sha256sums=('SKIP' +conflicts=("aseprite-git" "aseprite-gpl") +source=("https://github.com/${pkgname}/${pkgname}/releases/download/v1.1.13/Aseprite-v1.1.13-Source.zip" + "${pkgname}.desktop") +sha256sums=( 'f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a' '4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490') build() { - cd "$pkgname" + cd "$srcdir" if [ -z "$ASEPRITE_ACCEPT_EULA" ]; then less EULA.txt @@ -43,11 +44,11 @@ build() { -DUSE_SHARED_FREETYPE=ON \ -DFREETYPE_INCLUDE_DIR=/usr/include/freetype2 \ -DCMAKE_INSTALL_PREFIX:STRING=/usr .. - make + make $MAKEFLAGS } package() { - cd "$pkgname"/build + cd "$srcdir"/build make DESTDIR="$pkgdir/" install install -Dm644 "$srcdir/$pkgname.desktop" \ From 9ec2eda0882129605e4a810c894e53eb7e0b303d Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Fri, 3 Mar 2017 01:27:56 -0400 Subject: [PATCH 024/154] Removed git from makedepends, and git command to fix error in build() --- .SRCINFO | 5 ++--- PKGBUILD | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ac41696..e7fc024 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,14 @@ # Generated by mksrcinfo v8 -# Thu Mar 2 06:25:25 UTC 2017 +# Fri Mar 3 05:26:25 UTC 2017 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.13 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 license = custom makedepends = cmake - makedepends = git depends = pixman depends = curl depends = giflib diff --git a/PKGBUILD b/PKGBUILD index f55f4f8..ed3d8cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,13 +5,13 @@ pkgname=aseprite pkgver=1.1.13 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" license=('custom') depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') -makedepends=('cmake' 'git') +makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v1.1.13/Aseprite-v1.1.13-Source.zip" "${pkgname}.desktop") @@ -29,7 +29,6 @@ build() { fi mkdir -p build && cd build - git submodule update --init --recursive cmake -DUSE_SHARED_PIXMAN=ON \ -DWITH_WEBP_SUPPORT=ON \ -DUSE_SHARED_LIBWEBP=ON \ From cf0996c4f290ce1fe319d0372fed94911905b42e Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Fri, 3 Mar 2017 16:44:14 -0400 Subject: [PATCH 025/154] Added StartupWMClass=allegro to aseprite.desktop --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- aseprite.desktop | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e7fc024..ee48aa3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Mar 3 05:26:25 UTC 2017 +# Fri Mar 3 20:43:52 UTC 2017 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.1.13 - pkgrel = 2 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -23,7 +23,7 @@ pkgbase = aseprite source = https://github.com/aseprite/aseprite/releases/download/v1.1.13/Aseprite-v1.1.13-Source.zip source = aseprite.desktop sha256sums = f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a - sha256sums = 4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490 + sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index ed3d8cd..535f8a3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=aseprite pkgver=1.1.13 -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -14,9 +14,9 @@ depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'fre makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v1.1.13/Aseprite-v1.1.13-Source.zip" - "${pkgname}.desktop") +"${pkgname}.desktop") sha256sums=( 'f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a' - '4faeb782805e3427eedb04d7485e3e2d4eac6680509515b521a9f64ef5d79490') +'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f') build() { cd "$srcdir" diff --git a/aseprite.desktop b/aseprite.desktop index 137951d..e1a0321 100644 --- a/aseprite.desktop +++ b/aseprite.desktop @@ -6,6 +6,7 @@ Comment=Pixel-art paint program MimeType=image/bmp;image/gif;image/jpeg;image/png;image/x-pcx;image/x-tga;image/vnd.microsoft.icon;video/x-flic;image/webp;image/x-aseprite; Exec=aseprite %U Terminal=false +StartupWMClass=allegro Categories=Graphics;2DGraphics;RasterGraphics; Icon=aseprite X-Desktop-File-Install-Version=0.22 From 7f2175e6bf34a73689ca1e908e088ea900d20763 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Thu, 16 Nov 2017 08:36:41 -0400 Subject: [PATCH 026/154] aseprite v1.1.24 --- .SRCINFO | 10 +++++----- PKGBUILD | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ee48aa3..c2a0105 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Mar 3 20:43:52 UTC 2017 +# Thu Nov 16 12:36:25 UTC 2017 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.1.13 - pkgrel = 3 + pkgver = 1.2.4 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -20,9 +20,9 @@ pkgbase = aseprite depends = libwebp conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.1.13/Aseprite-v1.1.13-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.4/Aseprite-v1.2.4-Source.zip source = aseprite.desktop - sha256sums = f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a + sha256sums = f1fddeaf7dbb49b3cb207b01a38732b1758ed6379c735013e5fecbffe24d4bda sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 535f8a3..e11d22d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.1.13 -pkgrel=3 +pkgver=1.2.4 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -13,9 +13,9 @@ license=('custom') depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") -source=("https://github.com/${pkgname}/${pkgname}/releases/download/v1.1.13/Aseprite-v1.1.13-Source.zip" +source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" "${pkgname}.desktop") -sha256sums=( 'f4f306ce6642ecf2aa13161786b0b1797a2bedfc2c537bd910445e1b73dea56a' +sha256sums=( 'f1fddeaf7dbb49b3cb207b01a38732b1758ed6379c735013e5fecbffe24d4bda' 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f') build() { From c6c5dea28c06319535851023c18c0820a38aff11 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Thu, 16 Nov 2017 09:07:55 -0400 Subject: [PATCH 027/154] Disabled using the shared freetype library due to a missing file --- .SRCINFO | 4 ++-- PKGBUILD | 10 +++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c2a0105..3d423a2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Nov 16 12:36:25 UTC 2017 +# Thu Nov 16 13:07:31 UTC 2017 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.4 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 diff --git a/PKGBUILD b/PKGBUILD index e11d22d..8f17c53 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=aseprite pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -40,9 +40,13 @@ build() { -DUSE_SHARED_LIBLOADPNG=OFF \ -DUSE_SHARED_TINYXML=ON \ -DENABLE_UPDATER=OFF \ - -DUSE_SHARED_FREETYPE=ON \ - -DFREETYPE_INCLUDE_DIR=/usr/include/freetype2 \ + -DUSE_SHARED_FREETYPE=OFF \ -DCMAKE_INSTALL_PREFIX:STRING=/usr .. + + # TODO: Note that using the shared freetype library was disabled for aseprite v1.24 due to a missing header + # Double check if we can use the shared library later on to minimize package size + #-DFREETYPE_INCLUDE_DIR=/usr/include/freetype2 \ + make $MAKEFLAGS } From 1849f02e6a404aae140c68c5d32dc5108f220c3d Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Thu, 16 Nov 2017 10:34:29 -0400 Subject: [PATCH 028/154] Delete conflicting files with package libarchive. Must disable the compilation of these later on --- .SRCINFO | 4 ++-- PKGBUILD | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3d423a2..d384bce 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Nov 16 13:07:31 UTC 2017 +# Thu Nov 16 14:32:56 UTC 2017 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.4 - pkgrel = 2 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 8f17c53..5412cf7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=aseprite pkgver=1.2.4 -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -61,6 +61,10 @@ package() { install -Dm644 "../EULA.txt" "$pkgdir/usr/share/licenses/$pkgname/EULA.txt" # WARNING: fix for upstream including gtest and cmark in "make install" rm -rf "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/man" "$pkgdir/usr/bin/cmark" + + # Remove conflicting files with libarchive + # TODO: With the current compilation options, looks like aseprite build process builds these binaries. Disable the compilation of the following files later on: + rm -f "$pkgdir/usr/bin/"{bsdcat,bsdcpio,bsdtar} } # vim:set ts=2 sw=2 et: From e964b5167614a40803d6e30dfcfe5714714bb519 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Wed, 20 Dec 2017 07:52:55 -0400 Subject: [PATCH 029/154] aseprite v1.2.6 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d384bce..0b8adce 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu Nov 16 14:32:56 UTC 2017 +# Wed Dec 20 11:52:17 UTC 2017 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.4 - pkgrel = 3 + pkgver = 1.2.6 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -20,9 +20,9 @@ pkgbase = aseprite depends = libwebp conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.4/Aseprite-v1.2.4-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.6/Aseprite-v1.2.6-Source.zip source = aseprite.desktop - sha256sums = f1fddeaf7dbb49b3cb207b01a38732b1758ed6379c735013e5fecbffe24d4bda + sha256sums = e92a9c19cb5d36c64f8ee916ca34f8c2d628beadc58ab75c4718bd99683f8972 sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 5412cf7..d3a5eaf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.4 -pkgrel=3 +pkgver=1.2.6 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -15,7 +15,7 @@ makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" "${pkgname}.desktop") -sha256sums=( 'f1fddeaf7dbb49b3cb207b01a38732b1758ed6379c735013e5fecbffe24d4bda' +sha256sums=('e92a9c19cb5d36c64f8ee916ca34f8c2d628beadc58ab75c4718bd99683f8972' 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f') build() { From 03fef6d621a1841f468e1154564dcdbbc40537ae Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Fri, 16 Mar 2018 19:56:21 -0400 Subject: [PATCH 030/154] aseprite v1.2.7 --- .SRCINFO | 11 +++++++---- PKGBUILD | 22 ++++++++++------------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0b8adce..6185631 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,14 +1,15 @@ # Generated by mksrcinfo v8 -# Wed Dec 20 11:52:17 UTC 2017 +# Fri Mar 16 23:56:01 UTC 2018 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.6 + pkgver = 1.2.7 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 license = custom makedepends = cmake + depends = cmark depends = pixman depends = curl depends = giflib @@ -18,11 +19,13 @@ pkgbase = aseprite depends = tinyxml depends = freetype2 depends = libwebp + depends = harfbuzz + depends = allegro4 conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.6/Aseprite-v1.2.6-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.7/Aseprite-v1.2.7-Source.zip source = aseprite.desktop - sha256sums = e92a9c19cb5d36c64f8ee916ca34f8c2d628beadc58ab75c4718bd99683f8972 + sha256sums = 31ad9ea7bf48fb35cfa05c2860856ca61a74731222e41871241b1576f6ede40d sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index d3a5eaf..da72093 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,20 +4,19 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.6 +pkgver=1.2.7 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" license=('custom') -depends=('pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp') +depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp' 'harfbuzz' 'allegro4') makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" "${pkgname}.desktop") -sha256sums=('e92a9c19cb5d36c64f8ee916ca34f8c2d628beadc58ab75c4718bd99683f8972' +sha256sums=('31ad9ea7bf48fb35cfa05c2860856ca61a74731222e41871241b1576f6ede40d' 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f') - build() { cd "$srcdir" @@ -35,18 +34,17 @@ build() { -DUSE_SHARED_CURL=ON \ -DUSE_SHARED_GIFLIB=ON \ -DUSE_SHARED_JPEGLIB=ON \ + -DUSE_SHARED_HARFBUZZ=ON \ -DUSE_SHARED_ZLIB=ON \ -DUSE_SHARED_LIBPNG=ON \ - -DUSE_SHARED_LIBLOADPNG=OFF \ + -DUSE_SHARED_LIBLOADPNG=ON \ -DUSE_SHARED_TINYXML=ON \ + -DUSE_SHARED_CMARK=ON \ -DENABLE_UPDATER=OFF \ - -DUSE_SHARED_FREETYPE=OFF \ + -DUSE_SHARED_FREETYPE=ON \ + -DUSE_SHARED_ALLEGRO4=ON \ -DCMAKE_INSTALL_PREFIX:STRING=/usr .. - # TODO: Note that using the shared freetype library was disabled for aseprite v1.24 due to a missing header - # Double check if we can use the shared library later on to minimize package size - #-DFREETYPE_INCLUDE_DIR=/usr/include/freetype2 \ - make $MAKEFLAGS } @@ -59,12 +57,12 @@ package() { install -Dm644 "../data/icons/ase48.png" \ "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "../EULA.txt" "$pkgdir/usr/share/licenses/$pkgname/EULA.txt" - # WARNING: fix for upstream including gtest and cmark in "make install" - rm -rf "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/man" "$pkgdir/usr/bin/cmark" # Remove conflicting files with libarchive # TODO: With the current compilation options, looks like aseprite build process builds these binaries. Disable the compilation of the following files later on: + # Note: Github issue: https://github.com/aseprite/aseprite/issues/1602 rm -f "$pkgdir/usr/bin/"{bsdcat,bsdcpio,bsdtar} + rm -rf "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/man" "$pkgdir/usr/bin/cmark" } # vim:set ts=2 sw=2 et: From c26bd3e56f471456f172e7fe1eb9b52e954242d4 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sat, 17 Mar 2018 10:19:07 -0400 Subject: [PATCH 031/154] Do not use the allegro4 library from the official repository --- .SRCINFO | 5 ++--- PKGBUILD | 10 +++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6185631..7e97dcb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Mar 16 23:56:01 UTC 2018 +# Sat Mar 17 14:18:14 UTC 2018 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.7 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -20,7 +20,6 @@ pkgbase = aseprite depends = freetype2 depends = libwebp depends = harfbuzz - depends = allegro4 conflicts = aseprite-git conflicts = aseprite-gpl source = https://github.com/aseprite/aseprite/releases/download/v1.2.7/Aseprite-v1.2.7-Source.zip diff --git a/PKGBUILD b/PKGBUILD index da72093..738dd71 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,12 +5,12 @@ pkgname=aseprite pkgver=1.2.7 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" license=('custom') -depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp' 'harfbuzz' 'allegro4') +depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp' 'harfbuzz') makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" @@ -28,6 +28,10 @@ build() { fi mkdir -p build && cd build + + # CMake config notes: + # Do not build using the shared allegro4. Weird graphical glitches happen when linking to the library from the official repo + cmake -DUSE_SHARED_PIXMAN=ON \ -DWITH_WEBP_SUPPORT=ON \ -DUSE_SHARED_LIBWEBP=ON \ @@ -42,7 +46,7 @@ build() { -DUSE_SHARED_CMARK=ON \ -DENABLE_UPDATER=OFF \ -DUSE_SHARED_FREETYPE=ON \ - -DUSE_SHARED_ALLEGRO4=ON \ + -DUSE_SHARED_ALLEGRO4=OFF \ -DCMAKE_INSTALL_PREFIX:STRING=/usr .. make $MAKEFLAGS From f3a56dd79d68dd52ffce5a2e12958e7a5cf32aec Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sun, 18 Mar 2018 11:34:00 -0400 Subject: [PATCH 032/154] aseprite v1.2.7.2 --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7e97dcb..b4aea22 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sat Mar 17 14:18:14 UTC 2018 +# Sun Mar 18 15:33:40 UTC 2018 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.7 - pkgrel = 2 + pkgver = 1.2.7.2 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -22,9 +22,9 @@ pkgbase = aseprite depends = harfbuzz conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.7/Aseprite-v1.2.7-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.7.2/Aseprite-v1.2.7.2-Source.zip source = aseprite.desktop - sha256sums = 31ad9ea7bf48fb35cfa05c2860856ca61a74731222e41871241b1576f6ede40d + sha256sums = 96e00209f9e2380ac4ff26aa0bcb1ff16ab112cccb4c4f1ca49568eeecd02443 sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 738dd71..6cb4689 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.7 -pkgrel=2 +pkgver=1.2.7.2 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -15,7 +15,7 @@ makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" "${pkgname}.desktop") -sha256sums=('31ad9ea7bf48fb35cfa05c2860856ca61a74731222e41871241b1576f6ede40d' +sha256sums=('96e00209f9e2380ac4ff26aa0bcb1ff16ab112cccb4c4f1ca49568eeecd02443' 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f') build() { cd "$srcdir" From 46ee8df8b2cd2b6a94eff4d3a6854279cc447929 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sun, 18 Mar 2018 21:23:11 -0400 Subject: [PATCH 033/154] Fixed dependency error. Cannot use shared libloadpng --- .SRCINFO | 4 ++-- PKGBUILD | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b4aea22..424aa5d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Mar 18 15:33:40 UTC 2018 +# Mon Mar 19 01:22:17 UTC 2018 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.7.2 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 6cb4689..2d8d1b0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=aseprite pkgver=1.2.7.2 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -30,7 +30,12 @@ build() { mkdir -p build && cd build # CMake config notes: - # Do not build using the shared allegro4. Weird graphical glitches happen when linking to the library from the official repo + # Do not build using the shared allegro4. Weird graphical glitches happen + # when linking to the library from the official repo. Also, since loadpng.h + # is also distributed in allegro4, using that shared library must also be + # disabled since there's no guarantee Arch users might have allegro4 + # installed. + cmake -DUSE_SHARED_PIXMAN=ON \ -DWITH_WEBP_SUPPORT=ON \ @@ -41,12 +46,12 @@ build() { -DUSE_SHARED_HARFBUZZ=ON \ -DUSE_SHARED_ZLIB=ON \ -DUSE_SHARED_LIBPNG=ON \ - -DUSE_SHARED_LIBLOADPNG=ON \ -DUSE_SHARED_TINYXML=ON \ -DUSE_SHARED_CMARK=ON \ -DENABLE_UPDATER=OFF \ -DUSE_SHARED_FREETYPE=ON \ -DUSE_SHARED_ALLEGRO4=OFF \ + -DUSE_SHARED_LIBLOADPNG=OFF \ -DCMAKE_INSTALL_PREFIX:STRING=/usr .. make $MAKEFLAGS From d699465f504835223131ea4f48e74dff2152f9de Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Tue, 3 Apr 2018 20:56:32 -0400 Subject: [PATCH 034/154] aseprite v1.2.8 --- .SRCINFO | 10 +++++----- PKGBUILD | 16 ++++++++++------ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 424aa5d..dfbbfb7 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Mar 19 01:22:17 UTC 2018 +# Wed Apr 4 00:55:53 UTC 2018 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.7.2 - pkgrel = 2 + pkgver = 1.2.8 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 @@ -22,9 +22,9 @@ pkgbase = aseprite depends = harfbuzz conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.7.2/Aseprite-v1.2.7.2-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.8/Aseprite-v1.2.8.1-Source.zip source = aseprite.desktop - sha256sums = 96e00209f9e2380ac4ff26aa0bcb1ff16ab112cccb4c4f1ca49568eeecd02443 + sha256sums = 20559ea5e0b08361f4d554d885e9e1154eb190b19b6687e0b1243b1589249e56 sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 2d8d1b0..f7181dc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,9 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.7.2 -pkgrel=2 +pkgver=1.2.8 +_realver=.1 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -13,10 +14,13 @@ license=('custom') depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp' 'harfbuzz') makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") -source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" +source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}${_realver}-Source.zip" "${pkgname}.desktop") -sha256sums=('96e00209f9e2380ac4ff26aa0bcb1ff16ab112cccb4c4f1ca49568eeecd02443' -'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f') +sha256sums=( +'20559ea5e0b08361f4d554d885e9e1154eb190b19b6687e0b1243b1589249e56' +'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' +) + build() { cd "$srcdir" @@ -70,7 +74,7 @@ package() { # Remove conflicting files with libarchive # TODO: With the current compilation options, looks like aseprite build process builds these binaries. Disable the compilation of the following files later on: # Note: Github issue: https://github.com/aseprite/aseprite/issues/1602 - rm -f "$pkgdir/usr/bin/"{bsdcat,bsdcpio,bsdtar} + rm -f "$pkgdir/usr/bin/"{bsdcat,bsdcpio,bsdtar,img2webp} rm -rf "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/man" "$pkgdir/usr/bin/cmark" } From 91e67f21786f80a267d419181a0110cf81456b9a Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Sun, 29 Jul 2018 08:57:08 -0400 Subject: [PATCH 035/154] aseprite v1.2.9 --- .SRCINFO | 8 +++----- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index dfbbfb7..e9b0c98 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Wed Apr 4 00:55:53 UTC 2018 pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.8 + pkgver = 1.2.9 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -22,9 +20,9 @@ pkgbase = aseprite depends = harfbuzz conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.8/Aseprite-v1.2.8.1-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.9/Aseprite-v1.2.9-Source.zip source = aseprite.desktop - sha256sums = 20559ea5e0b08361f4d554d885e9e1154eb190b19b6687e0b1243b1589249e56 + sha256sums = 1ebbf5d4ecce70f8e5d682ab302beab82d01822a7c65cfb7de705f33625eb44e sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index f7181dc..2cc931b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.8 +pkgver=1.2.9 _realver=.1 pkgrel=1 pkgdesc='Create animated sprites and pixel art' @@ -14,10 +14,10 @@ license=('custom') depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp' 'harfbuzz') makedepends=('cmake') conflicts=("aseprite-git" "aseprite-gpl") -source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}${_realver}-Source.zip" +source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" "${pkgname}.desktop") sha256sums=( -'20559ea5e0b08361f4d554d885e9e1154eb190b19b6687e0b1243b1589249e56' +'1ebbf5d4ecce70f8e5d682ab302beab82d01822a7c65cfb7de705f33625eb44e' 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' ) From 2d3ed17c564bd5516dff73daee9c8290660b8dc6 Mon Sep 17 00:00:00 2001 From: "Wilson E. Alvarez" Date: Mon, 13 Aug 2018 16:10:41 -0400 Subject: [PATCH 036/154] Disabled Allegro4 alias fix --- .SRCINFO | 2 +- PKGBUILD | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e9b0c98..8ba0d67 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.9 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 2cc931b..c251d30 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,8 +5,7 @@ pkgname=aseprite pkgver=1.2.9 -_realver=.1 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" @@ -31,6 +30,9 @@ build() { [ "$reply" == "yes" ] || exit 1 fi + # Disable Allegro4 alias fix which creates a function declaration conflict: + sed -e 's/DUSE_ALLEG4_BACKEND/DUSE_ALLEG4_BACKEND -DALLEGRO_NO_FIX_ALIASES/g' -i CMakeLists.txt + mkdir -p build && cd build # CMake config notes: @@ -40,10 +42,8 @@ build() { # disabled since there's no guarantee Arch users might have allegro4 # installed. - cmake -DUSE_SHARED_PIXMAN=ON \ -DWITH_WEBP_SUPPORT=ON \ - -DUSE_SHARED_LIBWEBP=ON \ -DUSE_SHARED_CURL=ON \ -DUSE_SHARED_GIFLIB=ON \ -DUSE_SHARED_JPEGLIB=ON \ From 4786021ddd8430e4a9346944ccd6084faf9a3e3d Mon Sep 17 00:00:00 2001 From: Andrew Bueide Date: Tue, 21 May 2019 04:56:17 -0600 Subject: [PATCH 037/154] Update to 1.11 --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8ba0d67..366c4a1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.9 + pkgver = 1.2.11 pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 @@ -20,7 +20,7 @@ pkgbase = aseprite depends = harfbuzz conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.9/Aseprite-v1.2.9-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.11/Aseprite-v1.2.11-Source.zip source = aseprite.desktop sha256sums = 1ebbf5d4ecce70f8e5d682ab302beab82d01822a7c65cfb7de705f33625eb44e sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f diff --git a/PKGBUILD b/PKGBUILD index c251d30..ec7bb9c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.9 +pkgver=1.2.11 pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') @@ -16,7 +16,7 @@ conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" "${pkgname}.desktop") sha256sums=( -'1ebbf5d4ecce70f8e5d682ab302beab82d01822a7c65cfb7de705f33625eb44e' +'cb2c9249ef234504561252c554705895dde2c21d0e4e53c995ed43216b26d4b3' 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' ) From db81874510da5f9fa38b2981446a714105c0fa61 Mon Sep 17 00:00:00 2001 From: Andrew Bueide Date: Tue, 21 May 2019 05:00:06 -0600 Subject: [PATCH 038/154] Remove .AURINFO --- .AURINFO | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 .AURINFO diff --git a/.AURINFO b/.AURINFO deleted file mode 100644 index 5104273..0000000 --- a/.AURINFO +++ /dev/null @@ -1,22 +0,0 @@ -pkgbase = aseprite - pkgdesc = Create animated sprites and pixel art - pkgver = 1.0.9 - pkgrel = 1 - url = http://www.aseprite.org/ - arch = x86_64 - arch = i686 - license = GPL - makedepends = cmake - depends = allegro - depends = pixman - depends = curl - depends = giflib - depends = zlib - depends = libpng - depends = tinyxml - depends = gtest - source = git+https://github.com/aseprite/aseprite.git#tag=v1.0.9 - source = aseprite.desktop - -pkgname = aseprite - From ad92c6474028c5e9f1df2520c4eb52745804eeda Mon Sep 17 00:00:00 2001 From: Andrew Bueide Date: Mon, 1 Jul 2019 23:35:54 -0600 Subject: [PATCH 039/154] Update to 1.2.12 --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 366c4a1..a9cc220 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.11 + pkgver = 1.2.12 pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 @@ -22,7 +22,7 @@ pkgbase = aseprite conflicts = aseprite-gpl source = https://github.com/aseprite/aseprite/releases/download/v1.2.11/Aseprite-v1.2.11-Source.zip source = aseprite.desktop - sha256sums = 1ebbf5d4ecce70f8e5d682ab302beab82d01822a7c65cfb7de705f33625eb44e + sha256sums = 23ef408bc31e414fc09cc094fc7d53d00c8f57bf3ca2a97c852cc7af2e9fdbfb sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index ec7bb9c..aabd354 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.11 +pkgver=1.2.12 pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') @@ -16,7 +16,7 @@ conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" "${pkgname}.desktop") sha256sums=( -'cb2c9249ef234504561252c554705895dde2c21d0e4e53c995ed43216b26d4b3' +'23ef408bc31e414fc09cc094fc7d53d00c8f57bf3ca2a97c852cc7af2e9fdbfb' 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' ) From 6172d5d98605d98138854d8af64e6361f7e7b390 Mon Sep 17 00:00:00 2001 From: Andrew Bueide Date: Mon, 1 Jul 2019 23:43:42 -0600 Subject: [PATCH 040/154] Update source info --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index a9cc220..0a198ba 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -20,7 +20,7 @@ pkgbase = aseprite depends = harfbuzz conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.11/Aseprite-v1.2.11-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.12/Aseprite-v1.2.12-Source.zip source = aseprite.desktop sha256sums = 23ef408bc31e414fc09cc094fc7d53d00c8f57bf3ca2a97c852cc7af2e9fdbfb sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f From 6ef79206f65c1ae4912f51865ab0272c4d1a6318 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Sun, 27 Oct 2019 11:03:05 -0400 Subject: [PATCH 041/154] Update to v1.2.15 Updates the package to v1.2.15, adds skia build, puts maintainer names in PKGBUILD. Skia deps are downloaded manually as downloading them during prepare turns out to be bad practice, and long options and verbosity are used for clarity, though it's not common or necessary. EULA message was removed as there's no need for it and makepkg should run without user input anyways. --- .SRCINFO | 78 +++++++++++++++++++-- PKGBUILD | 201 ++++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 235 insertions(+), 44 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0a198ba..be36f69 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,12 +1,15 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.12 - pkgrel = 2 + pkgver = 1.2.15 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 arch = i686 license = custom makedepends = cmake + makedepends = ninja + makedepends = git + makedepends = python2 depends = cmark depends = pixman depends = curl @@ -16,14 +19,79 @@ pkgbase = aseprite depends = libjpeg-turbo depends = tinyxml depends = freetype2 - depends = libwebp depends = harfbuzz + depends = nettle + depends = fontconfig + depends = libxcursor + depends = desktop-file-utils conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.12/Aseprite-v1.2.12-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.15/Aseprite-v1.2.15-Source.zip source = aseprite.desktop - sha256sums = 23ef408bc31e414fc09cc094fc7d53d00c8f57bf3ca2a97c852cc7af2e9fdbfb + source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git + source = git+https://github.com/aseprite/skia.git#branch=aseprite-m71 + source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 + source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 + source = angle2::git+https://chromium.googlesource.com/angle/angle.git#commit=956ab4d9fab36be9929e63829475d4d69b2c681c + source = git+https://android.googlesource.com/platform/external/dng_sdk.git#commit=96443b262250c390b0caefbf3eed8463ba35ecae + source = egl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry#commit=a0bca08de07c7d7651047bedc0b653cfaaa4f2ae + source = git+https://android.googlesource.com/platform/external/expat.git#tag=android-6.0.1_r55 + source = freetype::git+https://skia.googlesource.com/third_party/freetype2.git#commit=7edc937fe679d14d66f55cf6f7fa607925d38f3c + source = git+https://android.googlesource.com/platform/external/googletest#commit=dd43b9998e9a44a579a7aba6c1309407d1a5ed95 + source = git+https://skia.googlesource.com/third_party/harfbuzz.git#tag=1.4.2 + source = git+https://chromium.googlesource.com/chromium/deps/icu.git#commit=ec9c1133693148470ffe2e5e53576998e3650c1d + source = git+https://skia.googlesource.com/external/github.com/ocornut/imgui.git#commit=bc6ac8b2aee0614debd940e45bc9cd0d9b355c86 + source = git+https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git#tag=1.0.0 + source = git+https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git#tag=2.0.0 + source = git+https://skia.googlesource.com/third_party/libpng.git#tag=v1.6.33 + source = git+https://chromium.googlesource.com/webm/libwebp.git#tag=v0.6.1 + source = git+https://skia.googlesource.com/external/github.com/lua/lua.git#tag=v5-3-4 + source = microhttpd::git+https://android.googlesource.com/platform/external/libmicrohttpd#commit=748945ec6f1c67b7efc934ab0808e1d32f2fb98d + source = opencl-lib::git+https://skia.googlesource.com/external/github.com/GPUOpen-Tools/common-lib-amd-APPSDK-3.0#commit=4e6d30e406d2e5a65e1d65e404fe6df5f772a32b + source = opengl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry#commit=14b80ebeab022b2c78f84a573f01028c96075553 + source = git+https://android.googlesource.com/platform/external/piex.git#commit=bb217acdca1cc0c16b704669dd6f91a1b509c406 + source = git+https://skia.googlesource.com/third_party/sdl#commit=5d7cfcca344034aff9327f77fc181ae3754e7a90 + source = git+https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git#commit=b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916 + source = spirv-headers::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git#commit=661ad91124e6af2272afd00f804d8aa276e17107 + source = spirv-tools::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git#commit=e9e4393b1c5aad7553c05782acefbe32b42644bd + source = swiftshader::git+https://swiftshader.googlesource.com/SwiftShader#commit=d6126aea667e37d2d7b57b0a381b9f26912a21b7 + source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 + source = git+https://github.com/2d-inc/Nima-Cpp.git#commit=4bd02269d7d1d2e650950411325eafa15defb084 + source = git+https://github.com/2d-inc/Nima-Math-Cpp.git#commit=e0c12772093fa8860f55358274515b86885f0108 + source = gn::https://chromium-gn.storage-download.googleapis.com/2f27ff0b6118e5886df976da5effa6003d19d1ce + sha256sums = 813d6a099e1131f25f54e3935d6fdcdb1d0854ba757af074f3fc59dc869f38f4 sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = c482981e91b5591ff85e055f3026956d6178aae3560ed984ff60b22e99351312 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index aabd354..af49c32 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,48 +1,162 @@ -# Maintainer: Wilson E. Alvarez +# Maintainer: Fredrick Brennan +# Maintainer: Andrew Bueide +# Maintainer: rouhannb +# Contributor: Wilson E. Alvarez # Contributor: Benoit Favre # Contributor: Alexander Rødseth # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.12 -pkgrel=2 +pkgver=1.2.15 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" license=('custom') -depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'libwebp' 'harfbuzz') -makedepends=('cmake') +depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' + 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'desktop-file-utils') +makedepends=('cmake' 'ninja' 'git' 'python2') conflicts=("aseprite-git" "aseprite-gpl") -source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/Aseprite-v${pkgver}-Source.zip" -"${pkgname}.desktop") -sha256sums=( -'23ef408bc31e414fc09cc094fc7d53d00c8f57bf3ca2a97c852cc7af2e9fdbfb' -'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' +source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ +v${pkgver}-Source.zip" +"${pkgname}.desktop" +"git+https://chromium.googlesource.com/chromium/tools/depot_tools.git" +"git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m71" +"git+https://chromium.googlesource.com/chromium/buildtools.git\ +#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" +"git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" +"angle2::git+https://chromium.googlesource.com/angle/angle.git\ +#commit=956ab4d9fab36be9929e63829475d4d69b2c681c" +"git+https://android.googlesource.com/platform/external/dng_sdk.git\ +#commit=96443b262250c390b0caefbf3eed8463ba35ecae" +"egl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry\ +#commit=a0bca08de07c7d7651047bedc0b653cfaaa4f2ae" +"git+https://android.googlesource.com/platform/external/expat.git#tag=android-6.0.1_r55" +"freetype::git+https://skia.googlesource.com/third_party/freetype2.git\ +#commit=7edc937fe679d14d66f55cf6f7fa607925d38f3c" +"git+https://android.googlesource.com/platform/external/googletest\ +#commit=dd43b9998e9a44a579a7aba6c1309407d1a5ed95" +"git+https://skia.googlesource.com/third_party/harfbuzz.git#tag=1.4.2" +"git+https://chromium.googlesource.com/chromium/deps/icu.git\ +#commit=ec9c1133693148470ffe2e5e53576998e3650c1d" +"git+https://skia.googlesource.com/external/github.com/ocornut/imgui.git\ +#commit=bc6ac8b2aee0614debd940e45bc9cd0d9b355c86" +"git+https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git\ +#tag=1.0.0" +"git+https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git#tag=2.0.0" +"git+https://skia.googlesource.com/third_party/libpng.git#tag=v1.6.33" +"git+https://chromium.googlesource.com/webm/libwebp.git#tag=v0.6.1" +"git+https://skia.googlesource.com/external/github.com/lua/lua.git#tag=v5-3-4" +"microhttpd::git+https://android.googlesource.com/platform/external/libmicrohttpd\ +#commit=748945ec6f1c67b7efc934ab0808e1d32f2fb98d" +"opencl-lib::git+https://skia.googlesource.com/external/github.com/GPUOpen-Tools/\ +common-lib-amd-APPSDK-3.0#commit=4e6d30e406d2e5a65e1d65e404fe6df5f772a32b" +"opengl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/\ +OpenGL-Registry#commit=14b80ebeab022b2c78f84a573f01028c96075553" +"git+https://android.googlesource.com/platform/external/piex.git\ +#commit=bb217acdca1cc0c16b704669dd6f91a1b509c406" +"git+https://skia.googlesource.com/third_party/sdl\ +#commit=5d7cfcca344034aff9327f77fc181ae3754e7a90" +"git+https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git\ +#commit=b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916" +"spirv-headers::git+https://skia.googlesource.com/external/github.com/KhronosGroup/\ +SPIRV-Headers.git#commit=661ad91124e6af2272afd00f804d8aa276e17107" +"spirv-tools::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git\ +#commit=e9e4393b1c5aad7553c05782acefbe32b42644bd" +"swiftshader::git+https://swiftshader.googlesource.com/SwiftShader\ +#commit=d6126aea667e37d2d7b57b0a381b9f26912a21b7" +"git+https://chromium.googlesource.com/chromium/src/third_party/zlib\ +#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" +"git+https://github.com/2d-inc/Nima-Cpp.git#commit=4bd02269d7d1d2e650950411325eafa15defb084" +"git+https://github.com/2d-inc/Nima-Math-Cpp.git#commit=e0c12772093fa8860f55358274515b86885f0108" +"gn::https://chromium-gn.storage-download.googleapis.com/2f27ff0b6118e5886df976da5effa6003d19d1ce" ) +sha256sums=( +'813d6a099e1131f25f54e3935d6fdcdb1d0854ba757af074f3fc59dc869f38f4' +'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'SKIP' +'c482981e91b5591ff85e055f3026956d6178aae3560ed984ff60b22e99351312' +) + +prepare() { + cd "$srcdir" + + # Install skia deps (essentially runs git-sync-deps with the files already downloaded) + mkdir --parents --verbose skia/third_party/externals + + for dep in buildtools common + do + rm --recursive --force "skia/$dep" + mv --force --no-target-directory --verbose "$dep" "skia/$dep" + done + + for dep in angle2 dng_sdk egl-registry expat freetype googletest harfbuzz icu imgui jsoncpp \ + libjpeg-turbo libpng libwebp lua microhttpd opencl-lib opengl-registry piex sdl \ + sfntly spirv-headers spirv-tools swiftshader zlib Nima-Cpp Nima-Math-Cpp + do + rm --recursive --force "skia/third_party/externals/$dep" + mv --force --no-target-directory --verbose "$dep" "skia/third_party/externals/$dep" + done + + chmod u=rwx,g=rx,o=rx --verbose gn + mv --verbose gn skia/bin/gn + cp --verbose skia/bin/gn skia/buildtools/linux64/gn + + # Skia assumes python is linked to python2, not python3 + # Also, running ninja from depot_tools seems to cause problems + mkdir --parents --verbose binsub + cd binsub + ln --force --symbolic --verbose /usr/bin/python2 python + ln --force --symbolic --verbose /usr/bin/python2-config python-config + ln --force --symbolic --verbose /usr/bin/ninja +} build() { cd "$srcdir" - if [ -z "$ASEPRITE_ACCEPT_EULA" ]; then - less EULA.txt - echo "Do you accept the EULA? yes/NO (set ASEPRITE_ACCEPT_EULA=yes to skip this message)" - read reply - [ "$reply" == "yes" ] || exit 1 - fi + # Build skia + _skiapath="$srcdir/binsub:$srcdir/depot_tools:$PATH" + cd skia + PATH="$_skiapath" gn gen out/Release --args="is_debug=false is_official_build=true\ + skia_use_system_expat=false skia_use_system_icu=false skia_use_system_libjpeg_turbo=false\ + skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false" + PATH="$_skiapath" ninja -C out/Release skia - # Disable Allegro4 alias fix which creates a function declaration conflict: - sed -e 's/DUSE_ALLEG4_BACKEND/DUSE_ALLEG4_BACKEND -DALLEGRO_NO_FIX_ALIASES/g' -i CMakeLists.txt + # Build aseprite + cd "$srcdir" + mkdir --parents --verbose build && cd build - mkdir -p build && cd build - - # CMake config notes: - # Do not build using the shared allegro4. Weird graphical glitches happen - # when linking to the library from the official repo. Also, since loadpng.h - # is also distributed in allegro4, using that shared library must also be - # disabled since there's no guarantee Arch users might have allegro4 - # installed. - - cmake -DUSE_SHARED_PIXMAN=ON \ + cmake \ + -DUSE_SHARED_PIXMAN=ON \ -DWITH_WEBP_SUPPORT=ON \ -DUSE_SHARED_CURL=ON \ -DUSE_SHARED_GIFLIB=ON \ @@ -54,28 +168,37 @@ build() { -DUSE_SHARED_CMARK=ON \ -DENABLE_UPDATER=OFF \ -DUSE_SHARED_FREETYPE=ON \ - -DUSE_SHARED_ALLEGRO4=OFF \ - -DUSE_SHARED_LIBLOADPNG=OFF \ - -DCMAKE_INSTALL_PREFIX:STRING=/usr .. + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release \ + -DLAF_OS_BACKEND=skia \ + -DSKIA_DIR="$srcdir/skia" \ + -DSKIA_OUT_DIR="$srcdir/skia/out/Release" \ + -G Ninja \ + .. - make $MAKEFLAGS + cmake --build . } package() { cd "$srcdir"/build - make DESTDIR="$pkgdir/" install - install -Dm644 "$srcdir/$pkgname.desktop" \ + DESTDIR="$pkgdir" cmake --install . + # Aseprite doesn't seem to install README.md for some reason. + install --mode=644 --verbose 'bin/data/README.md' "$pkgdir/usr/share/aseprite/data" + + install -D --mode=644 --verbose "$srcdir/$pkgname.desktop" \ "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 "../data/icons/ase48.png" \ + install -D --mode=644 --verbose "../data/icons/ase48.png" \ "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "../EULA.txt" "$pkgdir/usr/share/licenses/$pkgname/EULA.txt" + install -D --mode=644 --verbose "../EULA.txt" "$pkgdir/usr/share/licenses/$pkgname/EULA.txt" # Remove conflicting files with libarchive - # TODO: With the current compilation options, looks like aseprite build process builds these binaries. Disable the compilation of the following files later on: + # TODO: With the current compilation options, looks like aseprite build process builds these + # binaries. Disable the compilation of the following files later on: # Note: Github issue: https://github.com/aseprite/aseprite/issues/1602 - rm -f "$pkgdir/usr/bin/"{bsdcat,bsdcpio,bsdtar,img2webp} - rm -rf "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/man" "$pkgdir/usr/bin/cmark" + rm --verbose "$pkgdir/usr/bin/"{bsdcat,bsdcpio,bsdtar,img2webp} + rm --recursive --verbose "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/WebP" \ + "$pkgdir/usr/share/man" } # vim:set ts=2 sw=2 et: From d43f492ccfbafea12c7c17e6d05513c9fa807d54 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Thu, 21 Nov 2019 18:18:43 -0500 Subject: [PATCH 042/154] Update to v1.2.16.2 Several changes were made so that the package would mimic the file structure of the trial package that the Aseprite team distributes. These include adding a makedepend on pandoc to convert the README into an HTML file. --- .SRCINFO | 8 ++- PKGBUILD | 140 +++++++++++++++++++++++++---------------------- aseprite.desktop | 16 +++--- 3 files changed, 90 insertions(+), 74 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index be36f69..70685fb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.15 + pkgver = 1.2.16.2 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -10,6 +10,7 @@ pkgbase = aseprite makedepends = ninja makedepends = git makedepends = python2 + makedepends = pandoc depends = cmark depends = pixman depends = curl @@ -24,9 +25,10 @@ pkgbase = aseprite depends = fontconfig depends = libxcursor depends = desktop-file-utils + depends = hicolor-icon-theme conflicts = aseprite-git conflicts = aseprite-gpl - source = https://github.com/aseprite/aseprite/releases/download/v1.2.15/Aseprite-v1.2.15-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.16.2/Aseprite-v1.2.16.2-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m71 @@ -59,7 +61,7 @@ pkgbase = aseprite source = git+https://github.com/2d-inc/Nima-Cpp.git#commit=4bd02269d7d1d2e650950411325eafa15defb084 source = git+https://github.com/2d-inc/Nima-Math-Cpp.git#commit=e0c12772093fa8860f55358274515b86885f0108 source = gn::https://chromium-gn.storage-download.googleapis.com/2f27ff0b6118e5886df976da5effa6003d19d1ce - sha256sums = 813d6a099e1131f25f54e3935d6fdcdb1d0854ba757af074f3fc59dc869f38f4 + sha256sums = 3539c49da702d1ade71d6b5e5a3c495dd5d42c58ae88308b4a3288f93ac522bd sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index af49c32..66f3a68 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,15 +7,15 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.15 +pkgver=1.2.16.2 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" license=('custom') depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' - 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'desktop-file-utils') -makedepends=('cmake' 'ninja' 'git' 'python2') + 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'desktop-file-utils' 'hicolor-icon-theme') +makedepends=('cmake' 'ninja' 'git' 'python2' 'pandoc') conflicts=("aseprite-git" "aseprite-gpl") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ v${pkgver}-Source.zip" @@ -71,60 +71,56 @@ SPIRV-Headers.git#commit=661ad91124e6af2272afd00f804d8aa276e17107" "git+https://github.com/2d-inc/Nima-Math-Cpp.git#commit=e0c12772093fa8860f55358274515b86885f0108" "gn::https://chromium-gn.storage-download.googleapis.com/2f27ff0b6118e5886df976da5effa6003d19d1ce" ) -sha256sums=( -'813d6a099e1131f25f54e3935d6fdcdb1d0854ba757af074f3fc59dc869f38f4' -'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'SKIP' -'c482981e91b5591ff85e055f3026956d6178aae3560ed984ff60b22e99351312' -) +sha256sums=('3539c49da702d1ade71d6b5e5a3c495dd5d42c58ae88308b4a3288f93ac522bd' + 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'c482981e91b5591ff85e055f3026956d6178aae3560ed984ff60b22e99351312') prepare() { - cd "$srcdir" + cd "${srcdir}" # Install skia deps (essentially runs git-sync-deps with the files already downloaded) mkdir --parents --verbose skia/third_party/externals - for dep in buildtools common + for _dep in buildtools common do - rm --recursive --force "skia/$dep" - mv --force --no-target-directory --verbose "$dep" "skia/$dep" + mv --force --no-target-directory --verbose "${_dep}" "skia/${_dep}" done - for dep in angle2 dng_sdk egl-registry expat freetype googletest harfbuzz icu imgui jsoncpp \ + for _dep in angle2 dng_sdk egl-registry expat freetype googletest harfbuzz icu imgui jsoncpp \ libjpeg-turbo libpng libwebp lua microhttpd opencl-lib opengl-registry piex sdl \ sfntly spirv-headers spirv-tools swiftshader zlib Nima-Cpp Nima-Math-Cpp do - rm --recursive --force "skia/third_party/externals/$dep" - mv --force --no-target-directory --verbose "$dep" "skia/third_party/externals/$dep" + mv --force --no-target-directory --verbose "${_dep}" "skia/third_party/externals/${_dep}" done chmod u=rwx,g=rx,o=rx --verbose gn @@ -141,18 +137,18 @@ prepare() { } build() { - cd "$srcdir" + cd "${srcdir}" # Build skia - _skiapath="$srcdir/binsub:$srcdir/depot_tools:$PATH" + _skiapath="${srcdir}/binsub:${srcdir}/depot_tools:${PATH}" cd skia - PATH="$_skiapath" gn gen out/Release --args="is_debug=false is_official_build=true\ + PATH="${_skiapath}" gn gen out/Release --args="is_debug=false is_official_build=true\ skia_use_system_expat=false skia_use_system_icu=false skia_use_system_libjpeg_turbo=false\ skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false" - PATH="$_skiapath" ninja -C out/Release skia + PATH="${_skiapath}" ninja -C out/Release skia # Build aseprite - cd "$srcdir" + cd "${srcdir}" mkdir --parents --verbose build && cd build cmake \ @@ -171,8 +167,8 @@ build() { -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ -DLAF_OS_BACKEND=skia \ - -DSKIA_DIR="$srcdir/skia" \ - -DSKIA_OUT_DIR="$srcdir/skia/out/Release" \ + -DSKIA_DIR="${srcdir}/skia" \ + -DSKIA_OUT_DIR="${srcdir}/skia/out/Release" \ -G Ninja \ .. @@ -180,25 +176,41 @@ build() { } package() { - cd "$srcdir"/build + cd "${srcdir}"/build - DESTDIR="$pkgdir" cmake --install . - # Aseprite doesn't seem to install README.md for some reason. - install --mode=644 --verbose 'bin/data/README.md' "$pkgdir/usr/share/aseprite/data" + DESTDIR="${pkgdir}" cmake --install . - install -D --mode=644 --verbose "$srcdir/$pkgname.desktop" \ - "$pkgdir/usr/share/applications/$pkgname.desktop" - install -D --mode=644 --verbose "../data/icons/ase48.png" \ - "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -D --mode=644 --verbose "../EULA.txt" "$pkgdir/usr/share/licenses/$pkgname/EULA.txt" + # Aseprite, by default, doesn't install a few files on its own. So, they are installed manually. + + cp --recursive --verbose 'bin/data/docs' "${pkgdir}/usr/share/aseprite/data" + install --mode=644 --verbose 'bin/data/README.md' "${pkgdir}/usr/share/aseprite/data" + install --mode=644 --verbose 'bin/data/EULA.txt' "${pkgdir}/usr/share/aseprite/data" + + install --directory --verbose "${pkgdir}/usr/share/doc/${pkgname}" + cp --recursive --verbose '../docs' "${pkgdir}/usr/share/doc/${pkgname}" + install --mode=644 --verbose 'bin/data/EULA.txt' "${pkgdir}/usr/share/doc/${pkgname}" + pandoc '../README.md' --output="${pkgdir}/usr/share/doc/${pkgname}/README.html" + + install -D --mode=644 --verbose "../${pkgname}.desktop" \ + "${pkgdir}/usr/share/applications/${pkgname}.desktop" + + for _size in 32 48 64 + do + install -D --mode=644 --verbose "../data/icons/ase${_size}.png" \ + "${pkgdir}/usr/share/icons/hicolor/${_size}x${_size}/apps/${pkgname}.png" + done + + install -D --mode=644 --verbose --target-directory "${pkgdir}/usr/share/licenses/${pkgname}" \ + 'bin/data/EULA.txt' + install --mode=644 --verbose '../docs/LICENSES.md' "${pkgdir}/usr/share/licenses/${pkgname}" # Remove conflicting files with libarchive # TODO: With the current compilation options, looks like aseprite build process builds these # binaries. Disable the compilation of the following files later on: # Note: Github issue: https://github.com/aseprite/aseprite/issues/1602 - rm --verbose "$pkgdir/usr/bin/"{bsdcat,bsdcpio,bsdtar,img2webp} - rm --recursive --verbose "$pkgdir/usr/include" "$pkgdir/usr/lib" "$pkgdir/usr/share/WebP" \ - "$pkgdir/usr/share/man" + rm --verbose "${pkgdir}/usr/bin/"{bsdcat,bsdcpio,bsdtar,img2webp} + rm --recursive --verbose "${pkgdir}/usr/include" "${pkgdir}/usr/lib" "${pkgdir}/usr/share/WebP" \ + "${pkgdir}/usr/share/man" } # vim:set ts=2 sw=2 et: diff --git a/aseprite.desktop b/aseprite.desktop index e1a0321..306b8df 100644 --- a/aseprite.desktop +++ b/aseprite.desktop @@ -2,11 +2,13 @@ Type=Application Encoding=UTF-8 Name=Aseprite -Comment=Pixel-art paint program -MimeType=image/bmp;image/gif;image/jpeg;image/png;image/x-pcx;image/x-tga;image/vnd.microsoft.icon;video/x-flic;image/webp;image/x-aseprite; -Exec=aseprite %U -Terminal=false -StartupWMClass=allegro -Categories=Graphics;2DGraphics;RasterGraphics; +GenericName=Sprite Editor +Comment=Animated sprite editor & pixel art tool Icon=aseprite -X-Desktop-File-Install-Version=0.22 +Categories=Graphics;2DGraphics;RasterGraphics +Exec=aseprite %U +TryExec=aseprite +Terminal=false +StartupNotify=false +StartupWMClass=Aseprite +MimeType=image/bmp;image/gif;image/jpeg;image/png;image/x-pcx;image/x-tga;image/vnd.microsoft.icon;video/x-flic;image/webp;image/x-aseprite; From b0c2094df490bf87a2ab6e8ded3785137d9076df Mon Sep 17 00:00:00 2001 From: rouhannb Date: Fri, 22 Nov 2019 17:28:00 -0500 Subject: [PATCH 043/154] Fix checksum for aseprite.desktop --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 70685fb..c3caaa2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -62,7 +62,7 @@ pkgbase = aseprite source = git+https://github.com/2d-inc/Nima-Math-Cpp.git#commit=e0c12772093fa8860f55358274515b86885f0108 source = gn::https://chromium-gn.storage-download.googleapis.com/2f27ff0b6118e5886df976da5effa6003d19d1ce sha256sums = 3539c49da702d1ade71d6b5e5a3c495dd5d42c58ae88308b4a3288f93ac522bd - sha256sums = c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f + sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 66f3a68..e399857 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -72,7 +72,7 @@ SPIRV-Headers.git#commit=661ad91124e6af2272afd00f804d8aa276e17107" "gn::https://chromium-gn.storage-download.googleapis.com/2f27ff0b6118e5886df976da5effa6003d19d1ce" ) sha256sums=('3539c49da702d1ade71d6b5e5a3c495dd5d42c58ae88308b4a3288f93ac522bd' - 'c258fa38a0e0bd575f0bd744c4c3b60cf8d59d596c7572f84bd392e1c5e49b4f' + 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' 'SKIP' From df04467285d52a9c9421f152d029089d9696ea8f Mon Sep 17 00:00:00 2001 From: Andrew Bueide Date: Tue, 4 Feb 2020 22:40:05 -0600 Subject: [PATCH 044/154] Add skia-git as conflicting dependency (build fails with it installed) --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index e399857..ac0da16 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -16,7 +16,7 @@ license=('custom') depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('cmake' 'ninja' 'git' 'python2' 'pandoc') -conflicts=("aseprite-git" "aseprite-gpl") +conflicts=("aseprite-git" "aseprite-gpl" "skia-git") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ v${pkgver}-Source.zip" "${pkgname}.desktop" From 6b9d4761f64f9fed6917039773ebad3f6325f5ab Mon Sep 17 00:00:00 2001 From: Andrew Bueide Date: Tue, 4 Feb 2020 22:42:07 -0600 Subject: [PATCH 045/154] Update srcinfo --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index c3caaa2..6b38cb5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.16.2 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 arch = i686 From 8b1477cd2aa94941f051642bfb60ab582c76f9d6 Mon Sep 17 00:00:00 2001 From: Rohan Bafna Date: Tue, 11 Feb 2020 15:55:45 -0500 Subject: [PATCH 046/154] Remove skia, update pkgrel --- .SRCINFO | 2 +- PKGBUILD | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6b38cb5..28d956c 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,7 +10,6 @@ pkgbase = aseprite makedepends = ninja makedepends = git makedepends = python2 - makedepends = pandoc depends = cmark depends = pixman depends = curl @@ -28,6 +27,7 @@ pkgbase = aseprite depends = hicolor-icon-theme conflicts = aseprite-git conflicts = aseprite-gpl + conflicts = skia-git source = https://github.com/aseprite/aseprite/releases/download/v1.2.16.2/Aseprite-v1.2.16.2-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git diff --git a/PKGBUILD b/PKGBUILD index ac0da16..938f596 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,14 +8,14 @@ pkgname=aseprite pkgver=1.2.16.2 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" license=('custom') depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'desktop-file-utils' 'hicolor-icon-theme') -makedepends=('cmake' 'ninja' 'git' 'python2' 'pandoc') +makedepends=('cmake' 'ninja' 'git' 'python2') conflicts=("aseprite-git" "aseprite-gpl" "skia-git") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ v${pkgver}-Source.zip" @@ -189,7 +189,7 @@ package() { install --directory --verbose "${pkgdir}/usr/share/doc/${pkgname}" cp --recursive --verbose '../docs' "${pkgdir}/usr/share/doc/${pkgname}" install --mode=644 --verbose 'bin/data/EULA.txt' "${pkgdir}/usr/share/doc/${pkgname}" - pandoc '../README.md' --output="${pkgdir}/usr/share/doc/${pkgname}/README.html" + install --mode=644 --verbose '../README.md' "${pkgdir}/usr/share/doc/${pkgname}" install -D --mode=644 --verbose "../${pkgname}.desktop" \ "${pkgdir}/usr/share/applications/${pkgname}.desktop" From d38210d0792053759e916de1b544e1a200e271e1 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Wed, 19 Feb 2020 18:29:28 -0500 Subject: [PATCH 047/154] Empty pkgrel bump A few users have been having an issue where the package was always classified as outdated because the last pkgrel bump wasn't done properly. Hopefully, this fixes that. --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 28d956c..3428082 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.16.2 - pkgrel = 2 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 arch = i686 diff --git a/PKGBUILD b/PKGBUILD index 938f596..105c576 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,7 +8,7 @@ pkgname=aseprite pkgver=1.2.16.2 -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64' 'i686') url="http://www.aseprite.org/" From ea6a429477748aff5e714fccbf249a9e8fee79c2 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Thu, 12 Mar 2020 20:05:31 -0400 Subject: [PATCH 048/154] Update to v1.2.17 --- .SRCINFO | 55 +++++++++++++++-------------- PKGBUILD | 104 ++++++++++++++++++++++++++----------------------------- 2 files changed, 77 insertions(+), 82 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3428082..9fa15dd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,17 +1,15 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.16.2 - pkgrel = 3 + pkgver = 1.2.17 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 - arch = i686 license = custom makedepends = cmake makedepends = ninja makedepends = git makedepends = python2 depends = cmark - depends = pixman depends = curl depends = giflib depends = zlib @@ -23,45 +21,45 @@ pkgbase = aseprite depends = nettle depends = fontconfig depends = libxcursor - depends = desktop-file-utils depends = hicolor-icon-theme conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.16.2/Aseprite-v1.2.16.2-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.17/Aseprite-v1.2.17-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git - source = git+https://github.com/aseprite/skia.git#branch=aseprite-m71 + source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 - source = angle2::git+https://chromium.googlesource.com/angle/angle.git#commit=956ab4d9fab36be9929e63829475d4d69b2c681c - source = git+https://android.googlesource.com/platform/external/dng_sdk.git#commit=96443b262250c390b0caefbf3eed8463ba35ecae + source = angle2::git+https://chromium.googlesource.com/angle/angle.git#commit=ee07cb317579dfda40dabb5d6d9c209e0e9e0643 + source = git+https://dawn.googlesource.com/dawn.git#commit=604072bc2ed01018eb03bcbbf9d94042f679af63 + source = git+https://android.googlesource.com/platform/external/dng_sdk.git#commit=c8d0c9b1d16bfda56f15165d39e0ffa360a11123 source = egl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry#commit=a0bca08de07c7d7651047bedc0b653cfaaa4f2ae - source = git+https://android.googlesource.com/platform/external/expat.git#tag=android-6.0.1_r55 - source = freetype::git+https://skia.googlesource.com/third_party/freetype2.git#commit=7edc937fe679d14d66f55cf6f7fa607925d38f3c - source = git+https://android.googlesource.com/platform/external/googletest#commit=dd43b9998e9a44a579a7aba6c1309407d1a5ed95 - source = git+https://skia.googlesource.com/third_party/harfbuzz.git#tag=1.4.2 - source = git+https://chromium.googlesource.com/chromium/deps/icu.git#commit=ec9c1133693148470ffe2e5e53576998e3650c1d - source = git+https://skia.googlesource.com/external/github.com/ocornut/imgui.git#commit=bc6ac8b2aee0614debd940e45bc9cd0d9b355c86 - source = git+https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git#tag=1.0.0 - source = git+https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git#tag=2.0.0 - source = git+https://skia.googlesource.com/third_party/libpng.git#tag=v1.6.33 - source = git+https://chromium.googlesource.com/webm/libwebp.git#tag=v0.6.1 - source = git+https://skia.googlesource.com/external/github.com/lua/lua.git#tag=v5-3-4 + source = git+https://android.googlesource.com/platform/external/expat.git#commit=e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a + source = freetype::git+https://skia.googlesource.com/third_party/freetype2.git#commit=0a3d2bb99b45b72e1d45185ab054efa993d97210 + source = git+https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git#commit=3a74ee528255cc027d84b204a87b5c25e47bff79 + source = git+https://chromium.googlesource.com/chromium/deps/icu.git#commit=dbd3825b31041d782c5b504c59dcfb5ac7dda08c + source = git+https://skia.googlesource.com/external/github.com/ocornut/imgui.git#commit=d38d7c6628bebd02692cfdd6fa76b4d992a35b75 + source = git+https://skia.googlesource.com/libgifcodec#commit=38d9c73f49b861bb4a9829371ac311544b120023 + source = git+https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git#commit=574f3a772c96dc9db2c98ef24706feb3f6dbda9a + source = git+https://skia.googlesource.com/third_party/libpng.git#commit=386707c6d19b974ca2e3db7f5c61873813c6fe44 + source = git+https://chromium.googlesource.com/webm/libwebp.git#commit=0fe1a89dbf1930fc2554dbe76adad5d962054ead + source = git+https://skia.googlesource.com/external/github.com/lua/lua.git#commit=e354c6355e7f48e087678ec49e340ca0696725b1 source = microhttpd::git+https://android.googlesource.com/platform/external/libmicrohttpd#commit=748945ec6f1c67b7efc934ab0808e1d32f2fb98d source = opencl-lib::git+https://skia.googlesource.com/external/github.com/GPUOpen-Tools/common-lib-amd-APPSDK-3.0#commit=4e6d30e406d2e5a65e1d65e404fe6df5f772a32b + source = opencl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/OpenCL-Registry#commit=932ed55c85f887041291cef8019e54280c033c35 source = opengl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry#commit=14b80ebeab022b2c78f84a573f01028c96075553 source = git+https://android.googlesource.com/platform/external/piex.git#commit=bb217acdca1cc0c16b704669dd6f91a1b509c406 source = git+https://skia.googlesource.com/third_party/sdl#commit=5d7cfcca344034aff9327f77fc181ae3754e7a90 - source = git+https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git#commit=b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916 - source = spirv-headers::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git#commit=661ad91124e6af2272afd00f804d8aa276e17107 - source = spirv-tools::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git#commit=e9e4393b1c5aad7553c05782acefbe32b42644bd - source = swiftshader::git+https://swiftshader.googlesource.com/SwiftShader#commit=d6126aea667e37d2d7b57b0a381b9f26912a21b7 + source = git+https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git#commit=b55ff303ea2f9e26702b514cf6a3196a2e3e2974 + source = spirv-cross::git+https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross#commit=53ab2144b90abede33be5161aec5dfc94ddc3caf + source = spirv-headers::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1 + source = spirv-tools::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git#commit=0c4feb643b89d1792b02f7cbef315e9d95633bd7 + source = swiftshader::git+https://swiftshader.googlesource.com/SwiftShader#commit=430def835f9f85d52f4a96db9b715cd9a7403c9c + source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 - source = git+https://github.com/2d-inc/Nima-Cpp.git#commit=4bd02269d7d1d2e650950411325eafa15defb084 - source = git+https://github.com/2d-inc/Nima-Math-Cpp.git#commit=e0c12772093fa8860f55358274515b86885f0108 - source = gn::https://chromium-gn.storage-download.googleapis.com/2f27ff0b6118e5886df976da5effa6003d19d1ce - sha256sums = 3539c49da702d1ade71d6b5e5a3c495dd5d42c58ae88308b4a3288f93ac522bd + source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 + sha256sums = 698fb3f667f643869995f2a2d615561ec23cf03c1362895f90ebcc29ed8c1fc1 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP @@ -93,6 +91,7 @@ pkgbase = aseprite sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP + sha256sums = SKIP sha256sums = c482981e91b5591ff85e055f3026956d6178aae3560ed984ff60b22e99351312 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 105c576..b444115 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,50 +7,56 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.16.2 -pkgrel=3 +pkgver=1.2.17 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' -arch=('x86_64' 'i686') +arch=('x86_64') url="http://www.aseprite.org/" license=('custom') -depends=('cmark' 'pixman' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' - 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'desktop-file-utils' 'hicolor-icon-theme') +depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' + 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'hicolor-icon-theme') makedepends=('cmake' 'ninja' 'git' 'python2') conflicts=("aseprite-git" "aseprite-gpl" "skia-git") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ v${pkgver}-Source.zip" "${pkgname}.desktop" "git+https://chromium.googlesource.com/chromium/tools/depot_tools.git" -"git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m71" +"git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m81" "git+https://chromium.googlesource.com/chromium/buildtools.git\ #commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" "git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" "angle2::git+https://chromium.googlesource.com/angle/angle.git\ -#commit=956ab4d9fab36be9929e63829475d4d69b2c681c" +#commit=ee07cb317579dfda40dabb5d6d9c209e0e9e0643" +"git+https://dawn.googlesource.com/dawn.git#commit=604072bc2ed01018eb03bcbbf9d94042f679af63" "git+https://android.googlesource.com/platform/external/dng_sdk.git\ -#commit=96443b262250c390b0caefbf3eed8463ba35ecae" +#commit=c8d0c9b1d16bfda56f15165d39e0ffa360a11123" "egl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry\ #commit=a0bca08de07c7d7651047bedc0b653cfaaa4f2ae" -"git+https://android.googlesource.com/platform/external/expat.git#tag=android-6.0.1_r55" +"git+https://android.googlesource.com/platform/external/expat.git\ +#commit=e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a" "freetype::git+https://skia.googlesource.com/third_party/freetype2.git\ -#commit=7edc937fe679d14d66f55cf6f7fa607925d38f3c" -"git+https://android.googlesource.com/platform/external/googletest\ -#commit=dd43b9998e9a44a579a7aba6c1309407d1a5ed95" -"git+https://skia.googlesource.com/third_party/harfbuzz.git#tag=1.4.2" +#commit=0a3d2bb99b45b72e1d45185ab054efa993d97210" +"git+https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git\ +#commit=3a74ee528255cc027d84b204a87b5c25e47bff79" "git+https://chromium.googlesource.com/chromium/deps/icu.git\ -#commit=ec9c1133693148470ffe2e5e53576998e3650c1d" +#commit=dbd3825b31041d782c5b504c59dcfb5ac7dda08c" "git+https://skia.googlesource.com/external/github.com/ocornut/imgui.git\ -#commit=bc6ac8b2aee0614debd940e45bc9cd0d9b355c86" -"git+https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git\ -#tag=1.0.0" -"git+https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git#tag=2.0.0" -"git+https://skia.googlesource.com/third_party/libpng.git#tag=v1.6.33" -"git+https://chromium.googlesource.com/webm/libwebp.git#tag=v0.6.1" -"git+https://skia.googlesource.com/external/github.com/lua/lua.git#tag=v5-3-4" +#commit=d38d7c6628bebd02692cfdd6fa76b4d992a35b75" +"git+https://skia.googlesource.com/libgifcodec#commit=38d9c73f49b861bb4a9829371ac311544b120023" +"git+https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git\ +#commit=574f3a772c96dc9db2c98ef24706feb3f6dbda9a" +"git+https://skia.googlesource.com/third_party/libpng.git\ +#commit=386707c6d19b974ca2e3db7f5c61873813c6fe44" +"git+https://chromium.googlesource.com/webm/libwebp.git\ +#commit=0fe1a89dbf1930fc2554dbe76adad5d962054ead" +"git+https://skia.googlesource.com/external/github.com/lua/lua.git\ +#commit=e354c6355e7f48e087678ec49e340ca0696725b1" "microhttpd::git+https://android.googlesource.com/platform/external/libmicrohttpd\ #commit=748945ec6f1c67b7efc934ab0808e1d32f2fb98d" "opencl-lib::git+https://skia.googlesource.com/external/github.com/GPUOpen-Tools/\ common-lib-amd-APPSDK-3.0#commit=4e6d30e406d2e5a65e1d65e404fe6df5f772a32b" +"opencl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/\ +OpenCL-Registry#commit=932ed55c85f887041291cef8019e54280c033c35" "opengl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/\ OpenGL-Registry#commit=14b80ebeab022b2c78f84a573f01028c96075553" "git+https://android.googlesource.com/platform/external/piex.git\ @@ -58,20 +64,22 @@ OpenGL-Registry#commit=14b80ebeab022b2c78f84a573f01028c96075553" "git+https://skia.googlesource.com/third_party/sdl\ #commit=5d7cfcca344034aff9327f77fc181ae3754e7a90" "git+https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git\ -#commit=b18b09b6114b9b7fe6fc2f96d8b15e8a72f66916" +#commit=b55ff303ea2f9e26702b514cf6a3196a2e3e2974" +"spirv-cross::git+https://chromium.googlesource.com/external/github.com/KhronosGroup/\ +SPIRV-Cross#commit=53ab2144b90abede33be5161aec5dfc94ddc3caf" "spirv-headers::git+https://skia.googlesource.com/external/github.com/KhronosGroup/\ -SPIRV-Headers.git#commit=661ad91124e6af2272afd00f804d8aa276e17107" +SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" "spirv-tools::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git\ -#commit=e9e4393b1c5aad7553c05782acefbe32b42644bd" +#commit=0c4feb643b89d1792b02f7cbef315e9d95633bd7" "swiftshader::git+https://swiftshader.googlesource.com/SwiftShader\ -#commit=d6126aea667e37d2d7b57b0a381b9f26912a21b7" +#commit=430def835f9f85d52f4a96db9b715cd9a7403c9c" +"git+https://skia.googlesource.com/external/github.com/google/wuffs.git\ +#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a" "git+https://chromium.googlesource.com/chromium/src/third_party/zlib\ #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" -"git+https://github.com/2d-inc/Nima-Cpp.git#commit=4bd02269d7d1d2e650950411325eafa15defb084" -"git+https://github.com/2d-inc/Nima-Math-Cpp.git#commit=e0c12772093fa8860f55358274515b86885f0108" -"gn::https://chromium-gn.storage-download.googleapis.com/2f27ff0b6118e5886df976da5effa6003d19d1ce" +"gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('3539c49da702d1ade71d6b5e5a3c495dd5d42c58ae88308b4a3288f93ac522bd' +sha256sums=('698fb3f667f643869995f2a2d615561ec23cf03c1362895f90ebcc29ed8c1fc1' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' @@ -103,6 +111,7 @@ sha256sums=('3539c49da702d1ade71d6b5e5a3c495dd5d42c58ae88308b4a3288f93ac522bd' 'SKIP' 'SKIP' 'SKIP' + 'SKIP' 'c482981e91b5591ff85e055f3026956d6178aae3560ed984ff60b22e99351312') prepare() { @@ -116,9 +125,9 @@ prepare() { mv --force --no-target-directory --verbose "${_dep}" "skia/${_dep}" done - for _dep in angle2 dng_sdk egl-registry expat freetype googletest harfbuzz icu imgui jsoncpp \ - libjpeg-turbo libpng libwebp lua microhttpd opencl-lib opengl-registry piex sdl \ - sfntly spirv-headers spirv-tools swiftshader zlib Nima-Cpp Nima-Math-Cpp + for _dep in angle2 dawn dng_sdk egl-registry expat freetype harfbuzz icu imgui opencl-registry \ + libjpeg-turbo libpng libwebp lua microhttpd opencl-lib opengl-registry piex \ + sdl sfntly spirv-cross spirv-headers spirv-tools swiftshader zlib wuffs do mv --force --no-target-directory --verbose "${_dep}" "skia/third_party/externals/${_dep}" done @@ -128,12 +137,9 @@ prepare() { cp --verbose skia/bin/gn skia/buildtools/linux64/gn # Skia assumes python is linked to python2, not python3 - # Also, running ninja from depot_tools seems to cause problems mkdir --parents --verbose binsub cd binsub ln --force --symbolic --verbose /usr/bin/python2 python - ln --force --symbolic --verbose /usr/bin/python2-config python-config - ln --force --symbolic --verbose /usr/bin/ninja } build() { @@ -142,17 +148,16 @@ build() { # Build skia _skiapath="${srcdir}/binsub:${srcdir}/depot_tools:${PATH}" cd skia - PATH="${_skiapath}" gn gen out/Release --args="is_debug=false is_official_build=true\ - skia_use_system_expat=false skia_use_system_icu=false skia_use_system_libjpeg_turbo=false\ + PATH="${_skiapath}" gn gen out/Release-x64 --args="is_debug=false is_official_build=true \ + skia_use_system_expat=false skia_use_system_icu=false skia_use_system_libjpeg_turbo=false \ skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false" - PATH="${_skiapath}" ninja -C out/Release skia + PATH="${_skiapath}" ninja -C out/Release-x64 skia modules # Build aseprite cd "${srcdir}" mkdir --parents --verbose build && cd build cmake \ - -DUSE_SHARED_PIXMAN=ON \ -DWITH_WEBP_SUPPORT=ON \ -DUSE_SHARED_CURL=ON \ -DUSE_SHARED_GIFLIB=ON \ @@ -166,25 +171,24 @@ build() { -DUSE_SHARED_FREETYPE=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_BUILD_TYPE=Release \ - -DLAF_OS_BACKEND=skia \ + -DLAF_BACKEND=skia \ -DSKIA_DIR="${srcdir}/skia" \ - -DSKIA_OUT_DIR="${srcdir}/skia/out/Release" \ + -DSKIA_LIBRARY_DIR="${srcdir}/skia/out/Release-x64" \ -G Ninja \ .. - cmake --build . + ninja aseprite } package() { cd "${srcdir}"/build - DESTDIR="${pkgdir}" cmake --install . + install -D --verbose "bin/${pkgname}" "${pkgdir}/usr/bin/${pkgname}" # Aseprite, by default, doesn't install a few files on its own. So, they are installed manually. - cp --recursive --verbose 'bin/data/docs' "${pkgdir}/usr/share/aseprite/data" - install --mode=644 --verbose 'bin/data/README.md' "${pkgdir}/usr/share/aseprite/data" - install --mode=644 --verbose 'bin/data/EULA.txt' "${pkgdir}/usr/share/aseprite/data" + install --directory --verbose "${pkgdir}/usr/share/${pkgname}/data" + cp --recursive --verbose 'bin/data' "${pkgdir}/usr/share/${pkgname}" install --directory --verbose "${pkgdir}/usr/share/doc/${pkgname}" cp --recursive --verbose '../docs' "${pkgdir}/usr/share/doc/${pkgname}" @@ -203,14 +207,6 @@ package() { install -D --mode=644 --verbose --target-directory "${pkgdir}/usr/share/licenses/${pkgname}" \ 'bin/data/EULA.txt' install --mode=644 --verbose '../docs/LICENSES.md' "${pkgdir}/usr/share/licenses/${pkgname}" - - # Remove conflicting files with libarchive - # TODO: With the current compilation options, looks like aseprite build process builds these - # binaries. Disable the compilation of the following files later on: - # Note: Github issue: https://github.com/aseprite/aseprite/issues/1602 - rm --verbose "${pkgdir}/usr/bin/"{bsdcat,bsdcpio,bsdtar,img2webp} - rm --recursive --verbose "${pkgdir}/usr/include" "${pkgdir}/usr/lib" "${pkgdir}/usr/share/WebP" \ - "${pkgdir}/usr/share/man" } # vim:set ts=2 sw=2 et: From 9ab6b40eb34e083b3e91bcbbafb73acd11bec1d1 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Fri, 13 Mar 2020 12:42:25 -0400 Subject: [PATCH 049/154] Add .gitignore --- .gitignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..91bec31 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +* +!.gitignore +!.SRCINFO +!aseprite.desktop +!PKGBUILD \ No newline at end of file From 3bc48e49e0adf90644b435d07fc32ad55050d7df Mon Sep 17 00:00:00 2001 From: rouhannb Date: Fri, 13 Mar 2020 13:42:30 -0400 Subject: [PATCH 050/154] Use static libjpeg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using libjpeg-turbo on Aseprite gives the error “Wrong JPEG library version: library is 62, caller expects 80.” I’m not sure if there is any way to use a shared library right now, so I took the easy way out and just used the static library compiled with Aseprite. Additionally, I changed the hack for using Python 2 with depot_tools to something less messy. --- .SRCINFO | 3 +-- PKGBUILD | 20 ++++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9fa15dd..07f0b78 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.17 - pkgrel = 1 + pkgrel = 2 url = http://www.aseprite.org/ arch = x86_64 license = custom @@ -14,7 +14,6 @@ pkgbase = aseprite depends = giflib depends = zlib depends = libpng - depends = libjpeg-turbo depends = tinyxml depends = freetype2 depends = harfbuzz diff --git a/PKGBUILD b/PKGBUILD index b444115..ccaf7f7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,12 +8,12 @@ pkgname=aseprite pkgver=1.2.17 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="http://www.aseprite.org/" license=('custom') -depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'libjpeg-turbo' 'tinyxml' 'freetype2' +depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'freetype2' 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'hicolor-icon-theme') makedepends=('cmake' 'ninja' 'git' 'python2') conflicts=("aseprite-git" "aseprite-gpl" "skia-git") @@ -135,22 +135,19 @@ prepare() { chmod u=rwx,g=rx,o=rx --verbose gn mv --verbose gn skia/bin/gn cp --verbose skia/bin/gn skia/buildtools/linux64/gn - - # Skia assumes python is linked to python2, not python3 - mkdir --parents --verbose binsub - cd binsub - ln --force --symbolic --verbose /usr/bin/python2 python } build() { cd "${srcdir}" # Build skia - _skiapath="${srcdir}/binsub:${srcdir}/depot_tools:${PATH}" + _skiapath="${srcdir}/depot_tools:${PATH}" cd skia - PATH="${_skiapath}" gn gen out/Release-x64 --args="is_debug=false is_official_build=true \ - skia_use_system_expat=false skia_use_system_icu=false skia_use_system_libjpeg_turbo=false \ - skia_use_system_libpng=false skia_use_system_libwebp=false skia_use_system_zlib=false" + # Bypass the gn script, which uses `python` and expects Python 2 + PATH="${_skiapath}" PYTHONDONTWRITEBYTECODE=1 python2 "$(which gn.py)" gen out/Release-x64 \ + --args="is_debug=false is_official_build=true skia_use_system_expat=false \ + skia_use_system_icu=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false \ + skia_use_system_libwebp=false skia_use_system_zlib=false" PATH="${_skiapath}" ninja -C out/Release-x64 skia modules # Build aseprite @@ -161,7 +158,6 @@ build() { -DWITH_WEBP_SUPPORT=ON \ -DUSE_SHARED_CURL=ON \ -DUSE_SHARED_GIFLIB=ON \ - -DUSE_SHARED_JPEGLIB=ON \ -DUSE_SHARED_HARFBUZZ=ON \ -DUSE_SHARED_ZLIB=ON \ -DUSE_SHARED_LIBPNG=ON \ From b9cc5d332e934f284f37d6fc53bd15ed7b52a3f0 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Fri, 13 Mar 2020 17:40:44 -0400 Subject: [PATCH 051/154] Fix checksums for gn --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 07f0b78..3f8b73b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -91,7 +91,7 @@ pkgbase = aseprite sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = c482981e91b5591ff85e055f3026956d6178aae3560ed984ff60b22e99351312 + sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index ccaf7f7..a5b00fb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -112,7 +112,7 @@ sha256sums=('698fb3f667f643869995f2a2d615561ec23cf03c1362895f90ebcc29ed8c1fc1' 'SKIP' 'SKIP' 'SKIP' - 'c482981e91b5591ff85e055f3026956d6178aae3560ed984ff60b22e99351312') + 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2') prepare() { cd "${srcdir}" From 6e1d44e0e7beb6c0395ffe2509da6f4132024a3e Mon Sep 17 00:00:00 2001 From: rouhannb Date: Fri, 13 Mar 2020 18:20:55 -0400 Subject: [PATCH 052/154] Restoring old python2 hack --- PKGBUILD | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index a5b00fb..6b971de 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -135,16 +135,18 @@ prepare() { chmod u=rwx,g=rx,o=rx --verbose gn mv --verbose gn skia/bin/gn cp --verbose skia/bin/gn skia/buildtools/linux64/gn + + mkdir --verbose binsub + ln --symbolic /usr/bin/python2 binsub/python } build() { cd "${srcdir}" # Build skia - _skiapath="${srcdir}/depot_tools:${PATH}" + _skiapath="${srcdir}/binsub:${srcdir}/depot_tools:${PATH}" cd skia - # Bypass the gn script, which uses `python` and expects Python 2 - PATH="${_skiapath}" PYTHONDONTWRITEBYTECODE=1 python2 "$(which gn.py)" gen out/Release-x64 \ + PATH="${_skiapath}" gn gen out/Release-x64 \ --args="is_debug=false is_official_build=true skia_use_system_expat=false \ skia_use_system_icu=false skia_use_system_libjpeg_turbo=false skia_use_system_libpng=false \ skia_use_system_libwebp=false skia_use_system_zlib=false" From 2a4321b4e013dde4c6faa8dac3792026c98289c7 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Sat, 11 Apr 2020 11:26:05 -0400 Subject: [PATCH 053/154] Add freeglut and xorgproto as makedepends Xorgproto was mentioned in a comment, and the script skia uses to download dependencies mentions freeglut. --- .SRCINFO | 2 ++ PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 3f8b73b..8b12892 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -9,6 +9,8 @@ pkgbase = aseprite makedepends = ninja makedepends = git makedepends = python2 + makedepends = freeglut + makedepends = xorgproto depends = cmark depends = curl depends = giflib diff --git a/PKGBUILD b/PKGBUILD index 6b971de..99c787e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,7 +15,7 @@ url="http://www.aseprite.org/" license=('custom') depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'freetype2' 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'hicolor-icon-theme') -makedepends=('cmake' 'ninja' 'git' 'python2') +makedepends=('cmake' 'ninja' 'git' 'python2' 'freeglut' 'xorgproto') conflicts=("aseprite-git" "aseprite-gpl" "skia-git") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ v${pkgver}-Source.zip" From 0a3859dc23788797154c3283622e62aa90944fe6 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Sun, 12 Apr 2020 13:00:13 -0400 Subject: [PATCH 054/154] Replace dependency harfbuzz-icu with harfbuzz --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8b12892..fe9274e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.17 - pkgrel = 2 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 license = custom @@ -18,7 +18,7 @@ pkgbase = aseprite depends = libpng depends = tinyxml depends = freetype2 - depends = harfbuzz + depends = harfbuzz-icu depends = nettle depends = fontconfig depends = libxcursor diff --git a/PKGBUILD b/PKGBUILD index 99c787e..33b8eea 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -8,13 +8,13 @@ pkgname=aseprite pkgver=1.2.17 -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="http://www.aseprite.org/" license=('custom') depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'freetype2' - 'harfbuzz' 'nettle' 'fontconfig' 'libxcursor' 'hicolor-icon-theme') + 'harfbuzz-icu' 'nettle' 'fontconfig' 'libxcursor' 'hicolor-icon-theme') makedepends=('cmake' 'ninja' 'git' 'python2' 'freeglut' 'xorgproto') conflicts=("aseprite-git" "aseprite-gpl" "skia-git") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ From c45e175f87e43a75663a3843c00e5aea7a91b3e1 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Fri, 24 Apr 2020 17:09:28 -0400 Subject: [PATCH 055/154] Update to 1.2.18 --- .SRCINFO | 13 +++++++------ PKGBUILD | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index fe9274e..3768e71 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.17 - pkgrel = 3 + pkgver = 1.2.18 + pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 license = custom @@ -11,6 +11,9 @@ pkgbase = aseprite makedepends = python2 makedepends = freeglut makedepends = xorgproto + makedepends = libxi + makedepends = harfbuzz-icu + makedepends = nettle depends = cmark depends = curl depends = giflib @@ -18,15 +21,13 @@ pkgbase = aseprite depends = libpng depends = tinyxml depends = freetype2 - depends = harfbuzz-icu - depends = nettle depends = fontconfig depends = libxcursor depends = hicolor-icon-theme conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.17/Aseprite-v1.2.17-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.18/Aseprite-v1.2.18-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -60,7 +61,7 @@ pkgbase = aseprite source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = 698fb3f667f643869995f2a2d615561ec23cf03c1362895f90ebcc29ed8c1fc1 + sha256sums = 8ac253a002b14a9064d0ebcb99ad5fc715fd021c64ae9c9faa5f0facf1beb998 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 33b8eea..5a22834 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,15 +7,16 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.17 -pkgrel=3 +pkgver=1.2.18 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="http://www.aseprite.org/" license=('custom') -depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'freetype2' - 'harfbuzz-icu' 'nettle' 'fontconfig' 'libxcursor' 'hicolor-icon-theme') -makedepends=('cmake' 'ninja' 'git' 'python2' 'freeglut' 'xorgproto') +depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'freetype2' 'fontconfig' 'libxcursor' + 'hicolor-icon-theme') +makedepends=('cmake' 'ninja' 'git' 'python2' 'freeglut' 'xorgproto' 'libxi' 'harfbuzz-icu' + 'nettle') conflicts=("aseprite-git" "aseprite-gpl" "skia-git") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ v${pkgver}-Source.zip" @@ -79,7 +80,7 @@ SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('698fb3f667f643869995f2a2d615561ec23cf03c1362895f90ebcc29ed8c1fc1' +sha256sums=('8ac253a002b14a9064d0ebcb99ad5fc715fd021c64ae9c9faa5f0facf1beb998' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' From bfc7722cf94024b90a02f9fa4a905e3f9885403b Mon Sep 17 00:00:00 2001 From: rouhannb Date: Thu, 28 May 2020 23:28:02 -0400 Subject: [PATCH 056/154] Update to 1.2.19 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3768e71..ad34365 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.18 + pkgver = 1.2.19 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -27,7 +27,7 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.18/Aseprite-v1.2.18-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.19/Aseprite-v1.2.19-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -61,7 +61,7 @@ pkgbase = aseprite source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = 8ac253a002b14a9064d0ebcb99ad5fc715fd021c64ae9c9faa5f0facf1beb998 + sha256sums = 18d55abee3e55e6a165463c6408fa84f854f54c85f5b6b58a29d627bda86242c sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 5a22834..a400484 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.18 +pkgver=1.2.19 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -80,7 +80,7 @@ SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('8ac253a002b14a9064d0ebcb99ad5fc715fd021c64ae9c9faa5f0facf1beb998' +sha256sums=('18d55abee3e55e6a165463c6408fa84f854f54c85f5b6b58a29d627bda86242c' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' From 2e0004396d2b90898e5ae6b5dfc7b86a0b3327cc Mon Sep 17 00:00:00 2001 From: rouhannb Date: Sun, 31 May 2020 15:38:00 -0400 Subject: [PATCH 057/154] Update to 1.2.19.2 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ad34365..c00fcad 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.19 + pkgver = 1.2.19.2 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -27,7 +27,7 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.19/Aseprite-v1.2.19-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.19.2/Aseprite-v1.2.19.2-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -61,7 +61,7 @@ pkgbase = aseprite source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = 18d55abee3e55e6a165463c6408fa84f854f54c85f5b6b58a29d627bda86242c + sha256sums = 13a2fb5f0ed0cb0adc9834e40838fdece37898a62a5a16271ebe796471bd0e83 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index a400484..b410a40 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.19 +pkgver=1.2.19.2 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -80,7 +80,7 @@ SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('18d55abee3e55e6a165463c6408fa84f854f54c85f5b6b58a29d627bda86242c' +sha256sums=('13a2fb5f0ed0cb0adc9834e40838fdece37898a62a5a16271ebe796471bd0e83' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' From 75fb3cc5f284980e6c7fe951de6a497a149b5172 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Sat, 20 Jun 2020 06:56:09 -0400 Subject: [PATCH 058/154] Update to v1.2.21 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c00fcad..e7db575 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.19.2 + pkgver = 1.2.21 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -27,7 +27,7 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.19.2/Aseprite-v1.2.19.2-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.21/Aseprite-v1.2.21-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -61,7 +61,7 @@ pkgbase = aseprite source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = 13a2fb5f0ed0cb0adc9834e40838fdece37898a62a5a16271ebe796471bd0e83 + sha256sums = ac5f65cf32019c2d44033e25f1a3424ef2727cbfafc06b5083114e63b40845a1 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index b410a40..f8a95c7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.19.2 +pkgver=1.2.21 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -80,7 +80,7 @@ SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('13a2fb5f0ed0cb0adc9834e40838fdece37898a62a5a16271ebe796471bd0e83' +sha256sums=('ac5f65cf32019c2d44033e25f1a3424ef2727cbfafc06b5083114e63b40845a1' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' From e9cc5133984f99b9711ef7b424b35b368ba554f5 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Tue, 4 Aug 2020 20:39:23 -0400 Subject: [PATCH 059/154] Update to v1.2.22 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e7db575..3f5dd66 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.21 + pkgver = 1.2.22 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -27,7 +27,7 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.21/Aseprite-v1.2.21-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.22/Aseprite-v1.2.22-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -61,7 +61,7 @@ pkgbase = aseprite source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = ac5f65cf32019c2d44033e25f1a3424ef2727cbfafc06b5083114e63b40845a1 + sha256sums = f9aab2ca109b94e77ae2ac868881059d8849ecbd57f7794c8f2c6c621c88561d sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index f8a95c7..fa5a017 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.21 +pkgver=1.2.22 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -80,7 +80,7 @@ SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('ac5f65cf32019c2d44033e25f1a3424ef2727cbfafc06b5083114e63b40845a1' +sha256sums=('f9aab2ca109b94e77ae2ac868881059d8849ecbd57f7794c8f2c6c621c88561d' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' From 2e95f4def9fd57cc65a7147b1b7444c2bf2387f5 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Wed, 5 Aug 2020 02:03:04 -0400 Subject: [PATCH 060/154] Update to v1.2.23 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3f5dd66..1b11447 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.22 + pkgver = 1.2.23 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -27,7 +27,7 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.22/Aseprite-v1.2.22-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.23/Aseprite-v1.2.23-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -61,7 +61,7 @@ pkgbase = aseprite source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = f9aab2ca109b94e77ae2ac868881059d8849ecbd57f7794c8f2c6c621c88561d + sha256sums = 75d4079ea8f2d357f7f041c9aa716c833449fb606fc6520f111ab130e4855c55 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index fa5a017..6913b50 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.22 +pkgver=1.2.23 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -80,7 +80,7 @@ SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('f9aab2ca109b94e77ae2ac868881059d8849ecbd57f7794c8f2c6c621c88561d' +sha256sums=('75d4079ea8f2d357f7f041c9aa716c833449fb606fc6520f111ab130e4855c55' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' From 280cf67c6b4e64c2723f56a88dbf1ba85f9b8b03 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Wed, 12 Aug 2020 20:35:50 -0400 Subject: [PATCH 061/154] Update to v1.2.24 --- .SRCINFO | 6 +++--- PKGBUILD | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1b11447..ef2740a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.23 + pkgver = 1.2.24 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -27,7 +27,7 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.23/Aseprite-v1.2.23-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.24/Aseprite-v1.2.24-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -61,7 +61,7 @@ pkgbase = aseprite source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = 75d4079ea8f2d357f7f041c9aa716c833449fb606fc6520f111ab130e4855c55 + sha256sums = 72018ed7752219f024ba1f1c96bf2b9bc88174648528f641277bec7a7fdca1da sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 6913b50..5df11d4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.23 +pkgver=1.2.24 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -80,7 +80,7 @@ SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('75d4079ea8f2d357f7f041c9aa716c833449fb606fc6520f111ab130e4855c55' +sha256sums=('72018ed7752219f024ba1f1c96bf2b9bc88174648528f641277bec7a7fdca1da' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' From 56bf57c504fc8c72fc4ceb97ab85e32711659988 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Tue, 18 Aug 2020 09:37:20 -0400 Subject: [PATCH 062/154] Update to v1.2.25 --- .SRCINFO | 6 +++--- PKGBUILD | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ef2740a..8e606bc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.24 + pkgver = 1.2.25 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -27,7 +27,7 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - source = https://github.com/aseprite/aseprite/releases/download/v1.2.24/Aseprite-v1.2.24-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.25/Aseprite-v1.2.25-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -61,7 +61,7 @@ pkgbase = aseprite source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = 72018ed7752219f024ba1f1c96bf2b9bc88174648528f641277bec7a7fdca1da + sha256sums = c5496ad159454b44e9b6c0f872553a192a7d20feeb6337a799c3f7009cdda558 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 5df11d4..94f1838 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.24 +pkgver=1.2.25 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -80,7 +80,7 @@ SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" #commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) -sha256sums=('72018ed7752219f024ba1f1c96bf2b9bc88174648528f641277bec7a7fdca1da' +sha256sums=('c5496ad159454b44e9b6c0f872553a192a7d20feeb6337a799c3f7009cdda558' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' @@ -173,6 +173,7 @@ build() { -DLAF_BACKEND=skia \ -DSKIA_DIR="${srcdir}/skia" \ -DSKIA_LIBRARY_DIR="${srcdir}/skia/out/Release-x64" \ + -DSKIA_LIBRARY="${srcdir}/deps/skia/out/Release-x64/libskia.a" \ -G Ninja \ .. From bbac323adac9d463a1de0fe51000d8bf91cfeda0 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Tue, 18 Aug 2020 09:58:03 -0400 Subject: [PATCH 063/154] Fix typo that breaks build --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 94f1838..90b4ac8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -173,7 +173,7 @@ build() { -DLAF_BACKEND=skia \ -DSKIA_DIR="${srcdir}/skia" \ -DSKIA_LIBRARY_DIR="${srcdir}/skia/out/Release-x64" \ - -DSKIA_LIBRARY="${srcdir}/deps/skia/out/Release-x64/libskia.a" \ + -DSKIA_LIBRARY="${srcdir}/skia/out/Release-x64/libskia.a" \ -G Ninja \ .. From cd33bb9f803672895395a0ff37d72a706fda81d2 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Sat, 22 Aug 2020 11:46:29 -0400 Subject: [PATCH 064/154] Allow package to be rebuilt without cleaning src/ --- PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 90b4ac8..c26aecf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -123,22 +123,22 @@ prepare() { for _dep in buildtools common do - mv --force --no-target-directory --verbose "${_dep}" "skia/${_dep}" + ln --force --symbolic --verbose "../${_dep}" skia done for _dep in angle2 dawn dng_sdk egl-registry expat freetype harfbuzz icu imgui opencl-registry \ libjpeg-turbo libpng libwebp lua microhttpd opencl-lib opengl-registry piex \ sdl sfntly spirv-cross spirv-headers spirv-tools swiftshader zlib wuffs do - mv --force --no-target-directory --verbose "${_dep}" "skia/third_party/externals/${_dep}" + ln --force --symbolic --verbose "../../../${_dep}" skia/third_party/externals done chmod u=rwx,g=rx,o=rx --verbose gn mv --verbose gn skia/bin/gn cp --verbose skia/bin/gn skia/buildtools/linux64/gn - mkdir --verbose binsub - ln --symbolic /usr/bin/python2 binsub/python + mkdir --parents --verbose binsub + ln --force --symbolic /usr/bin/python2 binsub/python } build() { From 31fa464704294c07c6efe4f4344b2708f33d5e24 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Sat, 22 Aug 2020 13:34:12 -0400 Subject: [PATCH 065/154] Some cleanup, stop hardcoding path of Python 2 Thanks ISSOtm --- PKGBUILD | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index c26aecf..20eacc7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -121,10 +121,7 @@ prepare() { # Install skia deps (essentially runs git-sync-deps with the files already downloaded) mkdir --parents --verbose skia/third_party/externals - for _dep in buildtools common - do - ln --force --symbolic --verbose "../${_dep}" skia - done + ln --force --symbolic --verbose ../{buildtools,common} skia for _dep in angle2 dawn dng_sdk egl-registry expat freetype harfbuzz icu imgui opencl-registry \ libjpeg-turbo libpng libwebp lua microhttpd opencl-lib opengl-registry piex \ @@ -138,7 +135,7 @@ prepare() { cp --verbose skia/bin/gn skia/buildtools/linux64/gn mkdir --parents --verbose binsub - ln --force --symbolic /usr/bin/python2 binsub/python + ln --force --symbolic $(which python2) binsub/python } build() { From bfc177e10d1efc8b521b700e01ba56cba0924dae Mon Sep 17 00:00:00 2001 From: rouhannb Date: Mon, 16 Nov 2020 21:48:52 -0500 Subject: [PATCH 066/154] Download tarballs instead of git repos --- .SRCINFO | 145 +++++++++++++++++++++++++------------------ PKGBUILD | 183 +++++++++++++++++++++++++++++-------------------------- 2 files changed, 184 insertions(+), 144 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8e606bc..cab95d1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -27,73 +27,102 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git + noextract = aseprite-buildtools.tar.gz + noextract = aseprite-common.tar.gz + noextract = aseprite-angle2.tar.gz + noextract = aseprite-dawn.tar.gz + noextract = aseprite-dng_sdk.tar.gz + noextract = aseprite-egl-registry.tar.gz + noextract = aseprite-expat.tar.gz + noextract = aseprite-freetype.tar.gz + noextract = aseprite-harfbuzz.tar.gz + noextract = aseprite-icu.tar.gz + noextract = aseprite-imgui.tar.gz + noextract = aseprite-libgifcodec.tar.gz + noextract = aseprite-libjpeg-turbo.tar.gz + noextract = aseprite-libpng.tar.gz + noextract = aseprite-libwebp.tar.gz + noextract = aseprite-lua.tar.gz + noextract = aseprite-microhttpd.tar.gz + noextract = aseprite-opencl-lib.tar.gz + noextract = aseprite-opencl-registry.tar.gz + noextract = aseprite-opengl-registry.tar.gz + noextract = aseprite-piex.tar.gz + noextract = aseprite-sdl.tar.gz + noextract = aseprite-sfntly.tar.gz + noextract = aseprite-spirv-cross.tar.gz + noextract = aseprite-spirv-headers.tar.gz + noextract = aseprite-spirv-tools.tar.gz + noextract = aseprite-swiftshader.tar.gz + noextract = aseprite-wuffs.tar.gz + noextract = aseprite-zlib.tar.gz source = https://github.com/aseprite/aseprite/releases/download/v1.2.25/Aseprite-v1.2.25-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 - source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 - source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 - source = angle2::git+https://chromium.googlesource.com/angle/angle.git#commit=ee07cb317579dfda40dabb5d6d9c209e0e9e0643 - source = git+https://dawn.googlesource.com/dawn.git#commit=604072bc2ed01018eb03bcbbf9d94042f679af63 - source = git+https://android.googlesource.com/platform/external/dng_sdk.git#commit=c8d0c9b1d16bfda56f15165d39e0ffa360a11123 - source = egl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry#commit=a0bca08de07c7d7651047bedc0b653cfaaa4f2ae - source = git+https://android.googlesource.com/platform/external/expat.git#commit=e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a - source = freetype::git+https://skia.googlesource.com/third_party/freetype2.git#commit=0a3d2bb99b45b72e1d45185ab054efa993d97210 - source = git+https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git#commit=3a74ee528255cc027d84b204a87b5c25e47bff79 - source = git+https://chromium.googlesource.com/chromium/deps/icu.git#commit=dbd3825b31041d782c5b504c59dcfb5ac7dda08c - source = git+https://skia.googlesource.com/external/github.com/ocornut/imgui.git#commit=d38d7c6628bebd02692cfdd6fa76b4d992a35b75 - source = git+https://skia.googlesource.com/libgifcodec#commit=38d9c73f49b861bb4a9829371ac311544b120023 - source = git+https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git#commit=574f3a772c96dc9db2c98ef24706feb3f6dbda9a - source = git+https://skia.googlesource.com/third_party/libpng.git#commit=386707c6d19b974ca2e3db7f5c61873813c6fe44 - source = git+https://chromium.googlesource.com/webm/libwebp.git#commit=0fe1a89dbf1930fc2554dbe76adad5d962054ead - source = git+https://skia.googlesource.com/external/github.com/lua/lua.git#commit=e354c6355e7f48e087678ec49e340ca0696725b1 - source = microhttpd::git+https://android.googlesource.com/platform/external/libmicrohttpd#commit=748945ec6f1c67b7efc934ab0808e1d32f2fb98d - source = opencl-lib::git+https://skia.googlesource.com/external/github.com/GPUOpen-Tools/common-lib-amd-APPSDK-3.0#commit=4e6d30e406d2e5a65e1d65e404fe6df5f772a32b - source = opencl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/OpenCL-Registry#commit=932ed55c85f887041291cef8019e54280c033c35 - source = opengl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry#commit=14b80ebeab022b2c78f84a573f01028c96075553 - source = git+https://android.googlesource.com/platform/external/piex.git#commit=bb217acdca1cc0c16b704669dd6f91a1b509c406 - source = git+https://skia.googlesource.com/third_party/sdl#commit=5d7cfcca344034aff9327f77fc181ae3754e7a90 - source = git+https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git#commit=b55ff303ea2f9e26702b514cf6a3196a2e3e2974 - source = spirv-cross::git+https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross#commit=53ab2144b90abede33be5161aec5dfc94ddc3caf - source = spirv-headers::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1 - source = spirv-tools::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git#commit=0c4feb643b89d1792b02f7cbef315e9d95633bd7 - source = swiftshader::git+https://swiftshader.googlesource.com/SwiftShader#commit=430def835f9f85d52f4a96db9b715cd9a7403c9c - source = git+https://skia.googlesource.com/external/github.com/google/wuffs.git#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a - source = git+https://chromium.googlesource.com/chromium/src/third_party/zlib#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474 + source = aseprite-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz + source = aseprite-common.tar.gz::https://skia.googlesource.com/common.git/+archive/9737551d7a52c3db3262db5856e6bcd62c462b92.tar.gz + source = aseprite-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/ee07cb317579dfda40dabb5d6d9c209e0e9e0643.tar.gz + source = aseprite-dawn.tar.gz::https://dawn.googlesource.com/dawn.git/+archive/604072bc2ed01018eb03bcbbf9d94042f679af63.tar.gz + source = aseprite-dng_sdk.tar.gz::https://android.googlesource.com/platform/external/dng_sdk.git/+archive/c8d0c9b1d16bfda56f15165d39e0ffa360a11123.tar.gz + source = aseprite-egl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry/+archive/a0bca08de07c7d7651047bedc0b653cfaaa4f2ae.tar.gz + source = aseprite-expat.tar.gz::https://android.googlesource.com/platform/external/expat.git/+archive/e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a.tar.gz + source = aseprite-freetype.tar.gz::https://skia.googlesource.com/third_party/freetype2.git/+archive/0a3d2bb99b45b72e1d45185ab054efa993d97210.tar.gz + source = aseprite-harfbuzz.tar.gz::https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+archive/3a74ee528255cc027d84b204a87b5c25e47bff79.tar.gz + source = aseprite-icu.tar.gz::https://chromium.googlesource.com/chromium/deps/icu.git/+archive/dbd3825b31041d782c5b504c59dcfb5ac7dda08c.tar.gz + source = aseprite-imgui.tar.gz::https://skia.googlesource.com/external/github.com/ocornut/imgui.git/+archive/d38d7c6628bebd02692cfdd6fa76b4d992a35b75.tar.gz + source = aseprite-libgifcodec.tar.gz::https://skia.googlesource.com/libgifcodec/+archive/38d9c73f49b861bb4a9829371ac311544b120023.tar.gz + source = aseprite-libjpeg-turbo.tar.gz::https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git/+archive/574f3a772c96dc9db2c98ef24706feb3f6dbda9a.tar.gz + source = aseprite-libpng.tar.gz::https://skia.googlesource.com/third_party/libpng.git/+archive/386707c6d19b974ca2e3db7f5c61873813c6fe44.tar.gz + source = aseprite-libwebp.tar.gz::https://chromium.googlesource.com/webm/libwebp.git/+archive/0fe1a89dbf1930fc2554dbe76adad5d962054ead.tar.gz + source = aseprite-lua.tar.gz::https://skia.googlesource.com/external/github.com/lua/lua.git/+archive/e354c6355e7f48e087678ec49e340ca0696725b1.tar.gz + source = aseprite-microhttpd.tar.gz::https://android.googlesource.com/platform/external/libmicrohttpd/+archive/748945ec6f1c67b7efc934ab0808e1d32f2fb98d.tar.gz + source = aseprite-opencl-lib.tar.gz::https://skia.googlesource.com/external/github.com/GPUOpen-Tools/common-lib-amd-APPSDK-3.0/+archive/4e6d30e406d2e5a65e1d65e404fe6df5f772a32b.tar.gz + source = aseprite-opencl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/OpenCL-Registry/+archive/932ed55c85f887041291cef8019e54280c033c35.tar.gz + source = aseprite-opengl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry/+archive/14b80ebeab022b2c78f84a573f01028c96075553.tar.gz + source = aseprite-piex.tar.gz::https://android.googlesource.com/platform/external/piex.git/+archive/bb217acdca1cc0c16b704669dd6f91a1b509c406.tar.gz + source = aseprite-sdl.tar.gz::https://skia.googlesource.com/third_party/sdl/+archive/5d7cfcca344034aff9327f77fc181ae3754e7a90.tar.gz + source = aseprite-sfntly.tar.gz::https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git/+archive/b55ff303ea2f9e26702b514cf6a3196a2e3e2974.tar.gz + source = aseprite-spirv-cross.tar.gz::https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross/+archive/53ab2144b90abede33be5161aec5dfc94ddc3caf.tar.gz + source = aseprite-spirv-headers.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git/+archive/29c11140baaf9f7fdaa39a583672c556bf1795a1.tar.gz + source = aseprite-spirv-tools.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+archive/0c4feb643b89d1792b02f7cbef315e9d95633bd7.tar.gz + source = aseprite-swiftshader.tar.gz::https://swiftshader.googlesource.com/SwiftShader/+archive/430def835f9f85d52f4a96db9b715cd9a7403c9c.tar.gz + source = aseprite-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git/+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz + source = aseprite-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 sha256sums = c5496ad159454b44e9b6c0f872553a192a7d20feeb6337a799c3f7009cdda558 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP + sha256sums = ea9192b75031f9bb15b039ca1c3d07d6e9f00a9b1d49c0d15cdda6725e348139 + sha256sums = ad9dad8c9d083da0f6493bf13db8640243b0deeadf24c8114551259af3f16815 + sha256sums = 8be8172d4e09e9457155df58288625e0bdb4dbc5da6f33a699969e0771c0d593 + sha256sums = 5fbf372e9815fe998b28d33e6c592886b44681165a661a71b9402985b2b3d809 + sha256sums = db13bb99db626669b297293303e95eb8cb1f3ef7069266d06fe2ddbc228cd20e + sha256sums = e113aba9898c65a2449f23f3c1fdfce24bdc117c33bd9e77748cd015513822d3 + sha256sums = c0cb6ceae0270384e9d3445e1047cc2c2587ec6434781c4e3079c7a7874665ba + sha256sums = 0ae3d6d84b249363cf62f0e829b2ec78f1188b02500f6a9327ad26b4b9b275e4 + sha256sums = af341d5d21fbbebf99f3b6da9ce4e211046b5d88fb3ec532299dfc1323cfe835 + sha256sums = 29641c234faf498b0741d4b85c70dbf9fdbbb642064c16c1d4d38c496cb09c25 + sha256sums = 66a5a43e1ca069e9882b1f9e5021d4a1ff816d29c69d51c0f5fdc06115441464 + sha256sums = c7a5154249cc1ca1921b09120ee79134b33904e528d9278e46fbc76bca64ecd3 + sha256sums = a7f6de90a69e54667bc36008977a95ef4e7334ecff6b0cd3ed2153e833979f1f + sha256sums = da860b9869bd426f387dbf16037468faf8bb103f3fdf49a25d9e44e87e3bba30 + sha256sums = a1a1c7197cdf48ff747212db09da89ae0d35b52bdd7807b752f42ebfab801379 + sha256sums = 51562cb62e51b908ff8f977a8e1406acd056adeeaa8f65579e06653758b7d1f1 + sha256sums = da5e2e2383ed6cb09e65735587a3c5f8314b6274613881d1dd6114a442e48f91 + sha256sums = d2707e5056b70ae89099194c4088a4322dc1d4ab54ae21864df419091647c243 + sha256sums = e1864950d9c198a1882a4ba3cca1f0920bbf81df536e71580252dcdb70a6d169 + sha256sums = 67262e02cafa132a47294cf1f245c89510d5947d94ab2b7708cce7e0b1f63c26 + sha256sums = 65b69bb157f329efaeb7871f285b6ed2fa666b2cf119eca3697c97e4ca720be2 + sha256sums = 055a3d643bd95b997ff875a0a28b3f82c25e1e351cf6998cc4ba1bc6db0dbdce + sha256sums = 938322aa1cf6de836454e1bf13215173fd8eec3107cea56d647b44a09b14286e + sha256sums = c46de3453d5dc5ff9af5d539b8faec948f9da9d5a94cd232f1f7ec6c71229311 + sha256sums = 46a947e232322b40c3cf610fe87091857a70176fce702bdf9bc24b1b2659ce75 + sha256sums = 39ccfa6dcdd024a374fe6406514b97d5788b97ed8f850d8f6b9403877e1acd7c + sha256sums = 484efea4dee57ecf432e64f704f5bf680c0567f2699719a96e4872ab3da5a780 + sha256sums = b4dd94e4fe7c86698abfa418f6ea2d2071ff20854baa51738057c6a855eab275 + sha256sums = 17188c5b17b8fd3565afc4f0f21dc42ed93ae4a94f15a111d66b21f661211ce3 sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 20eacc7..b79d65e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,96 +23,101 @@ v${pkgver}-Source.zip" "${pkgname}.desktop" "git+https://chromium.googlesource.com/chromium/tools/depot_tools.git" "git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m81" -"git+https://chromium.googlesource.com/chromium/buildtools.git\ -#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" -"git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" -"angle2::git+https://chromium.googlesource.com/angle/angle.git\ -#commit=ee07cb317579dfda40dabb5d6d9c209e0e9e0643" -"git+https://dawn.googlesource.com/dawn.git#commit=604072bc2ed01018eb03bcbbf9d94042f679af63" -"git+https://android.googlesource.com/platform/external/dng_sdk.git\ -#commit=c8d0c9b1d16bfda56f15165d39e0ffa360a11123" -"egl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry\ -#commit=a0bca08de07c7d7651047bedc0b653cfaaa4f2ae" -"git+https://android.googlesource.com/platform/external/expat.git\ -#commit=e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a" -"freetype::git+https://skia.googlesource.com/third_party/freetype2.git\ -#commit=0a3d2bb99b45b72e1d45185ab054efa993d97210" -"git+https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git\ -#commit=3a74ee528255cc027d84b204a87b5c25e47bff79" -"git+https://chromium.googlesource.com/chromium/deps/icu.git\ -#commit=dbd3825b31041d782c5b504c59dcfb5ac7dda08c" -"git+https://skia.googlesource.com/external/github.com/ocornut/imgui.git\ -#commit=d38d7c6628bebd02692cfdd6fa76b4d992a35b75" -"git+https://skia.googlesource.com/libgifcodec#commit=38d9c73f49b861bb4a9829371ac311544b120023" -"git+https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git\ -#commit=574f3a772c96dc9db2c98ef24706feb3f6dbda9a" -"git+https://skia.googlesource.com/third_party/libpng.git\ -#commit=386707c6d19b974ca2e3db7f5c61873813c6fe44" -"git+https://chromium.googlesource.com/webm/libwebp.git\ -#commit=0fe1a89dbf1930fc2554dbe76adad5d962054ead" -"git+https://skia.googlesource.com/external/github.com/lua/lua.git\ -#commit=e354c6355e7f48e087678ec49e340ca0696725b1" -"microhttpd::git+https://android.googlesource.com/platform/external/libmicrohttpd\ -#commit=748945ec6f1c67b7efc934ab0808e1d32f2fb98d" -"opencl-lib::git+https://skia.googlesource.com/external/github.com/GPUOpen-Tools/\ -common-lib-amd-APPSDK-3.0#commit=4e6d30e406d2e5a65e1d65e404fe6df5f772a32b" -"opencl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/\ -OpenCL-Registry#commit=932ed55c85f887041291cef8019e54280c033c35" -"opengl-registry::git+https://skia.googlesource.com/external/github.com/KhronosGroup/\ -OpenGL-Registry#commit=14b80ebeab022b2c78f84a573f01028c96075553" -"git+https://android.googlesource.com/platform/external/piex.git\ -#commit=bb217acdca1cc0c16b704669dd6f91a1b509c406" -"git+https://skia.googlesource.com/third_party/sdl\ -#commit=5d7cfcca344034aff9327f77fc181ae3754e7a90" -"git+https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git\ -#commit=b55ff303ea2f9e26702b514cf6a3196a2e3e2974" -"spirv-cross::git+https://chromium.googlesource.com/external/github.com/KhronosGroup/\ -SPIRV-Cross#commit=53ab2144b90abede33be5161aec5dfc94ddc3caf" -"spirv-headers::git+https://skia.googlesource.com/external/github.com/KhronosGroup/\ -SPIRV-Headers.git#commit=29c11140baaf9f7fdaa39a583672c556bf1795a1" -"spirv-tools::git+https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git\ -#commit=0c4feb643b89d1792b02f7cbef315e9d95633bd7" -"swiftshader::git+https://swiftshader.googlesource.com/SwiftShader\ -#commit=430def835f9f85d52f4a96db9b715cd9a7403c9c" -"git+https://skia.googlesource.com/external/github.com/google/wuffs.git\ -#commit=4080840928c0b05a80cda0d14ac2e2615f679f1a" -"git+https://chromium.googlesource.com/chromium/src/third_party/zlib\ -#commit=ea3ba903faac98b64b2bf8de5e98cd97b335a474" +"${pkgname}-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/\ +505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz" +"${pkgname}-common.tar.gz::https://skia.googlesource.com/common.git/+archive/\ +9737551d7a52c3db3262db5856e6bcd62c462b92.tar.gz" +"${pkgname}-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/\ +ee07cb317579dfda40dabb5d6d9c209e0e9e0643.tar.gz" +"${pkgname}-dawn.tar.gz::https://dawn.googlesource.com/dawn.git/+archive/\ +604072bc2ed01018eb03bcbbf9d94042f679af63.tar.gz" +"${pkgname}-dng_sdk.tar.gz::https://android.googlesource.com/platform/external/dng_sdk.git/\ ++archive/c8d0c9b1d16bfda56f15165d39e0ffa360a11123.tar.gz" +"${pkgname}-egl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup\ +/EGL-Registry/+archive/a0bca08de07c7d7651047bedc0b653cfaaa4f2ae.tar.gz" +"${pkgname}-expat.tar.gz::https://android.googlesource.com/platform/external/expat.git/+archive/\ +e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a.tar.gz" +"${pkgname}-freetype.tar.gz::https://skia.googlesource.com/third_party/freetype2.git/+archive/\ +0a3d2bb99b45b72e1d45185ab054efa993d97210.tar.gz" +"${pkgname}-harfbuzz.tar.gz::https://chromium.googlesource.com/external/github.com/harfbuzz/\ +harfbuzz.git/+archive/3a74ee528255cc027d84b204a87b5c25e47bff79.tar.gz" +"${pkgname}-icu.tar.gz::https://chromium.googlesource.com/chromium/deps/icu.git/+archive/\ +dbd3825b31041d782c5b504c59dcfb5ac7dda08c.tar.gz" +"${pkgname}-imgui.tar.gz::https://skia.googlesource.com/external/github.com/ocornut/imgui.git\ +/+archive/d38d7c6628bebd02692cfdd6fa76b4d992a35b75.tar.gz" +"${pkgname}-libgifcodec.tar.gz::https://skia.googlesource.com/libgifcodec/+archive/\ +38d9c73f49b861bb4a9829371ac311544b120023.tar.gz" +"${pkgname}-libjpeg-turbo.tar.gz::https://skia.googlesource.com/external/github.com/libjpeg-turbo\ +/libjpeg-turbo.git/+archive/574f3a772c96dc9db2c98ef24706feb3f6dbda9a.tar.gz" +"${pkgname}-libpng.tar.gz::https://skia.googlesource.com/third_party/libpng.git/+archive/\ +386707c6d19b974ca2e3db7f5c61873813c6fe44.tar.gz" +"${pkgname}-libwebp.tar.gz::https://chromium.googlesource.com/webm/libwebp.git/+archive/\ +0fe1a89dbf1930fc2554dbe76adad5d962054ead.tar.gz" +"${pkgname}-lua.tar.gz::https://skia.googlesource.com/external/github.com/lua/lua.git/+archive/\ +e354c6355e7f48e087678ec49e340ca0696725b1.tar.gz" +"${pkgname}-microhttpd.tar.gz::https://android.googlesource.com/platform/external/libmicrohttpd\ +/+archive/748945ec6f1c67b7efc934ab0808e1d32f2fb98d.tar.gz" +"${pkgname}-opencl-lib.tar.gz::https://skia.googlesource.com/external/github.com/GPUOpen-Tools/\ +common-lib-amd-APPSDK-3.0/+archive/4e6d30e406d2e5a65e1d65e404fe6df5f772a32b.tar.gz" +"${pkgname}-opencl-registry.tar.gz::https://skia.googlesource.com/external/github.com/\ +KhronosGroup/OpenCL-Registry/+archive/932ed55c85f887041291cef8019e54280c033c35.tar.gz" +"${pkgname}-opengl-registry.tar.gz::https://skia.googlesource.com/external/github.com/\ +KhronosGroup/OpenGL-Registry/+archive/14b80ebeab022b2c78f84a573f01028c96075553.tar.gz" +"${pkgname}-piex.tar.gz::https://android.googlesource.com/platform/external/piex.git/+archive/\ +bb217acdca1cc0c16b704669dd6f91a1b509c406.tar.gz" +"${pkgname}-sdl.tar.gz::https://skia.googlesource.com/third_party/sdl/+archive/\ +5d7cfcca344034aff9327f77fc181ae3754e7a90.tar.gz" +"${pkgname}-sfntly.tar.gz::https://chromium.googlesource.com/external/github.com/googlei18n/\ +sfntly.git/+archive/b55ff303ea2f9e26702b514cf6a3196a2e3e2974.tar.gz" +"${pkgname}-spirv-cross.tar.gz::https://chromium.googlesource.com/external/github.com/\ +KhronosGroup/SPIRV-Cross/+archive/53ab2144b90abede33be5161aec5dfc94ddc3caf.tar.gz" +"${pkgname}-spirv-headers.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/\ +SPIRV-Headers.git/+archive/29c11140baaf9f7fdaa39a583672c556bf1795a1.tar.gz" +"${pkgname}-spirv-tools.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup\ +/SPIRV-Tools.git/+archive/0c4feb643b89d1792b02f7cbef315e9d95633bd7.tar.gz" +"${pkgname}-swiftshader.tar.gz::https://swiftshader.googlesource.com/SwiftShader/+archive/\ +430def835f9f85d52f4a96db9b715cd9a7403c9c.tar.gz" +"${pkgname}-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git\ +/+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz" +"${pkgname}-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/\ +ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) +_gitsrc=("${source[@]:4:29}") +noextract=("${_gitsrc[@]%%::*}") sha256sums=('c5496ad159454b44e9b6c0f872553a192a7d20feeb6337a799c3f7009cdda558' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' + 'ea9192b75031f9bb15b039ca1c3d07d6e9f00a9b1d49c0d15cdda6725e348139' + 'ad9dad8c9d083da0f6493bf13db8640243b0deeadf24c8114551259af3f16815' + '8be8172d4e09e9457155df58288625e0bdb4dbc5da6f33a699969e0771c0d593' + '5fbf372e9815fe998b28d33e6c592886b44681165a661a71b9402985b2b3d809' + 'db13bb99db626669b297293303e95eb8cb1f3ef7069266d06fe2ddbc228cd20e' + 'e113aba9898c65a2449f23f3c1fdfce24bdc117c33bd9e77748cd015513822d3' + 'c0cb6ceae0270384e9d3445e1047cc2c2587ec6434781c4e3079c7a7874665ba' + '0ae3d6d84b249363cf62f0e829b2ec78f1188b02500f6a9327ad26b4b9b275e4' + 'af341d5d21fbbebf99f3b6da9ce4e211046b5d88fb3ec532299dfc1323cfe835' + '29641c234faf498b0741d4b85c70dbf9fdbbb642064c16c1d4d38c496cb09c25' + '66a5a43e1ca069e9882b1f9e5021d4a1ff816d29c69d51c0f5fdc06115441464' + 'c7a5154249cc1ca1921b09120ee79134b33904e528d9278e46fbc76bca64ecd3' + 'a7f6de90a69e54667bc36008977a95ef4e7334ecff6b0cd3ed2153e833979f1f' + 'da860b9869bd426f387dbf16037468faf8bb103f3fdf49a25d9e44e87e3bba30' + 'a1a1c7197cdf48ff747212db09da89ae0d35b52bdd7807b752f42ebfab801379' + '51562cb62e51b908ff8f977a8e1406acd056adeeaa8f65579e06653758b7d1f1' + 'da5e2e2383ed6cb09e65735587a3c5f8314b6274613881d1dd6114a442e48f91' + 'd2707e5056b70ae89099194c4088a4322dc1d4ab54ae21864df419091647c243' + 'e1864950d9c198a1882a4ba3cca1f0920bbf81df536e71580252dcdb70a6d169' + '67262e02cafa132a47294cf1f245c89510d5947d94ab2b7708cce7e0b1f63c26' + '65b69bb157f329efaeb7871f285b6ed2fa666b2cf119eca3697c97e4ca720be2' + '055a3d643bd95b997ff875a0a28b3f82c25e1e351cf6998cc4ba1bc6db0dbdce' + '938322aa1cf6de836454e1bf13215173fd8eec3107cea56d647b44a09b14286e' + 'c46de3453d5dc5ff9af5d539b8faec948f9da9d5a94cd232f1f7ec6c71229311' + '46a947e232322b40c3cf610fe87091857a70176fce702bdf9bc24b1b2659ce75' + '39ccfa6dcdd024a374fe6406514b97d5788b97ed8f850d8f6b9403877e1acd7c' + '484efea4dee57ecf432e64f704f5bf680c0567f2699719a96e4872ab3da5a780' + 'b4dd94e4fe7c86698abfa418f6ea2d2071ff20854baa51738057c6a855eab275' + '17188c5b17b8fd3565afc4f0f21dc42ed93ae4a94f15a111d66b21f661211ce3' 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2') prepare() { @@ -121,13 +126,19 @@ prepare() { # Install skia deps (essentially runs git-sync-deps with the files already downloaded) mkdir --parents --verbose skia/third_party/externals - ln --force --symbolic --verbose ../{buildtools,common} skia + for _dep in buildtools common + do + mkdir --parents --verbose "skia/${_dep}" + tar --verbose --extract --file "${pkgname}-${_dep}.tar.gz" --directory "skia/${_dep}" + done for _dep in angle2 dawn dng_sdk egl-registry expat freetype harfbuzz icu imgui opencl-registry \ libjpeg-turbo libpng libwebp lua microhttpd opencl-lib opengl-registry piex \ sdl sfntly spirv-cross spirv-headers spirv-tools swiftshader zlib wuffs do - ln --force --symbolic --verbose "../../../${_dep}" skia/third_party/externals + mkdir --parents --verbose "skia/third_party/externals/${_dep}" + tar --verbose --extract --file "${pkgname}-${_dep}.tar.gz" --directory \ + "skia/third_party/externals/${_dep}" done chmod u=rwx,g=rx,o=rx --verbose gn From a251c85db5223e61e906c2d83e5ef587b8b4669a Mon Sep 17 00:00:00 2001 From: rouhannb Date: Wed, 18 Nov 2020 03:50:42 -0500 Subject: [PATCH 067/154] Change googlesource tarball checksums to SKIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every time a tarball snapshot of a git repo is downloaded from googlesource, the files’ timestamps are set to the request time, meaning that it’s impossible to hash the raw files. --- .SRCINFO | 58 ++++++++++++++++++++++++++++---------------------------- PKGBUILD | 58 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cab95d1..07b7362 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -94,35 +94,35 @@ pkgbase = aseprite sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP - sha256sums = ea9192b75031f9bb15b039ca1c3d07d6e9f00a9b1d49c0d15cdda6725e348139 - sha256sums = ad9dad8c9d083da0f6493bf13db8640243b0deeadf24c8114551259af3f16815 - sha256sums = 8be8172d4e09e9457155df58288625e0bdb4dbc5da6f33a699969e0771c0d593 - sha256sums = 5fbf372e9815fe998b28d33e6c592886b44681165a661a71b9402985b2b3d809 - sha256sums = db13bb99db626669b297293303e95eb8cb1f3ef7069266d06fe2ddbc228cd20e - sha256sums = e113aba9898c65a2449f23f3c1fdfce24bdc117c33bd9e77748cd015513822d3 - sha256sums = c0cb6ceae0270384e9d3445e1047cc2c2587ec6434781c4e3079c7a7874665ba - sha256sums = 0ae3d6d84b249363cf62f0e829b2ec78f1188b02500f6a9327ad26b4b9b275e4 - sha256sums = af341d5d21fbbebf99f3b6da9ce4e211046b5d88fb3ec532299dfc1323cfe835 - sha256sums = 29641c234faf498b0741d4b85c70dbf9fdbbb642064c16c1d4d38c496cb09c25 - sha256sums = 66a5a43e1ca069e9882b1f9e5021d4a1ff816d29c69d51c0f5fdc06115441464 - sha256sums = c7a5154249cc1ca1921b09120ee79134b33904e528d9278e46fbc76bca64ecd3 - sha256sums = a7f6de90a69e54667bc36008977a95ef4e7334ecff6b0cd3ed2153e833979f1f - sha256sums = da860b9869bd426f387dbf16037468faf8bb103f3fdf49a25d9e44e87e3bba30 - sha256sums = a1a1c7197cdf48ff747212db09da89ae0d35b52bdd7807b752f42ebfab801379 - sha256sums = 51562cb62e51b908ff8f977a8e1406acd056adeeaa8f65579e06653758b7d1f1 - sha256sums = da5e2e2383ed6cb09e65735587a3c5f8314b6274613881d1dd6114a442e48f91 - sha256sums = d2707e5056b70ae89099194c4088a4322dc1d4ab54ae21864df419091647c243 - sha256sums = e1864950d9c198a1882a4ba3cca1f0920bbf81df536e71580252dcdb70a6d169 - sha256sums = 67262e02cafa132a47294cf1f245c89510d5947d94ab2b7708cce7e0b1f63c26 - sha256sums = 65b69bb157f329efaeb7871f285b6ed2fa666b2cf119eca3697c97e4ca720be2 - sha256sums = 055a3d643bd95b997ff875a0a28b3f82c25e1e351cf6998cc4ba1bc6db0dbdce - sha256sums = 938322aa1cf6de836454e1bf13215173fd8eec3107cea56d647b44a09b14286e - sha256sums = c46de3453d5dc5ff9af5d539b8faec948f9da9d5a94cd232f1f7ec6c71229311 - sha256sums = 46a947e232322b40c3cf610fe87091857a70176fce702bdf9bc24b1b2659ce75 - sha256sums = 39ccfa6dcdd024a374fe6406514b97d5788b97ed8f850d8f6b9403877e1acd7c - sha256sums = 484efea4dee57ecf432e64f704f5bf680c0567f2699719a96e4872ab3da5a780 - sha256sums = b4dd94e4fe7c86698abfa418f6ea2d2071ff20854baa51738057c6a855eab275 - sha256sums = 17188c5b17b8fd3565afc4f0f21dc42ed93ae4a94f15a111d66b21f661211ce3 + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index b79d65e..7580c27 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -89,35 +89,35 @@ sha256sums=('c5496ad159454b44e9b6c0f872553a192a7d20feeb6337a799c3f7009cdda558' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' - 'ea9192b75031f9bb15b039ca1c3d07d6e9f00a9b1d49c0d15cdda6725e348139' - 'ad9dad8c9d083da0f6493bf13db8640243b0deeadf24c8114551259af3f16815' - '8be8172d4e09e9457155df58288625e0bdb4dbc5da6f33a699969e0771c0d593' - '5fbf372e9815fe998b28d33e6c592886b44681165a661a71b9402985b2b3d809' - 'db13bb99db626669b297293303e95eb8cb1f3ef7069266d06fe2ddbc228cd20e' - 'e113aba9898c65a2449f23f3c1fdfce24bdc117c33bd9e77748cd015513822d3' - 'c0cb6ceae0270384e9d3445e1047cc2c2587ec6434781c4e3079c7a7874665ba' - '0ae3d6d84b249363cf62f0e829b2ec78f1188b02500f6a9327ad26b4b9b275e4' - 'af341d5d21fbbebf99f3b6da9ce4e211046b5d88fb3ec532299dfc1323cfe835' - '29641c234faf498b0741d4b85c70dbf9fdbbb642064c16c1d4d38c496cb09c25' - '66a5a43e1ca069e9882b1f9e5021d4a1ff816d29c69d51c0f5fdc06115441464' - 'c7a5154249cc1ca1921b09120ee79134b33904e528d9278e46fbc76bca64ecd3' - 'a7f6de90a69e54667bc36008977a95ef4e7334ecff6b0cd3ed2153e833979f1f' - 'da860b9869bd426f387dbf16037468faf8bb103f3fdf49a25d9e44e87e3bba30' - 'a1a1c7197cdf48ff747212db09da89ae0d35b52bdd7807b752f42ebfab801379' - '51562cb62e51b908ff8f977a8e1406acd056adeeaa8f65579e06653758b7d1f1' - 'da5e2e2383ed6cb09e65735587a3c5f8314b6274613881d1dd6114a442e48f91' - 'd2707e5056b70ae89099194c4088a4322dc1d4ab54ae21864df419091647c243' - 'e1864950d9c198a1882a4ba3cca1f0920bbf81df536e71580252dcdb70a6d169' - '67262e02cafa132a47294cf1f245c89510d5947d94ab2b7708cce7e0b1f63c26' - '65b69bb157f329efaeb7871f285b6ed2fa666b2cf119eca3697c97e4ca720be2' - '055a3d643bd95b997ff875a0a28b3f82c25e1e351cf6998cc4ba1bc6db0dbdce' - '938322aa1cf6de836454e1bf13215173fd8eec3107cea56d647b44a09b14286e' - 'c46de3453d5dc5ff9af5d539b8faec948f9da9d5a94cd232f1f7ec6c71229311' - '46a947e232322b40c3cf610fe87091857a70176fce702bdf9bc24b1b2659ce75' - '39ccfa6dcdd024a374fe6406514b97d5788b97ed8f850d8f6b9403877e1acd7c' - '484efea4dee57ecf432e64f704f5bf680c0567f2699719a96e4872ab3da5a780' - 'b4dd94e4fe7c86698abfa418f6ea2d2071ff20854baa51738057c6a855eab275' - '17188c5b17b8fd3565afc4f0f21dc42ed93ae4a94f15a111d66b21f661211ce3' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2') prepare() { From cfffd018ed9cb2a315be8105fa4698ccfce61133 Mon Sep 17 00:00:00 2001 From: rouhannb Date: Tue, 20 Apr 2021 09:30:21 -0400 Subject: [PATCH 068/154] Update to v1.2.27, add Python 3 to makedepends --- .SRCINFO | 7 ++++--- PKGBUILD | 8 ++++---- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 07b7362..d98c6ca 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.25 + pkgver = 1.2.27 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -9,6 +9,7 @@ pkgbase = aseprite makedepends = ninja makedepends = git makedepends = python2 + makedepends = python makedepends = freeglut makedepends = xorgproto makedepends = libxi @@ -56,7 +57,7 @@ pkgbase = aseprite noextract = aseprite-swiftshader.tar.gz noextract = aseprite-wuffs.tar.gz noextract = aseprite-zlib.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.2.25/Aseprite-v1.2.25-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.27/Aseprite-v1.2.27-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 @@ -90,7 +91,7 @@ pkgbase = aseprite source = aseprite-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git/+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz source = aseprite-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = c5496ad159454b44e9b6c0f872553a192a7d20feeb6337a799c3f7009cdda558 + sha256sums = 541a5c561fe7481cfb6aec80ecc9a8435d8387325ba30c9e3116c3c76ef539d7 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index 7580c27..90e5bc9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,13 +1,13 @@ # Maintainer: Fredrick Brennan # Maintainer: Andrew Bueide -# Maintainer: rouhannb +# Maintainer: rouhannb # Contributor: Wilson E. Alvarez # Contributor: Benoit Favre # Contributor: Alexander Rødseth # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.25 +pkgver=1.2.27 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -15,7 +15,7 @@ url="http://www.aseprite.org/" license=('custom') depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'freetype2' 'fontconfig' 'libxcursor' 'hicolor-icon-theme') -makedepends=('cmake' 'ninja' 'git' 'python2' 'freeglut' 'xorgproto' 'libxi' 'harfbuzz-icu' +makedepends=('cmake' 'ninja' 'git' 'python2' 'python' 'freeglut' 'xorgproto' 'libxi' 'harfbuzz-icu' 'nettle') conflicts=("aseprite-git" "aseprite-gpl" "skia-git") source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ @@ -85,7 +85,7 @@ ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz" ) _gitsrc=("${source[@]:4:29}") noextract=("${_gitsrc[@]%%::*}") -sha256sums=('c5496ad159454b44e9b6c0f872553a192a7d20feeb6337a799c3f7009cdda558' +sha256sums=('541a5c561fe7481cfb6aec80ecc9a8435d8387325ba30c9e3116c3c76ef539d7' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' From 7fb517544ce2663f01a62ebee6a7d9aa6e360211 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Tue, 28 Dec 2021 14:31:21 -0800 Subject: [PATCH 069/154] Updated to v1.2.30. I have no idea what the original maintainers where doing, so I just bumped aseprite to v1.2.30 and skia to `aseprite-m96` --- .SRCINFO | 67 ++++++++++++++++++++++++++-------------------------- PKGBUILD | 71 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d98c6ca..0a38c78 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.27 + pkgver = 1.2.30 pkgrel = 1 url = http://www.aseprite.org/ arch = x86_64 @@ -57,10 +57,10 @@ pkgbase = aseprite noextract = aseprite-swiftshader.tar.gz noextract = aseprite-wuffs.tar.gz noextract = aseprite-zlib.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.2.27/Aseprite-v1.2.27-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.30/Aseprite-v1.2.30-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git - source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 + source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = aseprite-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz source = aseprite-common.tar.gz::https://skia.googlesource.com/common.git/+archive/9737551d7a52c3db3262db5856e6bcd62c462b92.tar.gz source = aseprite-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/ee07cb317579dfda40dabb5d6d9c209e0e9e0643.tar.gz @@ -91,40 +91,39 @@ pkgbase = aseprite source = aseprite-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git/+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz source = aseprite-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 - sha256sums = 541a5c561fe7481cfb6aec80ecc9a8435d8387325ba30c9e3116c3c76ef539d7 + sha256sums = 9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP + sha256sums = 23594f876b7f29555999d2f9aa2058e6ae1ece4fb720cdd0292c639c693694d6 + sha256sums = bbdd106ac79d31f42ba80b1286b7a4c1cbae7cac12725786d664db7c255957c2 + sha256sums = d928ac40fee155edf1cf823d57ce559786ff9f2c3dda7e83a857132ab545ed06 + sha256sums = 59957d0753ecf327c9f66b3009a908505f38d672637bf4d0c4ee0141e8bdd17a + sha256sums = 75b7fd8c6351b0c51f866d3defefe0266c27e1b593e1ba5cded546376431b09b + sha256sums = ca6f81ccc155144fbf2d168d596a71d254fc18738e0702a82f68974bd4e839e2 + sha256sums = ad256da64e2beca4f49ef02a39146f4f73d89d160eabf8b0eb8fce6cb8d606e4 + sha256sums = ff369316b724ced12280be18398a3600d4e2c2a581ec425180cc5b47a3e1d02a + sha256sums = ff8bc5c39d0a2db4b81501a693e91427d97200e88d2940ddbfb5df13677cde56 + sha256sums = c1f69fa10880cfce79480c7b7f4b968c116e04c942c7d12a0f68fdd94484e9d4 + sha256sums = 4678c9a24079f601abc7a4299009465fe65c60fd67c243532ece674bd2e16ada + sha256sums = 1ebf59f258299728962612b0c0d91caa2d0b66f60402792445b6ca1cac82e147 + sha256sums = 7f9e63d4ba3610698add3556455086173605957a8e9fa59ebcc4804cbdcff047 + sha256sums = bc31921c8bd1af7015657846d21498c665b9094bac8984d903dac273c3d9323e + sha256sums = cb1856e3c77b6d26ce3e8de648ba657418e289203e7f8f99a9f6a581ad6af93e + sha256sums = bf24eb0dccd631d5752f60ee3076c6102198d636655a929c5708aa61918d43a9 + sha256sums = 82c778de66817b8b96f3bbd8447b2bca429761d7e9de4d59158bec7ce33031e2 + sha256sums = ca9a80bb352c65caf62a9a08c3737bea5c4e6c836bd89d25e311c36620fb1b9e + sha256sums = f4f79c84ccc4de73ac7e8aa08f9ff47c5bfbab01b79889917b9f1ffa3bdb19df + sha256sums = f625e848d0fc137703efbbb5592e76b44e95332bc65acc67485b9855ffbc56fc + sha256sums = 86e43c39de644ff66ca02feeee144aa3a9654cf1bd59e186952fc75885d0edb5 + sha256sums = 618ce44921ddac4add337829f1b314388f5feedbc563a897b9c766c900b5e170 + sha256sums = cfa961a45b62689aef775456075cb2d1440d58d78d6b0874f361fcf7b768b021 + sha256sums = 2d26bf7a01cc69271b07971162c648a2da55308c65fe300ec93356cba9fe1b2f + sha256sums = d9c642324328b376a34ed01058af5b6fae3c2a8d7736300551227ee6335e439f + sha256sums = 4cc0cdf2d707ce3edc846fcaf516caea45ea6baafb4077d043660b91ee91b3aa + sha256sums = 34294532feba98c460721117ffb18a6c5584f7c48823ccc58109abd1bf2c7c45 + sha256sums = fcd29d69245483da000d6b162caccf0607b58dc06b77a5c79ad64403730f47e8 + sha256sums = 6280ed3515504fd9b64ce6f9fdedfcc49316dd56466726797fb80db0599be074 sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 pkgname = aseprite - diff --git a/PKGBUILD b/PKGBUILD index 90e5bc9..a13a1ff 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,13 +1,14 @@ -# Maintainer: Fredrick Brennan -# Maintainer: Andrew Bueide -# Maintainer: rouhannb +# Maintainer: Imperator Storm <30777770+ImperatorStorm@users.noreply.github.com> +# Contributor: Fredrick Brennan +# Contributor: Andrew Bueide +# Contributor: rouhannb # Contributor: Wilson E. Alvarez # Contributor: Benoit Favre # Contributor: Alexander Rødseth # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.27 +pkgver=1.2.30 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -22,7 +23,7 @@ source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/$ v${pkgver}-Source.zip" "${pkgname}.desktop" "git+https://chromium.googlesource.com/chromium/tools/depot_tools.git" -"git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m81" +"git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m96" "${pkgname}-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/\ 505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz" "${pkgname}-common.tar.gz::https://skia.googlesource.com/common.git/+archive/\ @@ -85,39 +86,39 @@ ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz" ) _gitsrc=("${source[@]:4:29}") noextract=("${_gitsrc[@]%%::*}") -sha256sums=('541a5c561fe7481cfb6aec80ecc9a8435d8387325ba30c9e3116c3c76ef539d7' +sha256sums=('9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' + '23594f876b7f29555999d2f9aa2058e6ae1ece4fb720cdd0292c639c693694d6' + 'bbdd106ac79d31f42ba80b1286b7a4c1cbae7cac12725786d664db7c255957c2' + 'd928ac40fee155edf1cf823d57ce559786ff9f2c3dda7e83a857132ab545ed06' + '59957d0753ecf327c9f66b3009a908505f38d672637bf4d0c4ee0141e8bdd17a' + '75b7fd8c6351b0c51f866d3defefe0266c27e1b593e1ba5cded546376431b09b' + 'ca6f81ccc155144fbf2d168d596a71d254fc18738e0702a82f68974bd4e839e2' + 'ad256da64e2beca4f49ef02a39146f4f73d89d160eabf8b0eb8fce6cb8d606e4' + 'ff369316b724ced12280be18398a3600d4e2c2a581ec425180cc5b47a3e1d02a' + 'ff8bc5c39d0a2db4b81501a693e91427d97200e88d2940ddbfb5df13677cde56' + 'c1f69fa10880cfce79480c7b7f4b968c116e04c942c7d12a0f68fdd94484e9d4' + '4678c9a24079f601abc7a4299009465fe65c60fd67c243532ece674bd2e16ada' + '1ebf59f258299728962612b0c0d91caa2d0b66f60402792445b6ca1cac82e147' + '7f9e63d4ba3610698add3556455086173605957a8e9fa59ebcc4804cbdcff047' + 'bc31921c8bd1af7015657846d21498c665b9094bac8984d903dac273c3d9323e' + 'cb1856e3c77b6d26ce3e8de648ba657418e289203e7f8f99a9f6a581ad6af93e' + 'bf24eb0dccd631d5752f60ee3076c6102198d636655a929c5708aa61918d43a9' + '82c778de66817b8b96f3bbd8447b2bca429761d7e9de4d59158bec7ce33031e2' + 'ca9a80bb352c65caf62a9a08c3737bea5c4e6c836bd89d25e311c36620fb1b9e' + 'f4f79c84ccc4de73ac7e8aa08f9ff47c5bfbab01b79889917b9f1ffa3bdb19df' + 'f625e848d0fc137703efbbb5592e76b44e95332bc65acc67485b9855ffbc56fc' + '86e43c39de644ff66ca02feeee144aa3a9654cf1bd59e186952fc75885d0edb5' + '618ce44921ddac4add337829f1b314388f5feedbc563a897b9c766c900b5e170' + 'cfa961a45b62689aef775456075cb2d1440d58d78d6b0874f361fcf7b768b021' + '2d26bf7a01cc69271b07971162c648a2da55308c65fe300ec93356cba9fe1b2f' + 'd9c642324328b376a34ed01058af5b6fae3c2a8d7736300551227ee6335e439f' + '4cc0cdf2d707ce3edc846fcaf516caea45ea6baafb4077d043660b91ee91b3aa' + '34294532feba98c460721117ffb18a6c5584f7c48823ccc58109abd1bf2c7c45' + 'fcd29d69245483da000d6b162caccf0607b58dc06b77a5c79ad64403730f47e8' + '6280ed3515504fd9b64ce6f9fdedfcc49316dd56466726797fb80db0599be074' 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2') prepare() { From 42407660dfcc9b0fd5db41308d6737cf5a770b16 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Thu, 30 Dec 2021 11:56:21 -0800 Subject: [PATCH 070/154] Fixed incorrect checksums and downgraded skia to m81, as aseprite v1.2.30 requires m81, not m96 --- .SRCINFO | 176 +++++++++++++++++++++++++++---------------------------- PKGBUILD | 122 +++++++++++++++++++------------------- 2 files changed, 149 insertions(+), 149 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0a38c78..47b6b95 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -28,102 +28,102 @@ pkgbase = aseprite conflicts = aseprite-git conflicts = aseprite-gpl conflicts = skia-git - noextract = aseprite-buildtools.tar.gz - noextract = aseprite-common.tar.gz - noextract = aseprite-angle2.tar.gz - noextract = aseprite-dawn.tar.gz - noextract = aseprite-dng_sdk.tar.gz - noextract = aseprite-egl-registry.tar.gz - noextract = aseprite-expat.tar.gz - noextract = aseprite-freetype.tar.gz - noextract = aseprite-harfbuzz.tar.gz - noextract = aseprite-icu.tar.gz - noextract = aseprite-imgui.tar.gz - noextract = aseprite-libgifcodec.tar.gz - noextract = aseprite-libjpeg-turbo.tar.gz - noextract = aseprite-libpng.tar.gz - noextract = aseprite-libwebp.tar.gz - noextract = aseprite-lua.tar.gz - noextract = aseprite-microhttpd.tar.gz - noextract = aseprite-opencl-lib.tar.gz - noextract = aseprite-opencl-registry.tar.gz - noextract = aseprite-opengl-registry.tar.gz - noextract = aseprite-piex.tar.gz - noextract = aseprite-sdl.tar.gz - noextract = aseprite-sfntly.tar.gz - noextract = aseprite-spirv-cross.tar.gz - noextract = aseprite-spirv-headers.tar.gz - noextract = aseprite-spirv-tools.tar.gz - noextract = aseprite-swiftshader.tar.gz - noextract = aseprite-wuffs.tar.gz - noextract = aseprite-zlib.tar.gz + noextract = aseprite-1.2.30-buildtools.tar.gz + noextract = aseprite-1.2.30-common.tar.gz + noextract = aseprite-1.2.30-angle2.tar.gz + noextract = aseprite-1.2.30-dawn.tar.gz + noextract = aseprite-1.2.30-dng_sdk.tar.gz + noextract = aseprite-1.2.30-egl-registry.tar.gz + noextract = aseprite-1.2.30-expat.tar.gz + noextract = aseprite-1.2.30-freetype.tar.gz + noextract = aseprite-1.2.30-harfbuzz.tar.gz + noextract = aseprite-1.2.30-icu.tar.gz + noextract = aseprite-1.2.30-imgui.tar.gz + noextract = aseprite-1.2.30-libgifcodec.tar.gz + noextract = aseprite-1.2.30-libjpeg-turbo.tar.gz + noextract = aseprite-1.2.30-libpng.tar.gz + noextract = aseprite-1.2.30-libwebp.tar.gz + noextract = aseprite-1.2.30-lua.tar.gz + noextract = aseprite-1.2.30-microhttpd.tar.gz + noextract = aseprite-1.2.30-opencl-lib.tar.gz + noextract = aseprite-1.2.30-opencl-registry.tar.gz + noextract = aseprite-1.2.30-opengl-registry.tar.gz + noextract = aseprite-1.2.30-piex.tar.gz + noextract = aseprite-1.2.30-sdl.tar.gz + noextract = aseprite-1.2.30-sfntly.tar.gz + noextract = aseprite-1.2.30-spirv-cross.tar.gz + noextract = aseprite-1.2.30-spirv-headers.tar.gz + noextract = aseprite-1.2.30-spirv-tools.tar.gz + noextract = aseprite-1.2.30-swiftshader.tar.gz + noextract = aseprite-1.2.30-wuffs.tar.gz + noextract = aseprite-1.2.30-zlib.tar.gz source = https://github.com/aseprite/aseprite/releases/download/v1.2.30/Aseprite-v1.2.30-Source.zip source = aseprite.desktop source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git - source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 - source = aseprite-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz - source = aseprite-common.tar.gz::https://skia.googlesource.com/common.git/+archive/9737551d7a52c3db3262db5856e6bcd62c462b92.tar.gz - source = aseprite-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/ee07cb317579dfda40dabb5d6d9c209e0e9e0643.tar.gz - source = aseprite-dawn.tar.gz::https://dawn.googlesource.com/dawn.git/+archive/604072bc2ed01018eb03bcbbf9d94042f679af63.tar.gz - source = aseprite-dng_sdk.tar.gz::https://android.googlesource.com/platform/external/dng_sdk.git/+archive/c8d0c9b1d16bfda56f15165d39e0ffa360a11123.tar.gz - source = aseprite-egl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry/+archive/a0bca08de07c7d7651047bedc0b653cfaaa4f2ae.tar.gz - source = aseprite-expat.tar.gz::https://android.googlesource.com/platform/external/expat.git/+archive/e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a.tar.gz - source = aseprite-freetype.tar.gz::https://skia.googlesource.com/third_party/freetype2.git/+archive/0a3d2bb99b45b72e1d45185ab054efa993d97210.tar.gz - source = aseprite-harfbuzz.tar.gz::https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+archive/3a74ee528255cc027d84b204a87b5c25e47bff79.tar.gz - source = aseprite-icu.tar.gz::https://chromium.googlesource.com/chromium/deps/icu.git/+archive/dbd3825b31041d782c5b504c59dcfb5ac7dda08c.tar.gz - source = aseprite-imgui.tar.gz::https://skia.googlesource.com/external/github.com/ocornut/imgui.git/+archive/d38d7c6628bebd02692cfdd6fa76b4d992a35b75.tar.gz - source = aseprite-libgifcodec.tar.gz::https://skia.googlesource.com/libgifcodec/+archive/38d9c73f49b861bb4a9829371ac311544b120023.tar.gz - source = aseprite-libjpeg-turbo.tar.gz::https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git/+archive/574f3a772c96dc9db2c98ef24706feb3f6dbda9a.tar.gz - source = aseprite-libpng.tar.gz::https://skia.googlesource.com/third_party/libpng.git/+archive/386707c6d19b974ca2e3db7f5c61873813c6fe44.tar.gz - source = aseprite-libwebp.tar.gz::https://chromium.googlesource.com/webm/libwebp.git/+archive/0fe1a89dbf1930fc2554dbe76adad5d962054ead.tar.gz - source = aseprite-lua.tar.gz::https://skia.googlesource.com/external/github.com/lua/lua.git/+archive/e354c6355e7f48e087678ec49e340ca0696725b1.tar.gz - source = aseprite-microhttpd.tar.gz::https://android.googlesource.com/platform/external/libmicrohttpd/+archive/748945ec6f1c67b7efc934ab0808e1d32f2fb98d.tar.gz - source = aseprite-opencl-lib.tar.gz::https://skia.googlesource.com/external/github.com/GPUOpen-Tools/common-lib-amd-APPSDK-3.0/+archive/4e6d30e406d2e5a65e1d65e404fe6df5f772a32b.tar.gz - source = aseprite-opencl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/OpenCL-Registry/+archive/932ed55c85f887041291cef8019e54280c033c35.tar.gz - source = aseprite-opengl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry/+archive/14b80ebeab022b2c78f84a573f01028c96075553.tar.gz - source = aseprite-piex.tar.gz::https://android.googlesource.com/platform/external/piex.git/+archive/bb217acdca1cc0c16b704669dd6f91a1b509c406.tar.gz - source = aseprite-sdl.tar.gz::https://skia.googlesource.com/third_party/sdl/+archive/5d7cfcca344034aff9327f77fc181ae3754e7a90.tar.gz - source = aseprite-sfntly.tar.gz::https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git/+archive/b55ff303ea2f9e26702b514cf6a3196a2e3e2974.tar.gz - source = aseprite-spirv-cross.tar.gz::https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross/+archive/53ab2144b90abede33be5161aec5dfc94ddc3caf.tar.gz - source = aseprite-spirv-headers.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git/+archive/29c11140baaf9f7fdaa39a583672c556bf1795a1.tar.gz - source = aseprite-spirv-tools.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+archive/0c4feb643b89d1792b02f7cbef315e9d95633bd7.tar.gz - source = aseprite-swiftshader.tar.gz::https://swiftshader.googlesource.com/SwiftShader/+archive/430def835f9f85d52f4a96db9b715cd9a7403c9c.tar.gz - source = aseprite-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git/+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz - source = aseprite-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz + source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 + source = aseprite-1.2.30-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz + source = aseprite-1.2.30-common.tar.gz::https://skia.googlesource.com/common.git/+archive/9737551d7a52c3db3262db5856e6bcd62c462b92.tar.gz + source = aseprite-1.2.30-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/ee07cb317579dfda40dabb5d6d9c209e0e9e0643.tar.gz + source = aseprite-1.2.30-dawn.tar.gz::https://dawn.googlesource.com/dawn.git/+archive/604072bc2ed01018eb03bcbbf9d94042f679af63.tar.gz + source = aseprite-1.2.30-dng_sdk.tar.gz::https://android.googlesource.com/platform/external/dng_sdk.git/+archive/c8d0c9b1d16bfda56f15165d39e0ffa360a11123.tar.gz + source = aseprite-1.2.30-egl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry/+archive/a0bca08de07c7d7651047bedc0b653cfaaa4f2ae.tar.gz + source = aseprite-1.2.30-expat.tar.gz::https://android.googlesource.com/platform/external/expat.git/+archive/e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a.tar.gz + source = aseprite-1.2.30-freetype.tar.gz::https://skia.googlesource.com/third_party/freetype2.git/+archive/0a3d2bb99b45b72e1d45185ab054efa993d97210.tar.gz + source = aseprite-1.2.30-harfbuzz.tar.gz::https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+archive/3a74ee528255cc027d84b204a87b5c25e47bff79.tar.gz + source = aseprite-1.2.30-icu.tar.gz::https://chromium.googlesource.com/chromium/deps/icu.git/+archive/dbd3825b31041d782c5b504c59dcfb5ac7dda08c.tar.gz + source = aseprite-1.2.30-imgui.tar.gz::https://skia.googlesource.com/external/github.com/ocornut/imgui.git/+archive/d38d7c6628bebd02692cfdd6fa76b4d992a35b75.tar.gz + source = aseprite-1.2.30-libgifcodec.tar.gz::https://skia.googlesource.com/libgifcodec/+archive/38d9c73f49b861bb4a9829371ac311544b120023.tar.gz + source = aseprite-1.2.30-libjpeg-turbo.tar.gz::https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git/+archive/574f3a772c96dc9db2c98ef24706feb3f6dbda9a.tar.gz + source = aseprite-1.2.30-libpng.tar.gz::https://skia.googlesource.com/third_party/libpng.git/+archive/386707c6d19b974ca2e3db7f5c61873813c6fe44.tar.gz + source = aseprite-1.2.30-libwebp.tar.gz::https://chromium.googlesource.com/webm/libwebp.git/+archive/0fe1a89dbf1930fc2554dbe76adad5d962054ead.tar.gz + source = aseprite-1.2.30-lua.tar.gz::https://skia.googlesource.com/external/github.com/lua/lua.git/+archive/e354c6355e7f48e087678ec49e340ca0696725b1.tar.gz + source = aseprite-1.2.30-microhttpd.tar.gz::https://android.googlesource.com/platform/external/libmicrohttpd/+archive/748945ec6f1c67b7efc934ab0808e1d32f2fb98d.tar.gz + source = aseprite-1.2.30-opencl-lib.tar.gz::https://skia.googlesource.com/external/github.com/GPUOpen-Tools/common-lib-amd-APPSDK-3.0/+archive/4e6d30e406d2e5a65e1d65e404fe6df5f772a32b.tar.gz + source = aseprite-1.2.30-opencl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/OpenCL-Registry/+archive/932ed55c85f887041291cef8019e54280c033c35.tar.gz + source = aseprite-1.2.30-opengl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry/+archive/14b80ebeab022b2c78f84a573f01028c96075553.tar.gz + source = aseprite-1.2.30-piex.tar.gz::https://android.googlesource.com/platform/external/piex.git/+archive/bb217acdca1cc0c16b704669dd6f91a1b509c406.tar.gz + source = aseprite-1.2.30-sdl.tar.gz::https://skia.googlesource.com/third_party/sdl/+archive/5d7cfcca344034aff9327f77fc181ae3754e7a90.tar.gz + source = aseprite-1.2.30-sfntly.tar.gz::https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git/+archive/b55ff303ea2f9e26702b514cf6a3196a2e3e2974.tar.gz + source = aseprite-1.2.30-spirv-cross.tar.gz::https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross/+archive/53ab2144b90abede33be5161aec5dfc94ddc3caf.tar.gz + source = aseprite-1.2.30-spirv-headers.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git/+archive/29c11140baaf9f7fdaa39a583672c556bf1795a1.tar.gz + source = aseprite-1.2.30-spirv-tools.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+archive/0c4feb643b89d1792b02f7cbef315e9d95633bd7.tar.gz + source = aseprite-1.2.30-swiftshader.tar.gz::https://swiftshader.googlesource.com/SwiftShader/+archive/430def835f9f85d52f4a96db9b715cd9a7403c9c.tar.gz + source = aseprite-1.2.30-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git/+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz + source = aseprite-1.2.30-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 sha256sums = 9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874 sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP - sha256sums = 23594f876b7f29555999d2f9aa2058e6ae1ece4fb720cdd0292c639c693694d6 - sha256sums = bbdd106ac79d31f42ba80b1286b7a4c1cbae7cac12725786d664db7c255957c2 - sha256sums = d928ac40fee155edf1cf823d57ce559786ff9f2c3dda7e83a857132ab545ed06 - sha256sums = 59957d0753ecf327c9f66b3009a908505f38d672637bf4d0c4ee0141e8bdd17a - sha256sums = 75b7fd8c6351b0c51f866d3defefe0266c27e1b593e1ba5cded546376431b09b - sha256sums = ca6f81ccc155144fbf2d168d596a71d254fc18738e0702a82f68974bd4e839e2 - sha256sums = ad256da64e2beca4f49ef02a39146f4f73d89d160eabf8b0eb8fce6cb8d606e4 - sha256sums = ff369316b724ced12280be18398a3600d4e2c2a581ec425180cc5b47a3e1d02a - sha256sums = ff8bc5c39d0a2db4b81501a693e91427d97200e88d2940ddbfb5df13677cde56 - sha256sums = c1f69fa10880cfce79480c7b7f4b968c116e04c942c7d12a0f68fdd94484e9d4 - sha256sums = 4678c9a24079f601abc7a4299009465fe65c60fd67c243532ece674bd2e16ada - sha256sums = 1ebf59f258299728962612b0c0d91caa2d0b66f60402792445b6ca1cac82e147 - sha256sums = 7f9e63d4ba3610698add3556455086173605957a8e9fa59ebcc4804cbdcff047 - sha256sums = bc31921c8bd1af7015657846d21498c665b9094bac8984d903dac273c3d9323e - sha256sums = cb1856e3c77b6d26ce3e8de648ba657418e289203e7f8f99a9f6a581ad6af93e - sha256sums = bf24eb0dccd631d5752f60ee3076c6102198d636655a929c5708aa61918d43a9 - sha256sums = 82c778de66817b8b96f3bbd8447b2bca429761d7e9de4d59158bec7ce33031e2 - sha256sums = ca9a80bb352c65caf62a9a08c3737bea5c4e6c836bd89d25e311c36620fb1b9e - sha256sums = f4f79c84ccc4de73ac7e8aa08f9ff47c5bfbab01b79889917b9f1ffa3bdb19df - sha256sums = f625e848d0fc137703efbbb5592e76b44e95332bc65acc67485b9855ffbc56fc - sha256sums = 86e43c39de644ff66ca02feeee144aa3a9654cf1bd59e186952fc75885d0edb5 - sha256sums = 618ce44921ddac4add337829f1b314388f5feedbc563a897b9c766c900b5e170 - sha256sums = cfa961a45b62689aef775456075cb2d1440d58d78d6b0874f361fcf7b768b021 - sha256sums = 2d26bf7a01cc69271b07971162c648a2da55308c65fe300ec93356cba9fe1b2f - sha256sums = d9c642324328b376a34ed01058af5b6fae3c2a8d7736300551227ee6335e439f - sha256sums = 4cc0cdf2d707ce3edc846fcaf516caea45ea6baafb4077d043660b91ee91b3aa - sha256sums = 34294532feba98c460721117ffb18a6c5584f7c48823ccc58109abd1bf2c7c45 - sha256sums = fcd29d69245483da000d6b162caccf0607b58dc06b77a5c79ad64403730f47e8 - sha256sums = 6280ed3515504fd9b64ce6f9fdedfcc49316dd56466726797fb80db0599be074 + sha256sums = 519c6cb4c9848d0d264199ffa1cf0db1f54801d73761f7154eb234da59938336 + sha256sums = aa24de5def12a7fdce55fed1597f8963e0b0a53edee80cf4ebf948cb67f85cba + sha256sums = bbd7ea3cd967cef781c9c9d21e0ee669c7b295d4a5b970db4fb3458f667e722a + sha256sums = fb5ea8819605873837820d2fc8e918f63f0563ce5909887418327b2135d7abc8 + sha256sums = 24de65063315ace8a576deddc899c7f39cd1e203d343b6e50930235bd276f37d + sha256sums = 576f3b2bafa98b2c1bbaf62240c3caf797d9e1844e9ce13e5047564f6351cdb8 + sha256sums = 1495e9d046e52cdfd1fc984e1d88dfcc1f9632f67f33352192711104c704d730 + sha256sums = ec5e7d646bc1971bd3ac93518b2b2d29feef579f7becd4f9d9b81a6a0a03e532 + sha256sums = c4db4e9f64dbbb4fd4dec253550912937a1e1a1668534f631eb37903fb923fc7 + sha256sums = 5e029fc50628fd5749b6fd901dd1cac7c4f92a3a9db2431b4306b1bbcff5aec5 + sha256sums = 0d237fea0d5dcb5dbfeeff6109980cea2ac58e2c10727147684356719f8c5de6 + sha256sums = c0fdfb263bcc12c7fb6eafec55f0d1fd8383c37c3b1e4eb4596748214ffed093 + sha256sums = e7fed969dd5bf83d1269ad73fbc189aead42fb4f32b2f4ddee2cb46affaa2155 + sha256sums = 6a5ec5804d3bc49ea79acce95a8ca36720842b83f15a368e2f98503d354b3dac + sha256sums = 152f67d21ba8765d16d8b8470879054a3a06e9185b9fadefe4853954642cc0ed + sha256sums = 4278b14776b9a09d85a91ebbb4af6b02df964f888ef33b2691164365bb82398f + sha256sums = 7515a68210b87d67c2919dac25ccf88f6a1da7a903b84951481e3a6f3f13f01b + sha256sums = e5c9cbcd367c5b2d2ac3e6c90ec987d0aa55b82f17077af328751a6a9bac30c9 + sha256sums = 6cebe18d357122853914b9fc3c13e0a221e2da19312d9745b41bf0042cc87310 + sha256sums = 23d27a0ebe16b795e9733caa4a6fdc25089ced37556a9af0d21c6d13aa18f691 + sha256sums = e8f7ed6ca96d34235eb0ad427ff947e6f21d5d5a39f06e14bdc6473a40a06cf4 + sha256sums = dc783398daf21f2c66fb791f61a3e92547851fd841059a5a39912396b1e0f1ac + sha256sums = 823dc6115a2749dc69e8f6e5afb0deca15ee8851cb36168cf2cca131b5201455 + sha256sums = 8d68986e51a55daa8ff196e83cb45fd05f7444bc1b7ce8dc380bdd45a070d256 + sha256sums = 7a1c9d0118e24ca68f48260129cee9bf610ec0319928ccfc19d173132ca75d93 + sha256sums = a007a25eb9f274f30082e4186f1f69bddea55ce7ac61f87215ad1865a16c49ce + sha256sums = fcd7aee8e452bfad434abdb3dfcaac2021184b16f43e26261cdc022e668b4ec0 + sha256sums = 59889d07c504160a2320d4f95454e7bf53fa1d6543239d1160f4161afc7dd842 + sha256sums = 274759bdd39d1c20da4144128d9246e50a3c5dc8570ae4b7689c840daece7746 sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index a13a1ff..c1e4a50 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -23,64 +23,64 @@ source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/$ v${pkgver}-Source.zip" "${pkgname}.desktop" "git+https://chromium.googlesource.com/chromium/tools/depot_tools.git" -"git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m96" -"${pkgname}-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/\ +"git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m81" +"${pkgname}-${pkgver}-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/\ 505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz" -"${pkgname}-common.tar.gz::https://skia.googlesource.com/common.git/+archive/\ +"${pkgname}-${pkgver}-common.tar.gz::https://skia.googlesource.com/common.git/+archive/\ 9737551d7a52c3db3262db5856e6bcd62c462b92.tar.gz" -"${pkgname}-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/\ +"${pkgname}-${pkgver}-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/\ ee07cb317579dfda40dabb5d6d9c209e0e9e0643.tar.gz" -"${pkgname}-dawn.tar.gz::https://dawn.googlesource.com/dawn.git/+archive/\ +"${pkgname}-${pkgver}-dawn.tar.gz::https://dawn.googlesource.com/dawn.git/+archive/\ 604072bc2ed01018eb03bcbbf9d94042f679af63.tar.gz" -"${pkgname}-dng_sdk.tar.gz::https://android.googlesource.com/platform/external/dng_sdk.git/\ +"${pkgname}-${pkgver}-dng_sdk.tar.gz::https://android.googlesource.com/platform/external/dng_sdk.git/\ +archive/c8d0c9b1d16bfda56f15165d39e0ffa360a11123.tar.gz" -"${pkgname}-egl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup\ +"${pkgname}-${pkgver}-egl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup\ /EGL-Registry/+archive/a0bca08de07c7d7651047bedc0b653cfaaa4f2ae.tar.gz" -"${pkgname}-expat.tar.gz::https://android.googlesource.com/platform/external/expat.git/+archive/\ +"${pkgname}-${pkgver}-expat.tar.gz::https://android.googlesource.com/platform/external/expat.git/+archive/\ e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a.tar.gz" -"${pkgname}-freetype.tar.gz::https://skia.googlesource.com/third_party/freetype2.git/+archive/\ +"${pkgname}-${pkgver}-freetype.tar.gz::https://skia.googlesource.com/third_party/freetype2.git/+archive/\ 0a3d2bb99b45b72e1d45185ab054efa993d97210.tar.gz" -"${pkgname}-harfbuzz.tar.gz::https://chromium.googlesource.com/external/github.com/harfbuzz/\ +"${pkgname}-${pkgver}-harfbuzz.tar.gz::https://chromium.googlesource.com/external/github.com/harfbuzz/\ harfbuzz.git/+archive/3a74ee528255cc027d84b204a87b5c25e47bff79.tar.gz" -"${pkgname}-icu.tar.gz::https://chromium.googlesource.com/chromium/deps/icu.git/+archive/\ +"${pkgname}-${pkgver}-icu.tar.gz::https://chromium.googlesource.com/chromium/deps/icu.git/+archive/\ dbd3825b31041d782c5b504c59dcfb5ac7dda08c.tar.gz" -"${pkgname}-imgui.tar.gz::https://skia.googlesource.com/external/github.com/ocornut/imgui.git\ +"${pkgname}-${pkgver}-imgui.tar.gz::https://skia.googlesource.com/external/github.com/ocornut/imgui.git\ /+archive/d38d7c6628bebd02692cfdd6fa76b4d992a35b75.tar.gz" -"${pkgname}-libgifcodec.tar.gz::https://skia.googlesource.com/libgifcodec/+archive/\ +"${pkgname}-${pkgver}-libgifcodec.tar.gz::https://skia.googlesource.com/libgifcodec/+archive/\ 38d9c73f49b861bb4a9829371ac311544b120023.tar.gz" -"${pkgname}-libjpeg-turbo.tar.gz::https://skia.googlesource.com/external/github.com/libjpeg-turbo\ +"${pkgname}-${pkgver}-libjpeg-turbo.tar.gz::https://skia.googlesource.com/external/github.com/libjpeg-turbo\ /libjpeg-turbo.git/+archive/574f3a772c96dc9db2c98ef24706feb3f6dbda9a.tar.gz" -"${pkgname}-libpng.tar.gz::https://skia.googlesource.com/third_party/libpng.git/+archive/\ +"${pkgname}-${pkgver}-libpng.tar.gz::https://skia.googlesource.com/third_party/libpng.git/+archive/\ 386707c6d19b974ca2e3db7f5c61873813c6fe44.tar.gz" -"${pkgname}-libwebp.tar.gz::https://chromium.googlesource.com/webm/libwebp.git/+archive/\ +"${pkgname}-${pkgver}-libwebp.tar.gz::https://chromium.googlesource.com/webm/libwebp.git/+archive/\ 0fe1a89dbf1930fc2554dbe76adad5d962054ead.tar.gz" -"${pkgname}-lua.tar.gz::https://skia.googlesource.com/external/github.com/lua/lua.git/+archive/\ +"${pkgname}-${pkgver}-lua.tar.gz::https://skia.googlesource.com/external/github.com/lua/lua.git/+archive/\ e354c6355e7f48e087678ec49e340ca0696725b1.tar.gz" -"${pkgname}-microhttpd.tar.gz::https://android.googlesource.com/platform/external/libmicrohttpd\ +"${pkgname}-${pkgver}-microhttpd.tar.gz::https://android.googlesource.com/platform/external/libmicrohttpd\ /+archive/748945ec6f1c67b7efc934ab0808e1d32f2fb98d.tar.gz" -"${pkgname}-opencl-lib.tar.gz::https://skia.googlesource.com/external/github.com/GPUOpen-Tools/\ +"${pkgname}-${pkgver}-opencl-lib.tar.gz::https://skia.googlesource.com/external/github.com/GPUOpen-Tools/\ common-lib-amd-APPSDK-3.0/+archive/4e6d30e406d2e5a65e1d65e404fe6df5f772a32b.tar.gz" -"${pkgname}-opencl-registry.tar.gz::https://skia.googlesource.com/external/github.com/\ +"${pkgname}-${pkgver}-opencl-registry.tar.gz::https://skia.googlesource.com/external/github.com/\ KhronosGroup/OpenCL-Registry/+archive/932ed55c85f887041291cef8019e54280c033c35.tar.gz" -"${pkgname}-opengl-registry.tar.gz::https://skia.googlesource.com/external/github.com/\ +"${pkgname}-${pkgver}-opengl-registry.tar.gz::https://skia.googlesource.com/external/github.com/\ KhronosGroup/OpenGL-Registry/+archive/14b80ebeab022b2c78f84a573f01028c96075553.tar.gz" -"${pkgname}-piex.tar.gz::https://android.googlesource.com/platform/external/piex.git/+archive/\ +"${pkgname}-${pkgver}-piex.tar.gz::https://android.googlesource.com/platform/external/piex.git/+archive/\ bb217acdca1cc0c16b704669dd6f91a1b509c406.tar.gz" -"${pkgname}-sdl.tar.gz::https://skia.googlesource.com/third_party/sdl/+archive/\ +"${pkgname}-${pkgver}-sdl.tar.gz::https://skia.googlesource.com/third_party/sdl/+archive/\ 5d7cfcca344034aff9327f77fc181ae3754e7a90.tar.gz" -"${pkgname}-sfntly.tar.gz::https://chromium.googlesource.com/external/github.com/googlei18n/\ +"${pkgname}-${pkgver}-sfntly.tar.gz::https://chromium.googlesource.com/external/github.com/googlei18n/\ sfntly.git/+archive/b55ff303ea2f9e26702b514cf6a3196a2e3e2974.tar.gz" -"${pkgname}-spirv-cross.tar.gz::https://chromium.googlesource.com/external/github.com/\ +"${pkgname}-${pkgver}-spirv-cross.tar.gz::https://chromium.googlesource.com/external/github.com/\ KhronosGroup/SPIRV-Cross/+archive/53ab2144b90abede33be5161aec5dfc94ddc3caf.tar.gz" -"${pkgname}-spirv-headers.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/\ +"${pkgname}-${pkgver}-spirv-headers.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/\ SPIRV-Headers.git/+archive/29c11140baaf9f7fdaa39a583672c556bf1795a1.tar.gz" -"${pkgname}-spirv-tools.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup\ +"${pkgname}-${pkgver}-spirv-tools.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup\ /SPIRV-Tools.git/+archive/0c4feb643b89d1792b02f7cbef315e9d95633bd7.tar.gz" -"${pkgname}-swiftshader.tar.gz::https://swiftshader.googlesource.com/SwiftShader/+archive/\ +"${pkgname}-${pkgver}-swiftshader.tar.gz::https://swiftshader.googlesource.com/SwiftShader/+archive/\ 430def835f9f85d52f4a96db9b715cd9a7403c9c.tar.gz" -"${pkgname}-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git\ +"${pkgname}-${pkgver}-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git\ /+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz" -"${pkgname}-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/\ +"${pkgname}-${pkgver}-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/\ ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz" "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" ) @@ -90,35 +90,35 @@ sha256sums=('9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' - '23594f876b7f29555999d2f9aa2058e6ae1ece4fb720cdd0292c639c693694d6' - 'bbdd106ac79d31f42ba80b1286b7a4c1cbae7cac12725786d664db7c255957c2' - 'd928ac40fee155edf1cf823d57ce559786ff9f2c3dda7e83a857132ab545ed06' - '59957d0753ecf327c9f66b3009a908505f38d672637bf4d0c4ee0141e8bdd17a' - '75b7fd8c6351b0c51f866d3defefe0266c27e1b593e1ba5cded546376431b09b' - 'ca6f81ccc155144fbf2d168d596a71d254fc18738e0702a82f68974bd4e839e2' - 'ad256da64e2beca4f49ef02a39146f4f73d89d160eabf8b0eb8fce6cb8d606e4' - 'ff369316b724ced12280be18398a3600d4e2c2a581ec425180cc5b47a3e1d02a' - 'ff8bc5c39d0a2db4b81501a693e91427d97200e88d2940ddbfb5df13677cde56' - 'c1f69fa10880cfce79480c7b7f4b968c116e04c942c7d12a0f68fdd94484e9d4' - '4678c9a24079f601abc7a4299009465fe65c60fd67c243532ece674bd2e16ada' - '1ebf59f258299728962612b0c0d91caa2d0b66f60402792445b6ca1cac82e147' - '7f9e63d4ba3610698add3556455086173605957a8e9fa59ebcc4804cbdcff047' - 'bc31921c8bd1af7015657846d21498c665b9094bac8984d903dac273c3d9323e' - 'cb1856e3c77b6d26ce3e8de648ba657418e289203e7f8f99a9f6a581ad6af93e' - 'bf24eb0dccd631d5752f60ee3076c6102198d636655a929c5708aa61918d43a9' - '82c778de66817b8b96f3bbd8447b2bca429761d7e9de4d59158bec7ce33031e2' - 'ca9a80bb352c65caf62a9a08c3737bea5c4e6c836bd89d25e311c36620fb1b9e' - 'f4f79c84ccc4de73ac7e8aa08f9ff47c5bfbab01b79889917b9f1ffa3bdb19df' - 'f625e848d0fc137703efbbb5592e76b44e95332bc65acc67485b9855ffbc56fc' - '86e43c39de644ff66ca02feeee144aa3a9654cf1bd59e186952fc75885d0edb5' - '618ce44921ddac4add337829f1b314388f5feedbc563a897b9c766c900b5e170' - 'cfa961a45b62689aef775456075cb2d1440d58d78d6b0874f361fcf7b768b021' - '2d26bf7a01cc69271b07971162c648a2da55308c65fe300ec93356cba9fe1b2f' - 'd9c642324328b376a34ed01058af5b6fae3c2a8d7736300551227ee6335e439f' - '4cc0cdf2d707ce3edc846fcaf516caea45ea6baafb4077d043660b91ee91b3aa' - '34294532feba98c460721117ffb18a6c5584f7c48823ccc58109abd1bf2c7c45' - 'fcd29d69245483da000d6b162caccf0607b58dc06b77a5c79ad64403730f47e8' - '6280ed3515504fd9b64ce6f9fdedfcc49316dd56466726797fb80db0599be074' + '519c6cb4c9848d0d264199ffa1cf0db1f54801d73761f7154eb234da59938336' + 'aa24de5def12a7fdce55fed1597f8963e0b0a53edee80cf4ebf948cb67f85cba' + 'bbd7ea3cd967cef781c9c9d21e0ee669c7b295d4a5b970db4fb3458f667e722a' + 'fb5ea8819605873837820d2fc8e918f63f0563ce5909887418327b2135d7abc8' + '24de65063315ace8a576deddc899c7f39cd1e203d343b6e50930235bd276f37d' + '576f3b2bafa98b2c1bbaf62240c3caf797d9e1844e9ce13e5047564f6351cdb8' + '1495e9d046e52cdfd1fc984e1d88dfcc1f9632f67f33352192711104c704d730' + 'ec5e7d646bc1971bd3ac93518b2b2d29feef579f7becd4f9d9b81a6a0a03e532' + 'c4db4e9f64dbbb4fd4dec253550912937a1e1a1668534f631eb37903fb923fc7' + '5e029fc50628fd5749b6fd901dd1cac7c4f92a3a9db2431b4306b1bbcff5aec5' + '0d237fea0d5dcb5dbfeeff6109980cea2ac58e2c10727147684356719f8c5de6' + 'c0fdfb263bcc12c7fb6eafec55f0d1fd8383c37c3b1e4eb4596748214ffed093' + 'e7fed969dd5bf83d1269ad73fbc189aead42fb4f32b2f4ddee2cb46affaa2155' + '6a5ec5804d3bc49ea79acce95a8ca36720842b83f15a368e2f98503d354b3dac' + '152f67d21ba8765d16d8b8470879054a3a06e9185b9fadefe4853954642cc0ed' + '4278b14776b9a09d85a91ebbb4af6b02df964f888ef33b2691164365bb82398f' + '7515a68210b87d67c2919dac25ccf88f6a1da7a903b84951481e3a6f3f13f01b' + 'e5c9cbcd367c5b2d2ac3e6c90ec987d0aa55b82f17077af328751a6a9bac30c9' + '6cebe18d357122853914b9fc3c13e0a221e2da19312d9745b41bf0042cc87310' + '23d27a0ebe16b795e9733caa4a6fdc25089ced37556a9af0d21c6d13aa18f691' + 'e8f7ed6ca96d34235eb0ad427ff947e6f21d5d5a39f06e14bdc6473a40a06cf4' + 'dc783398daf21f2c66fb791f61a3e92547851fd841059a5a39912396b1e0f1ac' + '823dc6115a2749dc69e8f6e5afb0deca15ee8851cb36168cf2cca131b5201455' + '8d68986e51a55daa8ff196e83cb45fd05f7444bc1b7ce8dc380bdd45a070d256' + '7a1c9d0118e24ca68f48260129cee9bf610ec0319928ccfc19d173132ca75d93' + 'a007a25eb9f274f30082e4186f1f69bddea55ce7ac61f87215ad1865a16c49ce' + 'fcd7aee8e452bfad434abdb3dfcaac2021184b16f43e26261cdc022e668b4ec0' + '59889d07c504160a2320d4f95454e7bf53fa1d6543239d1160f4161afc7dd842' + '274759bdd39d1c20da4144128d9246e50a3c5dc8570ae4b7689c840daece7746' 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2') prepare() { @@ -130,7 +130,7 @@ prepare() { for _dep in buildtools common do mkdir --parents --verbose "skia/${_dep}" - tar --verbose --extract --file "${pkgname}-${_dep}.tar.gz" --directory "skia/${_dep}" + tar --verbose --extract --file "${pkgname}-${pkgver}-${_dep}.tar.gz" --directory "skia/${_dep}" done for _dep in angle2 dawn dng_sdk egl-registry expat freetype harfbuzz icu imgui opencl-registry \ @@ -138,7 +138,7 @@ prepare() { sdl sfntly spirv-cross spirv-headers spirv-tools swiftshader zlib wuffs do mkdir --parents --verbose "skia/third_party/externals/${_dep}" - tar --verbose --extract --file "${pkgname}-${_dep}.tar.gz" --directory \ + tar --verbose --extract --file "${pkgname}-${pkgver}-${_dep}.tar.gz" --directory \ "skia/third_party/externals/${_dep}" done From e576abc19c528662b9361f4a969c35705b3a51a0 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Thu, 30 Dec 2021 12:52:27 -0800 Subject: [PATCH 071/154] Nuked checksums for most things, unreliable. --- .SRCINFO | 62 ++++++++++++++++++++++++++++---------------------------- PKGBUILD | 62 ++++++++++++++++++++++++++++---------------------------- 2 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 47b6b95..9a8f6d6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.30 - pkgrel = 1 + pkgrel = 3 url = http://www.aseprite.org/ arch = x86_64 license = custom @@ -95,35 +95,35 @@ pkgbase = aseprite sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = SKIP sha256sums = SKIP - sha256sums = 519c6cb4c9848d0d264199ffa1cf0db1f54801d73761f7154eb234da59938336 - sha256sums = aa24de5def12a7fdce55fed1597f8963e0b0a53edee80cf4ebf948cb67f85cba - sha256sums = bbd7ea3cd967cef781c9c9d21e0ee669c7b295d4a5b970db4fb3458f667e722a - sha256sums = fb5ea8819605873837820d2fc8e918f63f0563ce5909887418327b2135d7abc8 - sha256sums = 24de65063315ace8a576deddc899c7f39cd1e203d343b6e50930235bd276f37d - sha256sums = 576f3b2bafa98b2c1bbaf62240c3caf797d9e1844e9ce13e5047564f6351cdb8 - sha256sums = 1495e9d046e52cdfd1fc984e1d88dfcc1f9632f67f33352192711104c704d730 - sha256sums = ec5e7d646bc1971bd3ac93518b2b2d29feef579f7becd4f9d9b81a6a0a03e532 - sha256sums = c4db4e9f64dbbb4fd4dec253550912937a1e1a1668534f631eb37903fb923fc7 - sha256sums = 5e029fc50628fd5749b6fd901dd1cac7c4f92a3a9db2431b4306b1bbcff5aec5 - sha256sums = 0d237fea0d5dcb5dbfeeff6109980cea2ac58e2c10727147684356719f8c5de6 - sha256sums = c0fdfb263bcc12c7fb6eafec55f0d1fd8383c37c3b1e4eb4596748214ffed093 - sha256sums = e7fed969dd5bf83d1269ad73fbc189aead42fb4f32b2f4ddee2cb46affaa2155 - sha256sums = 6a5ec5804d3bc49ea79acce95a8ca36720842b83f15a368e2f98503d354b3dac - sha256sums = 152f67d21ba8765d16d8b8470879054a3a06e9185b9fadefe4853954642cc0ed - sha256sums = 4278b14776b9a09d85a91ebbb4af6b02df964f888ef33b2691164365bb82398f - sha256sums = 7515a68210b87d67c2919dac25ccf88f6a1da7a903b84951481e3a6f3f13f01b - sha256sums = e5c9cbcd367c5b2d2ac3e6c90ec987d0aa55b82f17077af328751a6a9bac30c9 - sha256sums = 6cebe18d357122853914b9fc3c13e0a221e2da19312d9745b41bf0042cc87310 - sha256sums = 23d27a0ebe16b795e9733caa4a6fdc25089ced37556a9af0d21c6d13aa18f691 - sha256sums = e8f7ed6ca96d34235eb0ad427ff947e6f21d5d5a39f06e14bdc6473a40a06cf4 - sha256sums = dc783398daf21f2c66fb791f61a3e92547851fd841059a5a39912396b1e0f1ac - sha256sums = 823dc6115a2749dc69e8f6e5afb0deca15ee8851cb36168cf2cca131b5201455 - sha256sums = 8d68986e51a55daa8ff196e83cb45fd05f7444bc1b7ce8dc380bdd45a070d256 - sha256sums = 7a1c9d0118e24ca68f48260129cee9bf610ec0319928ccfc19d173132ca75d93 - sha256sums = a007a25eb9f274f30082e4186f1f69bddea55ce7ac61f87215ad1865a16c49ce - sha256sums = fcd7aee8e452bfad434abdb3dfcaac2021184b16f43e26261cdc022e668b4ec0 - sha256sums = 59889d07c504160a2320d4f95454e7bf53fa1d6543239d1160f4161afc7dd842 - sha256sums = 274759bdd39d1c20da4144128d9246e50a3c5dc8570ae4b7689c840daece7746 - sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP + sha256sums = SKIP pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index c1e4a50..53b153c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ pkgname=aseprite pkgver=1.2.30 -pkgrel=1 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="http://www.aseprite.org/" @@ -90,36 +90,36 @@ sha256sums=('9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'SKIP' 'SKIP' - '519c6cb4c9848d0d264199ffa1cf0db1f54801d73761f7154eb234da59938336' - 'aa24de5def12a7fdce55fed1597f8963e0b0a53edee80cf4ebf948cb67f85cba' - 'bbd7ea3cd967cef781c9c9d21e0ee669c7b295d4a5b970db4fb3458f667e722a' - 'fb5ea8819605873837820d2fc8e918f63f0563ce5909887418327b2135d7abc8' - '24de65063315ace8a576deddc899c7f39cd1e203d343b6e50930235bd276f37d' - '576f3b2bafa98b2c1bbaf62240c3caf797d9e1844e9ce13e5047564f6351cdb8' - '1495e9d046e52cdfd1fc984e1d88dfcc1f9632f67f33352192711104c704d730' - 'ec5e7d646bc1971bd3ac93518b2b2d29feef579f7becd4f9d9b81a6a0a03e532' - 'c4db4e9f64dbbb4fd4dec253550912937a1e1a1668534f631eb37903fb923fc7' - '5e029fc50628fd5749b6fd901dd1cac7c4f92a3a9db2431b4306b1bbcff5aec5' - '0d237fea0d5dcb5dbfeeff6109980cea2ac58e2c10727147684356719f8c5de6' - 'c0fdfb263bcc12c7fb6eafec55f0d1fd8383c37c3b1e4eb4596748214ffed093' - 'e7fed969dd5bf83d1269ad73fbc189aead42fb4f32b2f4ddee2cb46affaa2155' - '6a5ec5804d3bc49ea79acce95a8ca36720842b83f15a368e2f98503d354b3dac' - '152f67d21ba8765d16d8b8470879054a3a06e9185b9fadefe4853954642cc0ed' - '4278b14776b9a09d85a91ebbb4af6b02df964f888ef33b2691164365bb82398f' - '7515a68210b87d67c2919dac25ccf88f6a1da7a903b84951481e3a6f3f13f01b' - 'e5c9cbcd367c5b2d2ac3e6c90ec987d0aa55b82f17077af328751a6a9bac30c9' - '6cebe18d357122853914b9fc3c13e0a221e2da19312d9745b41bf0042cc87310' - '23d27a0ebe16b795e9733caa4a6fdc25089ced37556a9af0d21c6d13aa18f691' - 'e8f7ed6ca96d34235eb0ad427ff947e6f21d5d5a39f06e14bdc6473a40a06cf4' - 'dc783398daf21f2c66fb791f61a3e92547851fd841059a5a39912396b1e0f1ac' - '823dc6115a2749dc69e8f6e5afb0deca15ee8851cb36168cf2cca131b5201455' - '8d68986e51a55daa8ff196e83cb45fd05f7444bc1b7ce8dc380bdd45a070d256' - '7a1c9d0118e24ca68f48260129cee9bf610ec0319928ccfc19d173132ca75d93' - 'a007a25eb9f274f30082e4186f1f69bddea55ce7ac61f87215ad1865a16c49ce' - 'fcd7aee8e452bfad434abdb3dfcaac2021184b16f43e26261cdc022e668b4ec0' - '59889d07c504160a2320d4f95454e7bf53fa1d6543239d1160f4161afc7dd842' - '274759bdd39d1c20da4144128d9246e50a3c5dc8570ae4b7689c840daece7746' - 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2') + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP' + 'SKIP') prepare() { cd "${srcdir}" From 4bf904749f9c121eabc9e32d6be61290699ab138 Mon Sep 17 00:00:00 2001 From: Eldred Habert Date: Thu, 6 Jan 2022 00:52:22 +0100 Subject: [PATCH 072/154] Use brand new PKGBUILD for Aseprite Package (#1) * Use brand new PKGBUILD instead Attempting to fix the old one's jank * Install third-party licenses as well * Install .desktop file as well * Add missing build-time dependencies * Install icons in the icon theme directories instead Also remove redundant `$srcdir`s in `package()` * Put font license in the central directory as well * Bump pkgrel It was bumped during my work * Ignore files in subdirectories * Add missing resource files * Use underscores for local variable names https://wiki.archlinux.org/title/Arch_package_guidelines#Package_etiquette https://github.com/ImperatorStorm/PKGBUILDs/pull/1#discussion_r777122781 * Use HTTPS for upstream URL * Add myself as co-maintainer Thanks! * Remove ICU dependency We are using a statically-linked version instead, apparently * Avoid interactive prompts when patching fails * Clean up $srcdir Extract Aseprite's sources into a separate directory Configure Aseprite out-of-tree Configure Skia in a fresh directory (apparently `gn` does not support out-of-tree) * Disable Skottie in Skia This functionality doesn't appear to be used by Aseprite, and excluding it should reduce build time * Only pull Skia dependencies that we need This significantly reduces initial build time (from syncing large repos) and storage use. The only remaining dependency that has a chance to be axed is `dng_sdk`, for which more investigation is needed. * Avoid printing redundant flags in `gn` args Brainfart. "static" flags like `is_debug` were re-printed for each "non-static" (e.g. `skia_use_*`) variant. Doing it this way also allows getting rid of weird quote shenanigans. * Simplify `gn` configure line `is_official_build=true` sets Skia up to use system libs by default, so only specify those that we *don't* want * Pull `gn` version ourselves That way, we can additionally check its integrity via the SHA256 * Add forgotten `libgl` dependency What's weird is that the lib seems not to be linked to dynamically, but I can't see it not being required at run time. Right? * Maybe use system libwebp? Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch * Fix system `libwebp`, add `pixman` as makedep * possibly fix shared-libwebp.patch? * Disable updater https://github.com/ImperatorStorm/PKGBUILDs/pull/1#issuecomment-1003838784 * Avoid creating symlinks to Skia deps in their dirs Would occur if they were already symlinked * Use system HarfBuzz and FreeType I remember getting build errors, but cannot reproduce them anymore. So use the system libs more where possible! * Find all WebP libs * Mark libwebp as runtime dep * Remove CMake variables used by libwebp build They do nothing now that we are using shared libwebp * Remove build-time dep on Pixman It doesn't wind up being used at all in the end * Trim off a bunch of dependencies from Skia Only libpng is required to render some of the images, it seems, so this reduces build time and the amount of sources, which is good! Co-authored-by: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> --- .SRCINFO | 138 +++++------------- .gitignore | 12 +- PKGBUILD | 300 +++++++++++++++------------------------- is_clang.py | 17 +++ optional-pixman.patch | 23 +++ shared-libarchive.patch | 74 ++++++++++ shared-libwebp.patch | 58 ++++++++ 7 files changed, 322 insertions(+), 300 deletions(-) create mode 100755 is_clang.py create mode 100644 optional-pixman.patch create mode 100644 shared-libarchive.patch create mode 100644 shared-libwebp.patch diff --git a/.SRCINFO b/.SRCINFO index 9a8f6d6..b8a7c13 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,129 +1,55 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.30 - pkgrel = 3 - url = http://www.aseprite.org/ + pkgrel = 4 + url = https://www.aseprite.org/ arch = x86_64 license = custom makedepends = cmake makedepends = ninja makedepends = git - makedepends = python2 makedepends = python - makedepends = freeglut - makedepends = xorgproto makedepends = libxi + makedepends = pixman makedepends = harfbuzz-icu - makedepends = nettle depends = cmark - depends = curl - depends = giflib + depends = libcurl.so + depends = libgif.so + depends = libjpeg.so depends = zlib depends = libpng depends = tinyxml - depends = freetype2 - depends = fontconfig - depends = libxcursor + depends = libfreetype.so + depends = libarchive.so + depends = libwebp.so + depends = libwebpmux.so + depends = libwebpdemux.so depends = hicolor-icon-theme - conflicts = aseprite-git - conflicts = aseprite-gpl - conflicts = skia-git - noextract = aseprite-1.2.30-buildtools.tar.gz - noextract = aseprite-1.2.30-common.tar.gz - noextract = aseprite-1.2.30-angle2.tar.gz - noextract = aseprite-1.2.30-dawn.tar.gz - noextract = aseprite-1.2.30-dng_sdk.tar.gz - noextract = aseprite-1.2.30-egl-registry.tar.gz - noextract = aseprite-1.2.30-expat.tar.gz - noextract = aseprite-1.2.30-freetype.tar.gz - noextract = aseprite-1.2.30-harfbuzz.tar.gz - noextract = aseprite-1.2.30-icu.tar.gz - noextract = aseprite-1.2.30-imgui.tar.gz - noextract = aseprite-1.2.30-libgifcodec.tar.gz - noextract = aseprite-1.2.30-libjpeg-turbo.tar.gz - noextract = aseprite-1.2.30-libpng.tar.gz - noextract = aseprite-1.2.30-libwebp.tar.gz - noextract = aseprite-1.2.30-lua.tar.gz - noextract = aseprite-1.2.30-microhttpd.tar.gz - noextract = aseprite-1.2.30-opencl-lib.tar.gz - noextract = aseprite-1.2.30-opencl-registry.tar.gz - noextract = aseprite-1.2.30-opengl-registry.tar.gz - noextract = aseprite-1.2.30-piex.tar.gz - noextract = aseprite-1.2.30-sdl.tar.gz - noextract = aseprite-1.2.30-sfntly.tar.gz - noextract = aseprite-1.2.30-spirv-cross.tar.gz - noextract = aseprite-1.2.30-spirv-headers.tar.gz - noextract = aseprite-1.2.30-spirv-tools.tar.gz - noextract = aseprite-1.2.30-swiftshader.tar.gz - noextract = aseprite-1.2.30-wuffs.tar.gz - noextract = aseprite-1.2.30-zlib.tar.gz + depends = libexpat.so=1-64 + depends = libharfbuzz.so=0-64 + depends = libgl + depends = libfontconfig.so + depends = libxcursor + noextract = Aseprite-v1.2.30-Source.zip source = https://github.com/aseprite/aseprite/releases/download/v1.2.30/Aseprite-v1.2.30-Source.zip - source = aseprite.desktop - source = git+https://chromium.googlesource.com/chromium/tools/depot_tools.git source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 - source = aseprite-1.2.30-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz - source = aseprite-1.2.30-common.tar.gz::https://skia.googlesource.com/common.git/+archive/9737551d7a52c3db3262db5856e6bcd62c462b92.tar.gz - source = aseprite-1.2.30-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/ee07cb317579dfda40dabb5d6d9c209e0e9e0643.tar.gz - source = aseprite-1.2.30-dawn.tar.gz::https://dawn.googlesource.com/dawn.git/+archive/604072bc2ed01018eb03bcbbf9d94042f679af63.tar.gz - source = aseprite-1.2.30-dng_sdk.tar.gz::https://android.googlesource.com/platform/external/dng_sdk.git/+archive/c8d0c9b1d16bfda56f15165d39e0ffa360a11123.tar.gz - source = aseprite-1.2.30-egl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/EGL-Registry/+archive/a0bca08de07c7d7651047bedc0b653cfaaa4f2ae.tar.gz - source = aseprite-1.2.30-expat.tar.gz::https://android.googlesource.com/platform/external/expat.git/+archive/e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a.tar.gz - source = aseprite-1.2.30-freetype.tar.gz::https://skia.googlesource.com/third_party/freetype2.git/+archive/0a3d2bb99b45b72e1d45185ab054efa993d97210.tar.gz - source = aseprite-1.2.30-harfbuzz.tar.gz::https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git/+archive/3a74ee528255cc027d84b204a87b5c25e47bff79.tar.gz - source = aseprite-1.2.30-icu.tar.gz::https://chromium.googlesource.com/chromium/deps/icu.git/+archive/dbd3825b31041d782c5b504c59dcfb5ac7dda08c.tar.gz - source = aseprite-1.2.30-imgui.tar.gz::https://skia.googlesource.com/external/github.com/ocornut/imgui.git/+archive/d38d7c6628bebd02692cfdd6fa76b4d992a35b75.tar.gz - source = aseprite-1.2.30-libgifcodec.tar.gz::https://skia.googlesource.com/libgifcodec/+archive/38d9c73f49b861bb4a9829371ac311544b120023.tar.gz - source = aseprite-1.2.30-libjpeg-turbo.tar.gz::https://skia.googlesource.com/external/github.com/libjpeg-turbo/libjpeg-turbo.git/+archive/574f3a772c96dc9db2c98ef24706feb3f6dbda9a.tar.gz - source = aseprite-1.2.30-libpng.tar.gz::https://skia.googlesource.com/third_party/libpng.git/+archive/386707c6d19b974ca2e3db7f5c61873813c6fe44.tar.gz - source = aseprite-1.2.30-libwebp.tar.gz::https://chromium.googlesource.com/webm/libwebp.git/+archive/0fe1a89dbf1930fc2554dbe76adad5d962054ead.tar.gz - source = aseprite-1.2.30-lua.tar.gz::https://skia.googlesource.com/external/github.com/lua/lua.git/+archive/e354c6355e7f48e087678ec49e340ca0696725b1.tar.gz - source = aseprite-1.2.30-microhttpd.tar.gz::https://android.googlesource.com/platform/external/libmicrohttpd/+archive/748945ec6f1c67b7efc934ab0808e1d32f2fb98d.tar.gz - source = aseprite-1.2.30-opencl-lib.tar.gz::https://skia.googlesource.com/external/github.com/GPUOpen-Tools/common-lib-amd-APPSDK-3.0/+archive/4e6d30e406d2e5a65e1d65e404fe6df5f772a32b.tar.gz - source = aseprite-1.2.30-opencl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/OpenCL-Registry/+archive/932ed55c85f887041291cef8019e54280c033c35.tar.gz - source = aseprite-1.2.30-opengl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry/+archive/14b80ebeab022b2c78f84a573f01028c96075553.tar.gz - source = aseprite-1.2.30-piex.tar.gz::https://android.googlesource.com/platform/external/piex.git/+archive/bb217acdca1cc0c16b704669dd6f91a1b509c406.tar.gz - source = aseprite-1.2.30-sdl.tar.gz::https://skia.googlesource.com/third_party/sdl/+archive/5d7cfcca344034aff9327f77fc181ae3754e7a90.tar.gz - source = aseprite-1.2.30-sfntly.tar.gz::https://chromium.googlesource.com/external/github.com/googlei18n/sfntly.git/+archive/b55ff303ea2f9e26702b514cf6a3196a2e3e2974.tar.gz - source = aseprite-1.2.30-spirv-cross.tar.gz::https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross/+archive/53ab2144b90abede33be5161aec5dfc94ddc3caf.tar.gz - source = aseprite-1.2.30-spirv-headers.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers.git/+archive/29c11140baaf9f7fdaa39a583672c556bf1795a1.tar.gz - source = aseprite-1.2.30-spirv-tools.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools.git/+archive/0c4feb643b89d1792b02f7cbef315e9d95633bd7.tar.gz - source = aseprite-1.2.30-swiftshader.tar.gz::https://swiftshader.googlesource.com/SwiftShader/+archive/430def835f9f85d52f4a96db9b715cd9a7403c9c.tar.gz - source = aseprite-1.2.30-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git/+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz - source = aseprite-1.2.30-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 + source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 + source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 + source = aseprite.desktop + source = is_clang.py + source = shared-libarchive.patch + source = shared-libwebp.patch + source = optional-pixman.patch sha256sums = 9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874 + sha256sums = SKIP + sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 + sha256sums = SKIP + sha256sums = SKIP sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP + sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441 + sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 + sha256sums = 9a85e9b1b52c1d33d128cb87c12395d9a245049cfc10e148659ae2acd4cab3e6 + sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 pkgname = aseprite diff --git a/.gitignore b/.gitignore index 91bec31..3b15a45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,9 @@ * -!.gitignore -!.SRCINFO -!aseprite.desktop -!PKGBUILD \ No newline at end of file +!/.gitignore +!/.SRCINFO +!/aseprite.desktop +!/PKGBUILD +!/is_clang.py +!/shared-libarchive.patch +!/shared-libwebp.patch +!/optional-pixman.patch diff --git a/PKGBUILD b/PKGBUILD index 53b153c..ae87442 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Imperator Storm <30777770+ImperatorStorm@users.noreply.github.com> +# Co-Maintainer: Eldred Habert # Contributor: Fredrick Brennan # Contributor: Andrew Bueide # Contributor: rouhannb @@ -9,213 +10,132 @@ pkgname=aseprite pkgver=1.2.30 -pkgrel=3 +pkgrel=4 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') -url="http://www.aseprite.org/" +url="https://www.aseprite.org/" license=('custom') -depends=('cmark' 'curl' 'giflib' 'zlib' 'libpng' 'tinyxml' 'freetype2' 'fontconfig' 'libxcursor' - 'hicolor-icon-theme') -makedepends=('cmake' 'ninja' 'git' 'python2' 'python' 'freeglut' 'xorgproto' 'libxi' 'harfbuzz-icu' - 'nettle') -conflicts=("aseprite-git" "aseprite-gpl" "skia-git") -source=("https://github.com/${pkgname}/${pkgname}/releases/download/v${pkgver}/${pkgname^}-\ -v${pkgver}-Source.zip" -"${pkgname}.desktop" -"git+https://chromium.googlesource.com/chromium/tools/depot_tools.git" -"git+https://github.com/${pkgname}/skia.git#branch=${pkgname}-m81" -"${pkgname}-${pkgver}-buildtools.tar.gz::https://chromium.googlesource.com/chromium/buildtools.git/+archive/\ -505de88083136eefd056e5ee4ca0f01fe9b33de8.tar.gz" -"${pkgname}-${pkgver}-common.tar.gz::https://skia.googlesource.com/common.git/+archive/\ -9737551d7a52c3db3262db5856e6bcd62c462b92.tar.gz" -"${pkgname}-${pkgver}-angle2.tar.gz::https://chromium.googlesource.com/angle/angle.git/+archive/\ -ee07cb317579dfda40dabb5d6d9c209e0e9e0643.tar.gz" -"${pkgname}-${pkgver}-dawn.tar.gz::https://dawn.googlesource.com/dawn.git/+archive/\ -604072bc2ed01018eb03bcbbf9d94042f679af63.tar.gz" -"${pkgname}-${pkgver}-dng_sdk.tar.gz::https://android.googlesource.com/platform/external/dng_sdk.git/\ -+archive/c8d0c9b1d16bfda56f15165d39e0ffa360a11123.tar.gz" -"${pkgname}-${pkgver}-egl-registry.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup\ -/EGL-Registry/+archive/a0bca08de07c7d7651047bedc0b653cfaaa4f2ae.tar.gz" -"${pkgname}-${pkgver}-expat.tar.gz::https://android.googlesource.com/platform/external/expat.git/+archive/\ -e5aa0a2cb0a5f759ef31c0819dc67d9b14246a4a.tar.gz" -"${pkgname}-${pkgver}-freetype.tar.gz::https://skia.googlesource.com/third_party/freetype2.git/+archive/\ -0a3d2bb99b45b72e1d45185ab054efa993d97210.tar.gz" -"${pkgname}-${pkgver}-harfbuzz.tar.gz::https://chromium.googlesource.com/external/github.com/harfbuzz/\ -harfbuzz.git/+archive/3a74ee528255cc027d84b204a87b5c25e47bff79.tar.gz" -"${pkgname}-${pkgver}-icu.tar.gz::https://chromium.googlesource.com/chromium/deps/icu.git/+archive/\ -dbd3825b31041d782c5b504c59dcfb5ac7dda08c.tar.gz" -"${pkgname}-${pkgver}-imgui.tar.gz::https://skia.googlesource.com/external/github.com/ocornut/imgui.git\ -/+archive/d38d7c6628bebd02692cfdd6fa76b4d992a35b75.tar.gz" -"${pkgname}-${pkgver}-libgifcodec.tar.gz::https://skia.googlesource.com/libgifcodec/+archive/\ -38d9c73f49b861bb4a9829371ac311544b120023.tar.gz" -"${pkgname}-${pkgver}-libjpeg-turbo.tar.gz::https://skia.googlesource.com/external/github.com/libjpeg-turbo\ -/libjpeg-turbo.git/+archive/574f3a772c96dc9db2c98ef24706feb3f6dbda9a.tar.gz" -"${pkgname}-${pkgver}-libpng.tar.gz::https://skia.googlesource.com/third_party/libpng.git/+archive/\ -386707c6d19b974ca2e3db7f5c61873813c6fe44.tar.gz" -"${pkgname}-${pkgver}-libwebp.tar.gz::https://chromium.googlesource.com/webm/libwebp.git/+archive/\ -0fe1a89dbf1930fc2554dbe76adad5d962054ead.tar.gz" -"${pkgname}-${pkgver}-lua.tar.gz::https://skia.googlesource.com/external/github.com/lua/lua.git/+archive/\ -e354c6355e7f48e087678ec49e340ca0696725b1.tar.gz" -"${pkgname}-${pkgver}-microhttpd.tar.gz::https://android.googlesource.com/platform/external/libmicrohttpd\ -/+archive/748945ec6f1c67b7efc934ab0808e1d32f2fb98d.tar.gz" -"${pkgname}-${pkgver}-opencl-lib.tar.gz::https://skia.googlesource.com/external/github.com/GPUOpen-Tools/\ -common-lib-amd-APPSDK-3.0/+archive/4e6d30e406d2e5a65e1d65e404fe6df5f772a32b.tar.gz" -"${pkgname}-${pkgver}-opencl-registry.tar.gz::https://skia.googlesource.com/external/github.com/\ -KhronosGroup/OpenCL-Registry/+archive/932ed55c85f887041291cef8019e54280c033c35.tar.gz" -"${pkgname}-${pkgver}-opengl-registry.tar.gz::https://skia.googlesource.com/external/github.com/\ -KhronosGroup/OpenGL-Registry/+archive/14b80ebeab022b2c78f84a573f01028c96075553.tar.gz" -"${pkgname}-${pkgver}-piex.tar.gz::https://android.googlesource.com/platform/external/piex.git/+archive/\ -bb217acdca1cc0c16b704669dd6f91a1b509c406.tar.gz" -"${pkgname}-${pkgver}-sdl.tar.gz::https://skia.googlesource.com/third_party/sdl/+archive/\ -5d7cfcca344034aff9327f77fc181ae3754e7a90.tar.gz" -"${pkgname}-${pkgver}-sfntly.tar.gz::https://chromium.googlesource.com/external/github.com/googlei18n/\ -sfntly.git/+archive/b55ff303ea2f9e26702b514cf6a3196a2e3e2974.tar.gz" -"${pkgname}-${pkgver}-spirv-cross.tar.gz::https://chromium.googlesource.com/external/github.com/\ -KhronosGroup/SPIRV-Cross/+archive/53ab2144b90abede33be5161aec5dfc94ddc3caf.tar.gz" -"${pkgname}-${pkgver}-spirv-headers.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup/\ -SPIRV-Headers.git/+archive/29c11140baaf9f7fdaa39a583672c556bf1795a1.tar.gz" -"${pkgname}-${pkgver}-spirv-tools.tar.gz::https://skia.googlesource.com/external/github.com/KhronosGroup\ -/SPIRV-Tools.git/+archive/0c4feb643b89d1792b02f7cbef315e9d95633bd7.tar.gz" -"${pkgname}-${pkgver}-swiftshader.tar.gz::https://swiftshader.googlesource.com/SwiftShader/+archive/\ -430def835f9f85d52f4a96db9b715cd9a7403c9c.tar.gz" -"${pkgname}-${pkgver}-wuffs.tar.gz::https://skia.googlesource.com/external/github.com/google/wuffs.git\ -/+archive/4080840928c0b05a80cda0d14ac2e2615f679f1a.tar.gz" -"${pkgname}-${pkgver}-zlib.tar.gz::https://chromium.googlesource.com/chromium/src/third_party/zlib/+archive/\ -ea3ba903faac98b64b2bf8de5e98cd97b335a474.tar.gz" -"gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" -) -_gitsrc=("${source[@]:4:29}") -noextract=("${_gitsrc[@]%%::*}") +depends=(# ~ Aseprite's direct dependencies ~ + # pixman is not linked to because we use Skia instead + # harfbuzz is linked statically because Aseprite expects an older version + cmark libcurl.so libgif.so libjpeg.so zlib libpng tinyxml libfreetype.so libarchive.so + libwebp.so libwebpmux.so libwebpdemux.so + hicolor-icon-theme # For installing Aseprite's icons + # ~ Skia deps ~ + # (Skia links dynamically to HarfBuzz, only Aseprite itself doesn't. >_<) + libexpat.so=1-64 libharfbuzz.so=0-64 libgl + # Already required by Aseprite: libjpeg-turbo libpng zlib freetype2 + # These two are only reported by Namcap, but don't seem to be direct dependencies? + libfontconfig.so libxcursor) +makedepends=(# "Meta" dependencies + cmake ninja git python + # Aseprite (including e.g. LAF) + libxi pixman + # Skia + harfbuzz-icu) +source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" + # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` + "git+https://github.com/aseprite/skia.git#branch=aseprite-m81" + # `gn` executable required to configure Skia, pulled from `skia/bin/fetch-gn` + # Normally we'd use the Arch-provided one, but it has API incompatibilities + "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" + # Skia dependencies, determined from `skia/DEPS` + # Only pulling what we need, though + "git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" + "git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" + "$pkgname.desktop" + # Python 3-compliant version of the script + is_clang.py + # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch + shared-libarchive.patch + # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch + shared-libwebp.patch + optional-pixman.patch) +noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root sha256sums=('9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874' + 'SKIP' + 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2' + 'SKIP' + 'SKIP' 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP' - 'SKIP') + 'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441' + 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' + '9a85e9b1b52c1d33d128cb87c12395d9a245049cfc10e148659ae2acd4cab3e6' + 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') prepare() { - cd "${srcdir}" + # Extract Aseprite's sources + mkdir -p aseprite + bsdtar -xf "${noextract[0]}" -C aseprite - # Install skia deps (essentially runs git-sync-deps with the files already downloaded) - mkdir --parents --verbose skia/third_party/externals + # Symlink Skia's build dependencies + # Sort of emulating `skia/tools/git-sync-deps`, but only grabbing what we need + mkdir -p skia/third_party/externals + # Key = repo name (from above), value = path under `src/skia/` + local -A _skiadeps=([buildtools]=buildtools + [common]=common) _dep + for _dep in "${!_skiadeps[@]}"; do + ln -svfT "$(realpath $_dep)" "skia/${_skiadeps[$_dep]}" + done + chmod 755 gn - for _dep in buildtools common - do - mkdir --parents --verbose "skia/${_dep}" - tar --verbose --extract --file "${pkgname}-${pkgver}-${_dep}.tar.gz" --directory "skia/${_dep}" - done + # Replace `is_clang.py` with Python 3-compliant version + cp -v is_clang.py skia/gn - for _dep in angle2 dawn dng_sdk egl-registry expat freetype harfbuzz icu imgui opencl-registry \ - libjpeg-turbo libpng libwebp lua microhttpd opencl-lib opengl-registry piex \ - sdl sfntly spirv-cross spirv-headers spirv-tools swiftshader zlib wuffs - do - mkdir --parents --verbose "skia/third_party/externals/${_dep}" - tar --verbose --extract --file "${pkgname}-${pkgver}-${_dep}.tar.gz" --directory \ - "skia/third_party/externals/${_dep}" - done - - chmod u=rwx,g=rx,o=rx --verbose gn - mv --verbose gn skia/bin/gn - cp --verbose skia/bin/gn skia/buildtools/linux64/gn - - mkdir --parents --verbose binsub - ln --force --symbolic $(which python2) binsub/python + # Allow using shared libarchive (the bundled version prevents using the `None` build type...) + env -C aseprite patch -tp1 +Date: Fri, 9 Oct 2020 02:18:36 +0300 +Subject: [PATCH] Make LibArchive as shared library dependency + +--- + CMakeLists.txt | 11 +++++++++++ + src/app/CMakeLists.txt | 2 +- + third_party/CMakeLists.txt | 22 ++++++++++++---------- + 3 files changed, 24 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9cb5a2cdfb..9d95936f36 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -60,6 +60,7 @@ option(USE_SHARED_CURL "Use your installed copy of curl" off) + option(USE_SHARED_GIFLIB "Use your installed copy of giflib" off) + option(USE_SHARED_JPEGLIB "Use your installed copy of jpeglib" off) + option(USE_SHARED_ZLIB "Use your installed copy of zlib" off) ++option(USE_SHARED_LIBARCHIVE "Use your installed copy of libarchive" off) + option(USE_SHARED_LIBPNG "Use your installed copy of libpng" off) + option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) + option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) +@@ -200,6 +201,16 @@ else() + endif() + include_directories(${ZLIB_INCLUDE_DIRS}) + ++# libarchive ++if(USE_SHARED_LIBARCHIVE) ++ find_package(LibArchive REQUIRED) ++else() ++ set(LibArchive_FOUND) ++ set(LibArchive_LIBRARIES archive_static) ++ set(LibArchive_INCLUDE_DIRS $) ++endif() ++include_directories(${LibArchive_INCLUDE_DIRS}) ++ + # libpng + if(USE_SHARED_LIBPNG) + find_package(PNG REQUIRED) +diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt +index e1e3bc1ae3..4a37838e95 100644 +--- a/src/app/CMakeLists.txt ++++ b/src/app/CMakeLists.txt +@@ -651,8 +651,8 @@ target_link_libraries(app-lib + ${ZLIB_LIBRARIES} + ${FREETYPE_LIBRARIES} + ${HARFBUZZ_LIBRARIES} ++ ${LibArchive_LIBRARIES} + json11 +- archive_static + fmt + tinyexpr) + +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index ffd1c0cfcd..4839d4097c 100644 +--- a/third_party/CMakeLists.txt.orig ++++ b/third_party/CMakeLists.txt +@@ -110,6 +110,7 @@ endif() + add_subdirectory(json11) + + # libarchive ++if(NOT USE_SHARED_LIBARCHIVE) + set(ENABLE_WERROR OFF CACHE BOOL "Treat warnings as errors - default is ON for Debug, OFF otherwise.") + set(ENABLE_TEST OFF CACHE BOOL "Enable unit and regression tests") + set(ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)") +@@ -123,6 +124,7 @@ set(ENABLE_CPIO OFF CACHE BOOL "Enable cpio building") + add_subdirectory(libarchive) + target_include_directories(archive_static INTERFACE + $) ++endif() + + # benchmark + if(ENABLE_BENCHMARKS) diff --git a/shared-libwebp.patch b/shared-libwebp.patch new file mode 100644 index 0000000..65de0c6 --- /dev/null +++ b/shared-libwebp.patch @@ -0,0 +1,58 @@ +From ca9e20a87be6dcc8d9b97841535b2320d2eb2f91 Mon Sep 17 00:00:00 2001 +From: Drauthius +Date: Sat, 26 Sep 2020 10:40:13 +0200 +Subject: [PATCH] Shared webp library + +Making optional linking with shared system webp library with +-DUSE_SHARED_WEBP option. +--- + CMakeLists.txt | 12 +++++++++--- + third_party/CMakeLists.txt | 2 +- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f16f09660d..40065905d3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -66,6 +66,7 @@ option(USE_SHARED_TINYXML "Use your installed copy of tinyxml" off) + option(USE_SHARED_PIXMAN "Use your installed copy of pixman" off) + option(USE_SHARED_FREETYPE "Use shared FreeType library" off) + option(USE_SHARED_HARFBUZZ "Use shared HarfBuzz library" off) ++option(USE_SHARED_WEBP "Use your installed copy of webp" off) + 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) +@@ -229,9 +230,17 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code + + # libwebp + if(WITH_WEBP_SUPPORT) +- set(WEBP_LIBRARIES webp webpdemux libwebpmux) +- set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) +- include_directories(${WEBP_INCLUDE_DIR}) ++ if(USE_SHARED_WEBP) ++ find_library(WEBP_LIBRARY NAMES webp) ++ find_library(WEBPDEMUX_LIBRARY NAMES webpdemux) ++ find_library(WEBPMUX_LIBRARY NAMES webpmux) ++ set(WEBP_LIBRARIES ${WEBP_LIBRARY} ${WEBPDEMUX_LIBRARY} ${WEBPMUX_LIBRARY}) ++ find_path(WEBP_INCLUDE_DIRS NAMES decode.h PATH_SUFFIXES webp) ++ else() ++ set(WEBP_LIBRARIES webp webpdemux libwebpmux) ++ set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) ++ include_directories(${WEBP_INCLUDE_DIR}) ++ endif() + endif() + + # tinyxml +diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt +index 4839d4097c..e8c3e83cbc 100644 +--- a/third_party/CMakeLists.txt ++++ b/third_party/CMakeLists.txt +@@ -32,7 +32,7 @@ if(NOT USE_SHARED_GIFLIB) + add_subdirectory(giflib) + endif() + +-if(WITH_WEBP_SUPPORT) ++if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP) + set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") + add_subdirectory(libwebp) + endif() From 4bbfab660a857e59077b531b519757ff9f0c8bcb Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Fri, 7 Jan 2022 19:50:56 +0100 Subject: [PATCH 073/154] Use upstream-provided .desktop file It's identical to ours, except it doesn't have the deprecated `Encoding` key --- .SRCINFO | 4 +--- PKGBUILD | 6 ++---- aseprite.desktop | 14 -------------- 3 files changed, 3 insertions(+), 21 deletions(-) delete mode 100644 aseprite.desktop diff --git a/.SRCINFO b/.SRCINFO index b8a7c13..820e581 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.30 - pkgrel = 4 + pkgrel = 5 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -36,7 +36,6 @@ pkgbase = aseprite source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 - source = aseprite.desktop source = is_clang.py source = shared-libarchive.patch source = shared-libwebp.patch @@ -46,7 +45,6 @@ pkgbase = aseprite sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 sha256sums = SKIP sha256sums = SKIP - sha256sums = deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25 sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441 sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 sha256sums = 9a85e9b1b52c1d33d128cb87c12395d9a245049cfc10e148659ae2acd4cab3e6 diff --git a/PKGBUILD b/PKGBUILD index ae87442..f613438 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ pkgname=aseprite pkgver=1.2.30 -pkgrel=4 +pkgrel=5 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -43,7 +43,6 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit # Only pulling what we need, though "git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" "git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" - "$pkgname.desktop" # Python 3-compliant version of the script is_clang.py # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -57,7 +56,6 @@ sha256sums=('9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874' 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2' 'SKIP' 'SKIP' - 'deaf646a615c79a4672b087562a09c44beef37e7acfc6f5f66a437d4f3b97a25' 'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441' 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' '9a85e9b1b52c1d33d128cb87c12395d9a245049cfc10e148659ae2acd4cab3e6' @@ -123,7 +121,7 @@ package() { # Install the binary and its `.desktop` file install -vDm 755 staging/bin/aseprite "$pkgdir/usr/bin/aseprite" - install -vDm 644 aseprite.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" + install -vDm 644 aseprite/src/desktop/linux/aseprite.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" # Install the icons in the correct directory (which is not the default) local _size for _size in 16 32 48 64 128 256; do diff --git a/aseprite.desktop b/aseprite.desktop deleted file mode 100644 index 306b8df..0000000 --- a/aseprite.desktop +++ /dev/null @@ -1,14 +0,0 @@ -[Desktop Entry] -Type=Application -Encoding=UTF-8 -Name=Aseprite -GenericName=Sprite Editor -Comment=Animated sprite editor & pixel art tool -Icon=aseprite -Categories=Graphics;2DGraphics;RasterGraphics -Exec=aseprite %U -TryExec=aseprite -Terminal=false -StartupNotify=false -StartupWMClass=Aseprite -MimeType=image/bmp;image/gif;image/jpeg;image/png;image/x-pcx;image/x-tga;image/vnd.microsoft.icon;video/x-flic;image/webp;image/x-aseprite; From e61b3c9b5be04d6ad64aa750f460f1d0517a1ec5 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Wed, 12 Jan 2022 23:06:33 -0800 Subject: [PATCH 074/154] upgpkg: aseprite 1.2.31-1 upstream release Apparently `common` got yeeted from DEPS, going to see if it builds with it before removing it --- .SRCINFO | 12 ++++++------ PKGBUILD | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 820e581..cf5931e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.30 - pkgrel = 5 + pkgver = 1.2.31 + pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -30,9 +30,9 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.30-Source.zip - source = https://github.com/aseprite/aseprite/releases/download/v1.2.30/Aseprite-v1.2.30-Source.zip - source = git+https://github.com/aseprite/skia.git#branch=aseprite-m81 + noextract = Aseprite-v1.2.31-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.31/Aseprite-v1.2.31-Source.zip + source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 @@ -40,7 +40,7 @@ pkgbase = aseprite source = shared-libarchive.patch source = shared-libwebp.patch source = optional-pixman.patch - sha256sums = 9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874 + sha256sums = 966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d sha256sums = SKIP sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 sha256sums = SKIP diff --git a/PKGBUILD b/PKGBUILD index f613438..5be091f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,8 +9,8 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.30 -pkgrel=5 +pkgver=1.2.31 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -35,7 +35,7 @@ makedepends=(# "Meta" dependencies harfbuzz-icu) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` - "git+https://github.com/aseprite/skia.git#branch=aseprite-m81" + "git+https://github.com/aseprite/skia.git#branch=aseprite-m96" # `gn` executable required to configure Skia, pulled from `skia/bin/fetch-gn` # Normally we'd use the Arch-provided one, but it has API incompatibilities "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" @@ -51,7 +51,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-libwebp.patch optional-pixman.patch) noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root -sha256sums=('9f4b098fe2327f2e9d73eb9f2aeebecad63e87ff2cf6fb6eeeee3c0778bb8874' +sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' 'SKIP' 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2' 'SKIP' From f1f431dac8fc2db27165cb96082e3da08a6f6a7b Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Wed, 12 Jan 2022 23:23:40 -0800 Subject: [PATCH 075/154] Fix up shared-libwebp.patch. --- .SRCINFO | 2 +- PKGBUILD | 2 +- shared-libwebp.patch | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cf5931e..69f0be5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -47,7 +47,7 @@ pkgbase = aseprite sha256sums = SKIP sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441 sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 - sha256sums = 9a85e9b1b52c1d33d128cb87c12395d9a245049cfc10e148659ae2acd4cab3e6 + sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 5be091f..93313b4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -58,7 +58,7 @@ sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' 'SKIP' 'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441' 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' - '9a85e9b1b52c1d33d128cb87c12395d9a245049cfc10e148659ae2acd4cab3e6' + '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') prepare() { diff --git a/shared-libwebp.patch b/shared-libwebp.patch index 65de0c6..071327d 100644 --- a/shared-libwebp.patch +++ b/shared-libwebp.patch @@ -25,7 +25,7 @@ index f16f09660d..40065905d3 100644 @@ -229,9 +230,17 @@ add_definitions(-DPNG_NO_MMX_CODE) # Do not use MMX optimizations in PNG code # libwebp - if(WITH_WEBP_SUPPORT) + if(ENABLE_WEBP) - set(WEBP_LIBRARIES webp webpdemux libwebpmux) - set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) - include_directories(${WEBP_INCLUDE_DIR}) @@ -51,8 +51,8 @@ index 4839d4097c..e8c3e83cbc 100644 add_subdirectory(giflib) endif() --if(WITH_WEBP_SUPPORT) -+if(WITH_WEBP_SUPPORT AND NOT USE_SHARED_WEBP) +-if(ENABLE_WEBP) ++if(ENABLE_WEBP AND NOT USE_SHARED_WEBP) set(WEBP_BUILD_EXTRAS OFF CACHE BOOL "Build extras.") add_subdirectory(libwebp) endif() From a58e729f86c79edce7629d42752dc423e0736d21 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Wed, 12 Jan 2022 23:50:07 -0800 Subject: [PATCH 076/154] Updated gn, now have to dl a zip and unpack it. Builds fine, but my linker `mold` isn't finding laft-ft. I'll work on it tommorrow. --- .SRCINFO | 4 ++-- PKGBUILD | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 69f0be5..0068a37 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -33,7 +33,7 @@ pkgbase = aseprite noextract = Aseprite-v1.2.31-Source.zip source = https://github.com/aseprite/aseprite/releases/download/v1.2.31/Aseprite-v1.2.31-Source.zip source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 - source = gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74 + source = gn.zip::https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 source = is_clang.py @@ -42,7 +42,7 @@ pkgbase = aseprite source = optional-pixman.patch sha256sums = 966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d sha256sums = SKIP - sha256sums = c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2 + sha256sums = 0ef7a431fa1bfd2d12edd1f6ceffac7e2b6ed89dcfae9aea9bf681d42a068347 sha256sums = SKIP sha256sums = SKIP sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441 diff --git a/PKGBUILD b/PKGBUILD index 93313b4..2de6978 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -38,7 +38,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit "git+https://github.com/aseprite/skia.git#branch=aseprite-m96" # `gn` executable required to configure Skia, pulled from `skia/bin/fetch-gn` # Normally we'd use the Arch-provided one, but it has API incompatibilities - "gn::https://chromium-gn.storage-download.googleapis.com/3523d50538357829725d4ed74b777a572ce0ac74" + "gn.zip::https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e" # Skia dependencies, determined from `skia/DEPS` # Only pulling what we need, though "git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" @@ -53,7 +53,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' 'SKIP' - 'c8c2d617f1a33d6eb27f25ebcc30bd8ba1e6a0aa980cada21dda2ad1401fa4a2' + '0ef7a431fa1bfd2d12edd1f6ceffac7e2b6ed89dcfae9aea9bf681d42a068347' 'SKIP' 'SKIP' 'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441' @@ -75,6 +75,7 @@ prepare() { for _dep in "${!_skiadeps[@]}"; do ln -svfT "$(realpath $_dep)" "skia/${_skiadeps[$_dep]}" done + bsdtar -xf gn.zip gn chmod 755 gn # Replace `is_clang.py` with Python 3-compliant version @@ -95,13 +96,13 @@ build() { # Flags can typically be found in `src/skia/gn/skia.gni`... but you're kind of on your own env -C skia ../gn gen "$_skiadir" --args="`printf '%s ' \ is_debug=false is_official_build=true skia_enable_{skottie,pdf}=false \ -skia_use_{expat,libjpeg_turbo,libwebp,xps,zlib,libgifcodec,sfntly}=false`" +skia_use_{expat,libwebp,xps,zlib,libgifcodec,sfntly}=false`" ninja -C "$_skiadir" skia modules echo Building Aseprite... # Suppress install messages since we install to a temporary area; `install -v` will do the job cmake -S aseprite -B build -G Ninja -Wno-dev -DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_BUILD_TYPE=None \ --DENABLE_UPDATER=NO -DLAF_WITH_EXAMPLES=OFF -DLAF_WITH_TESTS=OFF -DLAF_BACKEND=skia \ +-DENABLE_UPDATER=NO -DLAF_WITH_EXAMPLES=OFF -DLAF_WITH_TESTS=OFF -DLAF_OS_BACKEND=skia -DLAF_BACKEND=skia \ -DSKIA_DIR="$PWD/skia" -DSKIA_LIBRARY_DIR="$_skiadir" -DSKIA_LIBRARY="$_skiadir/libskia.a" \ -DUSE_SHARED_{CMARK,CURL,GIFLIB,JPEGLIB,ZLIB,LIBPNG,TINYXML,PIXMAN,FREETYPE,HARFBUZZ,LIBARCHIVE,WEBP}=YES ninja -C build From 9078bc1fac8f3ef0ea659a94417a8c96eb0688e9 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Thu, 13 Jan 2022 19:24:40 +0100 Subject: [PATCH 077/154] Fix build Use more recent `gn` Disable some functionality to broke the build (whether we should enable it back remains TBD) Change Skia flags to fix up dependencies Apply patch so missing Skia deps don't break Aseprite's build Many of these changes were imported from my work on `aseprite-git` https://github.com/ISSOtm/PKGBUILDs/tree/aseprite-git/aseprite-git --- .SRCINFO | 5 +++-- .gitignore | 1 + PKGBUILD | 26 +++++++++++++------------- shared-skia-deps.patch | 21 +++++++++++++++++++++ 4 files changed, 38 insertions(+), 15 deletions(-) create mode 100644 shared-skia-deps.patch diff --git a/.SRCINFO b/.SRCINFO index 0068a37..88add27 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -11,6 +11,7 @@ pkgbase = aseprite makedepends = python makedepends = libxi makedepends = pixman + makedepends = gn makedepends = harfbuzz-icu depends = cmark depends = libcurl.so @@ -33,21 +34,21 @@ pkgbase = aseprite noextract = Aseprite-v1.2.31-Source.zip source = https://github.com/aseprite/aseprite/releases/download/v1.2.31/Aseprite-v1.2.31-Source.zip source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 - source = gn.zip::https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 source = is_clang.py source = shared-libarchive.patch source = shared-libwebp.patch + source = shared-skia-deps.patch source = optional-pixman.patch sha256sums = 966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d sha256sums = SKIP - sha256sums = 0ef7a431fa1bfd2d12edd1f6ceffac7e2b6ed89dcfae9aea9bf681d42a068347 sha256sums = SKIP sha256sums = SKIP sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441 sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 + sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 pkgname = aseprite diff --git a/.gitignore b/.gitignore index 3b15a45..95f1d6a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,5 @@ !/is_clang.py !/shared-libarchive.patch !/shared-libwebp.patch +!/shared-skia-deps.patch !/optional-pixman.patch diff --git a/PKGBUILD b/PKGBUILD index 2de6978..edc7120 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -32,13 +32,10 @@ makedepends=(# "Meta" dependencies # Aseprite (including e.g. LAF) libxi pixman # Skia - harfbuzz-icu) + gn harfbuzz-icu) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "git+https://github.com/aseprite/skia.git#branch=aseprite-m96" - # `gn` executable required to configure Skia, pulled from `skia/bin/fetch-gn` - # Normally we'd use the Arch-provided one, but it has API incompatibilities - "gn.zip::https://chrome-infra-packages.appspot.com/dl/gn/gn/linux-amd64/+/git_revision:d62642c920e6a0d1756316d225a90fd6faa9e21e" # Skia dependencies, determined from `skia/DEPS` # Only pulling what we need, though "git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" @@ -49,16 +46,17 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-libarchive.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch shared-libwebp.patch + shared-skia-deps.patch optional-pixman.patch) noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' 'SKIP' - '0ef7a431fa1bfd2d12edd1f6ceffac7e2b6ed89dcfae9aea9bf681d42a068347' 'SKIP' 'SKIP' 'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441' 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' + 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') prepare() { @@ -75,34 +73,36 @@ prepare() { for _dep in "${!_skiadeps[@]}"; do ln -svfT "$(realpath $_dep)" "skia/${_skiadeps[$_dep]}" done - bsdtar -xf gn.zip gn - chmod 755 gn # Replace `is_clang.py` with Python 3-compliant version cp -v is_clang.py skia/gn # Allow using shared libarchive (the bundled version prevents using the `None` build type...) env -C aseprite patch -tp1 Date: Thu, 13 Jan 2022 19:33:23 +0100 Subject: [PATCH 078/154] Start Git-ignoring now-deleted file --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 95f1d6a..bb36aa2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,6 @@ * !/.gitignore !/.SRCINFO -!/aseprite.desktop !/PKGBUILD !/is_clang.py !/shared-libarchive.patch From e1fbe636bc2a4a3391b66ecaf3a8ce075ceff142 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Thu, 13 Jan 2022 19:45:45 +0100 Subject: [PATCH 079/154] Use upstream `is_clang.py` The new version works fine under Python 3 --- .SRCINFO | 2 -- .gitignore | 1 - PKGBUILD | 6 ------ is_clang.py | 17 ----------------- 4 files changed, 26 deletions(-) delete mode 100755 is_clang.py diff --git a/.SRCINFO b/.SRCINFO index 88add27..c49e904 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -36,7 +36,6 @@ pkgbase = aseprite source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 - source = is_clang.py source = shared-libarchive.patch source = shared-libwebp.patch source = shared-skia-deps.patch @@ -45,7 +44,6 @@ pkgbase = aseprite sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441 sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 diff --git a/.gitignore b/.gitignore index bb36aa2..565da64 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,6 @@ !/.gitignore !/.SRCINFO !/PKGBUILD -!/is_clang.py !/shared-libarchive.patch !/shared-libwebp.patch !/shared-skia-deps.patch diff --git a/PKGBUILD b/PKGBUILD index edc7120..16208e4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -40,8 +40,6 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit # Only pulling what we need, though "git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" "git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" - # Python 3-compliant version of the script - is_clang.py # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch shared-libarchive.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch @@ -53,7 +51,6 @@ sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' 'SKIP' 'SKIP' 'SKIP' - 'cb901aaf479bcf1a2406ce21eb31e43d3581712a9ea245672ffd8fbcd9190441' 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' @@ -74,9 +71,6 @@ prepare() { ln -svfT "$(realpath $_dep)" "skia/${_skiadeps[$_dep]}" done - # Replace `is_clang.py` with Python 3-compliant version - cp -v is_clang.py skia/gn - # Allow using shared libarchive (the bundled version prevents using the `None` build type...) env -C aseprite patch -tp1 Date: Thu, 13 Jan 2022 19:50:36 +0100 Subject: [PATCH 080/154] Fix up desktop integration --- .SRCINFO | 2 ++ .gitignore | 1 + PKGBUILD | 4 ++++ desktop.patch | 25 +++++++++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 desktop.patch diff --git a/.SRCINFO b/.SRCINFO index c49e904..0177f85 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -36,6 +36,7 @@ pkgbase = aseprite source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 + source = desktop.patch source = shared-libarchive.patch source = shared-libwebp.patch source = shared-skia-deps.patch @@ -44,6 +45,7 @@ pkgbase = aseprite sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP + sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 diff --git a/.gitignore b/.gitignore index 565da64..d0ea81c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ !/.gitignore !/.SRCINFO !/PKGBUILD +!/desktop.patch !/shared-libarchive.patch !/shared-libwebp.patch !/shared-skia-deps.patch diff --git a/PKGBUILD b/PKGBUILD index 16208e4..15c1777 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -40,6 +40,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit # Only pulling what we need, though "git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" "git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" + desktop.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch shared-libarchive.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch @@ -51,6 +52,7 @@ sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' 'SKIP' 'SKIP' 'SKIP' + '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' @@ -71,6 +73,8 @@ prepare() { ln -svfT "$(realpath $_dep)" "skia/${_skiadeps[$_dep]}" done + # Fix up Aseprite's desktop integration + env -C aseprite patch -tp1 + + +- ++ + + From 265487a1943c68772ba82a3955ba5776d4ddd691 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Thu, 13 Jan 2022 19:51:43 +0100 Subject: [PATCH 081/154] Register Aseprite's MIME info --- PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/PKGBUILD b/PKGBUILD index 15c1777..408e6ce 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -121,6 +121,7 @@ package() { # Install the binary and its `.desktop` file install -vDm 755 staging/bin/aseprite "$pkgdir/usr/bin/aseprite" install -vDm 644 aseprite/src/desktop/linux/aseprite.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" + install -vDm 644 aseprite/src/desktop/linux/mime/aseprite.xml "${pkgdir}/usr/share/mime/packages/${_pkgname}.xml" # Install the icons in the correct directory (which is not the default) local _size for _size in 16 32 48 64 128 256; do From acea23a10baed01e9d0913922b02a4c8fe79930e Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Thu, 13 Jan 2022 20:03:06 +0100 Subject: [PATCH 082/154] Get rid of `buildtools` and `common` dependencies --- .SRCINFO | 4 ---- PKGBUILD | 16 ---------------- 2 files changed, 20 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0177f85..0c0befc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -34,8 +34,6 @@ pkgbase = aseprite noextract = Aseprite-v1.2.31-Source.zip source = https://github.com/aseprite/aseprite/releases/download/v1.2.31/Aseprite-v1.2.31-Source.zip source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 - source = git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8 - source = git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92 source = desktop.patch source = shared-libarchive.patch source = shared-libwebp.patch @@ -43,8 +41,6 @@ pkgbase = aseprite source = optional-pixman.patch sha256sums = 966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d sha256sums = SKIP - sha256sums = SKIP - sha256sums = SKIP sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 diff --git a/PKGBUILD b/PKGBUILD index 408e6ce..60ea163 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -36,10 +36,6 @@ makedepends=(# "Meta" dependencies source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "git+https://github.com/aseprite/skia.git#branch=aseprite-m96" - # Skia dependencies, determined from `skia/DEPS` - # Only pulling what we need, though - "git+https://chromium.googlesource.com/chromium/buildtools.git#commit=505de88083136eefd056e5ee4ca0f01fe9b33de8" - "git+https://skia.googlesource.com/common.git#commit=9737551d7a52c3db3262db5856e6bcd62c462b92" desktop.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch shared-libarchive.patch @@ -49,8 +45,6 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit optional-pixman.patch) noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' - 'SKIP' - 'SKIP' 'SKIP' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' @@ -63,16 +57,6 @@ prepare() { mkdir -p aseprite bsdtar -xf "${noextract[0]}" -C aseprite - # Symlink Skia's build dependencies - # Sort of emulating `skia/tools/git-sync-deps`, but only grabbing what we need - mkdir -p skia/third_party/externals - # Key = repo name (from above), value = path under `src/skia/` - local -A _skiadeps=([buildtools]=buildtools - [common]=common) _dep - for _dep in "${!_skiadeps[@]}"; do - ln -svfT "$(realpath $_dep)" "skia/${_skiadeps[$_dep]}" - done - # Fix up Aseprite's desktop integration env -C aseprite patch -tp1 Date: Thu, 13 Jan 2022 20:12:08 +0100 Subject: [PATCH 083/154] Use shared libfmt --- .SRCINFO | 5 ++- .gitignore | 1 + PKGBUILD | 13 ++++---- shared-fmt.patch | 70 +++++++++++++++++++++++++++++++++++++++++ shared-libarchive.patch | 2 +- 5 files changed, 83 insertions(+), 8 deletions(-) create mode 100644 shared-fmt.patch diff --git a/.SRCINFO b/.SRCINFO index 0c0befc..bfa608d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -22,6 +22,7 @@ pkgbase = aseprite depends = tinyxml depends = libfreetype.so depends = libarchive.so + depends = libfmt.so depends = libwebp.so depends = libwebpmux.so depends = libwebpdemux.so @@ -35,6 +36,7 @@ pkgbase = aseprite source = https://github.com/aseprite/aseprite/releases/download/v1.2.31/Aseprite-v1.2.31-Source.zip source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = desktop.patch + source = shared-fmt.patch source = shared-libarchive.patch source = shared-libwebp.patch source = shared-skia-deps.patch @@ -42,7 +44,8 @@ pkgbase = aseprite sha256sums = 966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d sha256sums = SKIP sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 - sha256sums = e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7 + sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 + sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 diff --git a/.gitignore b/.gitignore index d0ea81c..50d1d8f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ !/.SRCINFO !/PKGBUILD !/desktop.patch +!/shared-fmt.patch !/shared-libarchive.patch !/shared-libwebp.patch !/shared-skia-deps.patch diff --git a/PKGBUILD b/PKGBUILD index 60ea163..6deac4e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,7 +18,7 @@ license=('custom') depends=(# ~ Aseprite's direct dependencies ~ # pixman is not linked to because we use Skia instead # harfbuzz is linked statically because Aseprite expects an older version - cmark libcurl.so libgif.so libjpeg.so zlib libpng tinyxml libfreetype.so libarchive.so + cmark libcurl.so libgif.so libjpeg.so zlib libpng tinyxml libfreetype.so libarchive.so libfmt.so libwebp.so libwebpmux.so libwebpdemux.so hicolor-icon-theme # For installing Aseprite's icons # ~ Skia deps ~ @@ -37,6 +37,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "git+https://github.com/aseprite/skia.git#branch=aseprite-m96" desktop.patch + shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch shared-libarchive.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2523.patch @@ -47,7 +48,8 @@ noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' 'SKIP' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' - 'e42675504bfbc17655aef1dca957041095026cd3dd4e6981fb6df0a363948aa7' + '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' + 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') @@ -59,11 +61,10 @@ prepare() { # Fix up Aseprite's desktop integration env -C aseprite patch -tp1 Date: Thu, 13 Jan 2022 20:53:22 +0100 Subject: [PATCH 084/154] Get rid of pixman in makedepends We apply a patch so it's unnecessary, so why are we still requiring it? --- .SRCINFO | 1 - PKGBUILD | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bfa608d..e4c3327 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -10,7 +10,6 @@ pkgbase = aseprite makedepends = git makedepends = python makedepends = libxi - makedepends = pixman makedepends = gn makedepends = harfbuzz-icu depends = cmark diff --git a/PKGBUILD b/PKGBUILD index 6deac4e..2af964e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -30,7 +30,7 @@ depends=(# ~ Aseprite's direct dependencies ~ makedepends=(# "Meta" dependencies cmake ninja git python # Aseprite (including e.g. LAF) - libxi pixman + libxi # Skia gn harfbuzz-icu) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" From 631d903e53b565428f59302e1caf49bf348482aa Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Thu, 20 Jan 2022 22:39:28 -0800 Subject: [PATCH 085/154] upgpkg: aseprite 1.2.32-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e4c3327..6248971 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.31 + pkgver = 1.2.32 pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 @@ -31,8 +31,8 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.31-Source.zip - source = https://github.com/aseprite/aseprite/releases/download/v1.2.31/Aseprite-v1.2.31-Source.zip + noextract = Aseprite-v1.2.32-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.32/Aseprite-v1.2.32-Source.zip source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = desktop.patch source = shared-fmt.patch @@ -40,7 +40,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d + sha256sums = 458ef8c526df12f90f3ebe769e80557b8d1ea184c5948936612775b0f591a877 sha256sums = SKIP sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 diff --git a/PKGBUILD b/PKGBUILD index 2af964e..a1c1a69 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.31 +pkgver=1.2.32 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -45,7 +45,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-skia-deps.patch optional-pixman.patch) noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root -sha256sums=('966bd940e1072ed24b70e211ca2bb1eb9aa6432ca12972a8e1df5f1e0150213d' +sha256sums=('458ef8c526df12f90f3ebe769e80557b8d1ea184c5948936612775b0f591a877' 'SKIP' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' From 34059c175ce46e1cdd385a186a8a16bff6de24b2 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Tue, 8 Feb 2022 20:46:19 -0800 Subject: [PATCH 086/154] upgpkg: aseprite 1.2.33-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6248971..aca6e6a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.32 + pkgver = 1.2.33 pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 @@ -31,8 +31,8 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.32-Source.zip - source = https://github.com/aseprite/aseprite/releases/download/v1.2.32/Aseprite-v1.2.32-Source.zip + noextract = Aseprite-v1.2.33-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.33/Aseprite-v1.2.33-Source.zip source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 source = desktop.patch source = shared-fmt.patch @@ -40,7 +40,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 458ef8c526df12f90f3ebe769e80557b8d1ea184c5948936612775b0f591a877 + sha256sums = c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b sha256sums = SKIP sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 diff --git a/PKGBUILD b/PKGBUILD index a1c1a69..bc21b41 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.32 +pkgver=1.2.33 pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -45,7 +45,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-skia-deps.patch optional-pixman.patch) noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root -sha256sums=('458ef8c526df12f90f3ebe769e80557b8d1ea184c5948936612775b0f591a877' +sha256sums=('c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b' 'SKIP' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' From 3c989507b10b2fc5ae0f3c4cac162533a8c1611f Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Fri, 18 Feb 2022 22:50:05 -0800 Subject: [PATCH 087/154] Upload `.config` file when building `linux-lts-llvm` --- PKGBUILD | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index bc21b41..e4277e2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -32,7 +32,10 @@ makedepends=(# "Meta" dependencies # Aseprite (including e.g. LAF) libxi # Skia - gn harfbuzz-icu) + gn harfbuzz-icu + # TODO: Benchmark clang v gcc + # clang + ) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "git+https://github.com/aseprite/skia.git#branch=aseprite-m96" From c83b6597a830e15d248ef9e2efe97e6fd4837a49 Mon Sep 17 00:00:00 2001 From: ryuukk <44361234+ryuukk@users.noreply.github.com> Date: Fri, 11 Mar 2022 14:23:43 +0100 Subject: [PATCH 088/154] upgpkg: aseprite 1.2.33-2 Use release source instead of cloning the entire repo Closes #5 --- .SRCINFO | 6 +++--- PKGBUILD | 10 ++++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index aca6e6a..44f8217 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.33 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -33,7 +33,7 @@ pkgbase = aseprite depends = libxcursor noextract = Aseprite-v1.2.33-Source.zip source = https://github.com/aseprite/aseprite/releases/download/v1.2.33/Aseprite-v1.2.33-Source.zip - source = git+https://github.com/aseprite/skia.git#branch=aseprite-m96 + source = skia.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch @@ -41,7 +41,7 @@ pkgbase = aseprite source = shared-skia-deps.patch source = optional-pixman.patch sha256sums = c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b - sha256sums = SKIP + sha256sums = aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 diff --git a/PKGBUILD b/PKGBUILD index e4277e2..9402ffa 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ pkgname=aseprite pkgver=1.2.33 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -38,7 +38,7 @@ makedepends=(# "Meta" dependencies ) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` - "git+https://github.com/aseprite/skia.git#branch=aseprite-m96" + "skia.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz" desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -49,7 +49,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit optional-pixman.patch) noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root sha256sums=('c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b' - 'SKIP' + 'aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' @@ -61,7 +61,9 @@ prepare() { # Extract Aseprite's sources mkdir -p aseprite bsdtar -xf "${noextract[0]}" -C aseprite - + # Extract Skia's sources + mkdir -p skia + bsdtar -xf skia.tar.gz -C skia # Fix up Aseprite's desktop integration env -C aseprite patch -tp1 Date: Fri, 11 Mar 2022 15:21:31 -0800 Subject: [PATCH 089/154] Improvement to previous commit. Download skia as `skia-$_skiaver.tar.gz` to prevent sourcefile collisions. --- .SRCINFO | 2 +- PKGBUILD | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 44f8217..472a883 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -33,7 +33,7 @@ pkgbase = aseprite depends = libxcursor noextract = Aseprite-v1.2.33-Source.zip source = https://github.com/aseprite/aseprite/releases/download/v1.2.33/Aseprite-v1.2.33-Source.zip - source = skia.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz + source = skia-m96.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch diff --git a/PKGBUILD b/PKGBUILD index 9402ffa..53a8a46 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,6 +10,7 @@ pkgname=aseprite pkgver=1.2.33 +_skiaver=m96 pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -38,7 +39,7 @@ makedepends=(# "Meta" dependencies ) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` - "skia.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz" + "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-2f1f21b8a9.tar.gz" desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -63,7 +64,7 @@ prepare() { bsdtar -xf "${noextract[0]}" -C aseprite # Extract Skia's sources mkdir -p skia - bsdtar -xf skia.tar.gz -C skia + bsdtar -xf skia-$_skiaver.tar.gz -C skia # Fix up Aseprite's desktop integration env -C aseprite patch -tp1 Date: Fri, 11 Mar 2022 15:24:20 -0800 Subject: [PATCH 090/154] Further improvements to Aseprite PKGBUILD. --- .SRCINFO | 1 + PKGBUILD | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 472a883..ae96573 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -32,6 +32,7 @@ pkgbase = aseprite depends = libfontconfig.so depends = libxcursor noextract = Aseprite-v1.2.33-Source.zip + noextract = skia-m96.tar.gz source = https://github.com/aseprite/aseprite/releases/download/v1.2.33/Aseprite-v1.2.33-Source.zip source = skia-m96.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz source = desktop.patch diff --git a/PKGBUILD b/PKGBUILD index 53a8a46..ab17bd2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -48,7 +48,8 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-libwebp.patch shared-skia-deps.patch optional-pixman.patch) -noextract=("${source[0]##*/}") # Don't extract Aseprite sources at the root +noextract=("Aseprite-v$pkgver-Source.zip" + "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b' 'aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' @@ -64,7 +65,7 @@ prepare() { bsdtar -xf "${noextract[0]}" -C aseprite # Extract Skia's sources mkdir -p skia - bsdtar -xf skia-$_skiaver.tar.gz -C skia + bsdtar xf skia-$_skiaver.tar.gz --strip-components=1 -C skia # Fix up Aseprite's desktop integration env -C aseprite patch -tp1 Date: Fri, 11 Mar 2022 23:14:55 -0800 Subject: [PATCH 091/154] Tabs are pain. --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index ab17bd2..e1777f4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -49,7 +49,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-skia-deps.patch optional-pixman.patch) noextract=("Aseprite-v$pkgver-Source.zip" - "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root + "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b' 'aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' From f5159409caf77f7f4a1ccff706fe633d3e254a98 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Wed, 16 Mar 2022 22:03:04 -0700 Subject: [PATCH 092/154] upgpkg: aseprite 1.2.34.1-1 upstream release --- .SRCINFO | 10 +++++----- PKGBUILD | 9 +++++---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ae96573..6b280c0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.33 - pkgrel = 2 + pkgver = 1.2.34.1 + pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -31,9 +31,9 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.33-Source.zip + noextract = Aseprite-v1.2.34.1-Source.zip noextract = skia-m96.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.2.33/Aseprite-v1.2.33-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.34.1/Aseprite-v1.2.34.1-Source.zip source = skia-m96.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz source = desktop.patch source = shared-fmt.patch @@ -41,7 +41,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b + sha256sums = 3dba4972048e25a06719e6227535937f17e6ff0f637bb337d97703cd7bdb0b41 sha256sums = aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 diff --git a/PKGBUILD b/PKGBUILD index e1777f4..4106f14 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,9 +9,10 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.33 +pkgver=1.2.34.1 _skiaver=m96 -pkgrel=2 +_skiahash=2f1f21b8a9 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -39,7 +40,7 @@ makedepends=(# "Meta" dependencies ) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` - "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-2f1f21b8a9.tar.gz" + "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz" desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -50,7 +51,7 @@ 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=('c3a86005f59483fcfcedae89bf82dfc6f82bba8d5244835ca4c005beab31435b' +sha256sums=('3dba4972048e25a06719e6227535937f17e6ff0f637bb337d97703cd7bdb0b41' 'aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' From ff725155504288b36621f528d2f3b44612afb262 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Wed, 16 Mar 2022 22:06:47 -0700 Subject: [PATCH 093/154] Remove unnecessary `.gitignore` files. --- .gitignore | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 50d1d8f..0000000 --- a/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -* -!/.gitignore -!/.SRCINFO -!/PKGBUILD -!/desktop.patch -!/shared-fmt.patch -!/shared-libarchive.patch -!/shared-libwebp.patch -!/shared-skia-deps.patch -!/optional-pixman.patch From 9777b005bcfae5cbd25b1155c47b8c44a366ead5 Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Thu, 24 Mar 2022 12:48:24 -0700 Subject: [PATCH 094/154] Add FabioLolix's suggestions and update email. --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 4106f14..bcc65cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,4 +1,4 @@ -# Maintainer: Imperator Storm <30777770+ImperatorStorm@users.noreply.github.com> +# Maintainer: Imperator Storm # Co-Maintainer: Eldred Habert # Contributor: Fredrick Brennan # Contributor: Andrew Bueide From 71f865251f05c7b1a64a5f888964d8d51a3e14dd Mon Sep 17 00:00:00 2001 From: ImperatorStorm <30777770+ImperatorStorm@users.noreply.github.com> Date: Sun, 17 Apr 2022 18:04:05 -0700 Subject: [PATCH 095/154] Revert "Add `tenacity-git` to `tenacity-wxgtk3-git`'s `conflicts`." This reverts commit ef45253dc4570e7396edfe3474fc530fb1b1fa06. --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index bcc65cd..860a9bd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ # Maintainer: Imperator Storm -# Co-Maintainer: Eldred Habert +# Maintainer: Eldred Habert # Contributor: Fredrick Brennan # Contributor: Andrew Bueide # Contributor: rouhannb From e358df22d7804f93a82292771cbbbe4cc5bdf51c Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Mon, 23 May 2022 11:43:12 -0700 Subject: [PATCH 096/154] Enable Aseprite scripting. --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6b280c0..6c897c0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.34.1 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = custom diff --git a/PKGBUILD b/PKGBUILD index 860a9bd..f52ecf8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.34.1 _skiaver=m96 _skiahash=2f1f21b8a9 -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -93,7 +93,7 @@ skia_use_{expat,xps,zlib,libgifcodec,sfntly}=false`" echo Building Aseprite... # Suppress install messages since we install to a temporary area; `install -v` will do the job cmake -S aseprite -B build -G Ninja -Wno-dev -DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_BUILD_TYPE=None \ --DENABLE_{UPDATER,SCRIPTING,WEBSOCKET}=NO -DLAF_WITH_EXAMPLES=OFF -DLAF_WITH_TESTS=OFF -DLAF_BACKEND=skia \ +-DENABLE_{UPDATER,WEBSOCKET}=OFF -DENABLE_SCRIPTING=ON -DLAF_WITH_EXAMPLES=OFF -DLAF_WITH_TESTS=OFF -DLAF_BACKEND=skia \ -DSKIA_DIR="$PWD/skia" -DSKIA_LIBRARY_DIR="$_skiadir" -DSKIA_LIBRARY="$_skiadir/libskia.a" \ -DUSE_SHARED_{CMARK,CURL,FMT,GIFLIB,JPEGLIB,ZLIB,LIBPNG,TINYXML,PIXMAN,FREETYPE,HARFBUZZ,LIBARCHIVE,WEBP}=YES ninja -C build From aae81b3fb4ccdf3fdb0d74523cc1ce62a0adf363 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Thu, 2 Jun 2022 12:40:18 -0700 Subject: [PATCH 097/154] upgpkg: aseprite 1.2.35-1 Also improve `quilt-server`'s `PKGBUILD`. --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6c897c0..f1dadf6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.34.1 - pkgrel = 2 + pkgver = 1.2.35 + pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -31,9 +31,9 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.34.1-Source.zip + noextract = Aseprite-v1.2.35-Source.zip noextract = skia-m96.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.2.34.1/Aseprite-v1.2.34.1-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.35/Aseprite-v1.2.35-Source.zip source = skia-m96.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz source = desktop.patch source = shared-fmt.patch @@ -41,7 +41,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 3dba4972048e25a06719e6227535937f17e6ff0f637bb337d97703cd7bdb0b41 + sha256sums = 407ee1cf9c4ac47cc0033d1ce597591d33f9c39bb8cfc5b95728c6195378be14 sha256sums = aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 diff --git a/PKGBUILD b/PKGBUILD index f52ecf8..0044f24 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,10 +9,10 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.34.1 +pkgver=1.2.35 _skiaver=m96 _skiahash=2f1f21b8a9 -pkgrel=2 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -51,7 +51,7 @@ 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=('3dba4972048e25a06719e6227535937f17e6ff0f637bb337d97703cd7bdb0b41' +sha256sums=('407ee1cf9c4ac47cc0033d1ce597591d33f9c39bb8cfc5b95728c6195378be14' 'aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' From 659376d1967d890dd63698bfcba69be0f43b03c8 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Thu, 2 Jun 2022 13:10:54 -0700 Subject: [PATCH 098/154] Bump aseprite-skia ver --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f1dadf6..37e01e6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -32,9 +32,9 @@ pkgbase = aseprite depends = libfontconfig.so depends = libxcursor noextract = Aseprite-v1.2.35-Source.zip - noextract = skia-m96.tar.gz + noextract = skia-m102.tar.gz source = https://github.com/aseprite/aseprite/releases/download/v1.2.35/Aseprite-v1.2.35-Source.zip - source = skia-m96.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m96-2f1f21b8a9.tar.gz + source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch @@ -42,7 +42,7 @@ pkgbase = aseprite source = shared-skia-deps.patch source = optional-pixman.patch sha256sums = 407ee1cf9c4ac47cc0033d1ce597591d33f9c39bb8cfc5b95728c6195378be14 - sha256sums = aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff + sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 diff --git a/PKGBUILD b/PKGBUILD index 0044f24..999ae8c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,8 +10,8 @@ pkgname=aseprite pkgver=1.2.35 -_skiaver=m96 -_skiahash=2f1f21b8a9 +_skiaver=m102 +_skiahash=861e4743af pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') @@ -52,7 +52,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('407ee1cf9c4ac47cc0033d1ce597591d33f9c39bb8cfc5b95728c6195378be14' - 'aa999a6d457f657e0a895340870aa84256ef9b7b65d1c4f107b51461119495ff' + '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' From 77f0ab44beb4c65ce1a5b2b8acfc5df85c848964 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Mon, 25 Jul 2022 15:58:56 -0700 Subject: [PATCH 099/154] upgpkg: aseprite 1.2.37-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 37e01e6..887f7a6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.35 + pkgver = 1.2.37 pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 @@ -31,9 +31,9 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.35-Source.zip + noextract = Aseprite-v1.2.37-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.2.35/Aseprite-v1.2.35-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.37/Aseprite-v1.2.37-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 @@ -41,7 +41,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 407ee1cf9c4ac47cc0033d1ce597591d33f9c39bb8cfc5b95728c6195378be14 + sha256sums = 74989ac5e57e4cba9cc16212d81f058c3aff70749d929e2e35eb38688c994c9e sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 diff --git a/PKGBUILD b/PKGBUILD index 999ae8c..8821dcb 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.35 +pkgver=1.2.37 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -51,7 +51,7 @@ 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=('407ee1cf9c4ac47cc0033d1ce597591d33f9c39bb8cfc5b95728c6195378be14' +sha256sums=('74989ac5e57e4cba9cc16212d81f058c3aff70749d929e2e35eb38688c994c9e' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' From 040afdc1ea1ef8264f6887c14f9920d4e83247a7 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Fri, 5 Aug 2022 15:57:56 -0700 Subject: [PATCH 100/154] upgpkg: aseprite 1.2.39-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 887f7a6..431cf0d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.37 + pkgver = 1.2.39 pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 @@ -31,9 +31,9 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.37-Source.zip + noextract = Aseprite-v1.2.39-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.2.37/Aseprite-v1.2.37-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.39/Aseprite-v1.2.39-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 @@ -41,7 +41,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 74989ac5e57e4cba9cc16212d81f058c3aff70749d929e2e35eb38688c994c9e + sha256sums = b84e67061a9600c6c508af26944851ce277f4e912bf73d8e9e83a2eba5510c21 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 diff --git a/PKGBUILD b/PKGBUILD index 8821dcb..91ca6d1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.37 +pkgver=1.2.39 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -51,7 +51,7 @@ 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=('74989ac5e57e4cba9cc16212d81f058c3aff70749d929e2e35eb38688c994c9e' +sha256sums=('b84e67061a9600c6c508af26944851ce277f4e912bf73d8e9e83a2eba5510c21' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' From 525a99edef643e31e5cedb5c7a5566d3ccd8afc0 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Fri, 5 Aug 2022 20:28:27 -0700 Subject: [PATCH 101/154] Fix `shared-libwebp.patch`. --- .SRCINFO | 4 ++-- PKGBUILD | 10 ++++++++-- shared-libwebp.patch | 32 +++++++++++++++++--------------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 431cf0d..cd7f8ae 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.39 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -46,7 +46,7 @@ pkgbase = aseprite sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 - sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 + sha256sums = 19352033f2e5787229b2b71f7e961aeb24f293fb0b188a774140a7830f2b344b sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 diff --git a/PKGBUILD b/PKGBUILD index 91ca6d1..78642cf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.39 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -56,7 +56,7 @@ sha256sums=('b84e67061a9600c6c508af26944851ce277f4e912bf73d8e9e83a2eba5510c21' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' - '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' + '19352033f2e5787229b2b71f7e961aeb24f293fb0b188a774140a7830f2b344b' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') @@ -68,14 +68,20 @@ prepare() { mkdir -p skia bsdtar xf skia-$_skiaver.tar.gz --strip-components=1 -C skia # Fix up Aseprite's desktop integration + echo desktop env -C aseprite patch -tp1 Date: Fri, 5 Aug 2022 20:40:23 -0700 Subject: [PATCH 102/154] Fix patch again --- .SRCINFO | 2 +- PKGBUILD | 2 +- shared-libwebp.patch | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index cd7f8ae..090b8f0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -46,7 +46,7 @@ pkgbase = aseprite sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 - sha256sums = 19352033f2e5787229b2b71f7e961aeb24f293fb0b188a774140a7830f2b344b + sha256sums = 6c52f390d486bbd4bd3b7b0c1b835861335c5d9ef4a244f96054e026ad9eabac sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 diff --git a/PKGBUILD b/PKGBUILD index 78642cf..a873914 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -56,7 +56,7 @@ sha256sums=('b84e67061a9600c6c508af26944851ce277f4e912bf73d8e9e83a2eba5510c21' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' - '19352033f2e5787229b2b71f7e961aeb24f293fb0b188a774140a7830f2b344b' + '6c52f390d486bbd4bd3b7b0c1b835861335c5d9ef4a244f96054e026ad9eabac' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') diff --git a/shared-libwebp.patch b/shared-libwebp.patch index e0d992a..c4c5219 100644 --- a/shared-libwebp.patch +++ b/shared-libwebp.patch @@ -39,6 +39,7 @@ index af077f6..fed17ff 100644 NAMES libwebp # required for Windows PATHS "${SKIA_LIBRARY_DIR}" NO_DEFAULT_PATH) set(WEBP_INCLUDE_DIR "${SKIA_DIR}/third_party/externals/libwebp/src") ++ endif() - else() - set(WEBP_LIBRARIES webp webpdemux libwebpmux) - set(WEBP_INCLUDE_DIR ${LIBWEBP_DIR}/src) From 983811ed8bab9e36f5547efa0b6563209999a5b3 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Fri, 5 Aug 2022 21:15:27 -0700 Subject: [PATCH 103/154] upgpkg: aseprite 1.2.39-2 Fix libwebp patch --- .SRCINFO | 4 ++-- PKGBUILD | 10 ++++++++-- shared-libwebp.patch | 31 ++++++++++++++++--------------- 3 files changed, 26 insertions(+), 19 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 431cf0d..78f09da 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.39 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -46,7 +46,7 @@ pkgbase = aseprite sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 - sha256sums = 2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055 + sha256sums = 320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 diff --git a/PKGBUILD b/PKGBUILD index 91ca6d1..bf112b2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.39 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -56,7 +56,7 @@ sha256sums=('b84e67061a9600c6c508af26944851ce277f4e912bf73d8e9e83a2eba5510c21' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' - '2d6b5f33f23adc4f9912511ac35311a776ce34519ef40e9db3659e4c5457f055' + '320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') @@ -68,14 +68,20 @@ prepare() { mkdir -p skia bsdtar xf skia-$_skiaver.tar.gz --strip-components=1 -C skia # Fix up Aseprite's desktop integration + echo desktop env -C aseprite patch -tp1 Date: Fri, 5 Aug 2022 21:16:20 -0700 Subject: [PATCH 104/154] Remove debug `echo`s --- PKGBUILD | 6 ------ 1 file changed, 6 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index bf112b2..f28c4f3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -68,20 +68,14 @@ prepare() { mkdir -p skia bsdtar xf skia-$_skiaver.tar.gz --strip-components=1 -C skia # Fix up Aseprite's desktop integration - echo desktop env -C aseprite patch -tp1 Date: Thu, 1 Sep 2022 08:51:20 -0700 Subject: [PATCH 105/154] `fmt` 9.1.0 rebuild --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 78f09da..018f10b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.39 - pkgrel = 2 + pkgrel = 3 url = https://www.aseprite.org/ arch = x86_64 license = custom diff --git a/PKGBUILD b/PKGBUILD index f28c4f3..e02bbb2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.39 _skiaver=m102 _skiahash=861e4743af -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From 4db3b3c183d146f37514690b7b1983173e1f0648 Mon Sep 17 00:00:00 2001 From: ISSOtm Date: Mon, 5 Sep 2022 00:10:55 +0200 Subject: [PATCH 106/154] Clean up PKGBUILD a bit Remove unused Skia config flags Disable two unnecessary Skia features Remove a duplicate LAF config flag Correct use of wrong variable in package() --- PKGBUILD | 41 +++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index e02bbb2..c9a04ba 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.39 _skiaver=m102 _skiahash=861e4743af -pkgrel=3 +pkgrel=4 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -82,21 +82,42 @@ prepare() { build() { echo Building Skia... local _skiadir="$PWD/skia/obj" - # Flags can typically be found in `src/skia/gn/skia.gni`... but you're kind of on your own - env -C skia gn gen "$_skiadir" --args="`printf '%s ' \ -is_debug=false is_official_build=true skia_build_fuzzers=false \ -skia_enable_{pdf,skottie,skrive,sksl}=false \ + # Flags can be found by running `gn args --list "$_skiadir"` from skia's directory. + # (Pipe the output somewhere, there's a LOT of args.) + # + # The flags are chosen to provide the API required by Aseprite and nothing else (if possible), + # so as to reduce the compilation time and final binary size. + # + # Individual rationales: + # is_official_build: Suggested by the build instructions. + # skia_build_fuzzers: We don't care about them. + # skia_enable_pdf: Not used by Aseprite. + # skia_enable_skottie: Not used by Aseprite. + # skia_enable_sksl: laf seems to want to use it... but no references are made anywhere. + # skia_enable_svg: Not used by Aseprite. It seems it has its own SVG exporter. + # skia_use_lib*_{encode,decode}: Aseprite only loads PNG assets, so only libpng is required. + # skia_use_expat: Only required for the Android font manager and SVGCanvas/SVGDevice. + # skia_use_piex: Not used by Aseprite. Only used for reading RAW files. + # skia_use_xps: Not used outside of Windows. + # skia_use_zlib: Only used for PDF and RAW files. + # skia_use_libgifcodec: Only used for GIFs, which Aseprite doesn't use. + # skia_enable_{particles,skparagraph,sktext}: Aseprite does not link against this library. + env -C skia gn gen "$_skiadir" --args="$(printf '%s ' \ +is_official_build=true skia_build_fuzzers=false \ +skia_enable_{pdf,skottie,sksl,svg}=false \ skia_use_{libjpeg_turbo,libwebp}_{encode,decode}=false \ -skia_use_{expat,xps,zlib,libgifcodec,sfntly}=false`" +skia_use_{expat,piex,xps,zlib,libgifcodec}=false \ +skia_enable_{particles,skparagraph,sktext}=false)" ninja -C "$_skiadir" skia modules echo Building Aseprite... # Suppress install messages since we install to a temporary area; `install -v` will do the job cmake -S aseprite -B build -G Ninja -Wno-dev -DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_BUILD_TYPE=None \ --DENABLE_{UPDATER,WEBSOCKET}=OFF -DENABLE_SCRIPTING=ON -DLAF_WITH_EXAMPLES=OFF -DLAF_WITH_TESTS=OFF -DLAF_BACKEND=skia \ --DSKIA_DIR="$PWD/skia" -DSKIA_LIBRARY_DIR="$_skiadir" -DSKIA_LIBRARY="$_skiadir/libskia.a" \ +-DENABLE_{UPDATER,WEBSOCKET}=OFF -DENABLE_SCRIPTING=ON \ +-DLAF_WITH_{EXAMPLES,TESTS}=OFF -DLAF_BACKEND=skia \ +-DSKIA_DIR="$PWD/skia" -DSKIA_LIBRARY_DIR="$_skiadir" \ -DUSE_SHARED_{CMARK,CURL,FMT,GIFLIB,JPEGLIB,ZLIB,LIBPNG,TINYXML,PIXMAN,FREETYPE,HARFBUZZ,LIBARCHIVE,WEBP}=YES - ninja -C build + cmake --build build } check() { @@ -114,7 +135,7 @@ package() { # Install the binary and its `.desktop` file install -vDm 755 staging/bin/aseprite "$pkgdir/usr/bin/aseprite" install -vDm 644 aseprite/src/desktop/linux/aseprite.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" - install -vDm 644 aseprite/src/desktop/linux/mime/aseprite.xml "${pkgdir}/usr/share/mime/packages/${_pkgname}.xml" + install -vDm 644 aseprite/src/desktop/linux/mime/aseprite.xml "$pkgdir/usr/share/mime/packages/$pkgname.xml" # Install the icons in the correct directory (which is not the default) local _size for _size in 16 32 48 64 128 256; do From 8c329cd43e162d2fb5153d98c4dcaf9d9b0108b2 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sun, 4 Sep 2022 18:51:14 -0700 Subject: [PATCH 107/154] Update `.SRCINFO`. --- .SRCINFO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index 018f10b..7574dd4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.39 - pkgrel = 3 + pkgrel = 4 url = https://www.aseprite.org/ arch = x86_64 license = custom From b155cd46e466ffbb6b0d864bd858e978d2eee152 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Mon, 5 Sep 2022 20:42:40 -0700 Subject: [PATCH 108/154] upgpkg: aseprite 1.2.40-1 upstream release --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7574dd4..b934bea 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.39 - pkgrel = 4 + pkgver = 1.2.40 + pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -31,9 +31,9 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.39-Source.zip + noextract = Aseprite-v1.2.40-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.2.39/Aseprite-v1.2.39-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.2.40/Aseprite-v1.2.40-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 @@ -41,7 +41,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = b84e67061a9600c6c508af26944851ce277f4e912bf73d8e9e83a2eba5510c21 + sha256sums = cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 diff --git a/PKGBUILD b/PKGBUILD index c9a04ba..55091d9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,10 +9,10 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.39 +pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=4 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -51,7 +51,7 @@ 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=('b84e67061a9600c6c508af26944851ce277f4e912bf73d8e9e83a2eba5510c21' +sha256sums=('cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' From 3e063a0a020301b652d1fbea8dbe47cc9851c3d7 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Fri, 4 Nov 2022 10:43:00 -0700 Subject: [PATCH 109/154] Openssl 3 rebuilds --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b934bea..aa73144 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.40 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = custom diff --git a/PKGBUILD b/PKGBUILD index 55091d9..d5f7ecf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From 04b6464785944b13a10d396a908294361e8639e7 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Fri, 27 Jan 2023 15:32:44 -0800 Subject: [PATCH 110/154] upgpkg: aseprite 1.2.40-3 libcmark rebuild --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index aa73144..708d45b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.40 - pkgrel = 2 + pkgrel = 3 url = https://www.aseprite.org/ arch = x86_64 license = custom diff --git a/PKGBUILD b/PKGBUILD index d5f7ecf..3651c7e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From e6b590fcae4f8a6bbd9fe5a1409b13455c17d993 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sun, 16 Apr 2023 15:56:27 -0700 Subject: [PATCH 111/154] upgpkg: aseprite 1.2.40-4 Enable websockets --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 708d45b..0302886 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.40 - pkgrel = 3 + pkgrel = 4 url = https://www.aseprite.org/ arch = x86_64 license = custom diff --git a/PKGBUILD b/PKGBUILD index 3651c7e..1604197 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=3 +pkgrel=4 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -113,7 +113,7 @@ skia_enable_{particles,skparagraph,sktext}=false)" echo Building Aseprite... # Suppress install messages since we install to a temporary area; `install -v` will do the job cmake -S aseprite -B build -G Ninja -Wno-dev -DCMAKE_INSTALL_MESSAGE=NEVER -DCMAKE_BUILD_TYPE=None \ --DENABLE_{UPDATER,WEBSOCKET}=OFF -DENABLE_SCRIPTING=ON \ +-DENABLE_UPDATER=OFF -DENABLE_{SCRIPTING,WEBSOCKET}=ON \ -DLAF_WITH_{EXAMPLES,TESTS}=OFF -DLAF_BACKEND=skia \ -DSKIA_DIR="$PWD/skia" -DSKIA_LIBRARY_DIR="$_skiadir" \ -DUSE_SHARED_{CMARK,CURL,FMT,GIFLIB,JPEGLIB,ZLIB,LIBPNG,TINYXML,PIXMAN,FREETYPE,HARFBUZZ,LIBARCHIVE,WEBP}=YES From 8f3a87e0548fbade6dceff06597d0be8900025f4 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 3 May 2023 11:59:54 -0700 Subject: [PATCH 112/154] GCC13 + Python 3.11 rebuilds --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0302886..b567e66 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.40 - pkgrel = 4 + pkgrel = 5 url = https://www.aseprite.org/ arch = x86_64 license = custom diff --git a/PKGBUILD b/PKGBUILD index 1604197..2b44465 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=4 +pkgrel=5 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From 0ae586ef92d799944554f0d2482b502be73a7855 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 3 May 2023 12:21:21 -0700 Subject: [PATCH 113/154] Fix `aseprite` compilation with GCC 13 --- .SRCINFO | 6 +++++- PKGBUILD | 8 +++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b567e66..17714d4 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.40 - pkgrel = 5 + pkgrel = 6 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -35,6 +35,8 @@ pkgbase = aseprite noextract = skia-m102.tar.gz source = https://github.com/aseprite/aseprite/releases/download/v1.2.40/Aseprite-v1.2.40-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz + source = IXWebSocket-GCC13pt1.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/389.patch + source = IXWebSocket-GCC13pt2.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/443.patch source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch @@ -43,6 +45,8 @@ pkgbase = aseprite source = optional-pixman.patch sha256sums = cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad + sha256sums = 540bdd2985ec1295137deab99b95cb484934ab5d6d3b080fbc21d15e50a5e429 + sha256sums = 5c188f30ebf15013f346ef2868d6cfeb84f7ee8ac68f837fee6269aabfa4ae59 sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 diff --git a/PKGBUILD b/PKGBUILD index 2b44465..d74df0c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=5 +pkgrel=6 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -41,6 +41,8 @@ makedepends=(# "Meta" dependencies source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz" + IXWebSocket-GCC13pt1.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/389.patch + IXWebSocket-GCC13pt2.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/443.patch desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -53,6 +55,8 @@ noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' + '540bdd2985ec1295137deab99b95cb484934ab5d6d3b080fbc21d15e50a5e429' + '5c188f30ebf15013f346ef2868d6cfeb84f7ee8ac68f837fee6269aabfa4ae59' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' @@ -77,6 +81,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 Date: Wed, 3 May 2023 12:39:37 -0700 Subject: [PATCH 114/154] Screw it, upstream uses `clang`, `gcc>=13` is broken, using `clang`. --- .SRCINFO | 3 ++- PKGBUILD | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 17714d4..b8ae987 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.40 - pkgrel = 6 + pkgrel = 7 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -12,6 +12,7 @@ pkgbase = aseprite makedepends = libxi makedepends = gn makedepends = harfbuzz-icu + makedepends = clang depends = cmark depends = libcurl.so depends = libgif.so diff --git a/PKGBUILD b/PKGBUILD index d74df0c..7840824 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=6 +pkgrel=7 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -36,7 +36,8 @@ makedepends=(# "Meta" dependencies # Skia gn harfbuzz-icu # TODO: Benchmark clang v gcc - # clang + # Fuck it, compiling with GCC>=13 is broken and I'm not gonna write a patch to fix it + clang ) source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` @@ -88,6 +89,10 @@ prepare() { build() { echo Building Skia... local _skiadir="$PWD/skia/obj" + export CXX=clang++ + export CC=clang + export AR=ar + export NM=nm # Flags can be found by running `gn args --list "$_skiadir"` from skia's directory. # (Pipe the output somewhere, there's a LOT of args.) # @@ -127,10 +132,18 @@ skia_enable_{particles,skparagraph,sktext}=false)" } check() { + export CXX=clang++ + export CC=clang + export AR=ar + export NM=nm env -C build ctest --output-on-failure } package() { + export CXX=clang++ + export CC=clang + export AR=ar + export NM=nm # Now the fun part: components of e.g. `libwebp` get installed as well, # since we've had to compile it. But we don't want them. # So, install normally, and then cherry-pick Aseprite's files out of that. From b5cad094cb5633b0cb9b3823e02728a165da544e Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 3 May 2023 12:55:29 -0700 Subject: [PATCH 115/154] everything broke --- .SRCINFO | 4 +++- PKGBUILD | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b8ae987..26c6ebe 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.40 - pkgrel = 7 + pkgrel = 8 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -38,6 +38,7 @@ pkgbase = aseprite source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz source = IXWebSocket-GCC13pt1.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/389.patch source = IXWebSocket-GCC13pt2.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/443.patch + source = laf-GCC13.patch::https://patch-diff.githubusercontent.com/raw/aseprite/laf/pull/55.patch source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch @@ -48,6 +49,7 @@ pkgbase = aseprite sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 540bdd2985ec1295137deab99b95cb484934ab5d6d3b080fbc21d15e50a5e429 sha256sums = 5c188f30ebf15013f346ef2868d6cfeb84f7ee8ac68f837fee6269aabfa4ae59 + sha256sums = 1eba75501a0b1635a379499d930a66dd83d8bdb6b251c62c89f3cfab9c13213e sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 diff --git a/PKGBUILD b/PKGBUILD index 7840824..6c7cad3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=7 +pkgrel=8 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -44,6 +44,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz" IXWebSocket-GCC13pt1.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/389.patch IXWebSocket-GCC13pt2.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/443.patch + laf-GCC13.patch::https://patch-diff.githubusercontent.com/raw/aseprite/laf/pull/55.patch desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -58,6 +59,7 @@ sha256sums=('cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '540bdd2985ec1295137deab99b95cb484934ab5d6d3b080fbc21d15e50a5e429' '5c188f30ebf15013f346ef2868d6cfeb84f7ee8ac68f837fee6269aabfa4ae59' + '1eba75501a0b1635a379499d930a66dd83d8bdb6b251c62c89f3cfab9c13213e' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' @@ -82,8 +84,10 @@ 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 Date: Wed, 3 May 2023 12:57:49 -0700 Subject: [PATCH 116/154] `-f` --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 6c7cad3..50c2c69 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -84,7 +84,7 @@ 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 Date: Fri, 28 Jul 2023 12:14:00 -0700 Subject: [PATCH 117/154] `libfmt=10` rebuild --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 26c6ebe..1e75794 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.2.40 - pkgrel = 8 + pkgrel = 9 url = https://www.aseprite.org/ arch = x86_64 license = custom diff --git a/PKGBUILD b/PKGBUILD index 50c2c69..d3448c9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.2.40 _skiaver=m102 _skiahash=861e4743af -pkgrel=8 +pkgrel=9 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From 0b07e635bdef626f7d1acbaad4d6f0ab384a1a29 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Mon, 27 Nov 2023 15:49:48 -0600 Subject: [PATCH 118/154] upgpkg: aseprite 1.3-1 upstream release --- .SRCINFO | 18 ++++++------------ PKGBUILD | 18 ++++-------------- shared-fmt.patch | 5 +++-- 3 files changed, 13 insertions(+), 28 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 1e75794..6eeed30 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.2.40 - pkgrel = 9 + pkgver = 1.3 + pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 license = custom @@ -32,26 +32,20 @@ pkgbase = aseprite depends = libgl depends = libfontconfig.so depends = libxcursor - noextract = Aseprite-v1.2.40-Source.zip + noextract = Aseprite-v1.3-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.2.40/Aseprite-v1.2.40-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3/Aseprite-v1.3-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz - source = IXWebSocket-GCC13pt1.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/389.patch - source = IXWebSocket-GCC13pt2.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/443.patch - source = laf-GCC13.patch::https://patch-diff.githubusercontent.com/raw/aseprite/laf/pull/55.patch source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb + sha256sums = ccbb08d7d76b267eea26b601c573111a8c046982f6e38847280da6e16012e3a6 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad - sha256sums = 540bdd2985ec1295137deab99b95cb484934ab5d6d3b080fbc21d15e50a5e429 - sha256sums = 5c188f30ebf15013f346ef2868d6cfeb84f7ee8ac68f837fee6269aabfa4ae59 - sha256sums = 1eba75501a0b1635a379499d930a66dd83d8bdb6b251c62c89f3cfab9c13213e sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 - sha256sums = 821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06 + sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 sha256sums = 320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 diff --git a/PKGBUILD b/PKGBUILD index d3448c9..84f33e9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,10 +9,10 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.2.40 +pkgver=1.3 _skiaver=m102 _skiahash=861e4743af -pkgrel=9 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -42,9 +42,6 @@ makedepends=(# "Meta" dependencies source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz" - IXWebSocket-GCC13pt1.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/389.patch - IXWebSocket-GCC13pt2.patch::https://patch-diff.githubusercontent.com/raw/machinezone/IXWebSocket/pull/443.patch - laf-GCC13.patch::https://patch-diff.githubusercontent.com/raw/aseprite/laf/pull/55.patch desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -55,13 +52,10 @@ 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=('cd67eaf34ee19ae5584f9052f3b385dcfa41232f38016baf08723b987ae583fb' +sha256sums=('ccbb08d7d76b267eea26b601c573111a8c046982f6e38847280da6e16012e3a6' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' - '540bdd2985ec1295137deab99b95cb484934ab5d6d3b080fbc21d15e50a5e429' - '5c188f30ebf15013f346ef2868d6cfeb84f7ee8ac68f837fee6269aabfa4ae59' - '1eba75501a0b1635a379499d930a66dd83d8bdb6b251c62c89f3cfab9c13213e' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' - '821f1354dbbc0bb3fa700e63037ed3c89b0d32bd2ab253450f91eeacd7d47c06' + 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' '320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' @@ -84,10 +78,6 @@ 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 Date: Wed, 29 Nov 2023 16:11:13 -0600 Subject: [PATCH 119/154] upgpkg: aseprite 1.3.1-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6eeed30..2d86dfc 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3 + pkgver = 1.3.1 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-Source.zip + noextract = Aseprite-v1.3.1-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3/Aseprite-v1.3-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.1/Aseprite-v1.3.1-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,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = ccbb08d7d76b267eea26b601c573111a8c046982f6e38847280da6e16012e3a6 + sha256sums = b9a72ef087570e236974724463b367c969abb08b7d326c2db1fe0651b63d8337 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 diff --git a/PKGBUILD b/PKGBUILD index 84f33e9..b3267c3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3 +pkgver=1.3.1 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -52,7 +52,7 @@ 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=('ccbb08d7d76b267eea26b601c573111a8c046982f6e38847280da6e16012e3a6' +sha256sums=('b9a72ef087570e236974724463b367c969abb08b7d326c2db1fe0651b63d8337' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From 5b5f507b124f39f3f8d7e31a4d4da85e3f449dc9 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sat, 2 Dec 2023 18:14:28 -0600 Subject: [PATCH 120/154] upgpkg: aseprite 1.3.2-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2d86dfc..e4243da 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.1 + pkgver = 1.3.2 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.1-Source.zip + noextract = Aseprite-v1.3.2-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.1/Aseprite-v1.3.1-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.2/Aseprite-v1.3.2-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,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = b9a72ef087570e236974724463b367c969abb08b7d326c2db1fe0651b63d8337 + sha256sums = 0246b18ff77d4c4e813c7f40207bfbd1387813b82d57900cde869dab370a26cc sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 diff --git a/PKGBUILD b/PKGBUILD index b3267c3..daf2283 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.1 +pkgver=1.3.2 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -52,7 +52,7 @@ 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=('b9a72ef087570e236974724463b367c969abb08b7d326c2db1fe0651b63d8337' +sha256sums=('0246b18ff77d4c4e813c7f40207bfbd1387813b82d57900cde869dab370a26cc' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From e119c72df419bc31bbb62d761ca8b13161966994 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sat, 20 Jan 2024 22:47:17 -0600 Subject: [PATCH 121/154] upgpkg: aseprite 1.3.2-2 SPDX-ified --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e4243da..3458a08 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,10 +1,10 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.2 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 - license = custom + license = LicenseRef-Aseprite-EULA makedepends = cmake makedepends = ninja makedepends = git diff --git a/PKGBUILD b/PKGBUILD index daf2283..f5391a9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,11 +12,11 @@ pkgname=aseprite pkgver=1.3.2 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" -license=('custom') +license=('LicenseRef-Aseprite-EULA') depends=(# ~ Aseprite's direct dependencies ~ # pixman is not linked to because we use Skia instead # harfbuzz is linked statically because Aseprite expects an older version From 93b4b55bfaa254e81242ee5687e655943916cb63 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Fri, 2 Feb 2024 01:44:41 -0600 Subject: [PATCH 122/154] upgpkg: aseprite 1.3.2-3 cmark rebuild --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 3458a08..2fc796b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.2 - pkgrel = 2 + pkgrel = 3 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA diff --git a/PKGBUILD b/PKGBUILD index f5391a9..ff19d37 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.3.2 _skiaver=m102 _skiahash=861e4743af -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From edcb2c0ed85c08a2336a0534cbcfdfccb7279ea6 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Thu, 15 Feb 2024 22:33:57 -0600 Subject: [PATCH 123/154] upgpkg: aseprite 1.3.3-1 upstream release --- .SRCINFO | 4 ++-- PKGBUILD | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2fc796b..f8f7736 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.2 - pkgrel = 3 + pkgver = 1.3.3 + pkgrel = 1 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA diff --git a/PKGBUILD b/PKGBUILD index ff19d37..8b27299 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,10 +9,10 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.2 +pkgver=1.3.3 _skiaver=m102 _skiahash=861e4743af -pkgrel=3 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -52,7 +52,7 @@ 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=('0246b18ff77d4c4e813c7f40207bfbd1387813b82d57900cde869dab370a26cc' +sha256sums=('0057a1488165b9ef8afe6a0bc45154e8ca31e42ed35754444a71a0e366405849' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From 88d323a39c5284af3dccd86526cf7b54da407b7f Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 21 Feb 2024 21:44:27 -0600 Subject: [PATCH 124/154] upgpkg: aseprite 1.3.4-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index f8f7736..6cd1498 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.3 + pkgver = 1.3.4 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.2-Source.zip + noextract = Aseprite-v1.3.4-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.2/Aseprite-v1.3.2-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.4/Aseprite-v1.3.4-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,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 0246b18ff77d4c4e813c7f40207bfbd1387813b82d57900cde869dab370a26cc + sha256sums = 93e87272cc5159ff695650d05d3c52a37074a97a630769910a84b71e914456a2 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 diff --git a/PKGBUILD b/PKGBUILD index 8b27299..e3979bc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.3 +pkgver=1.3.4 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -52,7 +52,7 @@ 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=('0057a1488165b9ef8afe6a0bc45154e8ca31e42ed35754444a71a0e366405849' +sha256sums=('93e87272cc5159ff695650d05d3c52a37074a97a630769910a84b71e914456a2' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From abe5adccd4b08a7f47bce9be6cb57a6a6cf117fc Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Mon, 18 Mar 2024 02:06:59 -0500 Subject: [PATCH 125/154] upgpkg: aseprite 1.3.5-1 upstream release --- .SRCINFO | 8 ++++---- .nvchecker.toml | 4 ++++ PKGBUILD | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .nvchecker.toml diff --git a/.SRCINFO b/.SRCINFO index 6cd1498..11d9d71 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.4 + pkgver = 1.3.5 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.4-Source.zip + noextract = Aseprite-v1.3.5-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.4/Aseprite-v1.3.4-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.5/Aseprite-v1.3.5-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,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 93e87272cc5159ff695650d05d3c52a37074a97a630769910a84b71e914456a2 + sha256sums = 6acf1b7f5019733cd8a54d8e0504e78b2f74cdb2073f82230e543cfd990f6984 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 diff --git a/.nvchecker.toml b/.nvchecker.toml new file mode 100644 index 0000000..5097652 --- /dev/null +++ b/.nvchecker.toml @@ -0,0 +1,4 @@ +[aseprite] +source = "regex" +regex = 'v(\d+\.\d+\.\d+)' +url = "https://github.com/aseprite/aseprite/tags" diff --git a/PKGBUILD b/PKGBUILD index e3979bc..9e79bb7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.4 +pkgver=1.3.5 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -52,7 +52,7 @@ 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=('93e87272cc5159ff695650d05d3c52a37074a97a630769910a84b71e914456a2' +sha256sums=('6acf1b7f5019733cd8a54d8e0504e78b2f74cdb2073f82230e543cfd990f6984' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From 4cb9d1b0e8152f4795f350ac3bf4a653e4843f2f Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sat, 23 Mar 2024 21:46:42 -0500 Subject: [PATCH 126/154] upgpkg: aseprite 1.3.5-2 Fixes #11 --- .SRCINFO | 2 +- PKGBUILD | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 11d9d71..eb13f12 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.5 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA diff --git a/PKGBUILD b/PKGBUILD index 9e79bb7..e9be606 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.3.5 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -149,6 +149,9 @@ package() { install -vDm 755 staging/bin/aseprite "$pkgdir/usr/bin/aseprite" install -vDm 644 aseprite/src/desktop/linux/aseprite.desktop "$pkgdir/usr/share/applications/$pkgname.desktop" install -vDm 644 aseprite/src/desktop/linux/mime/aseprite.xml "$pkgdir/usr/share/mime/packages/$pkgname.xml" + # Thumbnailer + install -vDm 755 aseprite/src/desktop/linux/aseprite-thumbnailer "$pkgdir/usr/bin/aseprite-thumbnailer" + install -vDm 644 aseprite/src/desktop/linux/gnome/aseprite.thumbnailer "$pkgdir/usr/share/thumbnailers/aseprite.thumbnailer" # Install the icons in the correct directory (which is not the default) local _size for _size in 16 32 48 64 128 256; do From e509181aa9a2cf666b633c9f5df54dea8b0369a0 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Tue, 9 Apr 2024 13:55:52 -0500 Subject: [PATCH 127/154] upgpkg: aseprite 1.3.6-1 upstream release --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index eb13f12..e1659a0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.5 - pkgrel = 2 + pkgver = 1.3.6 + 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.5-Source.zip + noextract = Aseprite-v1.3.6-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.5/Aseprite-v1.3.5-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.6/Aseprite-v1.3.6-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,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 6acf1b7f5019733cd8a54d8e0504e78b2f74cdb2073f82230e543cfd990f6984 + sha256sums = 5e974aa2786297981cd5ebe81f040a49b722bddfe33d70def207ad06cb0d34fc sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 diff --git a/PKGBUILD b/PKGBUILD index e9be606..cedab28 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,10 +9,10 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.5 +pkgver=1.3.6 _skiaver=m102 _skiahash=861e4743af -pkgrel=2 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -52,7 +52,7 @@ 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=('6acf1b7f5019733cd8a54d8e0504e78b2f74cdb2073f82230e543cfd990f6984' +sha256sums=('5e974aa2786297981cd5ebe81f040a49b722bddfe33d70def207ad06cb0d34fc' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From 8ac7a096247793563b416076cf5711601180f79f Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 22 May 2024 23:44:59 -0500 Subject: [PATCH 128/154] 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 Date: Thu, 23 May 2024 00:01:37 -0500 Subject: [PATCH 129/154] 1.3.7 switches to `tinyxml2` --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9141c2c..78af177 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -19,7 +19,7 @@ pkgbase = aseprite depends = libjpeg.so depends = zlib depends = libpng - depends = tinyxml + depends = tinyxml2 depends = libfreetype.so depends = libarchive.so depends = libfmt.so diff --git a/PKGBUILD b/PKGBUILD index ecfb130..871645f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -20,7 +20,7 @@ license=('LicenseRef-Aseprite-EULA') depends=(# ~ Aseprite's direct dependencies ~ # pixman is not linked to because we use Skia instead # harfbuzz is linked statically because Aseprite expects an older version - cmark libcurl.so libgif.so libjpeg.so zlib libpng tinyxml libfreetype.so libarchive.so libfmt.so + cmark libcurl.so libgif.so libjpeg.so zlib libpng tinyxml2 libfreetype.so libarchive.so libfmt.so libwebp.so libwebpmux.so libwebpdemux.so hicolor-icon-theme # For installing Aseprite's icons # ~ Skia deps ~ From 5c01d1c23143bb785a8945a9dcf8c1bcdc90bf70 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 7 Aug 2024 12:56:28 -0500 Subject: [PATCH 130/154] upgpkg: aseprite 1.3.7-2 Rebuild --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 78af177..8372747 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.7 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA diff --git a/PKGBUILD b/PKGBUILD index 871645f..499bc13 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.3.7 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From fc1ea126c9936c46f6bd8d5d38ab2af91e2b4b10 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Tue, 20 Aug 2024 19:27:26 -0500 Subject: [PATCH 131/154] upgpkg: aseprite 1.3.8-1 upstream release --- .SRCINFO | 14 +++--- ENABLE_UPDATER-fix.patch | 95 ---------------------------------------- PKGBUILD | 16 +++---- shared-libarchive.patch | 8 ++-- 4 files changed, 16 insertions(+), 117 deletions(-) delete mode 100644 ENABLE_UPDATER-fix.patch diff --git a/.SRCINFO b/.SRCINFO index 8372747..c098d79 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.7 - pkgrel = 2 + pkgver = 1.3.8 + 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.7-Source.zip + noextract = Aseprite-v1.3.8-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.7/Aseprite-v1.3.7-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.8/Aseprite-v1.3.8-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,15 +42,13 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - source = ENABLE_UPDATER-fix.patch - sha256sums = 6524b4dd38adac22f954122846ccca7377983cee2e0f17c1482294cf09cbdcfc + sha256sums = 4d62248a4b55ae6a5dc9a8974464ab166a009a6b2cc3f24ddb160b621d2f997c sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 - sha256sums = d7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53 + sha256sums = bed004cdbe61793c759a30c4afa5d844ce08c55a321d5c3625426f059f98b503 sha256sums = 320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 - sha256sums = 31369a5063d5f7839699fea00235b70057b0f2619592ba1db5af6d12c4f1171c pkgname = aseprite diff --git a/ENABLE_UPDATER-fix.patch b/ENABLE_UPDATER-fix.patch deleted file mode 100644 index 815dab1..0000000 --- a/ENABLE_UPDATER-fix.patch +++ /dev/null @@ -1,95 +0,0 @@ -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 499bc13..a45820e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,10 +9,10 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.7 +pkgver=1.3.8 _skiaver=m102 _skiahash=861e4743af -pkgrel=2 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -49,19 +49,17 @@ 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 - ENABLE_UPDATER-fix.patch) + optional-pixman.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root -sha256sums=('6524b4dd38adac22f954122846ccca7377983cee2e0f17c1482294cf09cbdcfc' +sha256sums=('4d62248a4b55ae6a5dc9a8974464ab166a009a6b2cc3f24ddb160b621d2f997c' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' - 'd7f2f8c43d24382453273ed17b1c0e05928980a36ad0b7c988da3aa0fe32de53' + 'bed004cdbe61793c759a30c4afa5d844ce08c55a321d5c3625426f059f98b503' '320ed456512fb26f30aa682d7d34529d6fc3372d76daba3812cecb8fc21d5f1d' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' - 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654' - '31369a5063d5f7839699fea00235b70057b0f2619592ba1db5af6d12c4f1171c') + 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') prepare() { # Extract Aseprite's sources @@ -80,8 +78,6 @@ 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 ) From 1d77599e425279680c70b9329cd5800faf1acb69 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Mon, 26 Aug 2024 17:11:17 -0500 Subject: [PATCH 132/154] upgpkg: aseprite 1.3.8.1-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c098d79..d5b6260 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.8 + pkgver = 1.3.8.1 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.8-Source.zip + noextract = Aseprite-v1.3.8.1-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.8/Aseprite-v1.3.8-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.8.1/Aseprite-v1.3.8.1-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,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 4d62248a4b55ae6a5dc9a8974464ab166a009a6b2cc3f24ddb160b621d2f997c + sha256sums = fc13536a9e14551245028d578493aa63f9978b943250936735dc62a5abfbee53 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 diff --git a/PKGBUILD b/PKGBUILD index a45820e..10fd01d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.8 +pkgver=1.3.8.1 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -52,7 +52,7 @@ 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=('4d62248a4b55ae6a5dc9a8974464ab166a009a6b2cc3f24ddb160b621d2f997c' +sha256sums=('fc13536a9e14551245028d578493aa63f9978b943250936735dc62a5abfbee53' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From 8bbe712b154dcdd1c5cf2a37ced85e4c9ce88d32 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Thu, 12 Sep 2024 23:59:38 -0500 Subject: [PATCH 133/154] upgpkg: aseprite 1.3.8.1-2 libfmt rebuild --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d5b6260..37934e9 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.8.1 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA diff --git a/PKGBUILD b/PKGBUILD index 10fd01d..e51fb8c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.3.8.1 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From 062d51bad04773c55d79d5f673a0d77a174e187d Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 2 Oct 2024 13:14:36 -0500 Subject: [PATCH 134/154] 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 From 3b7d5ac9de544042684ba05f04b3594c5d1db4ff Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sun, 6 Oct 2024 01:48:20 -0500 Subject: [PATCH 135/154] upgpkg: aseprite 1.3.9.1-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index c1f6678..33a582b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.9 + pkgver = 1.3.9.1 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.9-Source.zip + noextract = Aseprite-v1.3.9.1-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.9/Aseprite-v1.3.9-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.9.1/Aseprite-v1.3.9.1-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,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = 672c8ddb12d4c180f6c27b33ec4b0faefe5df321c7d40c03cb62ad3182e584ff + sha256sums = c4abfc90abcabd2971704d0b57abcf183e48c8932c11998c59122a491e2c686c sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 diff --git a/PKGBUILD b/PKGBUILD index 7d4e5e5..ec76c6e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.9 +pkgver=1.3.9.1 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -52,7 +52,7 @@ 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=('672c8ddb12d4c180f6c27b33ec4b0faefe5df321c7d40c03cb62ad3182e584ff' +sha256sums=('c4abfc90abcabd2971704d0b57abcf183e48c8932c11998c59122a491e2c686c' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From 18d6adea1e921b0a73be195b6e5696eac472059d Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Fri, 22 Nov 2024 10:42:26 -0600 Subject: [PATCH 136/154] upgpkg: aseprite 1.3.10.1-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 33a582b..9f72792 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.9.1 + pkgver = 1.3.10.1 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.9.1-Source.zip + noextract = Aseprite-v1.3.10.1-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.9.1/Aseprite-v1.3.9.1-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.10.1/Aseprite-v1.3.10.1-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,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch - sha256sums = c4abfc90abcabd2971704d0b57abcf183e48c8932c11998c59122a491e2c686c + sha256sums = 8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 diff --git a/PKGBUILD b/PKGBUILD index ec76c6e..b31c3fe 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Kamil Biduś pkgname=aseprite -pkgver=1.3.9.1 +pkgver=1.3.10.1 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -52,7 +52,7 @@ 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=('c4abfc90abcabd2971704d0b57abcf183e48c8932c11998c59122a491e2c686c' +sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' From 16f6266c927e118a3271adaefb872f18ec149614 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Mon, 25 Nov 2024 19:39:37 -0600 Subject: [PATCH 137/154] upgpkg: aseprite 1.3.10.1-3 Fix build --- .SRCINFO | 4 +++- PKGBUILD | 19 +++++++++++++++---- fix-shared-tinyxml2.patch | 24 ++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 fix-shared-tinyxml2.patch diff --git a/.SRCINFO b/.SRCINFO index 9f72792..e46a943 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.10.1 - pkgrel = 1 + pkgrel = 3 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA @@ -42,6 +42,7 @@ pkgbase = aseprite source = shared-libwebp.patch source = shared-skia-deps.patch source = optional-pixman.patch + source = fix-shared-tinyxml2.patch sha256sums = 8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 @@ -50,5 +51,6 @@ pkgbase = aseprite sha256sums = 0f8adb959d7000697af453d6cf5aaf9984b74868008382aad541d2c29871c751 sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 + sha256sums = ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index b31c3fe..f1ecf25 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,7 @@ pkgname=aseprite pkgver=1.3.10.1 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -49,7 +49,8 @@ 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 + fix-shared-tinyxml2.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4' @@ -59,8 +60,9 @@ sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4' '89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb' '0f8adb959d7000697af453d6cf5aaf9984b74868008382aad541d2c29871c751' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' - 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654') - + 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654' + 'ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3') +_debug="true" prepare() { # Extract Aseprite's sources mkdir -p aseprite @@ -69,15 +71,24 @@ prepare() { mkdir -p skia bsdtar xf skia-$_skiaver.tar.gz --strip-components=1 -C skia # Fix up Aseprite's desktop integration + [[ -n $_debug ]] && echo desktop.patch env -C aseprite patch -tp1 Date: Wed, 25 Dec 2024 14:59:30 -0800 Subject: [PATCH 138/154] Set found when using shared libwebp --- PKGBUILD | 11 ++++++++--- shared-libwebp-found.patch | 11 +++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 shared-libwebp-found.patch diff --git a/PKGBUILD b/PKGBUILD index f1ecf25..9fb926c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,12 +7,13 @@ # Contributor: Benoit Favre # Contributor: Alexander Rødseth # Contributor: Kamil Biduś +# Contributor: Jomar Milan pkgname=aseprite pkgver=1.3.10.1 _skiaver=m102 _skiahash=861e4743af -pkgrel=3 +pkgrel=4 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -50,7 +51,8 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-libwebp.patch shared-skia-deps.patch optional-pixman.patch - fix-shared-tinyxml2.patch) + fix-shared-tinyxml2.patch + shared-libwebp-found.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4' @@ -61,7 +63,8 @@ sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4' '0f8adb959d7000697af453d6cf5aaf9984b74868008382aad541d2c29871c751' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654' - 'ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3') + 'ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3' + '72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14') _debug="true" prepare() { # Extract Aseprite's sources @@ -89,6 +92,8 @@ prepare() { # TinyEXIF cannot find tinyxml2 otherwise [[ -n $_debug ]] && echo fix-shared-tinyxml2.patch env -C aseprite/third_party/TinyEXIF patch -tp1 Date: Wed, 25 Dec 2024 17:18:30 -0600 Subject: [PATCH 139/154] upgpkg: aseprite 1.3.10.1-5 Fix pkgrel + checksums --- .SRCINFO | 4 +++- PKGBUILD | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e46a943..4822508 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.10.1 - pkgrel = 3 + pkgrel = 5 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA @@ -43,6 +43,7 @@ pkgbase = aseprite source = shared-skia-deps.patch source = optional-pixman.patch source = fix-shared-tinyxml2.patch + source = shared-libwebp-found.patch sha256sums = 8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 @@ -52,5 +53,6 @@ pkgbase = aseprite sha256sums = eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0 sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 sha256sums = ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3 + sha256sums = 72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 9fb926c..3734082 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=aseprite pkgver=1.3.10.1 _skiaver=m102 _skiahash=861e4743af -pkgrel=4 +pkgrel=5 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" From ffed33147e5e151945a76375d1d20e2e6c740b20 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sun, 5 Jan 2025 15:57:39 -0600 Subject: [PATCH 140/154] upgpkg: aseprite 1.3.10.1-6 add translations --- .SRCINFO | 4 +++- PKGBUILD | 13 ++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4822508..ed10c7d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.10.1 - pkgrel = 5 + pkgrel = 6 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA @@ -36,6 +36,7 @@ pkgbase = aseprite noextract = skia-m102.tar.gz source = https://github.com/aseprite/aseprite/releases/download/v1.3.10.1/Aseprite-v1.3.10.1-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz + source = aseprite-strings::git+https://github.com/aseprite/strings.git#commit=f9cf9f95f46d78dcdfc4c9b8835306bd9728c8be source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch @@ -46,6 +47,7 @@ pkgbase = aseprite source = shared-libwebp-found.patch sha256sums = 8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad + sha256sums = a0090d46824bdbd79a83ec9ad83e4d09680471e442569ab16f753c62ef0d0e3c sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 sha256sums = 89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb diff --git a/PKGBUILD b/PKGBUILD index 3734082..b49bac8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=aseprite pkgver=1.3.10.1 _skiaver=m102 _skiahash=861e4743af -pkgrel=5 +pkgrel=6 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -43,6 +43,7 @@ makedepends=(# "Meta" dependencies source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz" + aseprite-strings::git+https://github.com/aseprite/strings.git#commit=f9cf9f95f46d78dcdfc4c9b8835306bd9728c8be desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -57,6 +58,7 @@ noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' + 'a0090d46824bdbd79a83ec9ad83e4d09680471e442569ab16f753c62ef0d0e3c' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' '89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb' @@ -92,8 +94,8 @@ prepare() { # TinyEXIF cannot find tinyxml2 otherwise [[ -n $_debug ]] && echo fix-shared-tinyxml2.patch env -C aseprite/third_party/TinyEXIF patch -tp1 Date: Sun, 5 Jan 2025 16:46:02 -0600 Subject: [PATCH 141/154] upgpkg: aseprite 1.3.10.1-7 fix `cp` args --- .SRCINFO | 2 +- PKGBUILD | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ed10c7d..ca89b99 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.10.1 - pkgrel = 6 + pkgrel = 7 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA diff --git a/PKGBUILD b/PKGBUILD index b49bac8..c261ec6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=aseprite pkgver=1.3.10.1 _skiaver=m102 _skiahash=861e4743af -pkgrel=6 +pkgrel=7 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -186,7 +186,7 @@ package() { install -vm 644 aseprite/data/fonts/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/font.txt" # Copy translations mkdir -p "$pkgdir/usr/share/$pkgname/data/strings/" - cp -vt aseprite-strings/*.ini "$pkgdir/usr/share/$pkgname/data/strings/" + cp -vt "$pkgdir/usr/share/$pkgname/data/strings/" aseprite-strings/*.ini # Copy translations' license install -vm 644 aseprite-strings/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/translations.txt" } From a2faf882426b19e94b1fdd3194948db8e3719846 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sat, 11 Jan 2025 16:56:19 -0600 Subject: [PATCH 142/154] upgpkg: aseprite 1.3.11-1 upstream release --- .SRCINFO | 10 +++++----- PKGBUILD | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ca89b99..343818b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.10.1 - pkgrel = 7 + pkgver = 1.3.11 + 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.10.1-Source.zip + noextract = Aseprite-v1.3.11-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.10.1/Aseprite-v1.3.10.1-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.11/Aseprite-v1.3.11-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz source = aseprite-strings::git+https://github.com/aseprite/strings.git#commit=f9cf9f95f46d78dcdfc4c9b8835306bd9728c8be source = desktop.patch @@ -45,7 +45,7 @@ pkgbase = aseprite source = optional-pixman.patch source = fix-shared-tinyxml2.patch source = shared-libwebp-found.patch - sha256sums = 8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4 + sha256sums = e608b7a77a1d77a50394323759ba12cf3543e1d05745e1d907fe9818157f2d4c sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = a0090d46824bdbd79a83ec9ad83e4d09680471e442569ab16f753c62ef0d0e3c sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 diff --git a/PKGBUILD b/PKGBUILD index c261ec6..d785f65 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,10 +10,10 @@ # Contributor: Jomar Milan pkgname=aseprite -pkgver=1.3.10.1 +pkgver=1.3.11 _skiaver=m102 _skiahash=861e4743af -pkgrel=7 +pkgrel=1 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -56,7 +56,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-libwebp-found.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root -sha256sums=('8eea1db7f3465c5d1442c19599de53ab6d69431767ffa320459f5c3ff8cc80b4' +sha256sums=('e608b7a77a1d77a50394323759ba12cf3543e1d05745e1d907fe9818157f2d4c' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' 'a0090d46824bdbd79a83ec9ad83e4d09680471e442569ab16f753c62ef0d0e3c' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' From efdd9a8532946fda9ae8f254b283197e15660c2c Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sat, 11 Jan 2025 17:27:48 -0600 Subject: [PATCH 143/154] Bump translations. --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 343818b..43a0d71 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -36,7 +36,7 @@ pkgbase = aseprite noextract = skia-m102.tar.gz source = https://github.com/aseprite/aseprite/releases/download/v1.3.11/Aseprite-v1.3.11-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz - source = aseprite-strings::git+https://github.com/aseprite/strings.git#commit=f9cf9f95f46d78dcdfc4c9b8835306bd9728c8be + source = aseprite-strings::git+https://github.com/aseprite/strings.git#commit=7b0af61dec1d98242d7eb2e9cab835d442d21235 source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch @@ -47,7 +47,7 @@ pkgbase = aseprite source = shared-libwebp-found.patch sha256sums = e608b7a77a1d77a50394323759ba12cf3543e1d05745e1d907fe9818157f2d4c sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad - sha256sums = a0090d46824bdbd79a83ec9ad83e4d09680471e442569ab16f753c62ef0d0e3c + sha256sums = 36b329f23429670bf473472a6b64ca5156d2707599eaabdd69ef424dd6ad5635 sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 sha256sums = 89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb diff --git a/PKGBUILD b/PKGBUILD index d785f65..9c836fa 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -43,7 +43,7 @@ makedepends=(# "Meta" dependencies source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz" - aseprite-strings::git+https://github.com/aseprite/strings.git#commit=f9cf9f95f46d78dcdfc4c9b8835306bd9728c8be + aseprite-strings::git+https://github.com/aseprite/strings.git#commit=7b0af61dec1d98242d7eb2e9cab835d442d21235 desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -58,7 +58,7 @@ noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('e608b7a77a1d77a50394323759ba12cf3543e1d05745e1d907fe9818157f2d4c' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' - 'a0090d46824bdbd79a83ec9ad83e4d09680471e442569ab16f753c62ef0d0e3c' + '36b329f23429670bf473472a6b64ca5156d2707599eaabdd69ef424dd6ad5635' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' '89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb' From 4d1f4368412c205acab12a1a27544ab103aeb5b4 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Tue, 28 Jan 2025 14:43:34 -0600 Subject: [PATCH 144/154] upgpkg: aseprite 1.3.12-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 43a0d71..566efcf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.11 + pkgver = 1.3.12 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.11-Source.zip + noextract = Aseprite-v1.3.12-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.11/Aseprite-v1.3.11-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.12/Aseprite-v1.3.12-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz source = aseprite-strings::git+https://github.com/aseprite/strings.git#commit=7b0af61dec1d98242d7eb2e9cab835d442d21235 source = desktop.patch @@ -45,7 +45,7 @@ pkgbase = aseprite source = optional-pixman.patch source = fix-shared-tinyxml2.patch source = shared-libwebp-found.patch - sha256sums = e608b7a77a1d77a50394323759ba12cf3543e1d05745e1d907fe9818157f2d4c + sha256sums = e44401463b66fc1267a1865ab75f5a9d1ae46e989c19a4ec7aadbaa315634e34 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 36b329f23429670bf473472a6b64ca5156d2707599eaabdd69ef424dd6ad5635 sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 diff --git a/PKGBUILD b/PKGBUILD index 9c836fa..43983e6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ # Contributor: Jomar Milan pkgname=aseprite -pkgver=1.3.11 +pkgver=1.3.12 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -56,7 +56,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-libwebp-found.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root -sha256sums=('e608b7a77a1d77a50394323759ba12cf3543e1d05745e1d907fe9818157f2d4c' +sha256sums=('e44401463b66fc1267a1865ab75f5a9d1ae46e989c19a4ec7aadbaa315634e34' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '36b329f23429670bf473472a6b64ca5156d2707599eaabdd69ef424dd6ad5635' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' From eb39bd7906a41461a60342069397c33ce6bca69c Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Thu, 27 Feb 2025 11:18:36 -0600 Subject: [PATCH 145/154] upgpkg: aseprite 1.3.13-1 upstream release --- .SRCINFO | 8 ++++---- PKGBUILD | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 566efcf..2066f91 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art - pkgver = 1.3.12 + pkgver = 1.3.13 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.12-Source.zip + noextract = Aseprite-v1.3.13-Source.zip noextract = skia-m102.tar.gz - source = https://github.com/aseprite/aseprite/releases/download/v1.3.12/Aseprite-v1.3.12-Source.zip + source = https://github.com/aseprite/aseprite/releases/download/v1.3.13/Aseprite-v1.3.13-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz source = aseprite-strings::git+https://github.com/aseprite/strings.git#commit=7b0af61dec1d98242d7eb2e9cab835d442d21235 source = desktop.patch @@ -45,7 +45,7 @@ pkgbase = aseprite source = optional-pixman.patch source = fix-shared-tinyxml2.patch source = shared-libwebp-found.patch - sha256sums = e44401463b66fc1267a1865ab75f5a9d1ae46e989c19a4ec7aadbaa315634e34 + sha256sums = c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 36b329f23429670bf473472a6b64ca5156d2707599eaabdd69ef424dd6ad5635 sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 diff --git a/PKGBUILD b/PKGBUILD index 43983e6..516237a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -10,7 +10,7 @@ # Contributor: Jomar Milan pkgname=aseprite -pkgver=1.3.12 +pkgver=1.3.13 _skiaver=m102 _skiahash=861e4743af pkgrel=1 @@ -56,7 +56,7 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-libwebp-found.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root -sha256sums=('e44401463b66fc1267a1865ab75f5a9d1ae46e989c19a4ec7aadbaa315634e34' +sha256sums=('c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' '36b329f23429670bf473472a6b64ca5156d2707599eaabdd69ef424dd6ad5635' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' From bb62a303018fdc99717e6606312b9d60b3e797e1 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sat, 15 Mar 2025 11:39:24 -0500 Subject: [PATCH 146/154] upgpkg: aseprite 1.3.13-2 Rebuild for tinyxml2 ABI change --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2066f91..a0df9cd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.13 - pkgrel = 1 + pkgrel = 2 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA @@ -19,7 +19,7 @@ pkgbase = aseprite depends = libjpeg.so depends = zlib depends = libpng - depends = tinyxml2 + depends = tinyxml2>=10.1.0 depends = libfreetype.so depends = libarchive.so depends = libfmt.so diff --git a/PKGBUILD b/PKGBUILD index 516237a..9926385 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=aseprite pkgver=1.3.13 _skiaver=m102 _skiahash=861e4743af -pkgrel=1 +pkgrel=2 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -21,7 +21,7 @@ license=('LicenseRef-Aseprite-EULA') depends=(# ~ Aseprite's direct dependencies ~ # pixman is not linked to because we use Skia instead # harfbuzz is linked statically because Aseprite expects an older version - cmark libcurl.so libgif.so libjpeg.so zlib libpng tinyxml2 libfreetype.so libarchive.so libfmt.so + cmark libcurl.so libgif.so libjpeg.so zlib libpng 'tinyxml2>=10.1.0' libfreetype.so libarchive.so libfmt.so libwebp.so libwebpmux.so libwebpdemux.so hicolor-icon-theme # For installing Aseprite's icons # ~ Skia deps ~ From 39b07a9297268098b895810ebc79faac8ffcb32e Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sun, 23 Mar 2025 12:09:05 -0500 Subject: [PATCH 147/154] upgpkg: aseprite 1.3.13-3 tinyxml2 rebuild --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index a0df9cd..2421861 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.13 - pkgrel = 2 + pkgrel = 3 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA @@ -19,7 +19,7 @@ pkgbase = aseprite depends = libjpeg.so depends = zlib depends = libpng - depends = tinyxml2>=10.1.0 + depends = tinyxml2>=11.0.0 depends = libfreetype.so depends = libarchive.so depends = libfmt.so diff --git a/PKGBUILD b/PKGBUILD index 9926385..2df0f2e 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=aseprite pkgver=1.3.13 _skiaver=m102 _skiahash=861e4743af -pkgrel=2 +pkgrel=3 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -21,7 +21,7 @@ license=('LicenseRef-Aseprite-EULA') depends=(# ~ Aseprite's direct dependencies ~ # pixman is not linked to because we use Skia instead # harfbuzz is linked statically because Aseprite expects an older version - cmark libcurl.so libgif.so libjpeg.so zlib libpng 'tinyxml2>=10.1.0' libfreetype.so libarchive.so libfmt.so + cmark libcurl.so libgif.so libjpeg.so zlib libpng 'tinyxml2>=11.0.0' libfreetype.so libarchive.so libfmt.so libwebp.so libwebpmux.so libwebpdemux.so hicolor-icon-theme # For installing Aseprite's icons # ~ Skia deps ~ From 06746f14f7f5c445305ba66bde26a9992111c444 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Sun, 30 Mar 2025 09:50:35 -0500 Subject: [PATCH 148/154] upgpkg: aseprite 1.3.13-4 workaround for cmake 4 --- .SRCINFO | 2 +- PKGBUILD | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2421861..9702469 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.13 - pkgrel = 3 + pkgrel = 4 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA diff --git a/PKGBUILD b/PKGBUILD index 2df0f2e..1aff1fc 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=aseprite pkgver=1.3.13 _skiaver=m102 _skiahash=861e4743af -pkgrel=3 +pkgrel=4 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -139,7 +139,8 @@ skia_enable_{particles,skparagraph,sktext}=false)" -DENABLE_UPDATER=OFF -DENABLE_{SCRIPTING,WEBSOCKET}=ON \ -DLAF_WITH_{EXAMPLES,TESTS}=OFF -DLAF_BACKEND=skia \ -DSKIA_DIR="$PWD/skia" -DSKIA_LIBRARY_DIR="$_skiadir" \ --DUSE_SHARED_{CMARK,CURL,FMT,GIFLIB,JPEGLIB,ZLIB,LIBPNG,TINYXML,PIXMAN,FREETYPE,HARFBUZZ,LIBARCHIVE,WEBP}=YES +-DUSE_SHARED_{CMARK,CURL,FMT,GIFLIB,JPEGLIB,ZLIB,LIBPNG,TINYXML,PIXMAN,FREETYPE,HARFBUZZ,LIBARCHIVE,WEBP}=YES \ +-DCMAKE_POLICY_VERSION_MINIMUM=3.5 # workaround cmake --build build } From 18db0ba0334d45603d4853cc61f6dee7cabc225a Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 30 Apr 2025 17:31:26 -0500 Subject: [PATCH 149/154] upgpkg: aseprite 1.3.13-5 libxml2 rebuild --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 9702469..4f2d169 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.13 - pkgrel = 4 + pkgrel = 5 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA @@ -36,7 +36,7 @@ pkgbase = aseprite noextract = skia-m102.tar.gz source = https://github.com/aseprite/aseprite/releases/download/v1.3.13/Aseprite-v1.3.13-Source.zip source = skia-m102.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/m102-861e4743af.tar.gz - source = aseprite-strings::git+https://github.com/aseprite/strings.git#commit=7b0af61dec1d98242d7eb2e9cab835d442d21235 + source = aseprite-strings::git+https://github.com/aseprite/strings.git#commit=5499ce2030d831c614f1ce7fdfdaf36a973c21f8 source = desktop.patch source = shared-fmt.patch source = shared-libarchive.patch @@ -47,7 +47,7 @@ pkgbase = aseprite source = shared-libwebp-found.patch sha256sums = c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad - sha256sums = 36b329f23429670bf473472a6b64ca5156d2707599eaabdd69ef424dd6ad5635 + sha256sums = 8ee87f57b5792e5751f63fe37cdda8d29053cd4449e1f533e792e15abcfefa79 sha256sums = 8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9 sha256sums = c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3 sha256sums = 89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb diff --git a/PKGBUILD b/PKGBUILD index 1aff1fc..4a31dc0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=aseprite pkgver=1.3.13 _skiaver=m102 _skiahash=861e4743af -pkgrel=4 +pkgrel=5 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -43,7 +43,7 @@ makedepends=(# "Meta" dependencies source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprite-v$pkgver-Source.zip" # Which branch a given build of Aseprite requires is noted in its `INSTALL.md` "skia-$_skiaver.tar.gz::https://github.com/aseprite/skia/archive/refs/tags/$_skiaver-$_skiahash.tar.gz" - aseprite-strings::git+https://github.com/aseprite/strings.git#commit=7b0af61dec1d98242d7eb2e9cab835d442d21235 + aseprite-strings::git+https://github.com/aseprite/strings.git#commit=5499ce2030d831c614f1ce7fdfdaf36a973c21f8 desktop.patch shared-fmt.patch # Based on https://patch-diff.githubusercontent.com/raw/aseprite/aseprite/pull/2535.patch @@ -58,7 +58,7 @@ noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1' '8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad' - '36b329f23429670bf473472a6b64ca5156d2707599eaabdd69ef424dd6ad5635' + '8ee87f57b5792e5751f63fe37cdda8d29053cd4449e1f533e792e15abcfefa79' '8b14e36939e930de581e95abf0591645aa0fcfd47161cf88b062917dbaaef7f9' 'c3591d376180d99ff8001c3d549c0bd18ef5e4d95f1755ccaa8e2fd65dd5d2b3' '89cd28a5a90ee9dd42e85866b6f954bde526068d94311b0730a62f00f9cfffdb' From 3e97bcb3d8b82c43248bb0fd08a0290ebfb5c978 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 30 Apr 2025 18:44:47 -0500 Subject: [PATCH 150/154] upgpkg: aseprite 1.3.13-6 try to fix skia --- .SRCINFO | 2 +- PKGBUILD | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4f2d169..3dc9df0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = aseprite pkgdesc = Create animated sprites and pixel art pkgver = 1.3.13 - pkgrel = 5 + pkgrel = 6 url = https://www.aseprite.org/ arch = x86_64 license = LicenseRef-Aseprite-EULA diff --git a/PKGBUILD b/PKGBUILD index 4a31dc0..4ab3710 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ pkgname=aseprite pkgver=1.3.13 _skiaver=m102 _skiahash=861e4743af -pkgrel=5 +pkgrel=6 pkgdesc='Create animated sprites and pixel art' arch=('x86_64') url="https://www.aseprite.org/" @@ -130,7 +130,8 @@ is_official_build=true skia_build_fuzzers=false \ skia_enable_{pdf,skottie,sksl,svg}=false \ skia_use_{libjpeg_turbo,libwebp}_{encode,decode}=false \ skia_use_{expat,piex,xps,zlib,libgifcodec}=false \ -skia_enable_{particles,skparagraph,sktext}=false)" +skia_enable_{particles,skparagraph,sktext}=false \ +cc="clang" cxx="clang++")" ninja -C "$_skiadir" skia modules echo Building Aseprite... From 0f6950ba960ff694473d4fe873966bd74871c868 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 30 Apr 2025 18:47:20 -0500 Subject: [PATCH 151/154] upgpkg: aseprite 1.3.13-6 try again --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 4ab3710..9dfd907 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -131,7 +131,7 @@ skia_enable_{pdf,skottie,sksl,svg}=false \ skia_use_{libjpeg_turbo,libwebp}_{encode,decode}=false \ skia_use_{expat,piex,xps,zlib,libgifcodec}=false \ skia_enable_{particles,skparagraph,sktext}=false \ -cc="clang" cxx="clang++")" +cc='clang' cxx='clang++')" ninja -C "$_skiadir" skia modules echo Building Aseprite... From 2822d9127dbe43aa2c30649866710ff2b6b67b21 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 30 Apr 2025 18:54:33 -0500 Subject: [PATCH 152/154] upgpkg: aseprite 1.3.13-6 try again again --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 9dfd907..441397b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -131,7 +131,7 @@ skia_enable_{pdf,skottie,sksl,svg}=false \ skia_use_{libjpeg_turbo,libwebp}_{encode,decode}=false \ skia_use_{expat,piex,xps,zlib,libgifcodec}=false \ skia_enable_{particles,skparagraph,sktext}=false \ -cc='clang' cxx='clang++')" +cc=clang cxx=clang\+\+)" ninja -C "$_skiadir" skia modules echo Building Aseprite... From d3ab2df85bf9ba94c14d4ab33390ec55349a22f3 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 30 Apr 2025 19:38:34 -0500 Subject: [PATCH 153/154] upgpkg: aseprite 1.3.13-6 I dislike `gn` --- PKGBUILD | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 441397b..125d839 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -125,13 +125,31 @@ build() { # skia_use_zlib: Only used for PDF and RAW files. # skia_use_libgifcodec: Only used for GIFs, which Aseprite doesn't use. # skia_enable_{particles,skparagraph,sktext}: Aseprite does not link against this library. - env -C skia gn gen "$_skiadir" --args="$(printf '%s ' \ -is_official_build=true skia_build_fuzzers=false \ -skia_enable_{pdf,skottie,sksl,svg}=false \ -skia_use_{libjpeg_turbo,libwebp}_{encode,decode}=false \ -skia_use_{expat,piex,xps,zlib,libgifcodec}=false \ -skia_enable_{particles,skparagraph,sktext}=false \ -cc=clang cxx=clang\+\+)" + + # gn is bad software +local _gn_args=( + is_official_build=true + skia_build_fuzzers=false + skia_enable_pdf=false + skia_enable_skottie=false + skia_enable_sksl=false + skia_enable_svg=false + skia_use_libjpeg_turbo_encode=false + skia_use_libjpeg_turbo_decode=false + skia_use_libwebp_encode=false + skia_use_libwebp_decode=false + skia_use_expat=false + skia_use_piex=false + skia_use_xps=false + skia_use_zlib=false + skia_use_libgifcodec=false + skia_enable_particles=false + skia_enable_skparagraph=false + skia_enable_sktext=false + cc="clang" + cxx="clang++" +) + env -C skia gn gen "$_skiadir" --args="${_gn_args[@]}" ninja -C "$_skiadir" skia modules echo Building Aseprite... From 3da9fd70a728db3c22636d019aecf5dbec7c9206 Mon Sep 17 00:00:00 2001 From: ImperatorStorm Date: Wed, 30 Apr 2025 19:46:22 -0500 Subject: [PATCH 154/154] upgpkg: aseprite 1.3.13-6 actually fix it for real this time unfortunately make it awful to edit as a result --- .SRCINFO | 2 ++ PKGBUILD | 34 ++++++++-------------------------- include_cstdint.patch | 23 +++++++++++++++++++++++ 3 files changed, 33 insertions(+), 26 deletions(-) create mode 100644 include_cstdint.patch diff --git a/.SRCINFO b/.SRCINFO index 3dc9df0..0dc95d5 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -45,6 +45,7 @@ pkgbase = aseprite source = optional-pixman.patch source = fix-shared-tinyxml2.patch source = shared-libwebp-found.patch + source = include_cstdint.patch sha256sums = c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1 sha256sums = 8d76c1ad3693e1fc019eb14d806082148eb4ed7d601474aeeaae601b05a9b3ad sha256sums = 8ee87f57b5792e5751f63fe37cdda8d29053cd4449e1f533e792e15abcfefa79 @@ -56,5 +57,6 @@ pkgbase = aseprite sha256sums = c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654 sha256sums = ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3 sha256sums = 72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14 + sha256sums = ce20c8caa61b0e4b478eb08853e1148eba76836027ec04cf5d0f76c4db9ae112 pkgname = aseprite diff --git a/PKGBUILD b/PKGBUILD index 125d839..a470559 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -53,7 +53,8 @@ source=("https://github.com/aseprite/aseprite/releases/download/v$pkgver/Aseprit shared-skia-deps.patch optional-pixman.patch fix-shared-tinyxml2.patch - shared-libwebp-found.patch) + shared-libwebp-found.patch + include_cstdint.patch) noextract=("Aseprite-v$pkgver-Source.zip" "skia-$_skiaver.tar.gz") # Don't extract Aseprite or skia sources at the root sha256sums=('c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1' @@ -66,8 +67,9 @@ sha256sums=('c2e639c083d99a5a478ded7c86d9d7f4e4ff9ebebf6fedac7f8bfc94d6bd94c1' 'eb9f544e68b41b5cb1a9ab7a6648db51587e67e94f1a452cb5a84f3d224bf5d0' 'c2d14f9738a96a9db3695c00ac3d14b1312b6a595b151bd56e19422c86517654' 'ba02fc060dc930cfd66a8903a5d8a59f981753bdf416e91cc77a48c56c86aea3' - '72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14') -_debug="true" + '72605d6760c29eb98f2d8d8cf2cc9f9f7d7655bcf7cfc944f6a46b0957adbb14' + 'ce20c8caa61b0e4b478eb08853e1148eba76836027ec04cf5d0f76c4db9ae112') +_debug="false" prepare() { # Extract Aseprite's sources mkdir -p aseprite @@ -96,6 +98,8 @@ prepare() { env -C aseprite/third_party/TinyEXIF patch -tp1 + #include + #include ++#include + #include + + namespace json11 { +diff --git a/skia/src/sksl/transform/SkSLTransform.h b/skia/src/sksl/transform/SkSLTransform.h +index b2d1f90..6a34284 100644 +--- a/skia/src/sksl/transform/SkSLTransform.h ++++ b/skia/src/sksl/transform/SkSLTransform.h +@@ -10,6 +10,7 @@ + + #include + #include ++#include + + namespace SkSL { \ No newline at end of file