aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharles kerr <charlesk@canonical.com>2015-12-29 10:26:56 -0600
committercharles kerr <charlesk@canonical.com>2015-12-29 10:26:56 -0600
commit2c05f9bc7831616b884982002d74a7e07a91637b (patch)
tree1997bc8b0a15e6bf453787edb8412d678caaf442
parent6b5cbcfe81a660cedcc3b905d5c6ccb29184fc35 (diff)
downloadayatana-indicator-sound-2c05f9bc7831616b884982002d74a7e07a91637b.tar.gz
ayatana-indicator-sound-2c05f9bc7831616b884982002d74a7e07a91637b.tar.bz2
ayatana-indicator-sound-2c05f9bc7831616b884982002d74a7e07a91637b.zip
bump glib minimum to 2.32 (released Mar 2012) for G_SOURCE_REMOVE
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/control2
-rw-r--r--src/CMakeLists.txt1
3 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1fbb8d..16ef27f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,12 +24,14 @@ set(SOURCE_DIR "${CMAKE_SOURCE_DIR}/src")
set(SOURCE_BINARY_DIR "${CMAKE_BINARY_DIR}/src")
set(PULSE_AUDIO_REQUIRED_VERSION 0.9.19)
+set(GLIB_2_0_REQUIRED_VERSION 2.32)
set(GIO_2_0_REQUIRED_VERSION 2.25.13)
set(URL_DISPATCHER_1_REQUIRED_VERSION 1)
pkg_check_modules(
PULSEAUDIO REQUIRED
libpulse-mainloop-glib>=${PULSE_AUDIO_REQUIRED_VERSION}
+ glib-2.0>=${GLIB_2_0_REQUIRED_VERSION}
gio-unix-2.0>=${GIO_2_0_REQUIRED_VERSION}
url-dispatcher-1>=${URL_DISPATCHER_1_REQUIRED_VERSION}
)
diff --git a/debian/control b/debian/control
index f170fcf..e65a858 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends: debhelper (>= 9.0),
libaccountsservice-dev,
libdbustest1-dev (>= 15.04.0),
libgirepository1.0-dev,
- libglib2.0-dev (>= 2.22.3),
+ libglib2.0-dev (>= 2.32.0),
libgtest-dev,
libqtdbusmock1-dev (>= 0.3),
libqtdbustest1-dev,
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 92acc67..3382c23 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,6 +32,7 @@ vala_init(indicator-sound-service
OPTIONS
--ccode
--thread
+ --target-glib=${GLIB_2_0_REQUIRED_VERSION}
--vapidir=${CMAKE_SOURCE_DIR}/vapi/
--vapidir=.
--pkg=url-dispatcher