From 8f556d5eb7df8ed5a1abb57b10236fd24e5691f9 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 30 Dec 2015 10:06:08 +0200 Subject: [PATCH] update package files Signed-off-by: Ivailo Monev --- package/archlinux/PKGBUILD | 10 +++++++--- package/entropy/katie/SRCBUILD | 13 ++++++++----- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 57d61ac85..b71dee175 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -3,15 +3,14 @@ pkgname=katie-git pkgver=4.8.7.8e624df -pkgrel=1 +pkgrel=2 pkgdesc='C++ toolkit derived from the Qt 4.8 framework' arch=('i686' 'x86_64') url='https://github.com/fluxer/katie' license=('LGPL' 'FDL' 'custom') depends=('openssl' 'zlib' 'cups' 'alsa-lib' 'gtk2' 'nas' 'libgl' 'libice' 'libsm' 'libxcursor' 'libxext' 'libxfixes' 'libxi' 'libxinerama' - 'libxrandr' 'libxrender' 'libx11' 'fontconfig' 'freetype2' 'glib2' - 'gst-plugins-base' 'libxml2') + 'libxrandr' 'libxrender' 'libx11' 'fontconfig' 'freetype2' 'glib2') makedepends=('cmake' 'git' 'python' 'postgresql' 'mariadb' 'unixodbc' 'mesa' 'vlc' 'unifdef') optdepends=('postgresql-libs: PostgreSQL driver' @@ -30,6 +29,11 @@ pkgver() { prepare() { mkdir -p build + + echo 'set(LDCONF_INSTALL_DIR /etc/ld.so.conf.d)' \ + >> katie/mkspecs/linux/vendor.cmake + echo 'set(DBUS_INTERFACES_INSTALL_DIR /etc/dbus-1/interfaces)' \ + >> katie/mkspecs/linux/vendor.cmake } build() { diff --git a/package/entropy/katie/SRCBUILD b/package/entropy/katie/SRCBUILD index 9446147eb..baae1b4dc 100644 --- a/package/entropy/katie/SRCBUILD +++ b/package/entropy/katie/SRCBUILD @@ -1,6 +1,7 @@ # Maintainer: Ivailo Monev version=4.8.7 +release=2 description='C++ toolkit derived from the Qt 4.8 framework' depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'glib' 'dbus' 'fontconfig' 'xorg-libraries' 'alsa-lib' 'icu' 'hicolor-icon-theme' @@ -9,6 +10,13 @@ makedepends=('python') optdepends=('gtk2' 'mariadb' 'unixodbc' 'postgresql' 'vlc' 'nas') sources=("https://github.com/fluxer/katie.git") +src_prepare() { + echo 'set(LDCONF_INSTALL_DIR /etc/ld.so.conf.d)' \ + >> katie.git/mkspecs/linux/vendor.cmake + echo 'set(DBUS_INTERFACES_INSTALL_DIR /etc/dbus-1/interfaces)' \ + >> katie.git/mkspecs/linux/vendor.cmake +} + src_compile() { mkdir -p build && cd build @@ -25,11 +33,6 @@ src_compile() { make } -src_check() { - cd "$SOURCE_DIR/build" - make check -} - src_install() { cd "$SOURCE_DIR/build" make DESTDIR="$INSTALL_DIR" install -- 2.11.0