author | Antonio Rojas
<arojas@archlinux.org> 2018-07-16 13:55:15 UTC |
committer | Antonio Rojas
<arojas@archlinux.org> 2018-07-16 13:55:15 UTC |
parent | 9477d96f6682df28633d9df7f617107f86a106c4 |
PKGBUILD | +5 | -9 |
krita-pyqt5.11.patch | +0 | -19 |
diff --git a/PKGBUILD b/PKGBUILD index 826df86..4f11615 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,8 +2,8 @@ # Maintainer: Antonio Rojas <arojas@archlinux,org> pkgname=krita -pkgver=4.1.0 -pkgrel=2 +pkgver=4.1.1 +pkgrel=1 pkgdesc="Edit and paint images" arch=(x86_64) url="https://krita.org" @@ -14,17 +14,13 @@ optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 'opencolorio: "krita-plugin-gmic: G'MIC plugin" 'python-pyqt5: for the Python plugins' 'libheif: HEIF filter') conflicts=(calligra-krita krita-l10n) replaces=(calligra-krita krita-l10n) -source=("https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig} - krita-pyqt5.11.patch) -sha256sums=('78792df8165b986b806dcf9960a2679f683f2263e06f3ad5a24b0f78d8f27ed5' - 'SKIP' - '37aa93119c759d80829112f169f64c47450f218e0fe05fc2e16ae54ff8170db2') +source=("https://download.kde.org/stable/krita/$pkgver/$pkgname-$pkgver.tar.gz"{,.sig}) +sha256sums=('5cab10343f97a9944a1ab2e137cd0ade6029ce157118009660af286eb75ce9e3' + 'SKIP') validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD') # Boudewijn Rempt <foundation@krita.org> prepare() { mkdir -p build - cd $pkgname-$pkgver - patch -p1 -i ../krita-pyqt5.11.patch # Fix python plugins with PyQt 5.11 } build() { diff --git a/krita-pyqt5.11.patch b/krita-pyqt5.11.patch deleted file mode 100644 index 004fbec..0000000 --- a/krita-pyqt5.11.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/plugins/extensions/pykrita/sip/CMakeLists.txt b/plugins/extensions/pykrita/sip/CMakeLists.txt -index 1f47f0af1c..d5a24f86ee 100644 ---- a/plugins/extensions/pykrita/sip/CMakeLists.txt -+++ b/plugins/extensions/pykrita/sip/CMakeLists.txt -@@ -12,9 +12,13 @@ set(SIP_INCLUDES - ${PYQT_SIP_DIR_OVERRIDE} - ./krita) - -+if(${PYQT5_VERSION} STRGREATER_EQUAL "050b00") -+ set(SIP_NAME -n PyQt5.sip) -+endif() -+ - set(SIP_CONCAT_PARTS 1) - set(SIP_TAGS ALL WS_X11 ${PYQT5_VERSION_TAG}) --set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector) -+set(SIP_EXTRA_OPTIONS -g -x PyKDE_QVector ${SIP_NAME}) - - set(PYTHON_SITE_PACKAGES_INSTALL_DIR ${LIB_INSTALL_DIR}/krita-python-libs) - file(GLOB PYKRITA_KRITA_sip_files ./krita/*.sip)