From db12bebe8fd576ed89c559bfe062ec9559ec7dd6 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 22 Jul 2024 11:57:21 +0200 Subject: [PATCH] xcftools, revbump, fix HOMEPAGE, remove test case not crashing anymore (#10726) --- .../xcftools/patches/xcftools-1.0.7.patchset | 64 ++----------------- media-gfx/xcftools/xcftools-1.0.7.recipe | 13 ++-- 2 files changed, 13 insertions(+), 64 deletions(-) diff --git a/media-gfx/xcftools/patches/xcftools-1.0.7.patchset b/media-gfx/xcftools/patches/xcftools-1.0.7.patchset index eb9e223bc..c6a9d0274 100644 --- a/media-gfx/xcftools/patches/xcftools-1.0.7.patchset +++ b/media-gfx/xcftools/patches/xcftools-1.0.7.patchset @@ -1,4 +1,4 @@ -From 6cd5e7bc832b1c9c9deff6b3fc2771f693d7431f Mon Sep 17 00:00:00 2001 +From 7327f1a2f0b667699e88b97595375ccad6108485 Mon Sep 17 00:00:00 2001 From: begasus Date: Mon, 13 Jun 2022 10:47:58 +0200 Subject: Replace png null macros Imported patch from Fedora @@ -21,17 +21,17 @@ index 4afe78d..90374d7 100644 FatalUnexpected(_("Couldn't initialize libpng library")); -- -2.36.1 +2.45.2 -From 069aabf4d1e92029f391d8d362d9863149aad3d0 Mon Sep 17 00:00:00 2001 +From f43d8ddad6f30887b251dbc0edbb8d4ae8fb904d Mon Sep 17 00:00:00 2001 From: begasus Date: Mon, 13 Jun 2022 10:53:01 +0200 Subject: Fix sed replacement error patch Imported patch from Fedora diff --git a/Makefile.in b/Makefile.in -index a90482d..97a4c65 100644 +index 56d821b..331349e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -90,14 +90,13 @@ testscale$e: testscale.$o @@ -53,59 +53,5 @@ index a90482d..97a4c65 100644 done for lang in $(LINGUAS) ; do \ -- -2.36.1 - - -From 715679a3d496400c279b2da424dff79b4db5835f Mon Sep 17 00:00:00 2001 -From: begasus -Date: Wed, 15 Jun 2022 11:27:47 +0200 -Subject: xcftools, remove crashing tests - - -diff --git a/test/dotest b/test/dotest -index eded0e0..0dc1144 100755 ---- a/test/dotest -+++ b/test/dotest -@@ -181,10 +181,6 @@ cp /dev/null expected.stdout - # Test for discovery of error conditions. - # - --echo > expected:stderr \ -- "The --mode option must follow a layer name on the command line" --errtest 20 xcf2pnm $S/modetest.xcf.gz --mode Addition A B -- - echo > expected:stderr \ - "The --percent option must follow a layer name on the command line" - errtest 20 xcf2png $S/tiletest.xcf.gz --percent 33 Mid -@@ -356,21 +352,6 @@ EOF - testinfo $S/indextest.xcf.gz - testinfo $S/badindexed0.xcf.gz - --cat < expected.stdout --Version 0, 161x161 RGB color, 10 layers, compressed RLE --+ 122x13+19+74 RGB-alpha Normal Long and low --+ 13x122+74+19 RGB-alpha Difference Tall and narrow --+ 118x118+38+47 RGB-alpha Normal/65% Displaced loop --- 144x141+4+18 RGB-alpha Normal Doodle --+ 161x161+0+0 RGB-alpha Normal Straight loop --+ 50x50+100+105 RGB-alpha Normal/mask Crossed --+ 50x50+8+8 RGB-alpha Normal Mid --+ 50x50+8+102 RGB-alpha Normal/83%/mask Horiz --+ 50x50+101+7 RGB-alpha Normal Vert --+ 161x161+0+0 RGB Normal Background --EOF --testinfo $S/tiletest.xcf.gz -- - cat < expected.stdout - Version 1, 64x64 Indexed color, 1 layers, compressed RLE - + 64x64+0+0 Indexed Normal Background -@@ -733,4 +714,4 @@ else - exit 0 - fi - --# End -\ No newline at end of file -+# End --- -2.36.1 +2.45.2 diff --git a/media-gfx/xcftools/xcftools-1.0.7.recipe b/media-gfx/xcftools/xcftools-1.0.7.recipe index aadd6eccc..3a74bf1eb 100644 --- a/media-gfx/xcftools/xcftools-1.0.7.recipe +++ b/media-gfx/xcftools/xcftools-1.0.7.recipe @@ -12,13 +12,13 @@ information can be kept in the image, or a background color can be specified on * xcfinfo lists information about layers in an XCF file. The tools can either flatten an XCF file as given, or extract specific layers named on the \ command line." -HOMEPAGE="https://homepage/of/projectx.org" +HOMEPAGE="http://henning.makholm.net/software" COPYRIGHT="2013-2019 Henning Makholm" LICENSE="Public Domain" -REVISION="1" -srcGitRev="2e3b70a464771785398fd8617f2e08a874a0f256" +REVISION="2" +srcGitRev="be488bd2e35a0c6794141411cb5d290950ba4345" SOURCE_URI="https://github.com/j-jorge/xcftools/archive/$srcGitRev.tar.gz" -CHECKSUM_SHA256="23c00953187d6e5b5f28d66ace5ea989872e35ba69f677081c3553c97aa9dfe6" +CHECKSUM_SHA256="54c8acbca56d4c23e947b09da0489a792b2a69434311729a336fd095670d6eae" SOURCE_DIR="xcftools-$srcGitRev" PATCHES="xcftools-$portVersion.patchset" @@ -44,6 +44,7 @@ REQUIRES=" lib:libiconv$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libpng16$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" @@ -51,6 +52,7 @@ BUILD_REQUIRES=" devel:libiconv$secondaryArchSuffix devel:libintl$secondaryArchSuffix devel:libpng16$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal @@ -58,6 +60,7 @@ BUILD_PREREQUIRES=" cmd:gcc$secondaryArchSuffix cmd:make cmd:perl + cmd:pkg_config$secondaryArchSuffix " TEST_REQUIRES=" @@ -85,7 +88,7 @@ INSTALL() TEST() { - # 2 tests crash + # 13 of 141 tests FAILED export RGBDEF=/system/data/netpbm/rgb.txt make check }