[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [sysadmin/ci-builder-tools] /: Remove qca suffix option from qoauth.
From:       Scarlett Clark <scarlett () scarlettgatelyclark ! com>
Date:       2016-04-06 12:18:15
Message-ID: E1anmPX-0001nP-E0 () scm ! kde ! org
[Download RAW message or body]

Git commit cec4e47d701243e1eb5520c4b806299ca3cc1af2 by Scarlett Clark.
Committed on 06/04/2016 at 12:17.
Pushed by scarlettclark into branch 'master'.

Remove qca suffix option from qoauth.

M  +0    -1    base/latest-qt4
M  +1    -1    build/qoauth/kf5-qt5.cfg
M  +1    -1    build/qoauth/stable-kf5-qt5.cfg

http://commits.kde.org/sysadmin/ci-builder-tools/cec4e47d701243e1eb5520c4b806299ca3cc1af2

diff --git a/base/latest-qt4 b/base/latest-qt4
index 1aa7784..158351c 100644
--- a/base/latest-qt4
+++ b/base/latest-qt4
@@ -64,7 +64,6 @@ extragear/office/skrooge: general/opencv
 extragear/office/tellico: general/poppler
 extragear/kdevelop/kdevplatform: general/qjson
 extragear/graphics/kolor-manager: general/oyranos
-general/oyranos: general/libxcm
 
 # Playground
 playground/edu/artikulate: general/qt-gstreamer
diff --git a/build/qoauth/kf5-qt5.cfg b/build/qoauth/kf5-qt5.cfg
index 7ee2fa3..3217f73 100644
--- a/build/qoauth/kf5-qt5.cfg
+++ b/build/qoauth/kf5-qt5.cfg
@@ -3,4 +3,4 @@ configureExecutable=qmake
 
 [Build]
 inSourceBuild=False
-configureCommand=%(configureExecutable)s "PREFIX = {instPrefix}/usr" "QCA_SUFFIX += kf5" 
\ No newline at end of file
+configureCommand=%(configureExecutable)s "PREFIX = {instPrefix}/usr"
\ No newline at end of file
diff --git a/build/qoauth/stable-kf5-qt5.cfg b/build/qoauth/stable-kf5-qt5.cfg
index 7a7743d..dfa0647 100644
--- a/build/qoauth/stable-kf5-qt5.cfg
+++ b/build/qoauth/stable-kf5-qt5.cfg
@@ -3,5 +3,5 @@ configureExecutable=qmake
 
 [Build]
 inSourceBuild=False
-configureCommand=%(configureExecutable)s "PREFIX = {instPrefix}/usr" "QCA_SUFFIX += kf5"
+configureCommand=%(configureExecutable)s "PREFIX = {instPrefix}/usr"
 
[prev in list] [next in list] [prev in thread] [next in thread]