* [gentoo-commits] repo/gentoo:master commit in: kde-misc/skanlite/, kde-misc/skanlite/files/
@ 2018-04-01 17:34 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-04-01 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 127dd59ae62037ba8e151fef043a41cef32621a4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 1 12:35:48 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 1 17:34:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=127dd59a
kde-misc/skanlite: 2.1.0 version bump
Package-Manager: Portage-2.3.27, Repoman-2.3.9
kde-misc/skanlite/Manifest | 1 +
kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch | 100 +++++++++++++++++++++
kde-misc/skanlite/skanlite-2.1.0.ebuild | 36 ++++++++
3 files changed, 137 insertions(+)
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index a4cb090a97c..8ce37d19c56 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1 +1,2 @@
DIST skanlite-2.0.1.tar.xz 2139624 BLAKE2B f6959650e6e59899e24f20214b2e94b0f4c004982e2ff961384c4a07e13305c6f839f679759db088c16ab879b499eb700edb5f7d8d65056ddd155c3a55f5365b SHA512 2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e
+DIST skanlite-2.1.0.tar.xz 1121468 BLAKE2B 8fd9bc7018e812203023a7e2906eb724e01baca70dbcccc08633f49e08de687738390a87d5c27526c084601d76f3cf272998818ad102d3dcd47518fab2fa47f6 SHA512 b346998f37def6b99c2feba7b323dbcb299c2bb0553598f83a30f8e7a04af1deaf60e7f5c70c4b663e0aecf95e7ee03252a15ef61745e6bc7d1c5a9d617aec00
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch b/kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch
new file mode 100644
index 00000000000..fe5600c8c9a
--- /dev/null
+++ b/kde-misc/skanlite/files/skanlite-2.1.0-cmake.patch
@@ -0,0 +1,100 @@
+From ac188879ebf7cab5631213305f289bec4ab25613 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 1 Apr 2018 13:36:48 +0200
+Subject: [PATCH 1/2] Cleanup CMakeLists.txt
+
+Cleanup duplicate find Qt5 and move all below #Dependencies block.
+Sort dependencies.
+KF5Sane is not an actual framework, so separate it from KF5 modules.
+---
+ CMakeLists.txt | 30 +++++++++++++-----------------
+ 1 file changed, 13 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d05fb37..6aacfb9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
+ include(GenerateExportHeader)
+
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
+-
+ # be not so strict with the poor developer who just wants to use strings
+ remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
+
+-set(KF5_VERSION "5.1.0")
++set(REQUIRED_QT_VERSION "5.2.0")
++set(KF5_MIN_VERSION "5.1.0")
+
+ ecm_setup_version(
+- ${KF5_VERSION}
++ ${KF5_MIN_VERSION}
+ VARIABLE_PREFIX SKANLITE
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
+ )
+
++set(SKANLITE_VERSION_STRING "2.1.0")
++
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
++
+ # Dependencies
+-set(REQUIRED_QT_VERSION "5.2.0")
++find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
+
+-# Required Qt5 components to build this framework
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
+ find_package(PNG REQUIRED)
+-
+ include_directories(${PNG_INCLUDE_DIRS})
+
+-set(SKANLITE_VERSION_STRING "2.1.0")
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
+-
+-find_package(KF5 ${KF5_VERSION} REQUIRED
+- COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ CoreAddons # KAboutData
++ DocTools # yields kdoctools_create_handbook
+ I18n
+- XmlGui # KAboutApplicationDialog
+ KIO # contains the KIOWidgets which we use in target_link_libraries
+- DocTools # yields kdoctools_create_handbook
+- Sane # will find KF5Sane
++ XmlGui # KAboutApplicationDialog
+ )
+
++find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
++
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+
+ # Subdirectories
+--
+2.16.3
+
+
+From 8bcc7e4fb701d2e95b8024df86830b9eeb6c97de Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 1 Apr 2018 13:50:34 +0200
+Subject: [PATCH 2/2] Make use of FeatureSummary
+
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6aacfb9..1736bff 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,3 +58,5 @@ add_subdirectory(src)
+ add_subdirectory(doc)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
++
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+--
+2.16.3
+
diff --git a/kde-misc/skanlite/skanlite-2.1.0.ebuild b/kde-misc/skanlite/skanlite-2.1.0.ebuild
new file mode 100644
index 00000000000..c0883592a57
--- /dev/null
+++ b/kde-misc/skanlite/skanlite-2.1.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE image scanning application"
+HOMEPAGE="https://www.kde.org/applications/graphics/skanlite"
+SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep libksane)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ media-libs/libpng:0=
+"
+RDEPEND="${DEPEND}
+ !kde-misc/skanlite:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/skanlite/, kde-misc/skanlite/files/
@ 2018-04-02 20:26 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-04-02 20:26 UTC (permalink / raw
To: gentoo-commits
commit: 75a167ae1971db9087e46b165ef7ba196b34413e
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 19:36:27 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 2 20:26:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75a167ae
kde-misc/skanlite: 2.1.0.1 version bump
Package-Manager: Portage-2.3.28, Repoman-2.3.9
kde-misc/skanlite/Manifest | 1 +
.../skanlite/files/skanlite-2.1.0.1-cmake.patch | 97 ++++++++++++++++++++++
kde-misc/skanlite/skanlite-2.1.0.1.ebuild | 36 ++++++++
3 files changed, 134 insertions(+)
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 8ce37d19c56..5c50cf0bea3 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,2 +1,3 @@
DIST skanlite-2.0.1.tar.xz 2139624 BLAKE2B f6959650e6e59899e24f20214b2e94b0f4c004982e2ff961384c4a07e13305c6f839f679759db088c16ab879b499eb700edb5f7d8d65056ddd155c3a55f5365b SHA512 2dc29f3aeca32a7afb515ae9349fab7ef635de731718b53ceaf532cbd3860fbb07bd936fd2988b6dddb74109775e22752ffd05a0a3d0218b9c8ae393af52b14e
+DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
DIST skanlite-2.1.0.tar.xz 1121468 BLAKE2B 8fd9bc7018e812203023a7e2906eb724e01baca70dbcccc08633f49e08de687738390a87d5c27526c084601d76f3cf272998818ad102d3dcd47518fab2fa47f6 SHA512 b346998f37def6b99c2feba7b323dbcb299c2bb0553598f83a30f8e7a04af1deaf60e7f5c70c4b663e0aecf95e7ee03252a15ef61745e6bc7d1c5a9d617aec00
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
new file mode 100644
index 00000000000..7b7daae11ea
--- /dev/null
+++ b/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
@@ -0,0 +1,97 @@
+From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Mon, 2 Apr 2018 21:27:52 +0200
+Subject: [PATCH] Cleanup CMakeLists.txt
+
+Summary:
+Cleanup duplicate find Qt5 and move all below #Dependencies block.
+Sort dependencies.
+KF5Sane is not an actual framework, so separate it from KF5 modules.
+
+Make use of FeatureSummary
+
+Reviewers: sars
+
+Reviewed By: sars
+
+Subscribers: ltoscano
+
+Differential Revision: https://phabricator.kde.org/D11861
+---
+ CMakeLists.txt | 32 +++++++++++++++-----------------
+ 1 file changed, 15 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2c23351..6b326df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+ include(KDECMakeSettings)
+ include(GenerateExportHeader)
+
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
+-
+ # be not so strict with the poor developer who just wants to use strings
+ remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+ remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
+
+-set(KF5_VERSION "5.1.0")
++set(REQUIRED_QT_VERSION "5.2.0")
++set(KF5_MIN_VERSION "5.1.0")
+
+ ecm_setup_version(
+- ${KF5_VERSION}
++ ${KF5_MIN_VERSION}
+ VARIABLE_PREFIX SKANLITE
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
+ )
+
++set(SKANLITE_VERSION_STRING "2.1.0.1")
++
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
++
+ # Dependencies
+-set(REQUIRED_QT_VERSION "5.2.0")
++find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
+
+-# Required Qt5 components to build this framework
+-find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
+ find_package(PNG REQUIRED)
+-
+ include_directories(${PNG_INCLUDE_DIRS})
+
+-set(SKANLITE_VERSION_STRING "2.1.0.1")
+-
+-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
+-
+-find_package(KF5 ${KF5_VERSION} REQUIRED
+- COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
++find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
+ CoreAddons # KAboutData
++ DocTools # yields kdoctools_create_handbook
+ I18n
+- XmlGui # KAboutApplicationDialog
+ KIO # contains the KIOWidgets which we use in target_link_libraries
+- DocTools # yields kdoctools_create_handbook
+- Sane # will find KF5Sane
++ XmlGui # KAboutApplicationDialog
+ )
+
++find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
++
+ add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+
+ # Subdirectories
+@@ -62,6 +58,8 @@ add_subdirectory(src)
+ add_subdirectory(doc)
+ add_subdirectory(autotests)
+ add_subdirectory(tests)
++
++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
+ find_package(KF5I18n CONFIG REQUIRED)
+ ki18n_install(po)
+--
+2.16.3
+
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
new file mode 100644
index 00000000000..c0883592a57
--- /dev/null
+++ b/kde-misc/skanlite/skanlite-2.1.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE image scanning application"
+HOMEPAGE="https://www.kde.org/applications/graphics/skanlite"
+SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep libksane)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ media-libs/libpng:0=
+"
+RDEPEND="${DEPEND}
+ !kde-misc/skanlite:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/skanlite/, kde-misc/skanlite/files/
@ 2019-07-15 20:52 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2019-07-15 20:52 UTC (permalink / raw
To: gentoo-commits
commit: bdf9052b496d97f1e0d6f882dfa7fcf160397d70
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 19:49:34 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 20:51:57 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf9052b
kde-misc/skanlite: EAPI-7 bump, HiDPI fix
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../skanlite/files/skanlite-2.1.0.1-hidpi.patch | 67 ++++++++++++++++++++++
kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild | 37 ++++++++++++
2 files changed, 104 insertions(+)
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
new file mode 100644
index 00000000000..563f5950063
--- /dev/null
+++ b/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
@@ -0,0 +1,67 @@
+From cb382f87d63bdc3736696ee289875bde2ecee9e5 Mon Sep 17 00:00:00 2001
+From: Alexander Volkov <a.volkov@rusbitech.ru>
+Date: Thu, 25 Apr 2019 18:09:59 +0300
+Subject: Add HiDPI support
+
+Reviewers: sars, davidedmundson, ngraham
+
+Reviewed By: sars
+
+Differential Revision: https://phabricator.kde.org/D20821
+---
+ src/ImageViewer.cpp | 14 +++++++++++---
+ src/main.cpp | 1 +
+ 2 files changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp
+index 09f9b3d..5cf1439 100644
+--- a/src/ImageViewer.cpp
++++ b/src/ImageViewer.cpp
+@@ -87,14 +87,19 @@ void ImageViewer::setQImage(QImage *img)
+ }
+
+ d->img = img;
+- d->scene->setSceneRect(0, 0, img->width(), img->height());
++ const auto dpr = devicePixelRatioF();
++ d->img->setDevicePixelRatio(dpr);
++ d->scene->setSceneRect(0, 0, img->width() / dpr, img->height() / dpr);
+ }
+
+ // ------------------------------------------------------------------------
+ void ImageViewer::drawBackground(QPainter *painter, const QRectF &rect)
+ {
+ painter->fillRect(rect, QColor(0x70, 0x70, 0x70));
+- painter->drawImage(rect, *d->img, rect);
++ QRectF r = rect & sceneRect();
++ const auto dpr = d->img->devicePixelRatio();
++ QRectF srcRect = QRectF(r.topLeft() * dpr, r.size() * dpr);
++ painter->drawImage(r, *d->img, srcRect);
+ }
+
+ // ------------------------------------------------------------------------
+@@ -118,7 +123,10 @@ void ImageViewer::zoomActualSize()
+ // ------------------------------------------------------------------------
+ void ImageViewer::zoom2Fit()
+ {
+- fitInView(d->img->rect(), Qt::KeepAspectRatio);
++ QRectF r = d->img->rect();
++ const auto dpr = d->img->devicePixelRatio();
++ r = QRectF(r.topLeft() / dpr, r.size() / dpr);
++ fitInView(r, Qt::KeepAspectRatio);
+ }
+
+ // ------------------------------------------------------------------------
+diff --git a/src/main.cpp b/src/main.cpp
+index aa704be..ae0d9b6 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -34,6 +34,7 @@
+
+ int main(int argc, char *argv[])
+ {
++ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
+ QApplication app(argc, argv);
+
+ Kdelibs4ConfigMigrator migrate(QLatin1String("Skanlite"));
+--
+cgit v1.1
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
new file mode 100644
index 00000000000..dec84c60dfe
--- /dev/null
+++ b/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="KDE image scanning application"
+HOMEPAGE="https://kde.org/applications/graphics/skanlite"
+SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
+
+LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kconfigwidgets)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kjobwidgets)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ $(add_kdeapps_dep libksane)
+ $(add_qt_dep qtgui)
+ $(add_qt_dep qtwidgets)
+ media-libs/libpng:0=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-hidpi.patch"
+)
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/skanlite/, kde-misc/skanlite/files/
@ 2020-08-01 7:36 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-08-01 7:36 UTC (permalink / raw
To: gentoo-commits
commit: 3d680c6ca69cc2acd7a4578c64087d6a93372ee9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 19:59:49 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 1 07:36:43 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d680c6c
kde-misc/skanlite: Drop 2.1.0.1-r1
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-misc/skanlite/Manifest | 1 -
.../skanlite/files/skanlite-2.1.0.1-cmake.patch | 97 ----------------------
.../skanlite/files/skanlite-2.1.0.1-hidpi.patch | 67 ---------------
kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild | 40 ---------
4 files changed, 205 deletions(-)
diff --git a/kde-misc/skanlite/Manifest b/kde-misc/skanlite/Manifest
index 5a47c9ad8d2..19b40567aff 100644
--- a/kde-misc/skanlite/Manifest
+++ b/kde-misc/skanlite/Manifest
@@ -1,2 +1 @@
-DIST skanlite-2.1.0.1.tar.xz 2151312 BLAKE2B c03ace256fd4159e36c7eb871f4f88a11142e36e427120560a09a0d0516f91450d350d4ae5db2004da6493d3a2a0aaaf5d45b4a688f3943cf92b76a71fb5f937 SHA512 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658
DIST skanlite-2.2.0.tar.xz 2415104 BLAKE2B 4ae5d909cdfdf55a552c11346ac689190aa67fd960e2af98ccc02cbf834ec6668e2926a5ab8a07ff6c4a4ef375dc1979250686c5ba05f1a94be4c59026f44f1a SHA512 cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20
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
deleted file mode 100644
index 7b7daae11ea..00000000000
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-cmake.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 7c155671b5ea1a7ed1244510e79e094fc6f8ff4e Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 2 Apr 2018 21:27:52 +0200
-Subject: [PATCH] Cleanup CMakeLists.txt
-
-Summary:
-Cleanup duplicate find Qt5 and move all below #Dependencies block.
-Sort dependencies.
-KF5Sane is not an actual framework, so separate it from KF5 modules.
-
-Make use of FeatureSummary
-
-Reviewers: sars
-
-Reviewed By: sars
-
-Subscribers: ltoscano
-
-Differential Revision: https://phabricator.kde.org/D11861
----
- CMakeLists.txt | 32 +++++++++++++++-----------------
- 1 file changed, 15 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2c23351..6b326df 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -17,44 +17,40 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
- include(KDECMakeSettings)
- include(GenerateExportHeader)
-
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
--
- # be not so strict with the poor developer who just wants to use strings
- remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
- remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
-
--set(KF5_VERSION "5.1.0")
-+set(REQUIRED_QT_VERSION "5.2.0")
-+set(KF5_MIN_VERSION "5.1.0")
-
- ecm_setup_version(
-- ${KF5_VERSION}
-+ ${KF5_MIN_VERSION}
- VARIABLE_PREFIX SKANLITE
- VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/skanlite_version.h"
- PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/src/version.h.cmake"
- )
-
-+set(SKANLITE_VERSION_STRING "2.1.0.1")
-+
-+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
-+
- # Dependencies
--set(REQUIRED_QT_VERSION "5.2.0")
-+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core Widgets)
-
--# Required Qt5 components to build this framework
--find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED Core)
- find_package(PNG REQUIRED)
--
- include_directories(${PNG_INCLUDE_DIRS})
-
--set(SKANLITE_VERSION_STRING "2.1.0.1")
--
--configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/version.h)
--
--find_package(KF5 ${KF5_VERSION} REQUIRED
-- COMPONENTS # alias to find_package(KFGuiAddons ${KF5_VERSION} REQUIRED)
-+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
- CoreAddons # KAboutData
-+ DocTools # yields kdoctools_create_handbook
- I18n
-- XmlGui # KAboutApplicationDialog
- KIO # contains the KIOWidgets which we use in target_link_libraries
-- DocTools # yields kdoctools_create_handbook
-- Sane # will find KF5Sane
-+ XmlGui # KAboutApplicationDialog
- )
-
-+find_package(KF5Sane ${KF5_MIN_VERSION} REQUIRED)
-+
- add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-
- # Subdirectories
-@@ -62,6 +58,8 @@ add_subdirectory(src)
- add_subdirectory(doc)
- add_subdirectory(autotests)
- add_subdirectory(tests)
-+
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-
- find_package(KF5I18n CONFIG REQUIRED)
- ki18n_install(po)
---
-2.16.3
-
diff --git a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch b/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
deleted file mode 100644
index 563f5950063..00000000000
--- a/kde-misc/skanlite/files/skanlite-2.1.0.1-hidpi.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From cb382f87d63bdc3736696ee289875bde2ecee9e5 Mon Sep 17 00:00:00 2001
-From: Alexander Volkov <a.volkov@rusbitech.ru>
-Date: Thu, 25 Apr 2019 18:09:59 +0300
-Subject: Add HiDPI support
-
-Reviewers: sars, davidedmundson, ngraham
-
-Reviewed By: sars
-
-Differential Revision: https://phabricator.kde.org/D20821
----
- src/ImageViewer.cpp | 14 +++++++++++---
- src/main.cpp | 1 +
- 2 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/ImageViewer.cpp b/src/ImageViewer.cpp
-index 09f9b3d..5cf1439 100644
---- a/src/ImageViewer.cpp
-+++ b/src/ImageViewer.cpp
-@@ -87,14 +87,19 @@ void ImageViewer::setQImage(QImage *img)
- }
-
- d->img = img;
-- d->scene->setSceneRect(0, 0, img->width(), img->height());
-+ const auto dpr = devicePixelRatioF();
-+ d->img->setDevicePixelRatio(dpr);
-+ d->scene->setSceneRect(0, 0, img->width() / dpr, img->height() / dpr);
- }
-
- // ------------------------------------------------------------------------
- void ImageViewer::drawBackground(QPainter *painter, const QRectF &rect)
- {
- painter->fillRect(rect, QColor(0x70, 0x70, 0x70));
-- painter->drawImage(rect, *d->img, rect);
-+ QRectF r = rect & sceneRect();
-+ const auto dpr = d->img->devicePixelRatio();
-+ QRectF srcRect = QRectF(r.topLeft() * dpr, r.size() * dpr);
-+ painter->drawImage(r, *d->img, srcRect);
- }
-
- // ------------------------------------------------------------------------
-@@ -118,7 +123,10 @@ void ImageViewer::zoomActualSize()
- // ------------------------------------------------------------------------
- void ImageViewer::zoom2Fit()
- {
-- fitInView(d->img->rect(), Qt::KeepAspectRatio);
-+ QRectF r = d->img->rect();
-+ const auto dpr = d->img->devicePixelRatio();
-+ r = QRectF(r.topLeft() / dpr, r.size() / dpr);
-+ fitInView(r, Qt::KeepAspectRatio);
- }
-
- // ------------------------------------------------------------------------
-diff --git a/src/main.cpp b/src/main.cpp
-index aa704be..ae0d9b6 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -34,6 +34,7 @@
-
- int main(int argc, char *argv[])
- {
-+ QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps);
- QApplication app(argc, argv);
-
- Kdelibs4ConfigMigrator migrate(QLatin1String("Skanlite"));
---
-cgit v1.1
diff --git a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild b/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
deleted file mode 100644
index 1a7a7c968a1..00000000000
--- a/kde-misc/skanlite/skanlite-2.1.0.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="forceoptional"
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Simple image scanning application based on libksane and KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.skanlite"
-SRC_URI="mirror://kde/stable/${PN}/2.1/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )"
-SLOT="5"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-apps/libksane-19.04.0:5
- >=kde-frameworks/kconfig-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kjobwidgets-${KFMIN}:5
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
- media-libs/libpng:0=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-hidpi.patch"
-)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-01 7:37 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-01 17:34 [gentoo-commits] repo/gentoo:master commit in: kde-misc/skanlite/, kde-misc/skanlite/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-04-02 20:26 Andreas Sturmlechner
2019-07-15 20:52 Andreas Sturmlechner
2020-08-01 7:36 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox