guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#77719] [PATCH] gnu: fuzzel: Update to 1.12.0.


From: Ashish SHUKLA
Subject: [bug#77719] [PATCH] gnu: fuzzel: Update to 1.12.0.
Date: Fri, 11 Apr 2025 07:31:10 +0200

* gnu/packages/xdisorg.scm (fuzzel): Update to 1.12.0.
[source]: Remove patch.

* gnu/packages/patches/fuzzel-fix-gcc-error.patch: Remove.

* gnu/local.mk (dist_patch_DATA): Unregister it.
---
 gnu/local.mk                                  |  1 -
 .../patches/fuzzel-fix-gcc-error.patch        | 42 -------------------
 gnu/packages/xdisorg.scm                      |  8 ++--
 3 files changed, 3 insertions(+), 48 deletions(-)
 delete mode 100644 gnu/packages/patches/fuzzel-fix-gcc-error.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 29bf4c72b8..352d982ab3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1335,7 +1335,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/fulcrum-1.9.1-unbundled-libraries.patch \
   %D%/packages/patches/fuse-glibc-2.34.patch                   \
   %D%/packages/patches/fuse-overlapping-headers.patch          \
-  %D%/packages/patches/fuzzel-fix-gcc-error.patch              \
   %D%/packages/patches/fuzzylite-relative-path-in-tests.patch  \
   %D%/packages/patches/fuzzylite-use-catch2.patch              \
   %D%/packages/patches/fuzzylite-soften-float-equality.patch   \
diff --git a/gnu/packages/patches/fuzzel-fix-gcc-error.patch 
b/gnu/packages/patches/fuzzel-fix-gcc-error.patch
deleted file mode 100644
index 4b5071e0e2..0000000000
--- a/gnu/packages/patches/fuzzel-fix-gcc-error.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 05b16745a1d26c4e098c39a49c56e9c312771bd2 Mon Sep 17 00:00:00 2001
-From: Ashish SHUKLA <ashish.is@lostca.se>
-Date: Mon, 23 Sep 2024 12:43:37 +0200
-Subject: [PATCH] Fix release build with GCC 11.x
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-meson in release build mode (with GCC) triggers following compiler error:
-
-   In file included from ../source/clipboard.c:14:
-   ../source/clipboard.c: In function ‘select_mime_type_for_offer’:
-   ../source/log.h:58:5: error: ‘%s’ directive argument is null 
[-Werror=format-overflow=]
-      58 |     log_msg(LOG_CLASS_DEBUG, LOG_MODULE, __FILE__, __LINE__, fmt, 
## __VA_ARGS__)
-         |     
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   ../source/clipboard.c:81:5: note: in expansion of macro ‘LOG_DBG’
-      81 |     LOG_DBG("mime-type: %s -> %s (offered type was %s)",
-         |     ^~~~~~~
-   ../source/clipboard.c:81:31: note: format string is defined here
-      81 |     LOG_DBG("mime-type: %s -> %s (offered type was %s)",
-         |                               ^~
-
-Fixes #420
----
- clipboard.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/clipboard.c b/clipboard.c
-index a4fa2d2..c692503 100644
---- a/clipboard.c
-+++ b/clipboard.c
-@@ -79,7 +79,9 @@ select_mime_type_for_offer(const char *_mime_type,
-     }
- 
-     LOG_DBG("mime-type: %s -> %s (offered type was %s)",
--            mime_type_map[*type], mime_type_map[mime_type], _mime_type);
-+            mime_type_map[*type],
-+            (mime_type_map[mime_type] == NULL ? "(null)" : 
mime_type_map[mime_type]),
-+            _mime_type);
- 
-     /* Mime-type transition; if the new mime-type is "better" than
-      * previously offered types, use the new type */
diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index 302c0434ca..0013b00ce7 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -64,7 +64,7 @@
 ;;; Copyright © 2022 Mehmet Tekman <mtekman89@gmail.com>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;; Copyright © 2024 Igor Goryachev <igor@goryachev.org>
-;;; Copyright © 2024 Ashish SHUKLA <ashish.is@lostca.se>
+;;; Copyright © 2024, 2025 Ashish SHUKLA <ashish.is@lostca.se>
 ;;; Copyright © 2024 Spencer Peters <spencerpeters@protonmail.com>
 ;;; Copyright © 2024 Jakob Kirsch <jakob.kirsch@web.de>
 ;;; Copyright © 2025 Evgeny Pisemsky <mail@pisemsky.site>
@@ -3559,7 +3559,7 @@ (define-public j4-dmenu-desktop
 (define-public fuzzel
   (package
     (name "fuzzel")
-    (version "1.11.1")
+    (version "1.12.0")
     (home-page "https://codeberg.org/dnkl/fuzzel";)
     (source (origin
               (method git-fetch)
@@ -3567,9 +3567,7 @@ (define-public fuzzel
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0dz451sjzglznkq9jmmcqm2m5y9kj1nx5zrdln56nmnbyyy4gkhl"))
-              (patches
-                (search-patches "fuzzel-fix-gcc-error.patch"))))
+                "0hsw98v499bz2nxvlw3ykq5qyyad3ci5a7x723r3cl84brabqrp3"))))
     (build-system meson-build-system)
     (arguments
      (list #:build-type "release"

base-commit: f7c41ab31f5023023385500f6eb9083d23dd1ccb
-- 
2.49.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]