Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kde5.git;a=commitdiff;h=7074e38f0dccc7ccbe7aa9576c50ee46e188cff1
commit 7074e38f0dccc7ccbe7aa9576c50ee46e188cff1 Author: crazy <[email protected]> Date: Fri Aug 18 23:23:39 2017 +0200 krita-3.2.0-1-x86_64 * Version bump diff --git a/source/kde5-extra/krita/FrugalBuild b/source/kde5-extra/krita/FrugalBuild index 8fdefe5..60d351c 100644 --- a/source/kde5-extra/krita/FrugalBuild +++ b/source/kde5-extra/krita/FrugalBuild @@ -2,28 +2,26 @@ # Maintainer: crazy <[email protected]> pkgname=krita -pkgver=3.1.4 -pkgrel=2 +pkgver=3.2.0 +pkgrel=1 pkgdesc="Krita is a FREE sketching and painting program" url="https://krita.org/"; archs=('x86_64') depends=('libgomp' 'libboost' 'gsl>=2.4' 'exiv2>=0.26' 'kio' 'opencolorio' 'openexr' 'poppler-qt5>=0.53.0' \ 'libraw>=0.18.0' 'libboost>=1.61.0' 'qt5-svg>=5.7.0-2' 'qt5-x11extras>=5.7.0-2' 'karchive' 'kcompletion' 'kconfig' \ 'kcoreaddons' 'kcrash' 'kdbusaddons' 'kguiaddons' 'ki18n' 'kitemviews' 'kservice' \ - 'kwidgetsaddons' 'kwindowsystem' 'nghttp2' 'qt5-multimedia') + 'kwidgetsaddons' 'kwindowsystem' 'nghttp2' 'qt5-multimedia' 'gsl') makedepends+=('vc>=0.7.5-3' 'boost>=1.61.0' 'x11-protos' 'eigen' 'kitemmodels') ## do not remove -DTARGET_ARCHITECTURE='none' , ever _F_cmake_confopts+=" -DTARGET_ARCHITECTURE='none' -DPACKAGERS_BUILD=true" Finclude kf5 groups=('kde5-extra') up2date="Flastverdir $_F_kde_mirror/stable/$pkgname" -source=($_F_kde_mirror/stable/$pkgname/${pkgver}/$pkgname-$pkgver.tar.gz compile-with-qt5.9.patch fix-boost-compile-error-with-qt5.7.patch) -sha1sums=('41854e4420cecd8a9c3e89a544bbbc068223a65c' \ - '1e66792d1fdae8e26854de41744baa2cc3b76712' \ - '4ef5aa2240d09fbeec91910e584caa7a97dad46c') +source=($_F_kde_mirror/stable/$pkgname/${pkgver}/$pkgname-$pkgver.tar.gz) +sha1sums=('a81d6fe5c5939b1c24ac90742935d9e7039ebf56') CXXFLAGS+=" -std=c++11" -## TODO: sort depends even more once 3.2.0 is released +## TODO: sort depends even more once 3.2.x is released ## change default look to breeze or whatever we use the time build() { diff --git a/source/kde5-extra/krita/compile-with-qt5.9.patch b/source/kde5-extra/krita/compile-with-qt5.9.patch deleted file mode 100644 index 765f0cc..0000000 --- a/source/kde5-extra/krita/compile-with-qt5.9.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur krita-3.1.4/libs/ui/KisResourceBundleManifest.cpp krita-3.1.4-p/libs/ui/KisResourceBundleManifest.cpp ---- krita-3.1.4/libs/ui/KisResourceBundleManifest.cpp 2017-05-26 08:47:55.000000000 +0200 -+++ krita-3.1.4-p/libs/ui/KisResourceBundleManifest.cpp 2017-06-17 18:21:47.225792422 +0200 -@@ -22,7 +22,9 @@ - #include <QDomElement> - #include <QDomNode> - #include <QDomNodeList> --#include <QForeachContainer> -+#if QT_VERSION < 0x050900 -+ #include <QForeachContainer> -+#endif - - #include <KoXmlNS.h> - #include <KoXmlReader.h> diff --git a/source/kde5-extra/krita/fix-boost-compile-error-with-qt5.7.patch b/source/kde5-extra/krita/fix-boost-compile-error-with-qt5.7.patch deleted file mode 100644 index 4f7cac43..0000000 --- a/source/kde5-extra/krita/fix-boost-compile-error-with-qt5.7.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur krita-3.0/CMakeLists.txt krita-3.0-p/CMakeLists.txt ---- krita-3.0/CMakeLists.txt 2016-05-29 13:26:44.000000000 +0200 -+++ krita-3.0-p/CMakeLists.txt 2016-07-31 15:11:05.321736081 +0200 -@@ -303,6 +303,7 @@ - set(HAVE_XCB FALSE) - endif() - -+add_definitions(-fext-numeric-literals) - add_definitions( - -DTRANSLATION_DOMAIN=\"krita\" - -DQT_USE_QSTRINGBUILDER _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
