From b4eed76918947a93a10168e021b4ccfa950c0d67 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Fri, 25 Dec 2015 04:47:42 +0200 Subject: [PATCH] update package files Signed-off-by: Ivailo Monev --- package/archlinux/PKGBUILD | 3 +-- package/entropy/katie/SRCBUILD | 12 ++++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 1a3916d34..57d61ac85 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -37,8 +37,7 @@ build() { cmake ../katie \ -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=OFF + -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/package/entropy/katie/SRCBUILD b/package/entropy/katie/SRCBUILD index f820b03e4..027a40ab4 100644 --- a/package/entropy/katie/SRCBUILD +++ b/package/entropy/katie/SRCBUILD @@ -6,21 +6,25 @@ depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib' 'dbus' 'fontconfig' 'xorg-libraries' 'alsa-lib' 'icu' 'hicolor-icon-theme' 'mesalib' 'cups') makedepends=('python') -optdepends=('gtk2' 'mariadb' 'unixodbc' 'vlc') +optdepends=('gtk2' 'mariadb' 'unixodbc' 'postgresql' 'vlc') sources=("https://github.com/fluxer/katie.git") src_compile() { mkdir -p build && cd build - _options="-DWITH_GTK2=FALSE -DWITH_VLC=FALSE" + _options="-DWITH_GTK2=FALSE -DWITH_MYSQL=FALSE -DWITH_ODBC=FALSE" + _options+=" -DWITH_PSQL=FALSE -DWITH_VLC=FALSE" [ "$OPTIONAL_GTK2" = "yes" ] && _options+=" -DWITH_GTK2=TRUE" + [ "$OPTIONAL_MARIADB" = "yes" ] && _options+=" -DWITH_MYSQL=TRUE" + [ "$OPTIONAL_UNIXODBC" = "yes" ] && _options+=" -DWITH_ODBC=TRUE" + [ "$OPTIONAL_POSTGRESQL" = "yes" ] && _options+=" -DWITH_PSQL=TRUE" [ "$OPTIONAL_VLC" = "yes" ] && _options+=" -DWITH_VLC=TRUE" cmake ../katie.git \ + -Wno-dev \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=OFF \ - $_options -Wno-dev + $_options make } -- 2.11.0