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

build: obtain iso-codes prefix from pkg-config

Browse source
This commit is contained in:
Jan Tojnar 2018-08-08 20:12:53 +02:00
parent 71617bf9b2
commit beec7ff0fe
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
4 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -15,7 +15,7 @@ variables:
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
gcr-devel enchant-devel libunwind-devel
gcr-devel enchant-devel libunwind-devel iso-codes-devel
gnome-online-accounts-devel itstool
FEDORA_TEST_DEPS: Xvfb tar xz
UBUNTU_DEPS: valac libgirepository1.0-dev
@ -23,7 +23,7 @@ variables:
libgee-0.8-dev libglib2.0-dev libgmime-2.6-dev libgtk-3-dev
libsecret-1-dev libxml2-dev libnotify-dev libsqlite3-dev
libwebkit2gtk-4.0-dev libgcr-3-dev libenchant-dev
libunwind-dev libgoa-1.0-dev itstool gettext
libunwind-dev iso-codes libgoa-1.0-dev itstool gettext
libmessaging-menu-dev libunity-dev
UBUNTU_TEST_DEPS: xauth xvfb

6
INSTALL
View file

@ -41,8 +41,8 @@ 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 desktop-file-utils libcanberra-devel libgee-devel \
sudo yum install vala gobject-introspection-devel 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 \
gcr-devel enchant-devel libunwind-devel \
@ -63,7 +63,7 @@ required libraries.
Install them by running this command:
sudo apt-get install valac libgirepository1.0-dev \
meson desktop-file-utils libcanberra-dev \
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 \
libwebkit2gtk-4.0-dev libgcr-3-dev libenchant-dev \

2
debian/control vendored
View file

@ -4,6 +4,7 @@ Priority: optional
Maintainer: Michael Gratton <mike@vee.net>
Build-Depends: debhelper (>= 8),
desktop-file-utils,
iso-codes,
itstool,
libcanberra-dev,
libenchant-dev,
@ -31,6 +32,7 @@ Homepage: https://wiki.gnome.org/Apps/Geary
Package: geary
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
iso-codes,
libcanberra0,
libenchant1c2a,
libgcr-base-3-1,

3
meson.build
View file

@ -59,6 +59,7 @@ 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)
libcanberra = dependency('libcanberra', version: '>= 0.28')
libmath = cc.find_library('m')
@ -104,7 +105,7 @@ if enable_valadoc
endif
# Language detection
iso_codes_dir = join_paths('/', 'usr', 'share', 'xml', 'iso-codes')
iso_codes_dir = join_paths(iso_codes.get_pkgconfig_variable('prefix'), 'share', 'xml', 'iso-codes')
if iso_639_xml == ''
iso_639_xml = join_paths(iso_codes_dir, 'iso_639.xml')
endif