gentoo icon indicating copy to clipboard operation
gentoo copied to clipboard
verified publisher icon gentoo

dev-games/aseprite: add 1.3.8.1, drop 1.3.5

Open winterheart opened this issue 1 year ago • 6 comments

Closes: https://bugs.gentoo.org/935448

Please check all the boxes that apply:

  • [x] I can submit this contribution in agreement with the Copyright Policy.
  • [x] I have certified the above via adding a Signed-off-by line to every commit in the pull request.
  • [x] This contribution has not been created with the assistance of Natural Language Processing artificial intelligence tools, in accordance with the AI policy.
  • [x] I have run pkgcheck scan --commits --net to check for issues with my commits.

Please note that all boxes must be checked for the pull request to be merged.

winterheart avatar Aug 13 '24 12:08 winterheart

Pull request CI report

Report generated at: 2024-08-13 13:09 UTC Newest commit scanned: cc40d2e23a2a555d38b8a31f0033a65709dd8654 Status: :white_check_mark: good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question: https://qa-reports.gentoo.org/output/gentoo-ci/5fe920b5a0/output.html

gentoo-repo-qa-bot avatar Aug 13 '24 13:08 gentoo-repo-qa-bot

Can we update straight to 1.3.8 which is out since a couple days after you opened this PR?

eli-schwartz avatar Aug 23 '24 01:08 eli-schwartz

Pull request CI report

Report generated at: 2024-08-25 22:48 UTC Newest commit scanned: 5349788aa9bedf510b4e734aee9f23647582e4a3 Status: :white_check_mark: good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question: https://qa-reports.gentoo.org/output/gentoo-ci/156a840f3a/output.html

gentoo-repo-qa-bot avatar Aug 25 '24 22:08 gentoo-repo-qa-bot

Upstream changed dependency from tinyxml to tinyxml2. Updated DEPEND, additionally fixed json11 bundled library installation.

winterheart avatar Aug 26 '24 08:08 winterheart

Pull request CI report

Report generated at: 2024-08-26 08:48 UTC Newest commit scanned: 29e596d7fd006bfdbf19c8030c344c27f8c5e1cf Status: :white_check_mark: good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question: https://qa-reports.gentoo.org/output/gentoo-ci/670e17b5fc/output.html

gentoo-repo-qa-bot avatar Aug 26 '24 08:08 gentoo-repo-qa-bot 

FAILED: laf/base/CMakeFiles/laf-base.dir/cfile.cpp.o 
/usr/bin/x86_64-pc-linux-gnu-g++ -DHAVE_CONFIG_H -DLAF_LINUX -DLAF_SKIA -DNDEBUG -DPNG_NO_MMX_CODE -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/harfbuzz -I/var/tmp/portage/dev-games/aseprite-1
.3.8.1/work/third_party/simpleini -I/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf -I/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/aseprite-1.3.8.1_build/laf -I/var/tmp/portage/dev-games/aseprite-1.3.8.
1/work/src -pipe -march=native -fstack-protector-all -O2 -fdiagnostics-color=always -frecord-gcc-switches -Werror=odr -Werror=lto-type-mismatch -Werror=strict-aliasing -Wformat -Werror=format-security -std=c++17
 -MD -MT laf/base/CMakeFiles/laf-base.dir/cfile.cpp.o -MF laf/base/CMakeFiles/laf-base.dir/cfile.cpp.o.d -o laf/base/CMakeFiles/laf-base.dir/cfile.cpp.o -c /var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/ba
se/cfile.cpp
/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/base/cfile.cpp: In function ‘float base::fgetf(FILE*)’:
/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/base/cfile.cpp:117:11: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
  117 |   return *reinterpret_cast<float*>(&v);
      |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/base/cfile.cpp: In function ‘double base::fgetd(FILE*)’:
/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/base/cfile.cpp:159:11: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
  159 |   return *reinterpret_cast<double*>(&v);
      |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/base/cfile.cpp: In function ‘int base::fputf(float, FILE*)’:
/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/base/cfile.cpp:234:19: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
  234 |   const int b = *(reinterpret_cast<int*>(&l));
      |                  ~^~~~~~~~~~~~~~~~~~~~~~~~~~~
/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/base/cfile.cpp: In function ‘int base::fputd(double, FILE*)’:
/var/tmp/portage/dev-games/aseprite-1.3.8.1/work/laf/base/cfile.cpp:257:25: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
  257 |   const long long b = *(reinterpret_cast<long long*>(&l));
      |                        ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cc1plus: some warnings being treated as errors

It appears this is back again...

eli-schwartz avatar Sep 01 '24 05:09 eli-schwartz

Ping?

eli-schwartz avatar Sep 20 '24 13:09 eli-schwartz

Please note the following changes I just made in 1.3.5-r1:

--- aseprite-1.3.5.ebuild	2024-12-29 19:23:17.518044041 +0100
+++ aseprite-1.3.5-r1.ebuild	2024-12-31 20:16:49.554094915 +0100
@@ -4,7 +4,6 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-
 inherit cmake desktop flag-o-matic python-any-r1 toolchain-funcs xdg-utils
 
 SKIA_VER="m102"
@@ -21,11 +20,10 @@
 LICENSE="Aseprite-EULA MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-IUSE="kde test webp"
+IUSE="test webp"
 RESTRICT="bindist mirror !test? ( test )"
 
-CDEPEND="
+COMMON_DEPEND="
 	app-arch/libarchive:=
 	app-text/cmark:=
 	dev-libs/libfmt:=
@@ -42,33 +40,22 @@
 	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}
+	webp? ( media-libs/libwebp:= )
+"
+RDEPEND="${COMMON_DEPEND}
 	gnome-extra/zenity
 "
-DEPEND="
-	${CDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? ( dev-cpp/gtest )
+DEPEND="${COMMON_DEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="${PYTHON_DEPS}
 	app-arch/unzip
 	dev-build/gn
-	virtual/pkgconfig"
-
-DOCS=(
-	docs/ase-file-specs.md
-	docs/gpl-palette-extension.md
-	README.md
-)
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )
+"
 
-S="${WORKDIR}"
+DOCS=( docs/{ase-file-specs,gpl-palette-extension}.md README.md )
 
 PATCHES=(
 	"${FILESDIR}/skia-${SKIA_VER}_remove_angle2.patch"
@@ -78,9 +65,17 @@
 	"${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
+	"${FILESDIR}/${P}_laf-strict-aliasing.patch"
+	"${FILESDIR}/${P}-no-fetch-in-cmake-kthx.patch" # bug 935448
 )
 
+src_unpack() {
+	mkdir "${S}" || die
+	pushd "${S}" > /dev/null || die
+		default
+	popd > /dev/null || die
+}
+
 src_prepare() {
 	cmake_src_prepare
 	# Skia: remove custom optimizations
@@ -111,82 +106,81 @@
 	filter-lto
 
 	einfo "Skia configuration"
-	cd "${WORKDIR}/skia-${SKIA_REV}" || die
+	pushd skia-${SKIA_REV} > /dev/null || die
+		tc-export AR CC CXX
 
-	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
+		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
+	popd > /dev/null || die
 
 	einfo "Aseprite configuration"
-	cd "${WORKDIR}" || die
-
 	local mycmakeargs=(
 		-DENABLE_CCACHE=OFF
 		-DENABLE_DESKTOP_INTEGRATION=ON
+		-DENABLE_I18N_STRINGS=OFF
 		-DENABLE_STEAM=OFF
 		-DENABLE_TESTS="$(usex test)"
-		-DENABLE_QT_THUMBNAILER="$(usex kde)"
+		-DENABLE_QT_THUMBNAILER=OFF
 		-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"
+		-DSKIA_DIR="${S}/skia-${SKIA_REV}/"
+		-DSKIA_LIBRARY_DIR="${S}/skia-${SKIA_REV}/out/Static/"
+		-DSKIA_LIBRARY="${S}/skia-${SKIA_REV}/out/Static/libskia.a"
+		-DSKSHAPER_LIBRARY="${S}/skia-${SKIA_REV}/out/Static/libskshaper.a"
 		-DUSE_SHARED_CMARK=ON
 		-DUSE_SHARED_CURL=ON
 		-DUSE_SHARED_FMT=ON
@@ -207,11 +201,11 @@
 
 src_compile() {
 	einfo "Skia compilation"
-	cd "${WORKDIR}/skia-${SKIA_REV}" || die
-	eninja -C out/Static
+	pushd skia-${SKIA_REV} > /dev/null || die
+		eninja -C out/Static
+	popd > /dev/null || die
 
 	einfo "Aseprite compilation"
-	cd "${WORKDIR}" || die
 	cmake_src_compile
 }

https://github.com/gentoo/gentoo/commit/0e678d0e1aa9aea055647fea832a501445555c9a https://github.com/gentoo/gentoo/commit/981b635fa4bf9f3410bc97ac771acc08c91fb54c

a17r avatar Dec 31 '24 19:12 a17r

Pull request CI report

Report generated at: 2025-03-28 18:29 UTC Newest commit scanned: 7929f91394248ac677fa797597865f0d69fa1434 Status: :white_check_mark: good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question: https://qa-reports.gentoo.org/output/gentoo-ci/c2790ba/output.html

gentoo-repo-qa-bot avatar Mar 28 '25 18:03 gentoo-repo-qa-bot

Pull Request assignment

Submitter: @winterheart Areas affected: ebuilds Packages affected: dev-games/aseprite

dev-games/aseprite: @winterheart, @gentoo/proxy-maint

Linked bugs

Bugs linked: 935448, 947283, 952292

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

gentoo-bot avatar Mar 29 '25 00:03 gentoo-bot

Pull request CI report

Report generated at: 2025-03-29 00:34 UTC Newest commit scanned: d39813d92b2865b6381a68cafd67d453dd37349f Status: :white_check_mark: good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question: https://qa-reports.gentoo.org/output/gentoo-ci/2c2b205/output.html

gentoo-repo-qa-bot avatar Mar 29 '25 00:03 gentoo-repo-qa-bot

Pull request CI report

Report generated at: 2025-07-31 07:55 UTC Newest commit scanned: 40896971fae9af48c09a34275a11943d3f812c70 Status: :white_check_mark: good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question: https://qa-reports.gentoo.org/output/gentoo-ci/64ad1b3/output.html

gentoo-repo-qa-bot avatar Jul 31 '25 07:07 gentoo-repo-qa-bot