me
/
guix
Archived
1
0
Fork 0
Code

gnu: Update gtkmm to 4.2.0, add gtkmm@3, and adjust gtkmm@2. 

* gnu/packages/gtk.scm (gtkmm)[version]: Update to 4.2.0.
[arguments](meson): New argument.
[native-inputs]: Add glib:bin.
[propagated-inputs]: Replace gtk+ with gtk.
(gtkmm-3): New variable.
(gtkmm-2)[arguments]: Strip certain inherited arguments.
* gnu/packages/animation.scm (synfigstudio)[inputs]: Switch to gtkmm-3.
* gnu/packages/astronomy.scm (stackistry)[inputs]: Ditto.
* gnu/packages/audio.scm (guitarix)[inputs]: Ditto.
* gnu/packages/disk.scm (parted)[inputs]: Ditto.
* gnu/packages/gnome.scm (gnome-system-monitor)[inputs]: Ditto.
(workrave)[inputs]: Ditto.
(gnote)[inputs]: Ditto.
* gnu/packages/gobby.scm (gobby)[inputs]: Ditto.
* gnu/packages/inkscape.scm (inkscape)[inputs]: Ditto.
* gnu/packages/mail.scm (astroid)[inputs]: Ditto.
* gnu/packages/mate.scm (mate-system-monitor)[inputs]: Ditto.
* gnu/packages/music.scm (tascam-gtk)[inputs]: Ditto.
* gnu/packages/photo.scm (rawtherapee)[inputs]: Ditto.
* gnu/packages/pulseaudio.scm (pavucontrol)[inputs]: Ditto.
(paprefs)[inputs]: Ditto.
* gnu/packages/text-editors.scm (jucipp)[inputs]: Ditto.
* gnu/packages/wm.scm (waybar)[inputs]: Ditto.
master
Raghav Gururajan 2021-09-02 13:32:57 -04:00 committed by Mathieu Othacehe
parent ef5b32310b
commit 50e0fa19f0
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
15 changed files with 55 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/animation.scm
View File

@ -225,7 +225,7 @@ for tweening, preventing the need to hand-draw each frame.")
`("XDG_DATA_DIRS" ":" prefix (,gtk-share)))
#t))))))
(inputs
`(("gtkmm" ,gtkmm)
`(("gtkmm" ,gtkmm-3)
("gtk+" ,gtk+)
("libsigc++" ,libsigc++)
("synfig" ,synfig)))

2
gnu/packages/astronomy.scm
View File

@ -385,7 +385,7 @@ astronomical fields. SkyMaker is part of the EFIGI
(native-inputs
`(("pkg-config" ,pkg-config)))
(inputs
`(("gtkmm" ,gtkmm)
`(("gtkmm" ,gtkmm-3)
("libskry" ,libskry)
("ffmpeg" ,ffmpeg)))
(home-page "https://github.com/GreatAttractor/stackistry")

2
gnu/packages/audio.scm
View File

@ -1886,7 +1886,7 @@ patches that can be used with softsynths such as Timidity and WildMidi.")
("lilv" ,lilv)
("ladspa" ,ladspa)
("jack" ,jack-1)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("gtk+" ,gtk+)
("fftwf" ,fftwf)
("lrdf" ,lrdf)

2
gnu/packages/disk.scm
View File

@ -572,7 +572,7 @@ and can dramatically shorten the lifespan of the drive if left unchecked.")
`(("util-linux" ,util-linux "lib")
("parted" ,parted)
("glib" ,glib)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("libxml2" ,libxml2)))
(native-inputs
`(("intltool" ,intltool)

6
gnu/packages/gnome.scm
View File

@ -10209,7 +10209,7 @@ Bluefish supports many programming and markup languages.")
(inputs
`(("gdk-pixbuf" ,gdk-pixbuf) ; for loading SVG files.
("gtk+" ,gtk+)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("librsvg" ,librsvg)
("libxml2" ,libxml2)
("libwnck" ,libwnck)))
@ -10781,7 +10781,7 @@ configurable file renaming. ")
(inputs `(("glib" ,glib)
("gtk+" ,gtk+)
("gdk-pixbuf" ,gdk-pixbuf)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("glibmm" ,glibmm)
("libx11" ,libx11)
("libxtst" ,libxtst)
@ -11435,7 +11435,7 @@ index files needed for Adwaita to be used outside of GNOME.")
("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("gspell" ,gspell)
("gtk+" ,gtk+)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("libsecret" ,libsecret)
("libuuid" ,util-linux "lib")
("libxml2" ,libxml2)

2
gnu/packages/gobby.scm
View File

@ -162,7 +162,7 @@ connect to a server running the old 0.4 protocol.")
(inputs
`(("gnutls" ,gnutls)
("gsasl" ,gsasl)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("gtksourceview" ,gtksourceview-3)
("libinfinity" ,libinfinity)
("libxml++-2" ,libxml++-2)))

64
gnu/packages/gtk.scm
View File

@ -1814,7 +1814,7 @@ library.")
(define-public gtkmm
(package
(name "gtkmm")
(version "3.24.4")
(version "4.2.0")
(source
(origin
(method url-fetch)
@ -1823,18 +1823,24 @@ library.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32 "0hv7pviln4cpjvpz7m7ga5krcsbibqzixdcn0dwzpz0cx71p3swv"))))
(base32 "12x9j82y37r4v0ngs22rzp4wmw7k2bbb9d3bymcczzz7y8w4q328"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
`(#:configure-flags '("-Dbuild-documentation=true")
#:phases
(modify-phases %standard-phases
(add-before 'build 'set-cache
(lambda _
(setenv "XDG_CACHE_HOME" (getcwd))))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
(system "Xvfb :1 +extension GLX &")
(setenv "DISPLAY" ":1")
;; Tests write to $HOME.
(setenv "HOME" (getcwd))
(setenv "XDG_RUNTIME_DIR" (getcwd))
;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))
@ -1858,15 +1864,15 @@ library.")
("xsltproc" ,libxslt)
("xorg-server" ,xorg-server-for-tests)))
(propagated-inputs
`(("atkmm" ,atkmm-2.28)
("cairomm" ,cairomm-1.14)
`(("atkmm" ,atkmm)
("cairomm" ,cairomm)
("glibmm" ,glibmm)
("gtk+" ,gtk+)
("pangomm" ,pangomm-2.46)))
("gtk" ,gtk)
("pangomm" ,pangomm)))
(synopsis "C++ Interfaces for GTK+ and GNOME")
(description "GTKmm is the official C++ interface for the popular GUI
library GTK+. Highlights include typesafe callbacks, and a comprehensive set of
widgets that are easily extensible via inheritance. You can create user
library GTK+. Highlights include typesafe callbacks, and a comprehensive set
of widgets that are easily extensible via inheritance. You can create user
interfaces either in code or with the Glade User Interface designer, using
libglademm. There's extensive documentation, including API reference and a
tutorial.")
@ -1878,6 +1884,27 @@ tutorial.")
;; Tools
license:gpl2+))))
(define-public gtkmm-3
(package
(inherit gtkmm)
(name "gtkmm")
(version "3.24.4")
(source
(origin
(method url-fetch)
(uri
(string-append "mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
(base32 "0hv7pviln4cpjvpz7m7ga5krcsbibqzixdcn0dwzpz0cx71p3swv"))))
(propagated-inputs
`(("atkmm-2.28" ,atkmm-2.28)
("cairomm-1.14" ,cairomm-1.14)
("glibmm" ,glibmm)
("gtk+" ,gtk+)
("pangomm-2.42" ,pangomm-2.46)))))
(define-public gtkmm-2
(package
(inherit gtkmm)
@ -1894,23 +1921,8 @@ tutorial.")
(base32 "0wkbzvsx4kgw16f6xjdc1dz7f77ldngdila4yi5lw2zrgcxsb006"))))
(build-system gnu-build-system)
(arguments
(substitute-keyword-arguments (package-arguments gtkmm)
((#:modules modules %gnu-build-system-modules)
`((srfi srfi-1)
,@modules))
((#:configure-flags flags)
`(fold delete
,flags
'("-Dbuild-documentation=true")))))
(native-inputs
`(("dot" ,graphviz)
("doxygen" ,doxygen)
("m4" ,m4)
("mm-common" ,mm-common)
("perl" ,perl)
("pkg-config" ,pkg-config)
("xsltproc" ,libxslt)
("xorg-server" ,xorg-server-for-tests)))
(strip-keyword-arguments
'(#:configure-flags) (package-arguments gtkmm)))
(propagated-inputs
`(("atkmm" ,atkmm-2.28)
("cairomm" ,cairomm-1.14)
@ -1935,7 +1947,7 @@ tutorial.")
(propagated-inputs
;; In 'Requires' of gtksourceviewmm-3.0.pc.
`(("glibmm" ,glibmm)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("gtksourceview" ,gtksourceview-3)))
(synopsis "C++ interface to the GTK+ 'GtkTextView' widget")
(description

2
gnu/packages/inkscape.scm
View File

@ -265,7 +265,7 @@ endif()~%~%"
`(("aspell" ,aspell)
("autotrace" ,autotrace)
("gdl" ,gdl-minimal)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("gtk" ,gtk+)
("gtkspell3" ,gtkspell3)
("gsl" ,gsl)

2
gnu/packages/mail.scm
View File

@ -930,7 +930,7 @@ mailpack. What can alterMIME do?
`(("boost" ,boost)
("gmime" ,gmime)
("gobject-introspection" ,gobject-introspection) ; it is referenced
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("libpeas" ,libpeas)
("libsass" ,libsass)
("notmuch" ,notmuch)

2
gnu/packages/mate.scm
View File

@ -1468,7 +1468,7 @@ can be used as backgrounds in the MATE Desktop environment.")
`(("cairo" ,cairo)
("glib" ,glib)
("glibmm" ,glibmm)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("gtk+" ,gtk+)
("gdk-pixbuf" ,gdk-pixbuf)
("libsigc++" ,libsigc++)

2
gnu/packages/music.scm
View File

@ -1883,7 +1883,7 @@ complete studio.")
(build-system gnu-build-system)
(inputs
`(("liblo" ,liblo)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("alsa-lib" ,alsa-lib)
("libxml++" ,libxml++-2)))
(native-inputs

2
gnu/packages/photo.scm
View File

@ -813,7 +813,7 @@ a complete panorama and stitch any series of overlapping pictures.")
("glib" ,glib)
("glibmm" ,glibmm)
("gtk+" ,gtk+)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("lcms" ,lcms)
("lensfun" ,lensfun)
("libcanberra" ,libcanberra)

4
gnu/packages/pulseaudio.scm
View File

@ -296,7 +296,7 @@ sound server.")
(build-system glib-or-gtk-build-system)
(inputs
`(("adwaita-icon-theme" ,adwaita-icon-theme) ;hard-coded theme
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("libcanberra" ,libcanberra)
("pulseaudio" ,pulseaudio)))
(native-inputs
@ -521,7 +521,7 @@ README.md for a detailed list of features.")
`(("gettext" ,gettext-minimal)
("pkg-config" ,pkg-config)))
(inputs
`(("gtkmm" ,gtkmm)
`(("gtkmm" ,gtkmm-3)
("pulseaudio" ,pulseaudio)))
(home-page "https://freedesktop.org/software/pulseaudio/paprefs/")
(synopsis "Simple GTK based configuration dialog for the PulseAudio sound

2
gnu/packages/text-editors.scm
View File

@ -394,7 +394,7 @@ bindings and many of the powerful features of GNU Emacs.")
`(("aspell" ,aspell)
("boost" ,boost)
("ctags" ,universal-ctags)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("gtksourceviewmm" ,gtksourceviewmm)
("libclang" ,clang-11) ;XXX: must be the same version as Mesas LLVM
("libgit2" ,libgit2)))

2
gnu/packages/wm.scm
View File

@ -1652,7 +1652,7 @@ modules for building a Wayland compositor.")
(inputs `(("date" ,date)
("fmt" ,fmt)
("gtk-layer-shell" ,gtk-layer-shell)
("gtkmm" ,gtkmm)
("gtkmm" ,gtkmm-3)
("jsoncpp" ,jsoncpp)
("libdbusmenu" ,libdbusmenu)
("libinput" ,libinput)