From deec87a4a0aa6778ff7b8a961659e9221f0cb09f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 2 Nov 2014 19:13:30 +0100 Subject: [PATCH] srcpkgs: no need to set CMAKE_INSTALL_LIBDIR manually. --- srcpkgs/freerdp/template | 2 +- srcpkgs/granite/template | 1 - srcpkgs/liblxqt/template | 2 +- srcpkgs/libqtxdg/template | 2 +- srcpkgs/midori/template | 2 +- srcpkgs/obexftp/template | 1 - srcpkgs/openobex/template | 3 +-- srcpkgs/phonon-backend-gstreamer/template | 1 - srcpkgs/phonon-backend-vlc/template | 1 - srcpkgs/phonon/template | 2 +- srcpkgs/polkit-qt/template | 1 - srcpkgs/strigi/template | 3 +-- 12 files changed, 7 insertions(+), 14 deletions(-) diff --git a/srcpkgs/freerdp/template b/srcpkgs/freerdp/template index 6af02359628..de9c41122f6 100644 --- a/srcpkgs/freerdp/template +++ b/srcpkgs/freerdp/template @@ -7,7 +7,7 @@ build_style=cmake configure_args="-DWITH_JPEG=ON -DWITH_PULSE=ON -DWITH_XINERAMA=ON -DWITH_XEXT=ON -DWITH_XCURSOR=ON -DWITH_XI=ON -DWITH_XRENDER=ON -DWITH_XV=ON -DWITH_XKBFILE=ON -DWITH_FFMPEG=ON -DWITH_GSTREAMER=OFF -DWITH_ALSA=ON - -DWITH_CUPS=OFF -DWITH_PCSC=OFF -DCMAKE_INSTALL_LIBDIR=lib" + -DWITH_CUPS=OFF -DWITH_PCSC=OFF" hostmakedepends="pkg-config cmake" makedepends=" alsa-lib-devel libjpeg-turbo-devel pulseaudio-devel libXinerama-devel diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index 6b94811246e..182cde521e6 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -3,7 +3,6 @@ pkgname=granite version=0.3.0 revision=1 build_style=cmake -configure_args="-DCMAKE_INSTALL_LIBDIR=lib" hostmakedepends="cmake pkg-config" makedepends="gobject-introspection vala-devel gtk+3-devel libgee08-devel" depends="hicolor-icon-theme" diff --git a/srcpkgs/liblxqt/template b/srcpkgs/liblxqt/template index fb69a133d7e..5038676f59f 100644 --- a/srcpkgs/liblxqt/template +++ b/srcpkgs/liblxqt/template @@ -3,7 +3,7 @@ pkgname=liblxqt version=0.8.0 revision=1 build_style=cmake -configure_args="-DUSE_QT5=1 -DCMAKE_INSTALL_LIBDIR=lib" +configure_args="-DUSE_QT5=1" hostmakedepends="cmake pkg-config" makedepends="qt5-tools-devel qt5-x11extras-devel libqtxdg-devel" short_desc="LXQT Desktop library" diff --git a/srcpkgs/libqtxdg/template b/srcpkgs/libqtxdg/template index d1dd7475176..5484c117ed2 100644 --- a/srcpkgs/libqtxdg/template +++ b/srcpkgs/libqtxdg/template @@ -3,7 +3,7 @@ pkgname=libqtxdg version=1.0.0 revision=1 build_style=cmake -configure_args="-DUSE_QT5=1 -DCMAKE_INSTALL_LIBDIR=lib" +configure_args="-DUSE_QT5=1" hostmakedepends="cmake pkg-config" makedepends="qt5-tools-devel" short_desc="Qt implementation of freedesktop.org xdg specifications" diff --git a/srcpkgs/midori/template b/srcpkgs/midori/template index e10aa62a3f6..9937251b1dd 100644 --- a/srcpkgs/midori/template +++ b/srcpkgs/midori/template @@ -5,7 +5,7 @@ revision=2 lib32disabled=yes create_wrksrc=yes build_style=cmake -configure_args="-DUSE_GTK3=1 -DUSE_ZEITGEIST=1 -DCMAKE_INSTALL_LIBDIR=lib" +configure_args="-DUSE_GTK3=1 -DUSE_ZEITGEIST=1" hostmakedepends="pkg-config intltool librsvg-utils cmake glib-devel vala-devel libzeitgeist-devel" makedepends="gtk+3-devel libxml2-devel vala-devel libzeitgeist-devel diff --git a/srcpkgs/obexftp/template b/srcpkgs/obexftp/template index 87abec0b5dd..e4956510f6b 100644 --- a/srcpkgs/obexftp/template +++ b/srcpkgs/obexftp/template @@ -4,7 +4,6 @@ version=0.24 revision=2 wrksrc=${pkgname}-${version}-Source build_style=cmake -configure_args="-DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_SBINDIR=bin" hostmakedepends="pkg-config cmake" makedepends="openobex-devel fuse-devel libbluetooth-devel" short_desc="OBEX transfer utilities" diff --git a/srcpkgs/openobex/template b/srcpkgs/openobex/template index 61a942a0ad1..6c6b1daa2fd 100644 --- a/srcpkgs/openobex/template +++ b/srcpkgs/openobex/template @@ -4,9 +4,8 @@ version=1.7.1 revision=2 wrksrc="${pkgname}-${version}-Source" build_style=cmake -configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib -DCMAKE_INSTALL_SBINDIR=/usr/bin" hostmakedepends="pkg-config cmake libxslt docbook-xsl" -makedepends="systemd-devel libusb-devel libbluetooth-devel libudev-devel" +makedepends="libusb-devel libbluetooth-devel libudev-devel" replaces="libopenobex>=0" short_desc="OBEX protocol implementation" homepage="http://dev.zuckschwerdt.org/openobex/" diff --git a/srcpkgs/phonon-backend-gstreamer/template b/srcpkgs/phonon-backend-gstreamer/template index 35705f7cde8..3d40fcbbd33 100644 --- a/srcpkgs/phonon-backend-gstreamer/template +++ b/srcpkgs/phonon-backend-gstreamer/template @@ -4,7 +4,6 @@ version=4.8.0 revision=1 lib32disabled=yes build_style=cmake -configure_args="-DCMAKE_INSTALL_LIBDIR=lib" hostmakedepends="cmake automoc4 pkg-config" makedepends="MesaLib-devel qt-devel phonon-devel>=4.8 gst-plugins-base1-devel gst-plugins-good1" depends="desktop-file-utils hicolor-icon-theme gst-plugins-good1 gst-libav" diff --git a/srcpkgs/phonon-backend-vlc/template b/srcpkgs/phonon-backend-vlc/template index 06e8c029380..cdb73cc9dca 100644 --- a/srcpkgs/phonon-backend-vlc/template +++ b/srcpkgs/phonon-backend-vlc/template @@ -4,7 +4,6 @@ version=0.8.0 revision=1 lib32disabled=yes build_style=cmake -configure_args="-DCMAKE_INSTALL_LIBDIR=lib" hostmakedepends="cmake automoc4 pkg-config" makedepends="qt-devel phonon-devel>=4.8 vlc-devel" depends="desktop-file-utils hicolor-icon-theme" diff --git a/srcpkgs/phonon/template b/srcpkgs/phonon/template index dc7a3c9db92..88b3b8a1003 100644 --- a/srcpkgs/phonon/template +++ b/srcpkgs/phonon/template @@ -3,7 +3,7 @@ pkgname=phonon version=4.8.1 revision=1 build_style=cmake -configure_args="-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON -DCMAKE_INSTALL_LIBDIR=lib" +configure_args="-DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON" hostmakedepends="cmake automoc4" makedepends="glib-devel qt-devel pulseaudio-devel libqzeitgeist-devel" short_desc="The multimedia framework for KDE" diff --git a/srcpkgs/polkit-qt/template b/srcpkgs/polkit-qt/template index fe7493dc033..760e5029dcb 100644 --- a/srcpkgs/polkit-qt/template +++ b/srcpkgs/polkit-qt/template @@ -3,7 +3,6 @@ pkgname=polkit-qt version=0.112.0 revision=1 build_style=cmake -configure_args="-DCMAKE_INSTALL_LIBDIR=lib" hostmakedepends="pkg-config cmake automoc4 git" makedepends="polkit-devel qt-devel" short_desc="Qt-style PolicyKit API" diff --git a/srcpkgs/strigi/template b/srcpkgs/strigi/template index 4a4463c5a41..69ce08a59fe 100644 --- a/srcpkgs/strigi/template +++ b/srcpkgs/strigi/template @@ -4,8 +4,7 @@ version=0.7.8 revision=5 build_style=cmake configure_args="-DENABLE_INOTIFY=ON -DENABLE_LOG4CXX=OFF -DENABLE_FAM=OFF - -DENABLE_CLUCENE=OFF -DENABLE_CLUCENE_NG=ON -DENABLE_FFMPEG=OFF - -DCMAKE_INSTALL_LIBDIR=lib" + -DENABLE_CLUCENE=OFF -DENABLE_CLUCENE_NG=ON -DENABLE_FFMPEG=OFF" hostmakedepends="pkg-config cmake perl" makedepends="attr-devel zlib-devel bzip2-devel boost-devel exiv2-devel libxml2-devel clucene-devel>=2.3.3.4 dbus-devel qt-devel" short_desc="Small fast desktop searching program"