Commit graph

131 commits

Author SHA1 Message Date
Artturi b4d77815ef
Merge pull request #221019 from Artturin/gtk2syscoonf 2023-03-13 21:16:12 +02:00
Artturin fab17d210d gtk2: read configuration from /etc/gtk-2.0/gtkrc
fixes issue 31702
2023-03-13 18:23:40 +02:00
Alyssa Ross 0913507b13
gtk3: re-disable introspection if no emulator
e.g. when cross compiling from Linux to FreeBSD.
2023-03-02 15:15:29 +00:00
Artturin f9fdf2d402 treewide: move NIX_CFLAGS_COMPILE to the env attrset
with structuredAttrs lists will be bash arrays which cannot be exported
which will be a issue with some patches and some wrappers like cc-wrapper

this makes it clearer that NIX_CFLAGS_COMPILE must be a string as lists
in env cause a eval failure
2023-02-22 21:23:04 +02:00
John Ericson d43e540f89 gtk: Add meta.pkgConfigModules and test 2023-02-11 11:02:59 -05:00
Vladimír Čunát 8a77ed60ac
Merge branch 'master' into staging-next 2023-01-27 09:36:55 +01:00
Shawn8901 a59dda942c treewide: remove global with lib; statements in pkgs/development 2023-01-26 18:31:02 +01:00
Jan Tojnar 8fea234757
Merge pull request #208973 from baloo/baloo/gtk3/3.24.36
gtk3: 3.24.35 -> 3.24.36
2023-01-12 21:45:51 +01:00
sternenseemann 80db805444 gtk3: remove obsolete gobject-introspection from buildInputs
Since #200337, it is propagated from nativeBuildInputs.
2023-01-07 13:47:33 +01:00
Arthur Gautier 89d3fe878c gtk3: 3.24.35 -> 3.24.36
https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.35...3.24.36
2023-01-03 22:22:56 -08:00
Sergei Trofimovich 092d57c076 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
    pkgs/development/tools/language-servers/ansible-language-server/default.nix
2022-12-28 09:35:37 +00:00
Sergei Trofimovich ce4b239b10 gtk2: drop unused xlibsWrapper import
On linux it's not used at all. On darwin removal of the dependency does
not change generated binaries. Should be a no-op as well.
2022-12-27 19:08:38 +00:00
José Romildo Malaquias 6134954aec
Merge pull request #207821 from bobby285271/gtk3-libXdamage
gtk3: add missing libXdamage
2022-12-27 09:00:29 -03:00
Bobby Rong 6257a5ae5d
gtk3: add missing libXdamage, explicitly add libXfixes
libXdamage is an optional dependency, however this is needed for XEmbed
tray icons on MATE to work properly. This is already enabled in gtk4.

https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.36/meson.build#L583
https://gitlab.gnome.org/search?search=xdamage&project_id=665&group_id=8&search_code=true&repository_ref=gtk-3-24

Also explicitly add libXfixes since gtk3 also optionally directly depends
on it.

https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.36/meson.build#L577
2022-12-27 10:19:06 +08:00
Jan Tojnar 0b714816fd gtk4: 4.8.2 → 4.8.3
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.8.2...4.8.3
2022-12-22 19:57:49 +00:00
Jan Tojnar c4f9092cfe gtk3: 3.24.34 → 3.24.35
https://gitlab.gnome.org/GNOME/gtk/-/compare/3.24.34...3.24.35

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-12-05 19:00:19 +01:00
Jan Tojnar 938686871d gtk4: 4.8.1 → 4.8.2
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.8.1...4.8.2

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-10-25 16:35:35 +02:00
Weijia Wang 9b61ff349a gtk4: fix build on aarch64-darwin 2022-10-11 08:31:04 +02:00
github-actions[bot] d2b7f4ad5f
Merge master into staging-next 2022-09-28 18:05:16 +00:00
Jan Tojnar 60096e9520 gtk4: 4.8.0 → 4.8.1
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.8.0...4.8.1

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-09-27 02:30:08 +02:00
Frederik Rietdijk 3086301ac4 Merge staging-next into staging 2022-09-12 19:49:24 +02:00
Jan Tojnar b7f6ec4ae6 gtk4: 4.6.6 → 4.8.0
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.6.6...4.8.0

Changelog-Reviewed-By: Jan Tojnar <jtojnar@gmail.com>
2022-09-09 22:05:58 +02:00
Artturin 237da4a2c0 gtk4: fix cross 2022-09-02 05:33:38 +03:00
Artturin 20642e2ab0 various: readd gobject-introspection to buildInputs
see eb829035c9
2022-07-12 15:18:44 +03:00
Artturin 1bd8727a4c various: enable gobject-introspection when cross-compiling
and fix cross in some
2022-07-08 03:56:47 +03:00
R. Ryantm e18baa0309 gtk4: 4.6.5 -> 4.6.6 2022-07-03 14:15:07 +02:00
github-actions[bot] c451d8d636
Merge master into staging-next 2022-05-31 12:01:21 +00:00
R. Ryantm c356e7246f gtk4: 4.6.4 -> 4.6.5 2022-05-31 13:17:26 +02:00
Vladimír Čunát 161315c4de
gtk3: fixup build on *-darwin 2022-05-31 07:27:14 +02:00
Jan Tojnar 435c0b508e gtk3: 3.24.33-2022-03-11 → 3.24.34
9d1d2f0a66...3.24.34
2022-05-27 19:28:17 +02:00
Jan Tojnar ac7627e62d gtk4: Fix incorrect merge
For some reason, 17a8a7deac re-introduced the patch, even though it was removed in ff29d2caa9.
2022-05-19 22:46:52 +02:00
github-actions[bot] 17a8a7deac
Merge staging-next into staging 2022-05-16 06:01:47 +00:00
Jan Tojnar ff29d2caa9 gtk4: 4.6.3 → 4.6.4
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.6.3...4.6.4
2022-05-16 03:28:03 +02:00
Maxine Aubrey 2ed533a838 gtk4: patch fixing g-c-c crashes
(cherry picked from commit 5d15a099b9)
2022-05-16 03:28:03 +02:00
Jan Tojnar 5729205c6e
Merge pull request #172616 from theknyaa/fix-gtk-immodules-cache
gtk: fix missing immodules.cache
2022-05-14 03:20:54 +02:00
Maxine Aubrey 20c371f91e
gtk3: 3.24.33 -> 3.24.33-2022-03-11 2022-05-13 23:18:14 +02:00
Maxine Aubrey 5d15a099b9
gtk4: patch fixing g-c-c crashes 2022-05-13 23:18:12 +02:00
Thekla Frie 8e8577806d gtk: fix missing immodules.cache
this file used to be generated by the gtk build process, but this
stopped being the case when upstream switched to a different
post-install system with version 3.24.32. this is not an upstream bug
since distributions are supposed to generate this file on their own
anyways [1].

Fixes #172406.

[1]: https://gitlab.gnome.org/GNOME/gtk/-/issues/4908
2022-05-12 20:48:03 +02:00
github-actions[bot] 3624aa9760
Merge staging-next into staging 2022-04-29 18:01:55 +00:00
R. Ryantm 2974df955f gtk4: 4.6.2 -> 4.6.3 2022-04-29 14:35:24 +02:00
Rick van Schijndel d97e95e862 gtk3: support cross-compilation 2022-04-28 23:43:28 +02:00
Jan Tojnar 1379cbe985 gtk4: move broadwayd into out
It is convenient to have it in PATH by default and does not seem to increase the output size much (+0.2M).

Just as was done to GTK 3 in https://github.com/NixOS/nixpkgs/pull/116053
2022-03-27 15:25:31 +02:00
Jan Tojnar d2f46a0e67 gtk4: 4.6.1 → 4.6.2
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.6.1...4.6.2
2022-03-25 15:02:46 +01:00
Jan Tojnar 71fd4d8688 gtk3: 3.24.31 → 3.24.33
https://gitlab.gnome.org/GNOME/gtk+/-/compare/3.24.31...3.24.33
2022-03-25 15:02:37 +01:00
Jan Tojnar 100ae90d51 tree-wide: Modernize moving gi-docgen-built docs to devdoc output
Since DevHelp 41, it no longer needs to be stored in `share/devhelp`.
2022-03-25 15:02:32 +01:00
R. Ryantm e4d79cee7c gtk4: 4.6.0 -> 4.6.1 2022-02-15 08:31:17 +00:00
Vladimír Čunát c8aa2e9d7a
gtk3: fix patch hash
The usual nix-prefetch-url confusion with fetchpatch:
https://github.com/NixOS/nixpkgs/pull/153412#issuecomment-1015350908
2022-01-18 13:33:03 +01:00
Las Safin 41d9dfb619 meson: Remove 0.57, use 0.60 everywhere 2022-01-11 12:51:09 +00:00
Mark Vainomaa d21e4dda7c
gtk3: fix darwin build
3.24.31 does not declare QuartzCore dependency properly and fails to link
2022-01-04 09:59:11 +02:00
Dmitry Kalinkin 438c50890a libepoxy: disable glx on darwin by default
Originally enabled in

950261bb9a ('darwin: fix gtk+3 dependencies')

since then many dependencies may have been changed to rely on Cocoa
only. Let's try disabling it by default to avoid the mesa dependency
on darwin, we can always enable on a case-by-case basis for apps that
really use X11.
2022-01-03 01:02:23 +01:00