From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id iOFIERG+n2ao1gAAe85BDQ:P1 (envelope-from ) for ; Tue, 23 Jul 2024 14:28:33 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iOFIERG+n2ao1gAAe85BDQ (envelope-from ) for ; Tue, 23 Jul 2024 16:28:33 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=maznc3VR; dmarc=pass (policy=none) header.from=gnu.org; 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=1721744913; h=from:from:sender:sender:reply-to: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:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZDrLUqOImBb17fUTza4u2xcun9y/X07vEL5WyuyyFcI=; b=lVdfFArHOJmhqTuL1Sszj+5SUQfFkImVI6np0awg0AsObxCW2fTNPsCx1vGoQMvDAdb1qW 1muII7B2Dx/xvR8AoAkXlkkEfQeuv1QIOoTzHH3TRuYGOw/j+RmkhMLWiCowuRCFNuikrF 7c0b4LZdo6MptJNxyfhVXtoNfftxPFc1WQmBPzF4ZFgIGdUmnyaMtM0GnsSD7hqLrODU8D paNRKzS1+r3HisT8+jo6KduxofhXyFj113LaSJS0tYLOwQKFHxOZz5OFFc3Chh+hiRWJ9C GFiu1meZDxLQz5ml1H80o4ebeafnARwBDJtvLUW28NIadGzzl1UWgbwNI19eKA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1721744913; a=rsa-sha256; cv=none; b=Wdti49cYe5FRzZRXg+aFAtkjQWSZSEoJx5nkqOeiEOLanFeEPonSH1f1v04q8e+dqxfyYl 7rxDvJ+1fml9sk0T9ohoNTdcdxIBEHYHiY7ELuQWmCCVcpHWU1enC0hSoJv4Y+H+WvvoDO HlBZE9NCGrxys40VZQIhIoQibun7UXxFLGZfHFAgO7yEeL5ZIBqGfo53VlGBnt+8BUBjEU UfRvOFRW41K3lkyWSZpturUaZaXK2dczgsmC28JzLntYHYORTC/FRHgCgTHsf7Nog2UEms FjKZBJOydut9YfpUMhUHIKaea5xyTmWtsPmuQ/3q6U8J3ZPzzlzLmSZREaEeBA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=envs.net header.s=modoboa header.b=maznc3VR; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 E75306CADC for ; Tue, 23 Jul 2024 16:28:32 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sWGUl-0001Nt-D1; Tue, 23 Jul 2024 10:28:03 -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 1sWGUh-00016f-8M for guix-patches@gnu.org; Tue, 23 Jul 2024 10:28:00 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sWGUg-0001Jf-Md for guix-patches@gnu.org; Tue, 23 Jul 2024 10:27:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sWGUl-0003B1-4o for guix-patches@gnu.org; Tue, 23 Jul 2024 10:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72256] [PATCH 3/5] gnu: zathura: Update to 0.5.6. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 23 Jul 2024 14:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72256 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72256@debbugs.gnu.org Cc: =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 72256-submit@debbugs.gnu.org id=B72256.172174484812129 (code B ref 72256); Tue, 23 Jul 2024 14:28:03 +0000 Received: (at 72256) by debbugs.gnu.org; 23 Jul 2024 14:27:28 +0000 Received: from localhost ([127.0.0.1]:60443 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sWGUC-00039T-Am for submit@debbugs.gnu.org; Tue, 23 Jul 2024 10:27:28 -0400 Received: from mail.envs.net ([5.199.136.28]:50032) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sWGU9-00039C-Do for 72256@debbugs.gnu.org; Tue, 23 Jul 2024 10:27:26 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 455BB38A39CB; Tue, 23 Jul 2024 14:27:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1721744840; bh=ZDrLUqOImBb17fUTza4u2xcun9y/X07vEL5WyuyyFcI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=maznc3VR3ogG5ZaAo/UUA3gzD5DGZgnAIeocPd6Vy9bP03cs30mnKaPtAHmkuj/JL Cfkp5N5TFNyJ+LqSw3un2SgKFFehJDLn62hrBt0Ja3lLO2YpTi2ycW7e7Z/E/ZtaDc kjrL1BzG8xGu1oirOR2BGJY7tXIvCeIyN0BxOjA7yl6+vMucx5WKGfhK75VkmNEiFa bvpPSgds6cNSWP8iMJriyf2X9xDaF2kpGs/lpk9MjHvynBA72IPbAfF/tQveac8IJg ANnxKallnGApcIbNl1e8kgi1pEYig442Cijt28bv7iZnBTOqSHfLWNVDsN9ZwKWsqI JHAc8oBsyBOvc0PSVCjSD9ODiCiNus2U/CzTPuKelPxkrA5Mc7mHWScYuInLD6S+oB VwT72bS4TbXAHlvimIVwunO+QcNSYkiJEwKh0hm2r3kz7IiSRWMfjAXh1dx2FVYJpf JMVaUqtbUIvibLe2qjwKYjCA8Lqs/WCIMd3HjCIzQkHnDuNBIoZwpwfA84GG3nDDnp 3hrINo7xYb+wAN8AIdT1RD8eUfkEk2IB8wiX/3gUWPadOCfTgy/n5ZP0INLfbwTLds VOgYjvyO2detR45u+l/4tjl8q4yRxfIJ1igPZK1grE6T9mzScQn4NPH/UMClte9T+4 LMqk5+DZW4DdlLotgiiH3vCc= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ilh4GfLF5Udh; Tue, 23 Jul 2024 14:27:17 +0000 (UTC) Received: from localhost (unknown [223.90.216.64]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Tue, 23 Jul 2024 14:27:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 1ff0cedf; Tue, 23 Jul 2024 14:27:38 +0000 (UTC) Date: Tue, 23 Jul 2024 22:27:32 +0800 Message-ID: <2219bdee8dfcb5c75fc19d3c08781fe12b3143ae.1721744318.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: List-Help: List-Subscribe: , Reply-to: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches From: iyzsong--- via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: E75306CADC X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.91 X-Spam-Score: -6.91 X-TUID: DoUPjTLyuz6S From: 宋文武 * gnu/packages/patches/zathura-use-struct-initializers.patch: Remove patch. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/pdf.scm (zathura): Update to 0.5.6. [source]: Remove patch. Change-Id: Ibe49294891f1adccfcfb6996674602535c8bd842 --- gnu/local.mk | 1 - .../zathura-use-struct-initializers.patch | 68 ------------------- gnu/packages/pdf.scm | 5 +- 3 files changed, 2 insertions(+), 72 deletions(-) delete mode 100644 gnu/packages/patches/zathura-use-struct-initializers.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef1e82eb04..df4e32add7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2277,7 +2277,6 @@ dist_patch_DATA = \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/xygrib-newer-proj.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ - %D%/packages/patches/zathura-use-struct-initializers.patch \ %D%/packages/patches/zig-0.9-riscv-support.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ %D%/packages/patches/zig-use-baseline-cpu-by-default.patch \ diff --git a/gnu/packages/patches/zathura-use-struct-initializers.patch b/gnu/packages/patches/zathura-use-struct-initializers.patch deleted file mode 100644 index 9a808a4bc3..0000000000 --- a/gnu/packages/patches/zathura-use-struct-initializers.patch +++ /dev/null @@ -1,68 +0,0 @@ -From c05328185292d6f6a4459024cdb563c63bfad230 Mon Sep 17 00:00:00 2001 -Message-ID: -From: Sebastian Ramacher -Date: Mon, 29 Jan 2024 21:05:22 +0100 -Subject: [PATCH] Use struct initializers - ---- - zathura/page-widget.c | 4 ++-- - zathura/shortcuts.c | 12 +++++------- - 2 files changed, 7 insertions(+), 9 deletions(-) - -diff --git a/zathura/page-widget.c b/zathura/page-widget.c -index 216381e..ac85dcf 100644 ---- a/zathura/page-widget.c -+++ b/zathura/page-widget.c -@@ -1426,8 +1426,8 @@ cb_menu_image_save(GtkMenuItem* item, ZathuraPage* page) - } - - /* set command */ -- char* export_command = g_strdup_printf(":export image-p%d-%d ", page_id, image_id); -- girara_argument_t argument = { 0, export_command }; -+ char* export_command = g_strdup_printf(":export image-p%d-%d ", page_id, image_id); -+ girara_argument_t argument = {.n = 0, .data = export_command}; - sc_focus_inputbar(priv->zathura->ui.session, &argument, NULL, 0); - g_free(export_command); - -diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c -index 8836cd2..35b5990 100644 ---- a/zathura/shortcuts.c -+++ b/zathura/shortcuts.c -@@ -513,7 +513,7 @@ sc_rotate(girara_session_t* session, girara_argument_t* argument, - zathura_document_set_rotation(zathura->document, (rotation + angle * t) % 360); - - /* update scale */ -- girara_argument_t new_argument = { zathura_document_get_adjust_mode(zathura->document), NULL }; -+ girara_argument_t new_argument = {.n = zathura_document_get_adjust_mode(zathura->document), .data = NULL}; - sc_adjust_window(zathura->ui.session, &new_argument, NULL, 0); - - /* render all pages again */ -@@ -1372,7 +1372,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* - zathura->shortcut.toggle_presentation_mode.zoom = zathura_document_get_zoom(zathura->document); - - /* adjust window */ -- girara_argument_t argument = { ZATHURA_ADJUST_BESTFIT, NULL }; -+ girara_argument_t argument = {.n = ZATHURA_ADJUST_BESTFIT, .data = NULL}; - sc_adjust_window(session, &argument, NULL, 0); - - /* hide status and inputbar */ -@@ -1390,13 +1390,11 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* - return false; - } - --bool --sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument), -- girara_event_t* UNUSED(event), unsigned int UNUSED(t)) --{ -+bool sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument), girara_event_t* UNUSED(event), -+ unsigned int UNUSED(t)) { - g_return_val_if_fail(session != NULL, false); - -- girara_argument_t arg = { GIRARA_HIDE, NULL }; -+ girara_argument_t arg = {.n = GIRARA_HIDE, .data = NULL}; - girara_isc_completion(session, &arg, NULL, 0); - - cb_destroy(NULL, NULL); --- -2.41.0 - diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 68a6c54d1d..376a817443 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -710,7 +710,7 @@ (define-public zathura-pdf-poppler (define-public zathura (package (name "zathura") - (version "0.5.4") + (version "0.5.6") (source (origin (method url-fetch) (uri @@ -718,8 +718,7 @@ (define-public zathura version ".tar.xz")) (sha256 (base32 - "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3")) - (patches (search-patches "zathura-use-struct-initializers.patch")))) + "1nhhdww8z6i2cmj7n6qjgyh49dy4jf0xq4j13djpvrfchxgf6y5l")))) (build-system meson-build-system) (arguments (list -- 2.45.2