nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add libpeas to the build

Browse source
This commit is contained in:
Michael Gratton 2019-09-26 23:16:14 +10:00 • committed by Michael James Gratton
parent 50d2a08663
commit a872fc34bb
5 changed files with 25 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
.gitlab-ci.yml
View file

@ -25,21 +25,22 @@ variables:
desktop-file-utils enchant2-devel folks-devel gcr-devel
glib2-devel gmime-devel gnome-online-accounts-devel
gspell-devel gtk3-devel iso-codes-devel json-glib-devel
itstool libappstream-glib-devel libcanberra-devel libgee-devel
libhandy-devel libsecret-devel libunwind-devel libxml2-devel
itstool libappstream-glib-devel libcanberra-devel
libgee-devel libhandy-devel libpeas-devel
libsecret-devel libunwind-devel libxml2-devel
libytnef-devel sqlite-devel webkitgtk4-devel
FEDORA_TEST_DEPS: Xvfb tar xz
# Ubuntu packages
UBUNTU_DEPS: meson build-essential valac
desktop-file-utils gettext iso-codes itstool
libappstream-glib-dev libcanberra-dev libenchant-dev libfolks-dev
libgcr-3-dev libgee-0.8-dev libglib2.0-dev
libappstream-glib-dev libcanberra-dev libenchant-dev
libfolks-dev libgcr-3-dev libgee-0.8-dev libglib2.0-dev
libgmime-2.6-dev libgoa-1.0-dev libgspell-1-dev
libgtk-3-dev libhandy-0.0-dev libjson-glib-dev
libmessaging-menu-dev libsecret-1-dev libsqlite3-dev
libunity-dev libunwind-dev libwebkit2gtk-4.0-dev
libxml2-dev libytnef0-dev
libmessaging-menu-dev libpeas-dev libsecret-1-dev
libsqlite3-dev libunity-dev libunwind-dev
libwebkit2gtk-4.0-dev libxml2-dev libytnef0-dev
UBUNTU_TEST_DEPS: xauth xvfb
# fedora:

16
INSTALL
View file

@ -44,8 +44,8 @@ Install them by running this command:
glib2-devel gmime-devel gnome-online-accounts-devel \
gspell-devel gtk3-devel iso-codes-devel json-glib-devel \
libappstream-glib-devel libcanberra-devel libgee-devel \
libhandy-devel libsecret-devel libunwind-devel libxml2-devel \
libytnef-devel sqlite-devel webkitgtk4-devel
libhandy-devel libpeas-devel libsecret-devel libunwind-devel \
libxml2-devel libytnef-devel sqlite-devel webkitgtk4-devel
Installing dependencies on Ubuntu/Debian
----------------------------------------
@ -53,12 +53,12 @@ Installing dependencies on Ubuntu/Debian
Install them by running this command:
sudo apt-get install meson build-essential valac \
desktop-file-utils iso-codes gettext libcanberra-dev \
libappstream-glib-dev libenchant-dev libfolks-dev libgcr-3-dev libgee-0.8-dev \
libglib2.0-dev libgmime-2.6-dev libgoa-1.0-dev libgspell-1-dev \
libgtk-3-dev libjson-glib-dev libhandy-0.0-dev libsecret-1-dev \
libsqlite3-dev libunwind-dev libwebkit2gtk-4.0-dev \
libxml2-dev libytnef0-dev itstool
desktop-file-utils iso-codes gettext itstool libcanberra-dev \
libappstream-glib-dev libenchant-dev libfolks-dev libgcr-3-dev \
libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgoa-1.0-dev \
libgspell-1-dev libgtk-3-dev libjson-glib-dev libhandy-0.0-dev \
libpeas-dev libsecret-1-dev libsqlite3-dev libunwind-dev \
libwebkit2gtk-4.0-dev libxml2-dev libytnef0-dev
And for Ubuntu Unity integration:

1
meson.build
View file

@ -90,6 +90,7 @@ json_glib = dependency('json-glib-1.0', version: '>= 1.0')
libcanberra = dependency('libcanberra', version: '>= 0.28')
libhandy = dependency('libhandy-0.0', version: '>= 0.0.9', required: false)
libmath = cc.find_library('m')
libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
libsecret = dependency('libsecret-1', version: '>= 0.11')
libsoup = dependency('libsoup-2.4', version: '>= 2.48')
libunwind_dep = dependency(

7
org.gnome.Geary.yml
View file

@ -186,6 +186,13 @@ modules:
- type: git
url: https://source.puri.sm/Librem5/libhandy.git
# Geary dependency
- name: libpeas
buildsystem: meson
sources:
- type: git
url: https://gitlab.gnome.org/GNOME/libpeas.git
# Geary dependency
- name: "libytnef"
sources:

1
src/client/meson.build
View file

@ -130,6 +130,7 @@ geary_client_dependencies = [
libcanberra,
libhandy,
libmath,
libpeas,
libsecret,
libsoup,
libxml,