From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6DF4A15812D for ; Tue, 31 Dec 2024 19:20:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26711E07D8; Tue, 31 Dec 2024 19:20:53 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B392EE07D1 for ; Tue, 31 Dec 2024 19:20:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D896B33BE9F for ; Tue, 31 Dec 2024 19:20:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 41702190F for ; Tue, 31 Dec 2024 19:20:49 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1735672817.62faa3a67f9c1e85c97ae0bdaafc53022a434dc4.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/aseprite/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/aseprite/aseprite-1.3.5.ebuild X-VCS-Directories: dev-games/aseprite/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 62faa3a67f9c1e85c97ae0bdaafc53022a434dc4 X-VCS-Branch: master Date: Tue, 31 Dec 2024 19:20:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3ed76454-6211-41c3-bb24-ab896c2431d9 X-Archives-Hash: ab824383d6f76ceab8522d1b0b6620b9 commit: 62faa3a67f9c1e85c97ae0bdaafc53022a434dc4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Dec 31 19:20:17 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 31 19:20:17 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62faa3a6 dev-games/aseprite: drop 1.3.5 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-games/aseprite/aseprite-1.3.5.ebuild | 233 ------------------------------- 1 file changed, 233 deletions(-) diff --git a/dev-games/aseprite/aseprite-1.3.5.ebuild b/dev-games/aseprite/aseprite-1.3.5.ebuild deleted file mode 100644 index 8717c09abd5e..000000000000 --- a/dev-games/aseprite/aseprite-1.3.5.ebuild +++ /dev/null @@ -1,233 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake desktop flag-o-matic python-any-r1 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://github.com/google/skia/archive/${SKIA_REV}.tar.gz -> skia-${SKIA_VER}-${SKIA_REV}.gh.tar.gz" - -# See https://github.com/aseprite/aseprite#license -LICENSE="Aseprite-EULA MIT" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -IUSE="kde test webp" -RESTRICT="bindist mirror !test? ( test )" - -CDEPEND=" - app-arch/libarchive:= - app-text/cmark:= - dev-libs/libfmt:= - dev-libs/tinyxml - media-libs/freetype - media-libs/giflib:= - media-libs/harfbuzz:=[truetype] - media-libs/libjpeg-turbo:= - media-libs/libpng:= - net-misc/curl - sys-libs/zlib:= - virtual/opengl - x11-libs/libX11 - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libxcb:= - kde? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - kde-frameworks/kio:5 - ) - webp? ( media-libs/libwebp:= )" -RDEPEND=" - ${CDEPEND} - gnome-extra/zenity -" -DEPEND=" - ${CDEPEND} - x11-base/xorg-proto" -BDEPEND=" - ${PYTHON_DEPS} - test? ( dev-cpp/gtest ) - app-arch/unzip - dev-build/gn - virtual/pkgconfig" - -DOCS=( - docs/ase-file-specs.md - docs/gpl-palette-extension.md - README.md -) - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}/skia-${SKIA_VER}_remove_angle2.patch" - "${FILESDIR}/${PN}-1.2.40_shared_libarchive.patch" - "${FILESDIR}/${PN}-1.3.2_shared_json11.patch" - "${FILESDIR}/${PN}-1.3.2_shared_webp.patch" - "${FILESDIR}/${PN}-1.2.35_laf_fixes.patch" - "${FILESDIR}/${PN}-1.3.2_shared_fmt.patch" - "${FILESDIR}/${PN}-1.3.2_strict-aliasing.patch" - "${FILESDIR}"/aseprite-1.3.5_laf-strict-aliasing.patch -) - -src_prepare() { - cmake_src_prepare - # Skia: remove custom optimizations - 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 - sed -i -e '/add_subdirectory(googletest)/d' \ - laf/third_party/CMakeLists.txt || die - # Fix shebang in thumbnailer - sed -i -e 's:#!/usr/bin/sh:#!/bin/sh:' \ - src/desktop/linux/aseprite-thumbnailer || die -} - -src_configure() { - # -Werror=strict-aliasing, -Werror=odr, -Werror=lto-type-mismatch - # https://bugs.gentoo.org/924692 - # https://github.com/aseprite/aseprite/issues/4413 - # - # There is a bundled skia that fails with ODR errors. When excluding just - # skia from testing, aseprite itself failed with strict-aliasing (before - # upstream PR#84), and when that is disabled, fails again with ODR and - # lto-type-mismatch issues. - # - # There are a lot of issues, so don't trust any fixes without thorough - # testing. - filter-lto - - einfo "Skia configuration" - cd "${WORKDIR}/skia-${SKIA_REV}" || die - - tc-export AR CC CXX - - passflags() { - local _f _x - _f=( ${1} ) - _x="[$(printf '"%s", ' "${_f[@]}")]" - myconf_gn+=( ${2}="${_x}" ) - } - - local myconf_gn=( - ar=\"${AR}\" - cc=\"${CC}\" - cxx=\"${CXX}\" - - is_official_build=true - is_component_build=false - is_debug=false - - skia_use_egl=false - skia_use_dawn=false - skia_use_dng_sdk=false - skia_use_metal=false - skia_use_sfntly=false - skia_use_wuffs=false - - skia_enable_pdf=false - skia_enable_svg=false - skia_use_expat=false - skia_use_ffmpeg=false - skia_use_fontconfig=false - skia_use_freetype=true - skia_use_gl=true - skia_use_harfbuzz=true - skia_use_icu=false - skia_use_libjpeg_turbo_decode=true - skia_use_libjpeg_turbo_encode=true - skia_use_libpng_decode=true - skia_use_libpng_encode=true - skia_use_libwebp_decode=$(usex webp true false) - skia_use_libwebp_encode=$(usex webp true false) - skia_use_lua=false - skia_use_vulkan=false - skia_use_x11=false - skia_use_xps=false - skia_use_zlib=true - ) - - passflags "${CFLAGS}" extra_cflags_c - passflags "${CXXFLAGS}" extra_cflags_cc - passflags "${LDFLAGS}" extra_ldflags - myconf_gn="${myconf_gn[@]}" - set -- gn gen --args="${myconf_gn% }" out/Static - echo "$@" - "$@" || die - - einfo "Aseprite configuration" - cd "${WORKDIR}" || die - - local mycmakeargs=( - -DENABLE_CCACHE=OFF - -DENABLE_DESKTOP_INTEGRATION=ON - -DENABLE_STEAM=OFF - -DENABLE_TESTS="$(usex test)" - -DENABLE_QT_THUMBNAILER="$(usex kde)" - -DENABLE_UPDATER=OFF - -DENABLE_UI=ON - -DENABLE_WEBP="$(usex webp)" - -DLAF_WITH_EXAMPLES=OFF - -DLAF_WITH_TESTS="$(usex test)" - -DFULLSCREEN_PLATFORM=ON - -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_FMT=ON - -DUSE_SHARED_FREETYPE=ON - -DUSE_SHARED_GIFLIB=ON - -DUSE_SHARED_HARFBUZZ=ON - -DUSE_SHARED_JPEGLIB=ON - -DUSE_SHARED_JSON11=OFF # Custom methods added to bundled version - -DUSE_SHARED_LIBARCHIVE=ON - -DUSE_SHARED_LIBPNG=ON - -DUSE_SHARED_PIXMAN=ON - -DUSE_SHARED_TINYXML=ON - -DUSE_SHARED_WEBP=ON - -DUSE_SHARED_ZLIB=ON - ) - cmake_src_configure -} - -src_compile() { - einfo "Skia compilation" - cd "${WORKDIR}/skia-${SKIA_REV}" || die - eninja -C out/Static - - einfo "Aseprite compilation" - cd "${WORKDIR}" || die - cmake_src_compile -} - -src_install() { - newicon -s 64 "${S}/data/icons/ase64.png" "${PN}.png" - cmake_src_install -} - -pkg_postinst() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -} - -pkg_postrm() { - xdg_desktop_database_update - xdg_icon_cache_update - xdg_mimeinfo_database_update -}