Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages /
geeqie
Commits:
91661d2e by Andreas Radke at 2025-04-21T21:38:45+02:00
upgpkg: 2.5-2; fix test with recent grep 3.12 - fixes #2
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- + fix_test_with_grep3.12.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = geeqie
pkgdesc = Lightweight image viewer
pkgver = 2.5
- pkgrel = 1
+ pkgrel = 2
url = http://www.geeqie.org/
arch = x86_64
license = GPL-2.0-or-later
@@ -62,9 +62,11 @@ pkgbase = geeqie
source =
https://github.com/BestImageViewer/geeqie/releases/download/v2.5/geeqie-2.5.tar.xz
source =
https://github.com/BestImageViewer/geeqie/releases/download/v2.5/geeqie-2.5.tar.xz.asc
source = Skip-failing-tests.patch
+ source = fix_test_with_grep3.12.patch
validpgpkeys = 91EC400226201276E2ADCEC7D0DA6F44C936D1DA
sha256sums =
cc991c9d4c78c58668105a15f7ece953bfc21b6b78cedc26ccbaaee6a12b8952
sha256sums = SKIP
sha256sums =
cfb1ddc810006c26a28a2bc1e35116819e8f191644265c5027b5dfce532aaa2e
+ sha256sums =
fc878f748f7f5b9c78efc4af969640fcde48462d5dff4c9fb3235d3f901e50c3
pkgname = geeqie
=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
pkgname=geeqie
pkgver=2.5
-pkgrel=1
+pkgrel=2
pkgdesc='Lightweight image viewer'
arch=('x86_64')
url="http://www.geeqie.org/";
@@ -45,10 +45,12 @@ optdepends=('librsvg: SVG rendering'
'libwebp: for WebP image format')
source=(#"http://www.geeqie.org/${pkgname}-${pkgver}.tar.xz"{,.asc}
https://github.com/BestImageViewer/geeqie/releases/download/v${pkgver}/${pkgname}-${pkgver}.tar.xz{,.asc}
- Skip-failing-tests.patch)
+ Skip-failing-tests.patch
+ fix_test_with_grep3.12.patch)
sha256sums=('cc991c9d4c78c58668105a15f7ece953bfc21b6b78cedc26ccbaaee6a12b8952'
'SKIP'
- 'cfb1ddc810006c26a28a2bc1e35116819e8f191644265c5027b5dfce532aaa2e')
+ 'cfb1ddc810006c26a28a2bc1e35116819e8f191644265c5027b5dfce532aaa2e'
+ 'fc878f748f7f5b9c78efc4af969640fcde48462d5dff4c9fb3235d3f901e50c3')
validpgpkeys=('91EC400226201276E2ADCEC7D0DA6F44C936D1DA') # "Colin Clark
<[email protected]>"
# main repo: http://www.geeqie.org/cgi-bin/gitweb.cgi?p=geeqie.git
@@ -59,6 +61,8 @@ prepare() {
# disable "Ancillary files" test
# https://github.com/BestImageViewer/geeqie/issues/1274
patch -Np1 -i $srcdir/Skip-failing-tests.patch
+ # https://github.com/BestImageViewer/geeqie/issues/1722 / #2
+ patch -Np1 -i $srcdir/fix_test_with_grep3.12.patch
}
build() {
=====================================
fix_test_with_grep3.12.patch
=====================================
@@ -0,0 +1,38 @@
+From 6ecb813fb8277d8baee7ae6e892a8a45c89f6ee9 Mon Sep 17 00:00:00 2001
+From: Colin Clark <[email protected]>
+Date: Sun, 20 Apr 2025 10:29:35 +0100
+Subject: [PATCH] Fix #1722: test failure: geeqie:analysis / Untranslated Text_
+ preferences.cc
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://github.com/BestImageViewer/geeqie/issues/1722
+
+The problem line is:
+"Néstor Díaz Valencia <[email protected]>"
+which contains accented characters.
+
+I do not expect the grep expression to detect accented characters as
+part of an alpha-numeric string. Why it does so on another system is not
+clear.
+
+Ignore that text line.
+---
+ scripts/untranslated-text.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/scripts/untranslated-text.sh b/scripts/untranslated-text.sh
+index f17f2053..d8eb5122 100755
+--- a/scripts/untranslated-text.sh
++++ b/scripts/untranslated-text.sh
+@@ -184,6 +184,9 @@ write_char_option
+ \"Zoom minimum\",
+ \"Zoom quality\",
+
++##preferences.cc
++Valencia
++
+ ##print.cc
+ G_CALLBACK(print_set_font_cb), const_cast<char *>(\"Image text font\"));
+ G_CALLBACK(print_set_font_cb), const_cast<char *>(\"Page text font\"));
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/geeqie/-/commit/91661d2eac7999be679cb2f010ba67cffd385c13
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/geeqie/-/commit/91661d2eac7999be679cb2f010ba67cffd385c13
You're receiving this email because of your account on gitlab.archlinux.org.
