mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: fltk: Update to 1.4.1 and add fltk-1.3.
FLTK 1.4 is intended to be mostly API compatible with FLTK 1.3.x, however there are still some programs that fail to build with it, so we keep fltk-1.3 for them. * gnu/packages/fltk.scm (fltk-1.3): Renamed from fltk. 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 Signed-off-by: 宋文武 <iyzsong@member.fsf.org>
This commit is contained in:
parent
c17545dbde
commit
d36e8719b6
8 changed files with 32 additions and 16 deletions
|
@ -447,7 +447,7 @@ precision.")
|
|||
(inputs
|
||||
;; TODO: Add libnauty, unbundle "libmicropython.a".
|
||||
(list ao
|
||||
fltk
|
||||
fltk-1.3
|
||||
glpk-4
|
||||
gmp
|
||||
gsl
|
||||
|
|
|
@ -2560,7 +2560,7 @@ auto-wah.")
|
|||
(build-system gnu-build-system)
|
||||
(inputs
|
||||
(list alsa-utils
|
||||
fltk
|
||||
fltk-1.3
|
||||
libx11
|
||||
libxext
|
||||
libxfixes
|
||||
|
@ -6365,7 +6365,7 @@ while still staying in time.")
|
|||
(list curl
|
||||
dbus
|
||||
flac
|
||||
fltk
|
||||
fltk-1.3
|
||||
lame
|
||||
libfdk
|
||||
libsamplerate
|
||||
|
|
|
@ -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 @@
|
|||
#: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 @@ linked, but works fine as a shared library. FLTK also includes an excellent
|
|||
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")
|
||||
|
|
|
@ -2445,7 +2445,7 @@ scripted in a Python-like language.")
|
|||
("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")
|
||||
|
|
|
@ -3526,7 +3526,7 @@ capabilities, custom envelopes, effects, etc.")
|
|||
boost
|
||||
cairo
|
||||
fftwf
|
||||
fltk
|
||||
fltk-1.3
|
||||
fontconfig
|
||||
jack-2
|
||||
lv2
|
||||
|
|
|
@ -1403,7 +1403,7 @@ for emergency communications data transfers (like ICS213 forms).")
|
|||
(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
|
||||
|
|
|
@ -202,7 +202,7 @@ RDP, VNC, SPICE, NX, XDMCP, SSH and EXEC network protocols are supported.")
|
|||
gnutls
|
||||
libjpeg-turbo
|
||||
;;ffmpeg ;TODO: add this for h264 encoding
|
||||
fltk
|
||||
fltk-1.3
|
||||
linux-pam
|
||||
libx11
|
||||
libxext
|
||||
|
|
|
@ -1059,7 +1059,7 @@ Features include
|
|||
(base32 "19rr09b4xvnz7isng8pzxm5879g3pqvml5v8vh4gbwwn93dnlwpn"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs (list autoconf automake))
|
||||
(inputs (list fltk
|
||||
(inputs (list fltk-1.3
|
||||
fontconfig
|
||||
openssl
|
||||
libjpeg-turbo
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue