From fe753a5715362aecc8a01d7e8b7033dc25e9067f Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 8 Jun 2019 15:41:56 +0200 Subject: [PATCH 1/8] Try to figure out the kcfg error --- .drone.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index a88af00..7bf7354 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,8 +7,9 @@ steps: pull: if-not-exists commands: - mkdir build - - cmake -B build - - make -C build -j2 + - cd build + - cmake ../ + - make build -j2 when: event: - push From 61dd7054af7c8d25e8398abb16d10b4bccb3b0e6 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 8 Jun 2019 15:42:54 +0200 Subject: [PATCH 2/8] Another fix --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7bf7354..64d9507 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ steps: - mkdir build - cd build - cmake ../ - - make build -j2 + - make -j2 when: event: - push From cc61d2abf6bb0da13f5507e79a4b4640fbd2d149 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 8 Jun 2019 15:43:40 +0200 Subject: [PATCH 3/8] Do not use parallelism --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 64d9507..8e3a91c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -9,7 +9,7 @@ steps: - mkdir build - cd build - cmake ../ - - make -j2 + - make when: event: - push From afe0d031e28e943425dfb56120d6b2479c448b6c Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 8 Jun 2019 15:47:24 +0200 Subject: [PATCH 4/8] Update CMakelists - Bump CMake minimum version to 3.0 - Use NO_POLICY_SCOPE for KDECompilerSettings --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57947ff..3d2111b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(danbooru_client) -cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +cmake_minimum_required(VERSION 3.0 FATAL_ERROR) set(danbooru_client_VERSION_MAJOR 0) set(danbooru_client_VERSION_MINOR 3) @@ -55,7 +55,7 @@ find_package(KF5 ${KF5_VERSION} REQUIRED include(ECMInstallIcons) include(KDEInstallDirs) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(FeatureSummary) From 17d711178ce1658988db1f4c9b4c1ba846231e60 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 8 Jun 2019 15:49:14 +0200 Subject: [PATCH 5/8] Fix dependencies, get rid of policy adjustments --- CMakeLists.txt | 1 + src/libdanbooru/CMakeLists.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d2111b..33ec047 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ find_package(KF5 ${KF5_VERSION} REQUIRED CoreAddons # Caches TextWidgets # Spin boxes GuiAddons # Image cache + KConfig # Configuration Completion # KComboBox XmlGui # User interface ConfigWidgets # Handling of configuration diff --git a/src/libdanbooru/CMakeLists.txt b/src/libdanbooru/CMakeLists.txt index b7daf4f..f496285 100644 --- a/src/libdanbooru/CMakeLists.txt +++ b/src/libdanbooru/CMakeLists.txt @@ -1,4 +1,3 @@ -cmake_policy(SET CMP0048 OLD) project(libdanbooru) set(CMAKE_INCLUDE_CURRENT_DIR ON) From 24b4d120d560bcdf92fd7e72f07e81eb3bc56257 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 8 Jun 2019 15:50:03 +0200 Subject: [PATCH 6/8] Whoops, fix KConfig name --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 33ec047..a3eae2d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ find_package(KF5 ${KF5_VERSION} REQUIRED CoreAddons # Caches TextWidgets # Spin boxes GuiAddons # Image cache - KConfig # Configuration + Config # Configuration Completion # KComboBox XmlGui # User interface ConfigWidgets # Handling of configuration From 0ee23fe9f73f84a3ab4f85e355070f28963847b5 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 8 Jun 2019 16:01:43 +0200 Subject: [PATCH 7/8] Make the Docker image privileged Otherwise kconfig_compiler won't work (needs statx, but it can be whitelisted in Docker only with a version of libseccomp not available in Leap 15.1) --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 8e3a91c..f8e0cc2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,6 +4,7 @@ name: default steps: - name: build image: einar/kde + privileged: true pull: if-not-exists commands: - mkdir build From 8ec286ee58fbc64c7609449f1a2a2018f295b084 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sat, 8 Jun 2019 16:15:13 +0200 Subject: [PATCH 8/8] [ci skip] Amend README --- README.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index c6f78aa..7acd639 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,11 @@ This is a (work in progress) C++ port from the original [Danbooru Client](http://kde-apps.org/content/show.php?content=114343). +[![Build Status](https://drone.dennogumi.org/api/badges/KDE/danbooru-client/status.svg)](https://drone.dennogumi.org/KDE/danbooru-client) + Current features: -- Supports most Danbooru image boards +- Supports Moebooru image boards (yande.re, konachan.net, and similar boards) - Search by one or multiple tags - Filter out posts with unwanted tags - View or download posts @@ -13,7 +15,7 @@ Current features: ### Requirements -[KDE Frameworks](https://community.kde.org/Frameworks) 5.7 or newer (needed for some features from KDeclarative), and Qt 5.4. +[KDE Frameworks](https://community.kde.org/Frameworks) 5.25 or newer, and Qt 5.9. In particular, Danbooru Client makes use of the following Frameworks: @@ -22,10 +24,12 @@ In particular, Danbooru Client makes use of the following Frameworks: - KGuiAddons (cache handling) - KCompletion (Combo box widgets) - KXmlGui (main window UI) +- KConfig (configuration handling) - KConfigWidgets (configuration handling) - KIO (network operation handling) - KWallet (password handling) - KDeclarative (thumbnail view) +- KFileMetaData (for tagging) At minimum, the following Qt 5.4 components are required as well: @@ -73,4 +77,4 @@ Notice that Danbooru Client does **not** implement the Gelbooru API at the momen ### License -This is Free Software, licensed under the GNU GPL v3 or later. See the LICENSE file for more details. \ No newline at end of file +This is Free Software, licensed under the GNU GPL v3 or later. See the LICENSE file for more details.