Package: guix-patches;
Reported by: Andy Tai <atai <at> atai.org>
Date: Tue, 31 Dec 2024 05:49:02 UTC
Severity: normal
Tags: patch
Done: 宋文武 <iyzsong <at> envs.net>
Bug is archived. No further changes may be made.
Message #35 received at 75220 <at> debbugs.gnu.org (full text, mbox):
From: Andy Tai <atai <at> atai.org> To: 75220 <at> debbugs.gnu.org, iyzsong <at> envs.net Cc: Andy Tai <atai <at> atai.org> Subject: [PATCH v5] gnu: fltk: Update to 1.4.1 and rename 1.3 as fltk-1.3, updated to 1.3.11. Date: Fri, 14 Feb 2025 23:06:20 -0800
* gnu/packages/fltk.scm (fltk-1.3): Rename ftlk as fltk-1.3
and update to 1.3.11.
[source]<origin>: Switch to git reference.
(fltk): New variable, fltk at 1.4.1.
* gnu/packages/algebra.scm (giac) [inputs]: Replace fltk by fltk-1.3.
* gnu/packages/audio.scm (rakarrack) [inputs]: Ditto.
(butt) [inputs]: Ditto.
* gnu/packages/game-development.scm (eureka) [inputs]: Ditto.
* gnu/packages/music.scm (yoshimi) [inputs]: Ditto.
* gnu/packages/radio.scm (flwrap) [inputs]: Ditto.
* gnu/packages/vnc.scm (tigervnc-client) [inputs]: Ditto.
* gnu/packages/web-browser.scm (dillo) [inputs]: Ditto.
Change-Id: I54833e5802d4b2088a42474d2edd17fe56bbdb68
---
gnu/packages/algebra.scm | 2 +-
gnu/packages/audio.scm | 4 ++--
gnu/packages/fltk.scm | 32 +++++++++++++++++++++++--------
gnu/packages/game-development.scm | 2 +-
gnu/packages/music.scm | 2 +-
gnu/packages/radio.scm | 2 +-
gnu/packages/vnc.scm | 2 +-
gnu/packages/web-browsers.scm | 2 +-
8 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm
index 4e41b7805e..74ecba2806 100644
--- a/gnu/packages/algebra.scm
+++ b/gnu/packages/algebra.scm
@@ -447,7 +447,7 @@ (define-public giac
(inputs
;; TODO: Add libnauty, unbundle "libmicropython.a".
(list ao
- fltk
+ fltk-1.3
glpk-4
gmp
gsl
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 4ae8fde662..1dc79ce62b 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2560,7 +2560,7 @@ (define-public rakarrack
(build-system gnu-build-system)
(inputs
(list alsa-utils
- fltk
+ fltk-1.3
libx11
libxext
libxfixes
@@ -6365,7 +6365,7 @@ (define-public butt
(list curl
dbus
flac
- fltk
+ fltk-1.3
lame
libfdk
libsamplerate
diff --git a/gnu/packages/fltk.scm b/gnu/packages/fltk.scm
index 05d418022f..475ad0feca 100644
--- a/gnu/packages/fltk.scm
+++ b/gnu/packages/fltk.scm
@@ -25,6 +25,7 @@
(define-module (gnu packages fltk)
#:use-module ((guix licenses) #:select (lgpl2.0 lgpl2.0+))
#:use-module (gnu packages)
+ #:use-module (gnu packages autotools)
#:use-module (gnu packages compression)
#:use-module (gnu packages image)
#:use-module (gnu packages xorg)
@@ -40,21 +41,23 @@ (define-module (gnu packages fltk)
#:use-module (guix build-system waf)
#:use-module (srfi srfi-1))
-(define-public fltk
+(define-public fltk-1.3
(package
(name "fltk")
- (version "1.3.9")
+ (version "1.3.11")
(source
(origin
- (method url-fetch)
- (uri (string-append "https://www.fltk.org/pub/fltk/"
- (first (string-split version #\-))
- "/fltk-" version "-source.tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fltk/fltk")
+ (commit (string-append "release-" version))))
(sha256
- (base32 "06siv517l1wfvcc1dg0h1dka5yzkh9gbmm835i1hgmjhbi2b0dnp"))))
+ (base32 "0pnifyhhvcqfjd6iaa4m14kvfyqhjjdw0aqbcizcdhhqrl6q4pjg"))))
(build-system gnu-build-system)
(native-inputs
- (list pkg-config))
+ (list autoconf
+ automake
+ pkg-config))
(inputs
`(("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
@@ -97,6 +100,19 @@ (define-public fltk
UI builder called FLUID that can be used to create applications in minutes.")
(license lgpl2.0))) ; plus certain additional permissions
+(define-public fltk
+ (package
+ (inherit fltk-1.3)
+ (version "1.4.1")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/fltk/fltk")
+ (commit (string-append "release-" version))))
+ (sha256
+ (base32 "0ii49imyw29drkhc9dvyiiybc9qy19fxc91wl6w2gmc3xsmdzd6z"))))))
+
+
(define-public ntk
(package
(name "ntk")
diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm
index dc642bf052..7054685dc6 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -2445,7 +2445,7 @@ (define-public eureka
("libfontconfig" ,fontconfig)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
- ("fltk" ,fltk)
+ ("fltk" ,fltk-1.3)
("zlib" ,zlib)))
(native-inputs (list pkg-config xdg-utils))
(synopsis "Doom map editor")
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 18a47e4650..11ea9313c5 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -3526,7 +3526,7 @@ (define-public yoshimi
boost
cairo
fftwf
- fltk
+ fltk-1.3
fontconfig
jack-2
lv2
diff --git a/gnu/packages/radio.scm b/gnu/packages/radio.scm
index 987ad5f997..626a1b9d5a 100644
--- a/gnu/packages/radio.scm
+++ b/gnu/packages/radio.scm
@@ -1403,7 +1403,7 @@ (define-public flwrap
(native-inputs
(list autoconf automake pkg-config))
(inputs
- (list fltk libx11 libxext libxfixes libxft))
+ (list fltk-1.3 libx11 libxext libxfixes libxft))
(synopsis "File encapsulation program")
(description
"Flwrap is a software utility for amateur radio use. Its purpose is to
diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm
index 5b320bb347..c45f4cab01 100644
--- a/gnu/packages/vnc.scm
+++ b/gnu/packages/vnc.scm
@@ -202,7 +202,7 @@ (define-public tigervnc-client
gnutls
libjpeg-turbo
;;ffmpeg ;TODO: add this for h264 encoding
- fltk
+ fltk-1.3
linux-pam
libx11
libxext
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index c0138eea17..df3335b4d8 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -1059,7 +1059,7 @@ (define-public dillo
(base32 "19rr09b4xvnz7isng8pzxm5879g3pqvml5v8vh4gbwwn93dnlwpn"))))
(build-system gnu-build-system)
(native-inputs (list autoconf automake))
- (inputs (list fltk
+ (inputs (list fltk-1.3
fontconfig
openssl
libjpeg-turbo
base-commit: 9b1fe3bd70a57cdbf99339eb06b3a9b57f060f97
--
2.34.1
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.