Commit graph

239 commits

Author SHA1 Message Date
worldofpeace 27a71a19ed gtk3: defines for debugging, disable cast checks
Because we're using plain buildtype these have to be
passed manually.

See: https://gitlab.gnome.org/GNOME/gtk/blob/3.24.10/meson.build#L59

With autotools the mapping for the the options to the defines was:

yes:     G_ENABLE_DEBUG G_ENABLE_CONSISTENCY_CHECKS
minimum: G_ENABLE_DEBUG G_DISABLE_CAST_CHECKS
no:      G_DISABLE_CAST_CHECKS G_DISABLE_ASSERT G_DISABLE_CHECKS

So we're passing the exact ones that would've been used for minimum.

Additionally it isn't a good idea to pass the equivalents used for "no" 
as it eliminates G_ENABLE_DEBUG which disables pre-condition checks and 
assertions. The actual option only existed to serve people who needed a 
specific build of GTK for very specific environments. And now they are
much better served with meson's plain buildtype and figuring out what to
pass themselves.
2019-08-05 06:09:25 -04:00
Frederik Rietdijk 0f6bda38fe Merge staging-next into staging 2019-07-26 14:45:31 +02:00
worldofpeace b1bc0645ea gdk-pixbuf: rename from gdk_pixbuf 2019-07-22 18:50:57 -04:00
worldofpeace 8438e3e67f gtk3: don't multiout demos 2019-07-21 15:04:45 -04:00
worldofpeace 3b24d6e187 gtk3: fix pkgconfig paths
MR Upstream: https://gitlab.gnome.org/GNOME/gtk/merge_requests/1002
2019-07-20 09:04:51 +02:00
worldofpeace ff1be88e38 gtk3: wrap demos, cleanup output 2019-07-17 10:45:06 +02:00
worldofpeace 6e4fed00bf gtk3: add sassc
This makes us generate the .css instead of
using the pregenerated ones.
2019-07-17 10:45:06 +02:00
worldofpeace 638c39e65b gtk3: 3.24.8 -> 3.24.10, meson!
We now build gtk3 with the meson build system.
Notably, at least for the expression, all the platforms
logic for we had for configureFlags should be unneeded
with meson.
2019-07-17 10:45:06 +02:00
worldofpeace a7edafd0d3 gtk3: cleanup expression 2019-07-17 10:45:06 +02:00
Michael Raskin ffd9bf7e29
Merge pull request #63060 from layus/gtk-demos
gtk3: re-enable demos
2019-06-20 06:52:11 +00:00
Matthew Bauer 263f5891b6 treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
Guillaume Maudoux 1a5d2e29c5 gtk3: re-enable demos 2019-06-14 14:38:15 +02:00
worldofpeace 7abeda982a gnome3.gsettings-desktop-schemas -> gsettings-desktop-schemas
gnome3.pomodoro is left out because I don't want to create a conflict.
2019-04-17 13:39:23 -04:00
Tor Hedin Brønner 5587831405
gtk3: 3.24.7 -> 3.24.8 (#59408)
https://gitlab.gnome.org/GNOME/gtk/blob/3.24.8/NEWS
2019-04-14 19:14:36 +02:00
Will Dietz bf072fcfb1 gtk3: 3.24.5 -> 3.24.7
http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.6.news
http://ftp.acc.umu.se/pub/gnome/sources/gtk+/3.24/gtk+-3.24.7.news

Export symbols patch "actually" seems
to no longer be required, drop it.
2019-03-12 16:36:14 -05:00
Silvan Mosberger e0cc49c219
gtk3: Fix for missing symbols (again)
Was removed again in f9a62dbace, but it
was still needed after all, see https://github.com/NixOS/nixpkgs/issues/55692#issuecomment-469058386
2019-03-09 15:49:16 +01:00
Frederik Rietdijk e2cd07b997 Merge staging-next into staging 2019-02-21 07:54:33 +01:00
Vladimír Čunát 32767d139f
Merge branch 'staging-next'
This round is without the systemd CVE,
as we don't have binaries for that yet.
BTW, I just ignore darwin binaries these days,
as I'd have to wait for weeks for them.
2019-02-20 09:38:45 +01:00
Michael Raskin 446520bb9b
Merge pull request #56026 from oxij/tree/move-defaults-to-package-files-half-cuda
all-packages.nix: move defaults to package files continues^2
2019-02-19 21:54:02 +00:00
Will Dietz f9a62dbace gtk3: 3.24.4 -> 3.24.5
* add fribidi as it's now required.
* fetch patches to fix fribidi linking, autoreconf
2019-02-17 20:49:34 -06:00
Michael Alan Dorman d576825130
gtk+-3.24.3: Fix for missing symbols
This change has already been merged upstream.
Fixes #55692; closes #55700.
2019-02-13 14:28:09 +01:00
Jan Malakhovski 7562d78023 gtk2: move defaults to package file 2019-02-03 15:32:19 +00:00
Vladimír Čunát 8ba516664b
Merge branch 'staging-next' into staging 2019-02-01 09:42:53 +01:00
Vladimír Čunát 5effa4e0f9
Merge branch 'master' into staging-next
Comments on conflicts:
- llvm: d6f401e1 vs. 469ecc70 - docs for 6 and 7 say the default is
  to build all targets, so we should be fine
- some pypi hashes: they were equivalent, just base16 vs. base32
2019-02-01 09:22:29 +01:00
Jan Tojnar 8f217162e7
gtk2-x11: fix darwin build 2019-01-27 17:24:36 +01:00
Jan Tojnar 10a60af7e0
gtk3-x11: fix darwin build 2019-01-27 15:38:18 +01:00
Will Dietz 0d17a4c307 gtk3: 3.24.3 -> 3.24.4 2019-01-21 15:49:14 -06:00
Will Dietz 2002b8a463 gtk3: 3.24.2 -> 3.24.3
* Drop patches, now included!
* Fixes system tray icon madness w/awesomeWM (and others?),
  oh joyous day what a time to be alive :)
  (parent_relative fixups, been using for a while, woohoo!)
2019-01-14 11:53:52 -06:00
Tor Hedin Brønner 2712f12244
gtk3: fix segfaults when opening dialogs
Fixes https://github.com/NixOS/nixpkgs/issues/53697
Closes https://github.com/NixOS/nixpkgs/pull/53736
2019-01-10 13:16:00 +01:00
Jan Tojnar 2a1c199e29
gtk3: 3.24.1 → 3.24.2
Also fixes language names.
2018-12-24 03:37:14 +01:00
Jan Tojnar a51a99c690
gobject-introspection: rename package
camelCase package name was a huge inconsistency in GNOME package set.
2018-12-02 12:42:29 +01:00
Jan Tojnar dc5afbd775
gtk3: 3.22.30 → 3.24.1 2018-11-30 21:34:44 +01:00
Jan Tojnar 5cc18c4781
gnome3: remove versionBranch attribute
Standard library now contains stdenv.lib.versions.majorMinor,
which does the same.
2018-10-05 02:17:19 +02:00
Daiderd Jordan ac95ddb008
gtk3: propagate Cocoa on darwin
Generally frameworks should not be propagated, but in this case it's
always needed so we propagate (only) Cocoa.
2018-08-19 13:09:25 +02:00
Daiderd Jordan 2286655abd
gtk3: add x11Support for darwin 2018-08-18 21:37:25 +02:00
Jan Tojnar 10c94913b8
gtk3: 3.22.29 → 3.22.30 2018-06-06 15:32:37 +02:00
Matthew Justin Bauer 75ae4c5a19
Merge pull request #40904 from matthewbauer/freeciv-on-darwin
Freeciv: enable on darwin
2018-05-22 22:37:11 -05:00
Matthew Bauer 9b8b29f175 gtk2: fix GNOME bug #557780
URL: https://gitlab.gnome.org/GNOME/gtk/issues/303

This patch will fix the assertion generated at startup for freeciv on
macOS. Conditionally applied on Darwin.

Gdk:ERROR:gdkimage-quartz.c:250:_gdk_image_new_for_depth: assertion failed: (depth == 24 || depth == 32)
2018-05-21 19:57:01 -05:00
Jan Malakhovski 7438083a4d tree-wide: disable doCheck and doInstallCheck where it fails (the trivial part) 2018-04-25 04:18:46 +00:00
Nikolay Amiantov db51b836b2 gtk3: fix build 2018-03-26 14:01:49 +03:00
Matthew Bauer ed2a9cf65f treewide: remove libintl hacks 2018-03-22 16:50:11 -05:00
Jan Tojnar fac57c25f0
gtk3: fix gtk-encode-symbolic-svg 2018-03-22 07:46:57 +01:00
Jan Tojnar 0973618e4e
gnome3: automated update 2018-03-22 07:46:42 +01:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Jan Tojnar 6e0cfc8f18
gtk3: add updateScript 2018-03-04 20:05:53 +01:00
Frederik Rietdijk 4f08b0fbac Merge remote-tracking branch 'upstream/master' into HEAD 2018-02-26 10:50:18 +01:00
Jan Tojnar a31d98f312
tree-wide: autorename gnome packages to use dashes 2018-02-25 17:41:16 +01:00
Vladimír Čunát 01bf8381fd
gtk3: 3.22.26 -> 3.22.28 (maintenance) 2018-02-24 22:30:22 +01:00
Vladimír Čunát 720f498d7a
gtk2: 2.24.31 -> 2.24.32 (maintenance) 2018-01-21 16:13:03 +01:00
Jan Tojnar 987d4595ba
gtk2: add gobject introspection dependency 2017-12-22 23:27:35 +01:00