| 1 |
commit: 75a167ae1971db9087e46b165ef7ba196b34413e |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Apr 2 19:36:27 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Apr 2 20:26:29 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a167ae |
| 7 |
|
| 8 |
kde-misc/skanlite: 2.1.0.1 version bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.28, Repoman-2.3.9 |
| 11 |
|
| 12 |
kde-misc/skanlite/Manifest | 1 + |
| 13 |
.../skanlite/files/skanlite-2.1.0.1-cmake.patch | 97 ++++++++++++++++++++++ |
| 14 |
kde-misc/skanlite/skanlite-2.1.0.1.ebuild | 36 ++++++++ |
| 15 |
3 files changed, 134 insertions(+) |
| 16 |
|
| 17 |
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest |
| 18 |
index 8ce37d19c56..5c50cf0bea3 100644 |
| 19 |
--- a/kde-misc/skanlite/Manifest |
| 20 |
+++ b/kde-misc/skanlite/Manifest |
| 21 |
@@ -1,2 +1,3 @@ |
| 22 |
DIST skanlite-2.0.1.tar.xz 2139624 BLAKE2B f6959650e6e59899e24f20214b2e94b0f4c004982e2ff961384c4a07e13305c6f839f679759db088c16ab879b499eb700edb5f7d8d65056ddd155c3a55f5365b SHA512 2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e |
| 23 |
+DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658 |
| 24 |
DIST skanlite-2.1.0.tar.xz 1121468 BLAKE2B 8fd9bc7018e812203023a7e2906eb724e01baca70dbcccc08633f49e08de687738390a87d5c27526c084601d76f3cf272998818ad102d3dcd47518fab2fa47f6 SHA512 b346998f37def6b99c2feba7b323dbcb299c2bb0553598f83a30f8e7a04af1deaf60e7f5c70c4b663e0aecf95e7ee03252a15ef61745e6bc7d1c5a9d617aec00 |
| 25 |
|
| 26 |
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch |
| 27 |
new file mode 100644 |
| 28 |
index 00000000000..7b7daae11ea |
| 29 |
--- /dev/null |
| 30 |
+++ b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch |
| 31 |
@@ -0,0 +1,97 @@ |
| 32 |
+From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001 |
| 33 |
+From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
| 34 |
+Date: Mon, 2 Apr 2018 21:27:52 +0200 |
| 35 |
+Subject: [PATCH] Cleanup CMakeLists.txt |
| 36 |
+ |
| 37 |
+Summary: |
| 38 |
+Cleanup duplicate find Qt5 and move all below #Dependencies block. |
| 39 |
+Sort dependencies. |
| 40 |
+KF5Sane is not an actual framework, so separate it from KF5 modules. |
| 41 |
+ |
| 42 |
+Make use of FeatureSummary |
| 43 |
+ |
| 44 |
+Reviewers: sars |
| 45 |
+ |
| 46 |
+Reviewed By: sars |
| 47 |
+ |
| 48 |
+Subscribers: ltoscano |
| 49 |
+ |
| 50 |
+Differential Revision: https://phabricator.kde.org/D11861 |
| 51 |
+--- |
| 52 |
+ CMakeLists.txt | 32 +++++++++++++++----------------- |
| 53 |
+ 1 file changed, 15 insertions(+), 17 deletions(-) |
| 54 |
+ |
| 55 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 56 |
+index 2c23351..6b326df 100644 |
| 57 |
+--- a/CMakeLists.txt |
| 58 |
++++ b/CMakeLists.txt |
| 59 |
+@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) |
| 60 |
+ include(KDECMakeSettings) |
| 61 |
+ include(GenerateExportHeader) |
| 62 |
+ |
| 63 |
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets) |
| 64 |
+- |
| 65 |
+ # be not so strict with the poor developer who just wants to use strings |
| 66 |
+ remove_definitions(-DQT_NO_URL_CAST_FROM_STRING) |
| 67 |
+ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) |
| 68 |
+ |
| 69 |
+-set(KF5_VERSION "5.1.0") |
| 70 |
++set(REQUIRED_QT_VERSION "5.2.0") |
| 71 |
++set(KF5_MIN_VERSION "5.1.0") |
| 72 |
+ |
| 73 |
+ ecm_setup_version( |
| 74 |
+- ${KF5_VERSION} |
| 75 |
++ ${KF5_MIN_VERSION} |
| 76 |
+ VARIABLE_PREFIX SKANLITE |
| 77 |
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h" |
| 78 |
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake" |
| 79 |
+ ) |
| 80 |
+ |
| 81 |
++set(SKANLITE_VERSION_STRING "2.1.0.1") |
| 82 |
++ |
| 83 |
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h) |
| 84 |
++ |
| 85 |
+ # Dependencies |
| 86 |
+-set(REQUIRED_QT_VERSION "5.2.0") |
| 87 |
++find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets) |
| 88 |
+ |
| 89 |
+-# Required Qt5 components to build this framework |
| 90 |
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core) |
| 91 |
+ find_package(PNG REQUIRED) |
| 92 |
+- |
| 93 |
+ include_directories(${PNG_INCLUDE_DIRS}) |
| 94 |
+ |
| 95 |
+-set(SKANLITE_VERSION_STRING "2.1.0.1") |
| 96 |
+- |
| 97 |
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h) |
| 98 |
+- |
| 99 |
+-find_package(KF5 ${KF5_VERSION} REQUIRED |
| 100 |
+- COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED) |
| 101 |
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS |
| 102 |
+ CoreAddons # KAboutData |
| 103 |
++ DocTools # yields kdoctools_create_handbook |
| 104 |
+ I18n |
| 105 |
+- XmlGui # KAboutApplicationDialog |
| 106 |
+ KIO # contains the KIOWidgets which we use in target_link_libraries |
| 107 |
+- DocTools # yields kdoctools_create_handbook |
| 108 |
+- Sane # will find KF5Sane |
| 109 |
++ XmlGui # KAboutApplicationDialog |
| 110 |
+ ) |
| 111 |
+ |
| 112 |
++find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED) |
| 113 |
++ |
| 114 |
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) |
| 115 |
+ |
| 116 |
+ # Subdirectories |
| 117 |
+@@ -62,6 +58,8 @@ add_subdirectory(src) |
| 118 |
+ add_subdirectory(doc) |
| 119 |
+ add_subdirectory(autotests) |
| 120 |
+ add_subdirectory(tests) |
| 121 |
++ |
| 122 |
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) |
| 123 |
+ |
| 124 |
+ find_package(KF5I18n CONFIG REQUIRED) |
| 125 |
+ ki18n_install(po) |
| 126 |
+-- |
| 127 |
+2.16.3 |
| 128 |
+ |
| 129 |
|
| 130 |
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild |
| 131 |
new file mode 100644 |
| 132 |
index 00000000000..c0883592a57 |
| 133 |
--- /dev/null |
| 134 |
+++ b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild |
| 135 |
@@ -0,0 +1,36 @@ |
| 136 |
+# Copyright 1999-2018 Gentoo Foundation |
| 137 |
+# Distributed under the terms of the GNU General Public License v2 |
| 138 |
+ |
| 139 |
+EAPI=6 |
| 140 |
+ |
| 141 |
+KDE_HANDBOOK="forceoptional" |
| 142 |
+KDE_TEST="forceoptional" |
| 143 |
+inherit kde5 |
| 144 |
+ |
| 145 |
+DESCRIPTION="KDE image scanning application" |
| 146 |
+HOMEPAGE="https://www.kde.org/applications/graphics/skanlite" |
| 147 |
+SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz" |
| 148 |
+ |
| 149 |
+LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )" |
| 150 |
+KEYWORDS="~amd64 ~x86" |
| 151 |
+IUSE="" |
| 152 |
+ |
| 153 |
+DEPEND=" |
| 154 |
+ $(add_frameworks_dep kconfig) |
| 155 |
+ $(add_frameworks_dep kconfigwidgets) |
| 156 |
+ $(add_frameworks_dep kcoreaddons) |
| 157 |
+ $(add_frameworks_dep ki18n) |
| 158 |
+ $(add_frameworks_dep kio) |
| 159 |
+ $(add_frameworks_dep kjobwidgets) |
| 160 |
+ $(add_frameworks_dep kwidgetsaddons) |
| 161 |
+ $(add_frameworks_dep kxmlgui) |
| 162 |
+ $(add_kdeapps_dep libksane) |
| 163 |
+ $(add_qt_dep qtgui) |
| 164 |
+ $(add_qt_dep qtwidgets) |
| 165 |
+ media-libs/libpng:0= |
| 166 |
+" |
| 167 |
+RDEPEND="${DEPEND} |
| 168 |
+ !kde-misc/skanlite:4 |
| 169 |
+" |
| 170 |
+ |
| 171 |
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) |
Archives