KolourPaint: bump version

This commit is contained in:
Gerasim Troeglazov
2020-05-07 11:38:21 +10:00
parent 5fe298b1da
commit 4163171aaf
2 changed files with 49 additions and 3 deletions

View File

@@ -16,11 +16,12 @@ features like Undo/Redo.
KolourPaint is opensource software written in C++ using the Qt and KDE \
libraries."
HOMEPAGE="http://www.kolourpaint.org/"
COPYRIGHT="2010-2019 KDE Organisation"
COPYRIGHT="2010-2020 KDE Organisation"
LICENSE="GNU LGPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://github.com/KDE/kolourpaint/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="b5d059ad211ff07be97fb0f6be309c0f21a8a34f18d93f9ce5f0fc5591bdc45c"
CHECKSUM_SHA256="2ad4c56c6c5fd52723885b06c9354faa2c53c9362d3249948d58ecf392aad156"
PATCHES="kolourpaint-$portVersion.patchset"
ADDITIONAL_FILES="kolourpaint.rdef.in"
ARCHITECTURES="!x86_gcc2 x86 x86_64"

View File

@@ -0,0 +1,45 @@
From e65f70b79f702b517587c6a8608c50b929585873 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 7 May 2020 10:58:36 +1000
Subject: Fix build for KF5 5.65 version
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d2eec6..63453b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR)
project(kolourpaint VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.11.0")
-set(KF5_MIN_VERSION "5.67.0")
+set(KF5_MIN_VERSION "5.65.0")
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
@@ -66,7 +66,7 @@ ecm_setup_version(${RELEASE_SERVICE_VERSION}
add_subdirectory( pics )
-add_subdirectory( doc )
+#add_subdirectory( doc )
########### next target ###############
diff --git a/mainWindow/kpMainWindow_File.cpp b/mainWindow/kpMainWindow_File.cpp
index 4fdc64f..e363191 100644
--- a/mainWindow/kpMainWindow_File.cpp
+++ b/mainWindow/kpMainWindow_File.cpp
@@ -882,7 +882,8 @@ QUrl kpMainWindow::askForSaveURL (const QString &caption,
docMetaInfo,
this);
- KFileCustomDialog fd (QUrl (startURL), this);
+ KFileCustomDialog fd (this);
+ fd.setUrl(QUrl (startURL));
fd.setOperationMode (KFileWidget::Saving);
fd.setWindowTitle (caption);
fd.setCustomWidget (saveOptionsWidget);
--
2.26.0