me
/
guix
Archived
1
0
Fork 0
Commit Graph

735 Commits (b764d10e9185cb6a250c94c487e8c5f35078c13b)

Author SHA1 Message Date
Ludovic Courtès dcf308a8bf
gnu: gtk+: Simplify inputs.
Obtained by running:

  guix style --input-simplification=always gtk+ gtk+@2

* gnu/packages/gtk.scm (gtk+-2, gtk+): Simplify inputs.
2021-12-05 23:24:48 +01:00
Ludovic Courtès 597119937d
gnu: gtk+@2: Use 'librsvg-for-system'.
* gnu/packages/gtk.scm (gtk+-2)[propagated-inputs]: Use
'librsvg-for-system' unconditionally.
2021-12-05 23:15:24 +01:00
Ludovic Courtès 2561f2720f
gnu: gtk+: Use 'librsvg-for-system'.
This brings back SVG support on non-x86_64 platforms.

* gnu/packages/gtk.scm (gtk+)[inputs]: Use 'librsvg-for-system'
unconditionally.
[arguments]: In 'disable-failing-tests' phase, remove conditional
substitutions aimed for non-x86_64 targets lacking librsvg support.
* gnu/packages/gnome.scm (libhandy)[arguments]: Likewise, remove
'skip-test-that-requires-svg' phase.
2021-12-05 22:42:26 +01:00
Ludovic Courtès 689d141cd8
gnu: Remove librsvg@2.50 from the Xfce dependency graph.
This allows us to build Xfce on non-x86_64 platforms.

* gnu/packages/gstreamer.scm (gst-plugins-good)[inputs]: Use
'librsvg-for-system' instead of 'librsvg'.
* gnu/packages/gtk.scm (guile-rsvg)[inputs]: Likewise.
* gnu/packages/xfce.scm (xfce4-xkb-plugin)[inputs]: Likewise.
2021-12-02 14:59:57 +01:00
Ludovic Courtès 96d3c3eee8
Revert "gnu: gtk+: Skip test that requires SVG support on non-x86_64."
This reverts commit fa35a5f649, which is
redundant with 8a8e491258.
2021-11-26 10:53:24 +01:00
Ludovic Courtès fa35a5f649
gnu: gtk+: Skip test that requires SVG support on non-x86_64.
* gnu/packages/gtk.scm (gtk+)[arguments]: In 'disable-failing-tests',
skip 'tree-relationships' when not 'target-x86-64?'.
2021-11-25 23:15:38 +01:00
Maxim Cournoyer 8a8e491258
gnu: gtk+: Conditionally disable the tree-relationships test.
* gnu/packages/gtk.scm (gtk+)[phases] {disable-failing-tests}: Disable the
tree-relationships test on non-x86_64 targets.
2021-11-25 14:01:04 -05:00
Maxim Cournoyer 76df1ad3df
gnu: gtk: Guard against timeouts in the test suite.
This change piggy backs on the improvements to the meson-build-system made in
dfcc96d8f48716ae5aefb383c58b153d5bcb407c; it's motivated by timeouts that
occurred in the GTK test suite while building on a heavily loaded machine.

* gnu/packages/gtk.scm (gtk)[parallel-tests]: New argument.
[test-options]: New argument, which now includes --suite=gtk and
--no-suite=gsk-compare-broadway, to match what upstream uses.
[phases]{check}: Remove override.
2021-11-20 08:57:02 -05:00
Ludovic Courtès 669d150f48
gnu: graphene: Depend on a fixed version of 'git-minimal'.
* gnu/packages/version-control.scm (git-minimal/fixed): New variable.
* gnu/packages/gtk.scm (graphene)[native-inputs]: Use it instead of
GIT-MINIMAL.
2021-11-17 23:59:09 +01:00
Ludovic Courtès 3a317f7476
Merge branch 'master' into core-updates-frozen 2021-11-17 23:43:14 +01:00
Maxim Cournoyer bc4f219ba4
gnu: gtkmm: Update to 4.4.0.
* gnu/packages/gtk.scm (gtkmm): Update to 4.4.0.  Delete trailing #t.
2021-11-11 12:18:26 -05:00
Maxim Cournoyer 7137befc43
gnu: gtkmm-3: Update to 3.24.5.
* gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.5.
[arguments]: Use meson-0.59.
2021-11-11 12:18:26 -05:00
Maxim Cournoyer 86528cab04
gnu: gdk-pixbuf: Remove obsolete jasper support.
The newer meson 0.60 failed the build because the jasper flag no longer
exists.

* gnu/packages/gtk.scm (gdk-pixbuf)[configure-flags]<jasper>: Remove configure
flag.
[phases]{patch-docbook}: Remove condition and TODO comment.
[inputs]: Remove jasper.
2021-11-11 12:18:23 -05:00
Maxim Cournoyer feab09f72a
gnu: gtk: Replace gdk-pixbuf+svg by librsvg.
With the addition of a profile hook for computing the gdk-pixbuf loaders cache
file, there is no longer a need for gdk-pixbuf+svg, and librsvg can propagate
gdk-pixbuf without fear, so replace the former for the latter.

The replacement was automated with the following command:

   $ git grep -l ',gdk-pixbuf+svg)' \
     | xargs sed 's/(".*" ,gdk-pixbuf+svg)/("librsvg" ,librsvg)/' -i

* gnu/packages/gtk.scm (gdk-pixbuf+svg): Delete package.
(gtk+-2)[propagated-inputs]: Replace gdk-pixbuf+svg with librsvg.
(gtk+)[propagated-inputs]: Likewise.
* gnu/packages/gnome.scm (gdk-pixbuf+svg): Add deprecated package.
2021-11-11 12:18:20 -05:00
Maxim Cournoyer 831c08d8f2
gnu: gdk-pixbuf: Add a search path for the loaders cache file.
Fixes <https://issues.guix.gnu.org/50957>.

The previous commit added a profile hook to compute a gdk-pixbuf loaders cache
file.  This change enables gdk-pixbuf to make use of it.

* gnu/packages/gtk.scm (gdk-pixbuf)[native-search-paths]: Add a search path
specification to set the GDK_PIXBUF_MODULE_FILE environment variable.
2021-11-11 12:18:19 -05:00
Maxim Cournoyer 7541598fe2
gnu: gtk: Add the generate-gdk-pixbuf-loaders-cache-file phase.
* gnu/packages/gtk.scm (gtk+)[arguments]: Import the (guix build
glib-or-gtk-build-system) module and put it in scope.
[phases]{generate-gdk-pixbuf-loaders-cache-file}: New phase.
(gtk): Likewise.
2021-11-11 12:18:19 -05:00
Maxim Cournoyer 6d08d40cfa
gnu: libthai: Make datrie a normal native-input.
* gnu/packages/gtk.scm (libthai)[native-input]: Remove conditional on the
datrie input.
2021-11-11 12:18:17 -05:00
Maxim Cournoyer b071402d35
gnu: pango: Update to 1.48.10.
* gnu/packages/gtk.scm (pango): Update to 1.48.10.  Remove trailing #t.
[inputs]: Remove conditional on the bash-minimal input.
2021-11-11 12:18:16 -05:00
Maxim Cournoyer 0195d4b1c3
gnu: libcloudproviders-minimal: Introduce minimal variant.
* gnu/packages/gnome.scm (libcloudproviders-minimal): New minimal variant that
doesn't require Inkscape to be built (through gtk-doc).
[source]: Adjust URI.
[outputs]: Remove field.
[configure-flags]: Disable introspection, docs and vala bindings.
[phases]{move-doc}: Move phase to ...
(libcloudproviders)[phases]: ... here.
Rewrite in terms of libcloudproviders-minimal.  The "doc" output is moved
here.
[configure-flags]: Clear inherited flags and enable doc.
* gnu/packages/gtk.scm (gtk+)[inputs]{libcloudproviders}: Use the minimal
variant to prevent a cycle with Inkscape.
2021-11-11 12:18:14 -05:00
Maxim Cournoyer 8dec1804a5
gnu: colord-minimal: Introduce minimal variant.
* gnu/packages/gnome.scm (colord-minimal): New minimal variant that doesn't
require Inkscape to be built (through gtk-doc).  Remove trailing #t.
[configure-flags]: Disable docs and manpage generation.  Sort order.
(colord): Rewrite in terms of colord-minimal.
[configure-flags]: Enable manpages and bash completion.
[phases]{fix-bash-completion-dir}: New phase.
[native-inputs]: Add bash_completion, docbook-xsl-ns and libxml2.
* gnu/packages/gtk.scm (gtk+)[inputs]{colord}: Use the colord-minimal variant
to prevent a cycle with Inkscape.
2021-11-11 12:18:14 -05:00
Maxim Cournoyer ff28af501d
gnu: json-glib-minimal: Introduce minimal variant.
* gnu/packages/gnome.scm (json-glib-minimal): New variable.
[source]: Adjust URI.
[outputs]: Move doc output to...
(json-glib)[outputs]: ... here.  Rewrite in terms of json-glib-minimal.
* gnu/packages/gtk.scm (gtk+): Use json-glib-minimal to break a cycle with
Inkscape.
2021-11-11 12:18:14 -05:00
Maxim Cournoyer 781f475bba
gnu: at-spi2-atk: Break a dependency cycle between GTK+ and Inkscape.
* gnu/packages/gtk.scm (at-spi2-atk)
[propagated-inputs]: Replace at-spi2-core with at-spi2-core-minimal.
2021-11-11 12:18:13 -05:00
Maxim Cournoyer 2971472e79
gnu: at-spi2-core: Reverse inheritance relationship with minimal variant.
Since the minimal variant is here to stay, this should make things easier to
maintain.

* gnu/packages/gtk.scm (at-spi2-core-minimal): Rewrite after removing
inheritance, making it the base minimal package, with no documentation-related
inputs or build phases.
(at-spi2-core): Rewrite definition, inherit from the above minimal variant,
adding the documentation-related inputs and build phases.
2021-11-11 12:18:13 -05:00
Thiago Jung Bauermann 4b4e35a771
gnu: gtk+-2: Fix ‘builder’ test.
The signal callbacks in the ‘builder’ testcase have wrong prototypes.
This causes it to fail the “/Builder/Signal Autoconnect” test on
powerpc64le-linux.

Solve the problem by backporting the upstream fix that was applied to
GTK+ 3.0.

* gnu/packages/patches/gtk2-fix-builder-test.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
* gnu/packages/gtk.scm (gtk+-2): Use it.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
2021-11-11 10:31:30 -05:00
Maxim Cournoyer 7a0ef7d263
gnu: gdk-pixbuf+svg: Fix typo in comment.
* gnu/packages/gtk.scm (gdk-pixbuf+svg): Fix typo in comment.
2021-11-11 10:31:16 -05:00
Maxim Cournoyer 96eb3bc68a
gnu: gdk-pixbuf: Add a debug output.
* gnu/packages/gtk.scm (gdk-pixbuf)[outputs]{debug}: New output.
[phases]: Strip trailing #t.
2021-11-11 10:31:16 -05:00
Maxim Cournoyer 3c181f9765
gnu: gtk+: Add a debug output.
* gnu/packages/gtk.scm (gtk+-2)[outputs]{debug}: New output.
2021-11-11 10:31:15 -05:00
Tobias Geerinckx-Rice 9b14b26f0a
gnu: packages: Remove last year's deprecations.
* gnu/packages/admin.scm (guile3.0-shepherd): Remove variable.
* gnu/packages/benchmark.scm (imb-openmpi): Likewise.
* gnu/packages/boost.scm (boost-with-python3): Likewise.
* gnu/packages/pep.scm (python-pep-adapter)[inputs]: Adjust accordingly.
* gnu/packages/cpp.scm (nlohmann-json-cpp): Likewise.
* gnu/packages/games.scm (openrct2)[inputs]: Adjust accordingly.
* gnu/packages/cups.scm (escpr): Likewise.
* gnu/packages/django.scm (python-django-jsonfield): Likewise.
* gnu/packages/emacs-xyz.scm (emacs-modus-operandi-theme)
(emacs-modus-vivendi-theme): Likewise.
* gnu/packages/engineering.scm (kicad-i18l): Likewise.
* gnu/packages/enlightenment.scm (enlightenment-wayland): Likewise.
* gnu/packages/firmware.scm (opensbi-qemu-virt, opensbi-qemu-sifive-u):
Likewise.
* gnu/packages/fonts.scm (font-gnu-freefont-ttf, font-open-dyslexic):
Likewise.
* gnu/packages/game-development.scm (guile3.0-chickadee)
(python-sge-pygame): Likewise.
* gnu/packages/games.scm (retux)[inputs]: Adjust accordingly.
* gnu/packages/gnome-xyz.scm (numix-theme): Likewise.
* gnu/packages/gnupg.scm (guile3.0-gcrypt): Likewise.
* gnu/packages/gstreamer.scm (gst-transcoder): Likewise.
* gnu/packages/gtk.scm (guile3.0-cairo, guile3.0-present, guile3.0-rsvg):
Likewise.
* gnu/packages/guile-xyz.scm (guile3.0-colorized, guile3.0-commonmark)
(guile3.0-config, guile3.0-email, guile3.0-fibers, guile3.0-gi)
(guile3.0-hall, guile3.0-hashing, guile3.0-haunt, guile3.0-ics)
(guile3.0-irregex, guile3.0-lib, guile3.0-mcron, guile3.0-minikanren)
(guile3.0-ncurses, guile3.0-ncurses/gpm, guile3.0-newt, guile3.0-parted)
(guile3.0-pfds, guile3.0-picture-language, guile3.0-semver)
(guile3.0-simple-zmq, guile3.0-squee, guile3.0-syntax-highlight)
(guile3.0-websocket, guile3.0-wisp, guile3.0-xapian): Likewise.
* gnu/packages/guile.scm (define-deprecated-guile3.0-package)
(guile3.0-json, guile3.0-gdbm-ffi, guile3.0-sqlite3)
(guile3.0-bytestructures, guile3.0-git): Likewise.
* gnu/packages/haskell-apps.scm (ghc-stylish-haskell): Likewise.
* gnu/packages/linux.scm (linux-libre-arm-veyron): Likewise.
* gnu/packages/mail.scm (guile3.0-mailutils): Likewise.
* gnu/packages/monitoring.scm (python2-graphite-web): Likewise.
* gnu/packages/package-management.scm (guile3.0-guix): Likewise.
* gnu/packages/package-management.scm (python-conda): Likewise.
* gnu/packages/phabricator.scm (libphutil): Likewise.
* gnu/packages/plotutils.scm (guile3.0-charting): Likewise.
* gnu/packages/python-xyz.scm (python2-smmap2, python-glances)
(python-smmap2): Likewise.
* gnu/packages/shells.scm (oil-shell): Likewise.
* gnu/packages/sqlite.scm (sqlite-with-column-metadata): Likewise.
* gnu/packages/ssh.scm (guile3.0-ssh): Likewise.
* gnu/packages/terminals.scm (et): Likewise.
* gnu/packages/tls.scm (guile3.0-gnutls): Likewise.
* gnu/packages/vlang.scm (v): Likewise.
* gnu/packages/vpn.scm (wireguard): Likewise.
* gnu/packages/web-browsers.scm (next, sbcl-next): Likewise.
* gnu/packages/xorg.scm (transset-df): Likewise.
2021-11-08 23:00:55 +01:00
Ricardo Wurmus fc15512be4
gnu: gtksheet: Fix build.
* gnu/packages/gtk.scm (gtksheet)[arguments]: Pass -fcommon option to GCC;
rename phase 'rename-type to 'patch-for-compatibility and update a reference
to a renamed macro.
2021-10-21 15:58:06 +00:00
Mathieu Othacehe e486b2b674
Merge remote-tracking branch 'signed/master' into core-updates 2021-10-18 14:37:26 +00:00
Tobias Geerinckx-Rice 44469ffd83
gnu: font-abattis-cantarell: Update variable name.
* gnu/packages/fonts.scm (font-cantarell): Rename to…
(font-abattis-cantarell): …this.
* gnu/packages/gnome.scm (gnome)[propagated-inputs]: Adjust accordingly.
* gnu/packages/mate.scm (mate)[inputs]: Likewise.
* gnu/services/xorg.scm (<gdm-configuration>): Likewise.
2021-10-15 18:12:45 +02:00
Mathieu Othacehe a1eca979fb
Merge remote-tracking branch 'origin/master' into core-updates-frozen. 2021-10-12 17:46:23 +00:00
Marius Bakke 74f2bb1b77
gnu: harfbuzz: Add 3.0.
* gnu/packages/gtk.scm (harfbuzz-3.0): New public variable.
2021-10-02 13:13:11 +02:00
Mathieu Othacehe 2e261e7ab8
gnu: graphene: Update to 1.10.6.
* gnu/packages/gtk.scm (graphene): Update to 1.10.6.
2021-10-02 10:54:36 +00:00
Raghav Gururajan 50e0fa19f0
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.
2021-10-02 10:54:13 +00:00
Raghav Gururajan ef5b32310b
gnu: Add gtk.
* gnu/packages/gtk.scm (gtk): New variable.
* gnu/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
2021-10-02 10:54:13 +00:00
Maxime Devos aacaa222d1
gnu: at-spi2-atk: Don't compile tests when cross-compiling.
* gnu/packages/gtk.scm
  (at-spi2-atk)[arguments]<#:configure-flags>: Set tests=false when
  cross-compiling.
2021-09-20 11:15:10 +00:00
Maxime Devos d1737d44e6
gnu: pango: Add bash-minimal input when cross-compiling.
* gnu/packages/gtk.scm
  (pango)[inputs]: Add "bash-minimal" when cross-compiling.
2021-09-20 11:15:10 +00:00
Maxime Devos 99eff8138b
gnu: gdk-pixbuf: Add bash-minimal input when cross-compiling.
* gnu/packages/gtk.scm
  (gdk-pixbuf)[inputs]: Add "bash-minimal" when cross-compiling.
2021-09-20 11:15:09 +00:00
Maxime Devos 26a336c20b
gnu: gdk-pixbuf: Find docbook when cross-compiling.
* gnu/packages/gtk.scm
  (gdk-pixbuf)[arguments]<#:phases>{patch-docbook}: Look for docbook
  in 'native-inputs' instead of 'inputs' when cross-compiling.
2021-09-20 11:15:09 +00:00
Maxime Devos 4823adb26b
gnu: at-spi2-core: Add missing "bash-minimal" input.
* gnu/packages/gtk.scm
  (at-spi2-core)[inputs]: Add "bash-minimal" when cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos b9ae6181df
gnu: at-spi2-core: Find docbook when cross-compiling.
* gnu/packages/gtk.scm
  (at-spi2-core)[arguments]<#:phases>{patch-docbook-sgml}: Look up
  "docbook-sxml" in 'native-inputs' instead of 'inputs' when cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos b79bf535e4
gnu: at-spi2-core: Don't cross-compile documentation.
* gnu/packages/gtk.scm
  (at-spi2-core)[arguments]<#:configure-flags>: Set docs=false when
  cross-compiling.
  (at-spi2-core)[arguments]<#:phases>{move-documentation}: Remove when
  cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos 2b16755f99
gnu: libthai: Add datrie as native-input when cross-compiling.
This allows the cross-build to succeed.

* gnu/packages/gnome.scm
  (libthai)[native-inputs]: Add "datrie" when cross-compiling.
2021-09-20 11:15:08 +00:00
Maxime Devos 9e6b25505a
gnu: graphene: Don't build introspection data when cross-compiling.
* gnu/packages/gtk.scm (graphene)[arguments]<#:configure-flags>: Set
  introspection=false when cross-compiling.
2021-09-20 11:15:06 +00:00
Maxime Devos 9fa7b1d112
gnu: atk: Disable introspection when cross-compiling.
* gnu/packages/gtk.scm
  (atk)[arguments]<#:configure-flags>: Set -Dintrospection=false
  when cross-compiling.
2021-09-20 11:15:06 +00:00
Maxime Devos 499dbe0f3c
gnu: dbus-cairo: Add missing bash-minimal input.
If absent, this causes the 'glib-or-gtk-wrap' phase to fail.

* gnu/packages/glib.scm
  (cairo)[inputs]: Add "bash-minimal", but only when cross-compiling
  to avoid a world-rebuild.
2021-09-20 11:11:47 +00:00
Thiago Jung Bauermann b452fe87e0
gnu: gtk+: Fix testsuite failure on non-x86_64 platforms.
On non-x86_64 platforms, gtk+ is linked with a gdk-pixbuf version that
doesn’t support SVG.  This causes the ‘icontheme’ test to fail because it
tries to fetch SVG icons in some of the tests.

Therefore, we need to disable the test when SVG support isn’t available.

* gnu/packages/gtk.scm (gtk+)[propagated-inputs]: Use the ‘target-x86-64?’
convenience function.
[arguments]<#:phases>{disable-failing-tests}: Disable ‘icontheme’ test on
non-x86_64 platforms.

Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
2021-09-19 18:16:29 +00:00
Efraim Flashner 210949fdc2
gnu: pango: Update to 1.48.9.
* gnu/packages/gtk.scm (pango): Update to 1.48.9.
2021-08-23 12:32:53 +03:00
Mathieu Othacehe 100520bab3
gnu: gtk-doc: Update to 1.33.2.
* gnu/packages/patches/gtk-doc-respect-xml-catalog.patch: New file.
* gnu/local.mk (DIST_PATCH_DATA): Add it.
* gnu/packages/gtk.scm (gtk-doc): Update to 1.33.2.
[source]: Add gtk-doc-respect-xml-catalog.patch patch.
[build-system]: Switch to meson.
[arguments]: Remove fix-docbook phase.
Remove configure flags that are no longer needed.
[outputs]: Remove the help output since the help-dir option no longer exists.
2021-08-19 16:01:27 +02:00