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

Merge branch 'wip/jtojnar/no-gir' into 'master'

Browse source 
Drop gobject-introspection dependency

See merge request GNOME/geary!138
This commit is contained in:
Michael Gratton 2019-02-24 08:48:31 +00:00
commit 383557f852
4 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -16,7 +16,7 @@ variables:
INSTALL_CMD: ninja -v -C $BUILD_DIR install
# Fedora packages
FEDORA_DEPS: vala gobject-introspection-devel
FEDORA_DEPS: vala
meson desktop-file-utils libcanberra-devel libgee-devel
glib2-devel gmime-devel gtk3-devel libnotify-devel sqlite-devel
webkitgtk4-devel libsecret-devel libxml2-devel vala-tools
@ -25,7 +25,7 @@ variables:
FEDORA_TEST_DEPS: Xvfb tar xz
# Ubuntu & Debian packages
UBUNTU_DEPS: valac libgirepository1.0-dev
UBUNTU_DEPS: valac build-essential
meson desktop-file-utils libcanberra-dev
libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgtk-3-dev
libsecret-1-dev libxml2-dev libnotify-dev libsqlite3-dev

4
INSTALL
View file

@ -41,7 +41,7 @@ Installing dependencies on Fedora
Fedora 25 and later ships with the correct versions of the required
libraries. Install them by running this command:
sudo yum install vala gobject-introspection-devel meson \
sudo yum install vala meson \
desktop-file-utils iso-codes-devel libcanberra-devel libgee-devel \
glib2-devel gmime-devel gtk3-devel libnotify-devel sqlite-devel \
webkitgtk4-devel libsecret-devel libxml2-devel vala-tools \
@ -62,7 +62,7 @@ required libraries.
Install them by running this command:
sudo apt-get install valac libgirepository1.0-dev \
sudo apt-get install valac \
meson desktop-file-utils iso-codes libcanberra-dev \
libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgtk-3-dev \
libsecret-1-dev libxml2-dev libnotify-dev libsqlite3-dev \

1
debian/control vendored
View file

@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 8),
libenchant-dev,
libgcr-3-dev,
libgee-0.8-dev,
libgirepository1.0-dev,
libglib2.0-dev (>= 2.54.0),
libgmime-2.6-dev (>= 2.6.17),
libgoa-1.0-dev,

1
meson.build
View file

@ -60,7 +60,6 @@ gdk = dependency('gdk-3.0', version: '>=' + target_gtk)
gee = dependency('gee-0.8', version: '>= 0.8.5')
gio = dependency('gio-2.0', version: '>=' + target_glib)
goa = dependency('goa-1.0')
gobject_introspection = dependency('gobject-introspection-1.0')
gthread = dependency('gthread-2.0', version: '>=' + target_glib)
iso_codes = dependency('iso-codes')
javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)