Commit graph

38 commits

Author SHA1 Message Date
Michael Gratton
a68cf8e029 Updates files for 3.34 development 2019-03-15 09:22:38 +11:00
Michael Gratton
742aca2b0c Add build dependencies for Folks
Flatpak manifest updates courtesy of gnome-contacts.
2019-03-09 20:17:01 +11:00
Michael Gratton
3a9b2855ed Use meson's standard approach to finding the messaging-menu library
Fixes FTB on master.
2019-02-27 12:07:30 +11:00
Christian Kellner
a0b211193a Fix valac preprocessor conditionals
Two preprocessor conditionals for vala source files were defined
in config.h, which is not picked up during vala compilation. Now,
pass the defines as command line options to valac. Fixes #264
2019-02-27 00:23:52 +01:00
Michael Gratton
b605ddc409 Validate both appdata and desktop files
Use same approach as
https://gitlab.gnome.org/GNOME/nautilus/blob/master/data/meson.build#L112-138
2019-02-24 22:09:05 +11:00
Jan Tojnar
737e42f9d9
Drop gobject-introspection dependency
Since 20cd9823a7, it is no longer used.
2019-02-23 00:37:23 +01:00
Michael Gratton
ee86739373 Flip the sense of the libunwind build option
Updates !109, see also #238
2019-02-21 12:03:11 +11:00
Thomas Moschny
b120525fd6 Turn the 'libunwind' build option into a boolean. 2019-02-19 15:40:10 +01:00
Thomas Moschny
a1377f3451 Allow to opt-out from using libunwind. 2019-02-17 17:56:46 +01:00
Michael Gratton
53b905dcfc Bump version for 3.32-dev 2019-02-18 01:57:13 +11:00
Michael Gratton
c56d86f438 Merge branch 'wip/enchant2' into 'master'
Support building with Enchant 2.x

See merge request GNOME/geary!85
2019-01-21 02:08:43 +00:00
Michael Gratton
1877c81d00 Allow configuring the location of the web extension shared lib 2019-01-17 11:08:26 +11:00
Michael Gratton
92d7b8b5c9 Remove duplicate webkitgtk dep 2019-01-16 11:12:31 +11:00
Michael Gratton
68a985a76c Support building with Enchant 2.x
This adds support for Enchant 2 named "enchant" and Enchant 2 named
"enchant-2" (!)
2019-01-16 11:12:31 +11:00
Michael Gratton
668e4b469a Merge branch 'buildfix' into 'master'
Meson build fixes for FreeBSD

See merge request GNOME/geary!78
2019-01-10 12:20:58 +00:00
Michael Gratton
6b9ae903fb Re-enable GCR support for cert pinning
This re-adds support for using GCR for pinning certs, but only if GCR
is in a known good state. If so, pinned certs will be stored using GCR,
if not, they will be stored in Geary's XDG data dirs as a fallback.
2019-01-10 17:33:37 +11:00
Greg V
b8ae8865ea Fix meson targets for contractor contract 2019-01-09 12:50:13 +03:00
Greg V
e4d368736a Use sqlite dependency when checking FTS
On FreeBSD, checking sqlite.h without the dependency would look at
/usr/include/sqlite.h (base system version) instead of
/usr/local/include/sqlite.h (ports version, which has FTS and everything).
2019-01-09 12:29:34 +03:00
Michael Gratton
70d56b179a Merge branch 'print-headers' into 'master'
Print common headers when printing messages

See merge request GNOME/geary!47
2018-09-30 13:23:01 +00:00
Federico Bruni
7094de03cf remove deprecated 'languages' parameter of gnome.yelp()
Since version 0.43 Meson automatically reads the LINGUAS file.
2018-09-28 17:40:34 +02:00
Alex Henrie
698f61e6e5 Print common headers when printing messages 2018-09-26 18:43:46 -06:00
Jan Tojnar
beec7ff0fe
build: obtain iso-codes prefix from pkg-config 2018-08-09 15:18:33 +02:00
Michael James Gratton
a3662c8155 Fix libunwind native dep so Flatpak builds once again. 2018-07-04 15:57:47 +10:00
Rico Tzschichholz
20cd9823a7 bindings: Drop custom javascriptcore-4.0 and webkit2gtk-4.0 vapi 2018-06-04 12:55:59 +02:00
Michael James Gratton
fbc6671e16 Fix up GOA branch to build with meson. 2018-05-28 00:46:31 +10:00
Michael James Gratton
2b1f0e8a90 More dependency cleanup.
* debian/control: Remove version numbers from packages that aren't
  strictly required.

* meson.build: Fix dup sqlite3 dep, sort primary deps.
2018-05-21 10:41:35 +10:00
Michael James Gratton
386f9864c7 Revert "Merge branch 'wip/ricotz/webkit'. Fixes Bug 788113."
This reverts commit 43341cd3e3, reversing
changes made to ffb4befdd8.

This is causing segfault in Geary.JS.to_string_released() when running
client tests, so reverting until a solution is found.
2018-05-19 13:57:58 +10:00
Michael James Gratton
d4aaa3c551 Bump library dependency min versions to reflect reality.
Commit 43341cd3 basically means we require vala 0.38, which excludes
Debian 9 (stretch), Ubuntu 16.04 (artful) and Fedora 26. Hence bump
minimum versions (and tidy up the list of deps) to reflect this.
2018-05-19 10:32:45 +10:00
Rico Tzschichholz
f809febed3 Drop custom webkit2gtk bindings 2018-04-23 19:38:37 +02:00
Michael James Gratton
c7c138dbdf Fix meson warning about use of version kwarg in find_library(). 2018-04-14 22:18:00 +10:00
Michael James Gratton
5456dab49c Tidy up inclusion of libunwind in the Meson build.
* meson.build: Use libunwind and libunwind-generic to avoid having to
  search for the platform-specific lib.

* src/meson.build: Set UNW_LOCAL_ONLY define to get the most optimal
  unwind impl.
2018-01-12 18:21:26 +11:00
Michael James Gratton
147dd8e4c0 Fix target GLib version in Meson build. 2017-12-18 14:49:04 +11:00
Michael James Gratton
a972236bb2 Update WebKit and JSC dependencies in Meson build.
* bindings/meson.build: Declare a dependency for JSC that includes both
  the lib, VAPI and appropriate build directory. Update WK dependencies
  to reflect the same that their pkg-config files currently do, sort.

* meson.build: Rename top-level JSC deps to make it clear what they are
  for.

* src/engine/meson.build: Depend on JSC rather than WK, sort deps.
2017-12-18 14:49:04 +11:00
Michael James Gratton
f020791935 Revert "Treat POODLE and REF_TRACKING defines per others in Meson build."
This reverts commit c25f254de8.
2017-12-14 09:44:33 +11:00
Michael James Gratton
c25f254de8 Treat POODLE and REF_TRACKING defines per others in Meson build. 2017-12-12 15:56:31 +11:00
Michael James Gratton
763ccd2f7c Fix compiling and using GSettings schema when built by Meson.
* desktop/meson.build: Make sure the schema is re-compiled with the
  source XML changes.

* meson.build: Make compiling the schema mandatory, since both running
  the client locally and unit tests require it. Fix path to compiled
  schema so the client can find it.
2017-12-12 15:56:31 +11:00
Michael James Gratton
afb236517f Fix meson build when libmessaging-menu is available.
Since libmessaging-menu has a either a broken pkg_config file or a dumb
VAPI name, we need to detect the library and the VAPI in two steps, then
add them both as dependencies.
2017-12-12 15:56:31 +11:00
Niels De Graef
01c13f726f Port build system to Meson. Bug 777044.
Some remarks:

* Note that Meson adds a hard dependency on Python 3.

* All dependencies and defines are now listed together.

* Some build files were put in their respective subdirectories, e.g. the Geary
  engine library will be built from the Meson file in `src/engine`.

* `--fatal-warnings` is no longer an explicit flag, as Meson provides
  `-Dwerror=true` for this.

* An explicit resource file needs to be used. The issue to support this from
  Meson itself can be found at https://github.com/mesonbuild/meson/issues/706 .

* The `gnome.yelp()` function parses a LINGUAS file so we no longer need to keep
  track of all languages in our build system.

* There are no Debian scripts defined in the meson.build files to keep them
  clean, but they can be kept as separate scripts in `build-aux`.

* Left out the `dist` target as there is now `ninja dist`

* `geary-docs` is disabled by default, as valadoc-0.38.3 returns errors.

https://bugzilla.gnome.org/show_bug.cgi?id=777044
2017-12-12 00:27:46 +01:00