Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

media-gfx/gnofract4d: add 4.3_p20230717 #31946

Closed
wants to merge 2 commits into from

Conversation

cjmayo
Copy link
Contributor

@cjmayo cjmayo commented Jul 18, 2023

  • Updated to GTK 4
  • Set the displayed version to match the ebuild
  • Avoid test failures on x86

Drop versions older than latest stable

--- gnofract4d-4.3_p20221125-r1.ebuild
+++ gnofract4d-4.3_p20230717.ebuild
@@ -3,13 +3,14 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
+DISTUTILS_EXT=1
 DISTUTILS_SINGLE_IMPL=1
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 optfeature virtualx xdg
 
-COMMIT="f90eb2a9c25e3f3aef65e8d4dce7d73bcb795b2d"
+COMMIT="47d2093e8f6399d1badfba0d1cb0f9867e90b326"
 
 DESCRIPTION="A program for drawing beautiful mathematically-based images known as fractals"
 HOMEPAGE="https://fract4d.github.io/gnofract4d/"
@@ -17,17 +18,16 @@
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 DEPEND="
 	media-libs/libjpeg-turbo:0=
 	media-libs/libpng:0="
 RDEPEND="${DEPEND}
 	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
-	x11-libs/gtk+:3[introspection]"
+	gui-libs/gtk:4[introspection]"
 BDEPEND="
 	virtual/pkgconfig
 	test? (
@@ -38,11 +38,8 @@
 
 S="${WORKDIR}/${PN}-${COMMIT}"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3_p20221125-clang16.patch
-)
-
 src_prepare() {
+	sed -i -e "s:VERSION = '4.3':VERSION = '$PV':" fract4d/options.py || die
 	sed -i -e "s:share/doc/gnofract4d/:share/doc/${PF}/:" setup.py || die
 
 	distutils-r1_src_prepare
@@ -54,6 +51,11 @@
 		# test_regress.py does not provide pytest with any tests and inspecting it requires dev-python/pillow
 		test_regress.py
 	)
+	use x86 && local EPYTEST_DESELECT=(
+		# https://bugs.gentoo.org/890796
+		test_fractal.py::Test::testDiagonal
+		test_fractal.py::Test::testRecolor
+	)
 	TMPDIR="${T}" virtx epytest
 }

Signed-off-by: Chris Mayo <aklhfex@gmail.com>
Closes: https://bugs.gentoo.org/890796
Signed-off-by: Chris Mayo <aklhfex@gmail.com>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @cjmayo
Areas affected: ebuilds
Packages affected: media-gfx/gnofract4d

media-gfx/gnofract4d: @cjmayo, @gentoo/proxy-maint

Linked bugs

Bugs linked: 890796


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

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Jul 18, 2023
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2023-07-18 18:40 UTC
Newest commit scanned: 31d1992
Status: ✅ 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/3733c5dd7c/output.html

@cjmayo cjmayo deleted the gnofract4d-4.3_p20230717 branch October 23, 2023 18:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
4 participants