summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames McCoy <jamessan@debian.org>2018-02-20 19:29:03 -0500
committerJames McCoy <jamessan@debian.org>2018-02-27 21:28:19 -0500
commita7da0679c26ca2554135ef40b498221b3f60aa43 (patch)
treeb3f82c7e222da1b075e3b255a1a71d602c9d36c8
parent440829b44807bfb6c6aff13b2e4d16be25c67ad9 (diff)
Switch to KDE Frameworks 5 wallet support
In order to avoid installing kf5-config, directly specify the include and library paths as part of the --with-kwallet configure option. Closes: #883593 Signed-off-by: James McCoy <jamessan@debian.org>
-rw-r--r--debian/control4
-rwxr-xr-xdebian/rules2
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index 21e4d43..a7898bf 100644
--- a/debian/control
+++ b/debian/control
@@ -12,12 +12,14 @@ Build-Depends: apache2-dev (>= 2.4.16),
dh-python,
doxygen,
junit [!hurd-i386 !hppa !sparc],
- kdelibs5-dev,
libapr1-dev,
libaprutil1-dev,
libdb5.3-dev,
libdbus-1-dev,
liblz4-dev (>= 0.0~r129),
+ libkf5coreaddons-dev,
+ libkf5i18n-dev,
+ libkf5wallet-dev,
libperl-dev,
libsasl2-dev,
libsecret-1-dev,
diff --git a/debian/rules b/debian/rules
index 9a8c4d8..96bdfff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ confflags = \
--with-editor=/usr/bin/editor \
--with-ruby-sitedir=/usr/lib/ruby \
--with-swig=/usr/bin/swig \
- --with-kwallet \
+ --with-kwallet=/usr/include:$(libdir) \
--with-lz4 \
--with-utf8proc \
CFLAGS="$(CFLAGS)" \