diff --git a/org.kde.atelier.json b/org.kde.atelier.json index 7db08fe..71ef0d3 100644 --- a/org.kde.atelier.json +++ b/org.kde.atelier.json @@ -1,55 +1,33 @@ { "id": "org.kde.atelier", "branch": "master", "runtime": "org.kde.Platform", "runtime-version": "5.14", "sdk": "org.kde.Sdk", "command": "atelier", "tags": ["nightly"], "desktop-file-name-suffix": " (Nightly)", "finish-args": ["--share=ipc", "--socket=x11", "--share=network", "--socket=wayland", "--filesystem=host", "--device=all" ], "modules": [ - { - "name": "qwt", - "buildsystem": "qmake", - "cleanup": [ - "/doc", - "/include", - "/features", - "/share", - "/plugins" - ], - "sources": [ - { - "type": "archive", - "url": "https://downloads.sourceforge.net/project/qwt/qwt/6.1.4/qwt-6.1.4.tar.bz2", - "sha256":"1529215329e51fc562e0009505a838f427919a18b362afff441f035b2d9b5bd9" - }, - { - "type": "patch", - "path": "qwtPatch.patch" - } - ] - }, { "name": "atcore", - "config-opts": ["-DBUILD_GUI=ON"], + "config-opts": ["-DBUILD_GUI=OFF"], "buildsystem": "cmake-ninja", "cleanup": [ "/mkspecs", "/include", "/*/cmake" ], "sources": [ { "type": "git", "url": "git://anongit.kde.org/atcore.git" } ] }, { "name": "atelier", "buildsystem": "cmake-ninja", "sources": [ { "type": "git", "url": "git://anongit.kde.org/atelier.git" } ] } ] } diff --git a/qwtPatch.patch b/qwtPatch.patch deleted file mode 100644 index 4bb7d96..0000000 --- a/qwtPatch.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- qwt-6.1.3.orig/qwtconfig.pri 2016-06-13 03:14:23.031601095 -0400 -+++ qwt-6.1.3/qwtconfig.pri 2018-06-17 20:49:52.270255773 -0400 -@@ -16,17 +16,7 @@ - # Install paths - ###################################################################### - --QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] -- --unix { -- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION -- # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION --} -- --win32 { -- QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION -- # QWT_INSTALL_PREFIX = C:/Qwt-$$QWT_VERSION-qt-$$QT_VERSION --} -+QWT_INSTALL_PREFIX = /app - - QWT_INSTALL_DOCS = $${QWT_INSTALL_PREFIX}/doc - QWT_INSTALL_HEADERS = $${QWT_INSTALL_PREFIX}/include - -@@ -118,7 +108,7 @@ - # Otherwise you have to build it from the designer directory. - ###################################################################### - --QWT_CONFIG += QwtDesigner -+#QWT_CONFIG += QwtDesigner - - ###################################################################### - # Compile all Qwt classes into the designer plugin instead