mirror of
https://github.com/SlackBuildsOrg/slackbuilds
synced 2024-09-30 05:39:56 +02:00
network/owncloud-client: Improved qt4/qt5 compatibility.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
This commit is contained in:
parent
066b0b5a9e
commit
8429aa33aa
2 changed files with 14 additions and 10 deletions
|
@ -4,10 +4,13 @@ ownCloud server, and always have your latest files wherever you are. Make
|
|||
a change to the files on one computer, it will flow across the others using
|
||||
the desktop sync clients.
|
||||
|
||||
This package will build against qt5 libraries if they are present on your
|
||||
system. This will cause issue with qtkeychain as it will build against qt4
|
||||
by default. One way to work around this is to uninstall qt5 before building
|
||||
the owncloud-client package.
|
||||
|
||||
This package optionally requires the Sphinx package in order to create its
|
||||
man pages.
|
||||
|
||||
Note: You must build this package against the same version of Qt that
|
||||
qtkeychain was built against. This package will automatically build
|
||||
against qt4. If you wish to build this package against qt5 then you
|
||||
must set the flag BUILD_WITH_QT4 to 'No' when building this package.
|
||||
For example:
|
||||
|
||||
# BUILD_WITH_QT4=No ./owncloud-client.SlackBuild
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
# Slackware build script for owncloud-client
|
||||
|
||||
# Copyright 2013-2016 Christopher Walker Copperas Cove, TX
|
||||
# Copyright 2013-2017 Christopher Walker Copperas Cove, TX
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use of this script, with or without modification, is
|
||||
|
@ -24,14 +24,14 @@
|
|||
|
||||
PRGNAM=owncloud-client
|
||||
VERSION=${VERSION:-2.2.4}
|
||||
BUILD=${BUILD:-1}
|
||||
BUILD=${BUILD:-2}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
SRCNAM=owncloudclient
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
case "$( uname -m )" in
|
||||
i?86) ARCH=i486 ;;
|
||||
i?86) ARCH=i586 ;;
|
||||
arm*) ARCH=arm ;;
|
||||
*) ARCH=$( uname -m ) ;;
|
||||
esac
|
||||
|
@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
|
|||
PKG=$TMP/package-$PRGNAM
|
||||
OUTPUT=${OUTPUT:-/tmp}
|
||||
|
||||
if [ "$ARCH" = "i486" ]; then
|
||||
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
|
||||
if [ "$ARCH" = "i586" ]; then
|
||||
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
|
||||
LIBDIRSUFFIX=""
|
||||
elif [ "$ARCH" = "i686" ]; then
|
||||
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
|
||||
|
@ -81,6 +81,7 @@ cd build
|
|||
-DCMAKE_INSTALL_MANDIR=/usr/man \
|
||||
-DCMAKE_INSTALL_SYSCONFDIR=/etc/$PRGNAM \
|
||||
-DCMAKE_BUILD_TYPE="Release" \
|
||||
-DBUILD_WITH_QT4=${BUILD_WITH_QT4:-"yes"} \
|
||||
..
|
||||
make VERBOSE=1
|
||||
make doc
|
||||
|
|
Loading…
Reference in a new issue