From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 2NFKGtuEGmTJTgEASxT56A (envelope-from ) for ; Wed, 22 Mar 2023 05:32:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id AKFYGtuEGmSbBAAA9RJhRA (envelope-from ) for ; Wed, 22 Mar 2023 05:32:27 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AD3F19190 for ; Wed, 22 Mar 2023 05:32:26 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=oi+KzceV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1679459547; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=Wf85KzG+twezleyQsFJ7Vrm+1swWTGhbC2unAN6Ytho=; b=TIpLhnPRIfdssTpCmAc/PiblZk2ldsLaDFalAXngkzDYHQKgvup1j66Kr6fkyKU/xjh0SK AQshhjhCsXQZQ406ixaa1e0aFJueBJHGunHPeDCAS2dHlIe2lbWa7K66RKLBVxhcus43I5 FUSj4mJacu3uUERaRMQ700/XM/QS4GBTxOsgcDbG8YQSWXqvTDmDGilzMNRrh4svop0+r5 vmvkfAv2rJtKxJkGoMg5p/Fg1XnlEZznFwanqOw7x2jfcnOTCiypFtcDqQjqEK94GOo7Ag py9wX3DANQ+7Il+Sf3bHpC2dOFkrpIGvV85OWfa6SFCG6p4nZII/LvOJn366+Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=oi+KzceV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1679459547; a=rsa-sha256; cv=none; b=tVtjh09DWYCE98+ZozalI89bGjkKwZ5Lta/uJjfbYnGPbGdILIMvPRs3N9BLuxmI8ds0AJ 7gOAM4fNT6ioU3IAdYFatGqksgE/mmThAmZ9Pw3g/XfheusBp3eAsEnH1GeIb2dERXa52I pKbb8bb2wvt9tRon1WKdh54I9hPJMJLDlWJoWh+dbdPIo1t4MlMdxv+B/140kQim2SUKhP wxeWMFg4H/7DAFOn9tIMxaFiB+TJGcn7KbESzuNKR/HQrwJingSF6YJ+/nUGtgc7uABdyN otyFTV3s1meqpIJg1Zt2Pg+0hWCt3o7PkrMv17Y9QZN2mYDCmSPo8QNkt02AHg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peq8q-0001rb-Qx; Wed, 22 Mar 2023 00:32:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peq8p-0001oB-4D for guix-patches@gnu.org; Wed, 22 Mar 2023 00:32:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peq8o-00010N-Rj for guix-patches@gnu.org; Wed, 22 Mar 2023 00:32:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peq8o-0007FA-Lj for guix-patches@gnu.org; Wed, 22 Mar 2023 00:32:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62367] [PATCH 1/2] gnu: geeqie: Update to 2.0.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 04:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62367 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62367@debbugs.gnu.org Cc: Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167945949027794 (code B ref -1); Wed, 22 Mar 2023 04:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Mar 2023 04:31:30 +0000 Received: from localhost ([127.0.0.1]:33172 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peq8H-0007ED-Bd for submit@debbugs.gnu.org; Wed, 22 Mar 2023 00:31:30 -0400 Received: from lists.gnu.org ([209.51.188.17]:59402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peq8E-0007E4-5q for submit@debbugs.gnu.org; Wed, 22 Mar 2023 00:31:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1peq8D-0001is-S1 for guix-patches@gnu.org; Wed, 22 Mar 2023 00:31:25 -0400 Received: from mail-qt1-x830.google.com ([2607:f8b0:4864:20::830]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peq8B-0000im-JE for guix-patches@gnu.org; Wed, 22 Mar 2023 00:31:25 -0400 Received: by mail-qt1-x830.google.com with SMTP id bz27so9574269qtb.1 for ; Tue, 21 Mar 2023 21:31:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679459481; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Wf85KzG+twezleyQsFJ7Vrm+1swWTGhbC2unAN6Ytho=; b=oi+KzceVxTp8E6BAtViOsSWobgKs7tckYLPFkzbrPwRZAwDgMMHiJ5yC/JSa+9ytR+ wROUUgm5VWO0k1+map+CRtqrLtNDvqzue9I/jCfwG/E4udnz1dNGnyu1gron3lFh7zAe IDeFJvK14KndQcpG1hMgJrQ1xxl634oInpPOAzM5tpZ1KBP4xDkDSrFXUkamPk+36QuA odJnCJuvWd7cjQ7SThOiU+YV0UwJe9wpMtYfxQhBPhfqVTdv+NbMK55z4mpIwjV/+Jhc 0BdDGXCIvgiAdgU/XWFfOg2tYuFrNX6rbCcBMA36hZ0BhC0PUa1l0tnraN0rmCzIskek hW1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679459481; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Wf85KzG+twezleyQsFJ7Vrm+1swWTGhbC2unAN6Ytho=; b=XxI6VD3luFiE/tX4YyCPkI2V/t1P78yGkitVAwqCTpGtguJ6i8i5velKoffHBkkrAA ZQPLpJ+NihDaRqLl5QpQDYGUm9FDQZZsb2BCo46WCkgiaFzNqFshEQk1yIyuMXAMHCOK Xqxtqxl3wvIVV5d/Mzd4dnQ/lXjpCfxsloI8xaZ9dO/cksw9pp9Hc/bhNdc/HwSy3iXD 4TfCin2LwmVBqg7qzj7sEGGY1ElP+LIRuTfXuA1zO5/5CO7tq0tT8tpzDXamJL8TXmb/ p3mqw8MnrCN55Aeh4rbg11+WI5XfCfsttMwxx1iGX02SF9prQP35686TiaA9q9S7ctvv l7Lg== X-Gm-Message-State: AO0yUKXUqV0JHsF2IInPV8HxUVkeAFuitwxn1dQ5V2HQJ+qw5xoRjcUp o+7watouJ2hH+GfwjINA07MK2D9Cb+XKsw== X-Google-Smtp-Source: AK7set/oLs8pMwDnAiJCtMWizB3xJB5t029Djb9WDt5AWD5i3kD1l3yCpdTdD5QS91owqYcBZ96itg== X-Received: by 2002:a05:622a:1445:b0:3d5:8130:1ed5 with SMTP id v5-20020a05622a144500b003d581301ed5mr2997503qtx.63.1679459481484; Tue, 21 Mar 2023 21:31:21 -0700 (PDT) Received: from localhost.localdomain (dsl-10-130-195.b2b2c.ca. [72.10.130.195]) by smtp.gmail.com with ESMTPSA id p138-20020a374290000000b007426b917031sm10654619qka.121.2023.03.21.21.31.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Mar 2023 21:31:21 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 22 Mar 2023 00:31:15 -0400 Message-Id: <20230322043115.15871-1-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::830; envelope-from=maxim.cournoyer@gmail.com; helo=mail-qt1-x830.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: X-Migadu-Queue-Id: AD3F19190 X-Spam-Score: -2.65 X-Migadu-Spam-Score: -2.65 X-Migadu-Scanner: scn0.migadu.com List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-TUID: xFVPXESPUY4S * gnu/packages/image-viewers.scm (geeqie): Update to 2.0.1. [build-system]: Switch to meson. [arguments]: Delete field. [inputs]: Remove clutter. [native-inputs]: Add xxd. Remove autoconf and automake. * gnu/packages/patches/geeqie-clutter.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/image-viewers.scm | 48 ++++++----------------- gnu/packages/patches/geeqie-clutter.patch | 35 ----------------- 3 files changed, 13 insertions(+), 71 deletions(-) delete mode 100644 gnu/packages/patches/geeqie-clutter.patch diff --git a/gnu/local.mk b/gnu/local.mk index 186d82a8ab..e07b23b179 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1201,7 +1201,6 @@ dist_patch_DATA = \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ %D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch \ %D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch \ - %D%/packages/patches/geeqie-clutter.patch \ %D%/packages/patches/gemmi-fix-pegtl-usage.patch \ %D%/packages/patches/gemmi-fix-sajson-types.patch \ %D%/packages/patches/genimage-mke2fs-test.patch \ diff --git a/gnu/packages/image-viewers.scm b/gnu/packages/image-viewers.scm index 0758cf5b27..470ae08a9b 100644 --- a/gnu/packages/image-viewers.scm +++ b/gnu/packages/image-viewers.scm @@ -24,7 +24,7 @@ ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2021 dissent ;;; Copyright © 2022 Michael Rohleder -;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022, 2023 Maxim Cournoyer ;;; Copyright © 2022 Tomasz Jeneralczyk ;;; Copyright © 2022 Cairn ;;; @@ -101,6 +101,7 @@ (define-module (gnu packages image-viewers) #:use-module (gnu packages upnp) #:use-module (gnu packages version-control) #:use-module (gnu packages video) + #:use-module (gnu packages vim) #:use-module (gnu packages web) #:use-module (gnu packages xdisorg) #:use-module (gnu packages xml) @@ -231,7 +232,7 @@ (define-public feh (define-public geeqie (package (name "geeqie") - (version "1.6") + (version "2.0.1") (source (origin (method git-fetch) (uri (git-reference @@ -239,43 +240,20 @@ (define-public geeqie (commit (string-append "v" version)))) (sha256 (base32 - "1i9yd8lddp6b9s9vjjjzbpqj4bvwidxc6kiba6vdrk7dda5akyky")) - (file-name (git-file-name name version)) - (patches (search-patches "geeqie-clutter.patch")))) - (build-system gnu-build-system) - (arguments - ;; Enable support for a "map" pane using GPS data. - `(#:configure-flags '("CFLAGS=-O2 -g -fcommon" - "--enable-map" - "--enable-gtk3") - #:phases (modify-phases %standard-phases - (add-after 'unpack 'correctly-locate-aux-scripts - ;; The git checkout has symlinks under the auxdir - ;; directory pointing to /usr/share/automake-1.16/depcomp - ;; and /usr/share/automake-1.16/install-sh, which causes - ;; the configure phase to fail (see: - ;; https://github.com/BestImageViewer/geeqie/issues/936). - (lambda* (#:key inputs #:allow-other-keys) - (let ((automake (assoc-ref inputs "automake"))) - (delete-file "auxdir/depcomp") - (symlink (car (find-files automake "depcomp")) - "auxdir/depcomp") - (delete-file "auxdir/install-sh") - (symlink (car (find-files automake "install-sh")) - "auxdir/install-sh"))))))) + "199s0f3khnycr5vhk2ww3xnnasz7dzwxdl89pxjadq6rpgprfqyh")) + (file-name (git-file-name name version)))) + (build-system meson-build-system) (inputs - (list clutter - libchamplain + (list exiv2 + gtk+ lcms - exiv2 - libpng - gtk+)) + libchamplain + libpng)) (native-inputs - (list autoconf - automake - `(,glib "bin") ; glib-gettextize + (list `(,glib "bin") ; glib-gettextize intltool - pkg-config)) + pkg-config + xxd)) (home-page "https://www.geeqie.org/") (synopsis "Lightweight GTK+ based image viewer") (description diff --git a/gnu/packages/patches/geeqie-clutter.patch b/gnu/packages/patches/geeqie-clutter.patch deleted file mode 100644 index ab7cc957d8..0000000000 --- a/gnu/packages/patches/geeqie-clutter.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c99084ac5fc2fb854ff8e8abd4bd3298fb08fb43 Mon Sep 17 00:00:00 2001 -From: Colin Clark -Date: Sat, 9 Jan 2021 11:35:41 +0000 -Subject: [PATCH] Fix #829: segfault with clutter-gtk - -https://github.com/BestImageViewer/geeqie/issues/829 - -This fix might cause other problems which might be cured by calling: -LIBGL_ALWAYS_INDIRECT=1 geeqie - -or, worst case: -geeqie --disable-clutter ---- - src/main.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/main.c b/src/main.c -index f497240d..4af654fe 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -904,11 +904,6 @@ gint main(gint argc, gchar *argv[]) - #ifdef HAVE_GTHREAD - #if !GLIB_CHECK_VERSION(2,32,0) - g_thread_init(NULL); --#endif --#ifdef HAVE_CLUTTER --/* FIXME: see below */ -- putenv("LIBGL_ALWAYS_INDIRECT=1"); -- XInitThreads(); - #endif - gdk_threads_init(); - gdk_threads_enter(); --- -2.34.0 - base-commit: 03ab1a27620d18f7e09ef7cc28f62d0a0c78b186 -- 2.33.1