commit: 486b4513d17db2df841153495118a8018b908c45 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com> AuthorDate: Sat Jul 23 20:26:03 2022 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Tue Jul 26 12:14:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=486b4513
dev-games/aseprite: regenerate Manifest Don't use *.googlesource.com as tarball source, it generates non-reproducible tarballs (https://github.com/google/gitiles/issues/84). Closes: https://bugs.gentoo.org/860297 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/26550 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> dev-games/aseprite/Manifest | 2 +- dev-games/aseprite/aseprite-1.2.35.ebuild | 26 +++++++++------------- .../aseprite/files/skia-m102_remove_angle2.patch | 4 ++-- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/dev-games/aseprite/Manifest b/dev-games/aseprite/Manifest index 7a47be51dcd6..18ab0748f31b 100644 --- a/dev-games/aseprite/Manifest +++ b/dev-games/aseprite/Manifest @@ -1,3 +1,3 @@ DIST Aseprite-v1.1.9-Source.zip 11746265 BLAKE2B fa16be059a7bb3b83705c56e7e93cbbb71676617a8d0798f0e481b09199ae069b85826615f8609acabb10a4e9a9da0857f2f99b03c2b913f26eee6d4dfdc0f0a SHA512 44c5878c67e69d2510c862e8f6869d727aa47b3d23d41d4e7318eca54c6d72fc5f89e72c70c160ce6da78fa091e11eedefa74e0273dc4cea59b2fe16c8851d9e DIST Aseprite-v1.2.35-Source.zip 61972632 BLAKE2B f9e24d04a19756f65041cb9c96a4142fe5078a4f6d8b48f69e79501822ff8a5070f350cf9016e5500fec5aeb82d4d8eb2c8d8b42a73fd8bc73aecab185d002fe SHA512 2577a683516adc9c601300da15e9099d6fa698fec32f4b62ce95c46412c1dd26b0538cc23996e0a1060ac4a4de47c2538124c4a01ade375f3b4efcbc99fbbdc8 -DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.tar.gz 53866802 BLAKE2B c8a67c96a78bb09802b54536f994a0964ba46f1996cc1e7f41757c08802519ec0c7fe22c667b546e7d9cdee6b0d257f8629f2294b880ff9b5acac6a7f3bf18bf SHA512 15c44ffe7d1e9c678ab80826e4a76e783014859b05f1dc9410077e1a1a45b8b3bcc80bd99237e7b1a7e7301f73abdb51f7ddb10010ffe97418b2fc1356ea55e9 +DIST skia-m102-3338e90707323d2cd3a150276acb9f39933deee2.tar.gz 53944562 BLAKE2B 9da3e8386cd7a18a6ee9362743bee4146c41038af8868a6f5e8a2dce468e4dc4669b488861d117da8d1bd8461b2ad47bfc300774a33a84153bca345d63a929a7 SHA512 9ae0032ee3861ce4958af6eb7047273d28b1faa3823576ef568e3c7faed7f49a9976540a72c3fa38234a4ae6319ac381324eff807938f9763781fd33ad67d075 diff --git a/dev-games/aseprite/aseprite-1.2.35.ebuild b/dev-games/aseprite/aseprite-1.2.35.ebuild index 367e97fc2ace..fde3fc002290 100644 --- a/dev-games/aseprite/aseprite-1.2.35.ebuild +++ b/dev-games/aseprite/aseprite-1.2.35.ebuild @@ -7,12 +7,13 @@ inherit cmake desktop ninja-utils toolchain-funcs xdg-utils SKIA_VER="m102" # Last commit in ${SKIA_VER} feature branch +# Don't use skia.googlesource.com, it produces non-reproducible tarballs SKIA_REV="3338e90707323d2cd3a150276acb9f39933deee2" DESCRIPTION="Animated sprite editor & pixel art tool" HOMEPAGE="https://www.aseprite.org"; SRC_URI="https://github.com/aseprite/aseprite/releases/download/v${PV}/Aseprite-v${PV}-Source.zip - https://skia.googlesource.com/skia/+archive/${SKIA_REV}.tar.gz -> skia-${SKIA_VER}-${SKIA_REV}.tar.gz" + https://github.com/google/skia/archive/${SKIA_REV}.tar.gz -> skia-${SKIA_VER}-${SKIA_REV}.tar.gz" # See https://github.com/aseprite/aseprite#license LICENSE="Aseprite-EULA" @@ -68,18 +69,11 @@ PATCHES=( "${FILESDIR}/${P}_laf_fixes.patch" ) -src_unpack() { - unpack "Aseprite-v${PV}-Source.zip" - # Unpack skia into separate dir - mkdir -p "${WORKDIR}/skia" || die - cd "${WORKDIR}/skia" || die - unpack "skia-${SKIA_VER}-${SKIA_REV}.tar.gz" -} - src_prepare() { cmake_src_prepare # Skia: remove custom optimizations - sed -i -e 's:"\/\/gn\/skia\:optimize",::g' skia/gn/BUILDCONFIG.gn || die + sed -i -e 's:"\/\/gn\/skia\:optimize",::g' \ + "skia-${SKIA_REV}/gn/BUILDCONFIG.gn" || die # Aseprite: don't install tga bundled library sed -i -e '/install/d' src/tga/CMakeLists.txt || die # Aseprite: don't use bundled gtest @@ -92,7 +86,7 @@ src_prepare() { src_configure() { einfo "Skia configuration" - cd "${WORKDIR}/skia" || die + cd "${WORKDIR}/skia-${SKIA_REV}" || die tc-export AR CC CXX @@ -164,10 +158,10 @@ src_configure() { -DLAF_WITH_EXAMPLES=OFF -DLAF_WITH_TESTS="$(usex test)" -DFULLSCREEN_PLATFORM=ON - -DSKIA_DIR="${WORKDIR}/skia/" - -DSKIA_LIBRARY_DIR="${WORKDIR}/skia/out/Static/" - -DSKIA_LIBRARY="${WORKDIR}/skia/out/Static/libskia.a" - -DSKSHAPER_LIBRARY="${WORKDIR}/skia/out/Static/libskshaper.a" + -DSKIA_DIR="${WORKDIR}/skia-${SKIA_REV}/" + -DSKIA_LIBRARY_DIR="${WORKDIR}/skia-${SKIA_REV}/out/Static/" + -DSKIA_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskia.a" + -DSKSHAPER_LIBRARY="${WORKDIR}/skia-${SKIA_REV}/out/Static/libskshaper.a" -DUSE_SHARED_CMARK=ON -DUSE_SHARED_CURL=ON -DUSE_SHARED_FREETYPE=ON @@ -187,7 +181,7 @@ src_configure() { src_compile() { einfo "Skia compilation" - cd "${WORKDIR}/skia" || die + cd "${WORKDIR}/skia-${SKIA_REV}" || die eninja -C out/Static einfo "Aseprite compilation" diff --git a/dev-games/aseprite/files/skia-m102_remove_angle2.patch b/dev-games/aseprite/files/skia-m102_remove_angle2.patch index 71b9bd6f3326..7539a1e9aeb7 100644 --- a/dev-games/aseprite/files/skia-m102_remove_angle2.patch +++ b/dev-games/aseprite/files/skia-m102_remove_angle2.patch @@ -1,5 +1,5 @@ ---- a/skia/third_party/zlib/BUILD.gn 2022-07-10 00:39:12.507321714 +0300 -+++ b/skia/third_party/zlib/BUILD.gn 2022-07-10 00:40:49.175261689 +0300 +--- a/skia-3338e90707323d2cd3a150276acb9f39933deee2/third_party/zlib/BUILD.gn 2022-07-10 00:39:12.507321714 +0300 ++++ b/skia-3338e90707323d2cd3a150276acb9f39933deee2/third_party/zlib/BUILD.gn 2022-07-10 00:40:49.175261689 +0300 @@ -197,12 +197,3 @@ config("zlib_config") { }
