Commit Graph

154 Commits

Author SHA1 Message Date
Emmanuele Bassi
a7e96675bd build: Use get_supported_arguments()
Instead of checking each flag one by one, use the appropriate method of
the Meson compiler object.
2018-02-20 13:18:28 +00:00
Matthias Clasen
c2531b7ff2 Merge branch 'wip/carlosg/imwayland' into 'master'
modules: Add wayland IM implementation

See merge request GNOME/gtk!4
2018-02-15 03:01:43 +00:00
Emmanuele Bassi
327e7a4ccc build: Rename last 'enable' options
Drop the 'enable-' prefix to conform to the best practices for naming
configuration options in Meson.
2018-02-14 14:14:22 +00:00
Emmanuele Bassi
7b32900c55 build: Rename GDK backend options
Drop the 'enable-' prefix, and always enable all platform-specific
backends. We can disable them depending on the platform. This way,
the documentation printed by `meson configure` remains accurate.
2018-02-14 14:14:22 +00:00
Emmanuele Bassi
1440db1570 build: Coalesce print backends options into one
Instead of having separate options for each print backend, we can use
the same approach as the input method modules: a single option, with a
comma-separated list of print backends.
2018-02-14 14:14:22 +00:00
Christoph Reiter
7d44735893 meson: Require glib 2.55.0
gtk+ has started using g_file_load_bytes() which is available
since glib 2.55.0
2018-02-13 18:00:27 +01:00
Carlos Garnacho
21e9fe4f55 modules: Add wayland IM implementation
This IM context implementation goes through the gtk-text-input protocol,
leaving up to the compositor the actual interaction with IM engines.
2018-02-13 15:47:57 +01:00
Emmanuele Bassi
99bcccd884 Bump up the dependency on Meson
We're going to use a new argument in the generate_gir() function.
2018-02-12 11:42:44 +00:00
Emmanuele Bassi
00990ec307 build: Fix the non-pkg-config Vulkan detection
Not all the variables were renamed.
2018-02-05 14:35:34 +00:00
Emmanuele Bassi
3b0e6720af build: Use pkg-config to find Vulkan
The standard Vulkan SDK ships with a pkg-config file, like a modern
library should.

We should fall back to finding the library and header only for platforms
where pkg-config is not really a thing.

Based on a patch by: Daniel Stone <daniels@collabora.com>

https://bugzilla.gnome.org/show_bug.cgi?id=793181
2018-02-05 14:01:59 +00:00
Matthias Clasen
fd25a8cdf2 Drop the mir backend
Mir is in the process of switching over to the Wayland protocol,
so we don't need to maintain a separate backend, going forward.
2018-02-05 07:50:17 +01:00
Ting-Wei Lan
14b181ebd4 build: Use pkg-config to find iso-codes
Instead of hard-coding the path of iso-codes, we can get the prefix with
pkg-config. We still fallback to /usr when it is not available.

https://bugzilla.gnome.org/show_bug.cgi?id=792282
2018-01-07 14:53:41 +08:00
Matthias Clasen
f259aa7e76 Bump the pango requirement
We want to use the new font variation api in pango 1.41.
2018-01-03 13:06:28 -05:00
Matthias Clasen
ade33c6e14 Add font features on the tweak page 2018-01-03 12:18:18 -05:00
Carlos Soriano
f54e7712c5 gtkplacessidebar: Adapt to libcloudproviders 0.2.x
And a few improvements on the way.

https://bugzilla.gnome.org/show_bug.cgi?id=786123
2017-11-13 16:55:10 +01:00
Emmanuele Bassi
183538c2e2 Bump up the dependency on libepoxy
We are going to use new API to detect whether or not GLX is available
before calling GL API.

https://bugzilla.gnome.org/show_bug.cgi?id=775279
2017-10-28 09:46:15 -04:00
Benjamin Otte
3a8f2ae64f build: Warn about ignored qualifiers
https://bugzilla.gnome.org/show_bug.cgi?id=789351
2017-10-23 16:30:57 +02:00
Matthias Clasen
0e1785ed48 Bump version to 3.93
This lets us add new API without deprecation warnings.
2017-10-20 13:54:01 +02:00
Chun-wei Fan
18abb78bfd Meson: Support Windows builds
Add the necessary machinery into the Meson definition files so that we
can build for Windows.

Since we don't have Wayland or X support for our use case here, disable
them once we know that we are building for Windows, as they are
(otherwise) enabled by default, and enable the items that need to be
built for Windows builds.

Exclude gtk4-launch from Windows builds as that is something that
is not supported on Windows.

As we won't have gio-unix on Windows, and PangoFT2 is optional, don't use
fallbacks for them when we are on Windows (but do use fallbacks for
gio-win32, as it will be used).

Also, clean up meson.build a bit as we can just force-include
msvc_recommended_pragmas.h from GLib since we depend on GLib, and so we
can handle these warnings from msvc_recommended_pragmas.h instead.

https://bugzilla.gnome.org/show_bug.cgi?id=785210
2017-10-20 17:30:58 +08:00
Matthias Clasen
99f42bb72e 3.92.1
Change the project name back to gtk+ to avoid trouble with
tarball names not matching ftpadmin expectations.
2017-10-18 23:17:27 +02:00
Matthias Clasen
e4259eaeaa 3.92.0 2017-10-18 18:52:06 +02:00
Benjamin Otte
43c212ac28 build: Enable -Wswitch-enum and -Wswitch-default
This patch makes that work using 1 of 2 options:

1. Add all missing enums to the switch statement
  or
2. Cast the switch argument to a uint to avoid having to do that (mostly
   for GdkEventType).

I even found a bug while doing that: clearing a GtkImage with a surface
did not notify thae surface property.

The reason for enabling this flag even though it is tedious at times is
that it is very useful when adding values to an enum, because it makes
GTK immediately warn about all the switch statements where this enum is
relevant.
And I expect changes to enums to be frequent during the GTK4 development
cycle.
2017-10-06 21:23:39 +02:00
Benjamin Otte
2ac66328a3 build: Turn on more warning flags
-Wshadow these days does not overwarn anymore like it did in gcc 4.
There are no warnings inside gtk, so better enable it to keep it that
way.

-Wuninitialized also has no positives, so I'm gonna turn it on just
because.
2017-10-06 21:23:39 +02:00
Benjamin Otte
c1e9869329 build: Don't turn off critical warnings
-Wint-conversion is important because it checks casts from ints to
pointers.

-Wdiscarded-qualifiers is important to catch cases where we don't
strings when we should.
2017-10-06 16:03:08 +02:00
Felipe Borges
5a32b78ba1 build: Bump minimum GLib version to 2.53.7
Otherwise it fails to build with:

GLib-Genmarshal-WARNING **: failed to open "--pragma-once":
No such file or directory

https://bugzilla.gnome.org/show_bug.cgi?id=788230
2017-10-03 21:29:57 -04:00
Debarshi Ray
edaaefcb74 build: Bump minimum Meson version to 0.42.1
Otherwise it fails to build with:

  FAILED: gtk/im-ipa@sha/imipa.c.o
  ...
  In file included from ../gtk/gtkintl.h:4:0,
                   from ../modules/input/imipa.c:28:
  /opt/include/glib-2.0/glib/gi18n-lib.h:27:2: error: #error You must
          define GETTEXT_PACKAGE before including gi18n-lib.h. Did you
          forget to include config.h?
   #error You must define GETTEXT_PACKAGE before
           including gi18n-lib.h.  Did you forget to include config.h?
    ^~~~~
  ../modules/input/imipa.c:144:3: error: ‘GETTEXT_PACKAGE’ undeclared
          here (not in a function)
     GETTEXT_PACKAGE,     /* Translation domain */
     ^~~~~~~~~~~~~~~
  ../modules/input/imipa.c:145:4: error: ‘GTK_LOCALEDIR’ undeclared
          here (not in a function)
      GTK_LOCALEDIR,     /* Dir for bindtextdomain (not strictly
              needed for "gtk+") */
      ^~~~~~~~~~~~~
2017-09-18 18:04:34 +02:00
Emmanuele Bassi
67d9cefb72 build: Declare cairo_libs outside MSVC check block
Otherwise there won't be a reference to it on non-MSVC builds.
2017-09-15 15:57:34 +01:00
Chun-wei Fan
84ff9e93d5 build: Add fallback dependency discovery for MSVC
For dependencies that do not generate pkg-config files for their Visual
Studio build systems, we need to look for them using cc.has_header() and
cc.find_library(), namely for Cairo and HarfBuzz, if one does not have
crafted pkg-config files for them (which, by themselves may be
error-prone).

As a result, we will still try to look for Cairo and HarfBuzz using
pkg-config, but will give another shot at them on Visual Studio using
cc.has_header() and cc.find_library() if they couldn't be found via
pkg-config.

https://bugzilla.gnome.org/show_bug.cgi?id=785210
2017-09-15 21:41:16 +08:00
Chun-wei Fan
fc5f391110 build: Correct PangoCairo required version
We ought to use pango_req instead of cairo_req for the version required
for PangoCairo.

https://bugzilla.gnome.org/show_bug.cgi?id=785210
2017-09-15 21:41:15 +08:00
Chun-wei Fan
0b783f6750 meson.build: Fix Vulkan library detection on Visual Studio
The Vulkan .lib file that is supplied by the LunarG Vulkan SDK is
vulkan-1.lib, not vulkan.lib, so make sure we look for the right
libraries when building on Visual Studio (I am not sure whether the
LunarG SDK will work for MinGW/mingw-w64 builds, as only Visual Studio
.lib files are provided).

Note that this will require one to set LIB and INCLUDE appropriately to
find the Vulkan .lib and header files, and possibly PATH if one's video
drivers do not contain the Vulkan runtime DLL.

https://bugzilla.gnome.org/show_bug.cgi?id=785210
2017-09-15 21:41:15 +08:00
Timm Bäder
c3a191abe2 build: Add directories to the summary 2017-09-14 18:22:36 +02:00
Nirbheek Chauhan
aa3e8ee097 build: Add dependency fallbacks for libs with meson ports
With these changes gtk+ builds for me using fallbacks for all libraries
with fallbacks available. Needs the following changes:

https://github.com/ebassi/graphene/pull/109 (graphene)
https://bugzilla.gnome.org/show_bug.cgi?id=787414 (pango)
https://github.com/mesonbuild/meson/pull/2291 (will be in meson 0.42.1)

https://bugzilla.gnome.org/show_bug.cgi?id=787416
2017-09-12 00:24:58 +05:30
Javier Jardón
80e3239033 meson.build: enable-tests -> build-tests
This completes b5e00d36f0
2017-09-06 20:45:35 +01:00
Matthias Clasen
dd4361a638 Rename enable-documentation and enable-man-pages options
You can now disable the documentation build with
-Ddocumentation=false and -Dman-pages=false.
2017-09-06 11:10:55 -04:00
Matthias Clasen
b5e00d36f0 Allow building without tests and demos
This is meant to cut down build time in flatpak and similar
situations. Since it produces technically incomplete builds,
we list these options in the status output at the end of
the meson run.
2017-09-06 09:53:20 -04:00
Timm Bäder
2a373b8ac8 build: Depend on wayland-protocols 1.9
Needed for the keyboard shortcuts inhibit protocol
2017-09-05 10:09:24 +02:00
Julius Härtl
a1635b6188 gtkplacessidebar: implement libcloudproviders support
Add integration of the libcloudproviders DBus API to the
GtkPlacesSidebar by showing name and sync status of the cloud providers.
The exported menu is rendered as a GtkPopover.

The sidebar will be updated if the list of cloudproviders changes e.g.
by adding or removing an account. If any cloud provider changes detailed
information like sync status only the individual sidebar row gets
updated.

Co-authored-by: Carlos Soriano <csoriano@gnome.org>
Co-authored-by: Daniel Boles <dboles@src.gnome.org>

https://bugzilla.gnome.org/show_bug.cgi?id=786123
2017-09-04 11:32:03 -04:00
Emmanuele Bassi
e3f99fa2df build: Use the appropriate symbol visibility annotation
We cargo-culted this from Autotools, but GCC on Windows supports the
same __declspec syntax as MSVC. The only difference is the additional
flag needed for GCC-like compilers.
2017-08-22 10:27:14 +01:00
Emmanuele Bassi
7845854ca2 build: Fix macOS linker compatibility flags
The linker on macOS does not support '=' in its command line; there's no
guarantee that we are using the correct compatibility versions compared
to the Autotools build, but for that we'll need to build GTK+ master on
macOS.
2017-08-22 10:24:45 +01:00
Emmanuele Bassi
55c42b9d25 build: Allow using libepoxy as a subproject
Like we do for Graphene, we can build libepoxy as a sub-project of GTK+
in case we do not find the dependency installed on the system.
2017-08-22 10:22:37 +01:00
Emmanuele Bassi
08526d4da0 build: Print out a configuration summary
Add some easy to check summary of the configuration step, especially for
optional features that can use automatic discovery.
2017-08-18 16:56:09 +01:00
Emmanuele Bassi
a4d0800673 build: Fix post-install script
Use the appropriate variable when expanding the input method modules
path.
2017-08-14 22:31:13 +01:00
Timm Bäder
2a49e08d6d meson: Don't define G_ENABLE_CONSISTENCY_CHECKS unconditionally
We add it back later depending on the current buildtype.
2017-08-14 13:01:22 +02:00
Matthias Clasen
6c7e8ecb1f Bump version 2017-07-19 21:18:57 -04:00
Ignacio Casal Quinteiro
ed6aa0e6e0 meson: remove duplicated G_ENABLE_DEBUG 2017-05-16 22:50:00 +02:00
Emmanuele Bassi
daccf61dcf meson: Use buildtype to determine the debugging flags
Meson has a `--buildtype` option which allows us to avoid defining an ad
hoc `--enable-debug=yes|no|minimum` option ourselves.
2017-05-10 12:03:01 +01:00
Ernestas Kulik
fee3f9afa1 meson: depend on glib >= 2.53.1
The code uses g_object_new_with_properties(), which is only available in
versions 2.53.1 and up.

https://bugzilla.gnome.org/show_bug.cgi?id=782123
2017-05-03 16:14:58 +01:00
Emmanuele Bassi
ea32f4c020 build: Depend on Meson 0.40 at least 2017-05-03 15:10:57 +01:00
Emmanuele Bassi
17518ef89b build: Improve consistency of the "coding" style
We're mixing a lot of styles in the Meson build files. This is an
attempt at making everything slightly more consistent in terms of
whitespace and indentation.
2017-05-03 15:10:57 +01:00
Emmanuele Bassi
6dd35248d5 build: Put the xkbcommon required version into a variable
We use it in two places.
2017-05-03 15:10:57 +01:00
Emmanuele Bassi
c1965150c7 build: Add post-install script
When building GTK+ straight from the repository without any assistance
from packaging tools, we need to trigger system-wide updates, like the
icon theme cache update, or the schema compilation.
2017-05-03 15:10:57 +01:00
Emmanuele Bassi
ba87e857e2 build: Generate the API references (WIP)
Still a work in progress.
2017-05-03 15:10:57 +01:00
Emmanuele Bassi
482f34006e build: Use the appropriate linker flags
We need to check if the linker flags we use are available, depending on
the platform, and we need to ensure that the shared library is
versioned appropriately.
2017-05-03 15:10:56 +01:00
Emmanuele Bassi
47bcf66af8 build: Bump version and C standard
GTK+ 4.0 uses C99.
2017-05-03 15:10:56 +01:00
Emmanuele Bassi
c97ef81a10 build: Add missing symbol visibility flags
GTK symbols are not visible by default, and only the ones annotated with
_GDK_EXTERN (and wrapper macros) are exported. We need to define
_GDK_EXTERN during the configuration, depending on the platform and
compiler we use.
2017-05-03 15:10:56 +01:00
Emmanuele Bassi
68039b610b build: Add compiler warnings and errors
We don't want to build buggy code.
2017-05-03 15:10:56 +01:00
Emmanuele Bassi
ede1f7002f build: Depend on graphene-gobject-1.0
We use the GObject types with Graphene, so we need to check that the
library has been built with them.
2017-05-03 15:10:56 +01:00
Emmanuele Bassi
3f4cc06ee3 build: Some whitespace cleanups 2017-05-03 15:10:56 +01:00
Emmanuele Bassi
007d9a5e19 build: Generate the appropriate GLib versioning checks
The autotools build checks the version of GLib we are depending on in
order to generate the appropriate GLIB_VERSION values for the
min-required/max-allowed defines.
2017-05-03 15:10:56 +01:00
Emmanuele Bassi
8582f80391 build: Add the appropriate paths in the configuration header
Instead of injecting them into the C compiler arguments.
2017-05-03 15:10:56 +01:00
Emmanuele Bassi
898bbb4626 build: Use the appropriate quoting
There's no need for string concatenation.
2017-05-03 15:10:56 +01:00
Tim-Philipp Müller
e850973956 meson: build input modules
We have to work around some ordering problems here. We still
manage to keep most of the guts in modules/input/meson.build,
so it's not too ugly overall.

(The autotools build solves this with a 'make -C ../../input/modules'
inside gtk/Makefile, but that's not something we can or want to do.)
2017-05-03 15:10:56 +01:00
Tim-Philipp Müller
1c14e93e69 meson: check for xinerama 2017-05-03 15:10:56 +01:00
Tim-Philipp Müller
25cdd19bb0 meson: fix XIAllowTouchEvents check
Need to link against dep/lib to check for function in it. Also
misc fixes to surrounding xi-related checks.
2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
2f3c975058 meson: remove duplicate libm variable
Only need one of libm and mlib
2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
5d71390a75 meson: check for more missing config.h defines
Lots of them are unused and can be removed. For others we
add a check.
2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
361e5d0b74 meson: simplify function checks
Because we can. We don't need to specify the right header anymore
to check for functions.
2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
4e9403df7f meson: simplify header checks
Remove workaround for gcc bug (Meson does that now), and
construct the right config.h defines for the headers on
the fly instead of listing them in the build file, which
is more error prone.
2017-05-03 15:10:55 +01:00
Matthias Clasen
f12c011e43 Set glib min/max versions 2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
69f075202d meson: fix GETTEXT_PACKAGE 2017-05-03 15:10:55 +01:00
Matthias Clasen
fc11fb7fda Don't require glslc for vulkan
The compiled shaders are checked into git.
2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
412c2225b1 meson: move colord checks into cups printbackend
Which is the only user of it. Also add option to enable/disable.
2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
a35e5f3135 meson: modules: add printbackends
The cups checks might not work properly everywhere yet,
since they don't use cups-config and parse the output yet.
2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
cbfaebfa83 meson: add po and po-properties 2017-05-03 15:10:55 +01:00
Tim-Philipp Müller
48e2b77369 meson: generate .pc files 2017-05-03 15:10:54 +01:00
Tim-Philipp Müller
98e633f658 meson: gtk: use gnome.mkenums() and gnome.genmarshal() 2017-05-03 15:10:54 +01:00
Tim-Philipp Müller
c7d3fe5e26 meson: gdk: add quartz backend skeleton
Won't even build yet, just put basic bits in place.
2017-05-03 15:10:54 +01:00
Tim-Philipp Müller
442185388b meson: gdk: win32: add skeleton bits for win32 backend
Won't even build, configure bits still missing.
2017-05-03 15:10:54 +01:00
Tim-Philipp Müller
152a25d099 meson: gdk: add Mir backend bits
Completely untested, might not even build.
2017-05-03 15:10:54 +01:00
Tim-Philipp Müller
b947e88fbf meson: gdk: update and sync with Makefiles
Also create gdk.gresource.xml at build-time.
2017-05-03 15:10:53 +01:00
Tim-Philipp Müller
95979f4d2f meson: add vulkan bits 2017-05-03 15:10:53 +01:00
Tim-Philipp Müller
b8a017b081 meson: use add_project_arguments() instead of add_global_arguments()
So Gtk+ can be used as a subproject.
2017-05-03 15:10:53 +01:00
Tim-Philipp Müller
a23ce5c11c meson: fix checks for maths and X11 funcs that need the right deps 2017-05-03 15:10:53 +01:00
Tim-Philipp Müller
917a6b0912 meson: work around meson/gcc bug detecting linux/* headers 2017-05-03 15:10:53 +01:00
Tim-Philipp Müller
a223294605 meson: set _GNU_SOURCE project wide
Easier, also means we don't have to define it for
checks. that will only succeed with it defind.
2017-05-03 15:10:53 +01:00
Tim-Philipp Müller
b08a9bac6f meson: add graphene subproject that can be used as fallback 2017-05-03 15:10:52 +01:00
Timm Bäder
4fcca9945f meson: update build files 2017-05-03 15:10:52 +01:00
Timm Bäder
6dd6660c68 meson: Conditionally check for dependencies 2017-05-03 15:10:52 +01:00
Timm Bäder
02a250147f meson: Check for more libraries 2017-05-03 15:10:52 +01:00
Timm Bäder
8ae847e4fc Build examples 2017-05-03 15:10:52 +01:00
Timm Bäder
d2ecd6e3c6 meson: Also check for sincos 2017-05-03 15:10:51 +01:00
Timm Bäder
fe29dbd9cc meson.build: Add more required versions
...build tests/ and testsuite/, properly define gtk_version, etc.
2017-05-03 15:10:51 +01:00
Timm Bäder
2144b776b2 meson: Generate demos.h for gtk3-demo 2017-05-03 15:10:51 +01:00
Timm Bäder
fe42d645ad meson: Build gtk3-demo 2017-05-03 15:10:51 +01:00
Timm Bäder
81ffccf79f meson: build gtk/ again 2017-05-03 15:10:51 +01:00
Timm Bäder
294ebd70b3 build: Generate wayland protocol files 2017-05-03 15:10:51 +01:00
Timm Bäder
88a2a571d5 gtk major version 2017-05-03 15:10:51 +01:00
Timm Bäder
3f62b935e5 meson: Use xrandr 2017-05-03 15:10:51 +01:00
Timm Bäder
df965304d4 meson: make gtk buildable
x11 only
2017-05-03 15:10:51 +01:00
Timm Bäder
082cf3553d meson: Build gtk marshallers
And fix libgtk_dep/libgdk_dep to link_with the shared lib
2017-05-03 15:10:50 +01:00