diff options
Diffstat (limited to 'kde-apps/kruler')
| -rw-r--r-- | kde-apps/kruler/Manifest | 5 | ||||
| -rw-r--r-- | kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch | 45 | ||||
| -rw-r--r-- | kde-apps/kruler/kruler-19.08.2.ebuild | 40 | ||||
| -rw-r--r-- | kde-apps/kruler/kruler-19.08.3.ebuild | 45 |
4 files changed, 93 insertions, 42 deletions
diff --git a/kde-apps/kruler/Manifest b/kde-apps/kruler/Manifest index c0042d54308d..637e0f2fb1f2 100644 --- a/kde-apps/kruler/Manifest +++ b/kde-apps/kruler/Manifest @@ -1,5 +1,6 @@ +AUX kruler-19.08.3-qt-5.14.patch 1395 BLAKE2B e46ce5ca3e4540a8776e5df5ef478abfd6a12d22551d3180c7ee6efe29fb3036020ffb6d512d26651c92aa8b7f3667480903ad81d053c005fd4acf665b29f1d0 SHA512 bd88002f2f5d40861cb8b63bed31a1f541fd11c214c116b1b8a4ef2fa93fe997f8be672c5af5718ffcbd0222d449b898ddf64c3523accd186006cffc9a65d9f5 DIST kruler-19.04.3.tar.xz 249128 BLAKE2B edd73d76e299defb832631fb5052bdfb1a748d09d310ceb1b74fdfc91e1fe02b967cfb3773a4a26c817293bad9805d29a9d4775f1982288ecad7ae431905e0e4 SHA512 fc4d2b621f8e4aafb742848a3a58da77c3fa5a00ea91d347df588cb8f9da69a0c92028133e5f87243b2fa148318a47b213d392f8fe8da5a0ce876e4146502511 -DIST kruler-19.08.2.tar.xz 249424 BLAKE2B ac5854bcb2214aa69803b9f33134ab1b3399cad6997d9c09d3fc77682bdcf570f8bf0c4a3ece1fd1b69071b227b3829709db31e0413b55ec5ce2b59a5b93fab2 SHA512 88d45697d29a887b32a98a577fd438cdc2f73c23483522de3e3ee0ac9ee88977548ee423db827f94d69588ed929e54e1eee073f6a98045e7cabadd9323d740ab +DIST kruler-19.08.3.tar.xz 249500 BLAKE2B 49e857bee9076f6f4abde7c719b9c4e7a55d50d70d9beef76ad6e31826aed44c0f66accd5b4ea80afc9543459e27f793973d82930dd0f400ca507b69f9ed51a3 SHA512 25e146e941f6eaf04e4f93cffad0fae777345800f1b80127e39f3701660d4c0f2839d152a82c15b8e5ebe9351a41974e139223984fd6cd99f49b7de36789d139 EBUILD kruler-19.04.3.ebuild 843 BLAKE2B 868cedc5939f99946af58058f5406d4c1ce9a29c0b43d0dea91413835562ca8ad2a1572c1c67602f610fc89415006718ceb8913cb5ce92b02e3f1baf1ac925db SHA512 4a87985bce986263d821ae5c0b94f1e0152c18f420501d17d6213d8a7b1de6ab3f9c439405cd6f9018d86c70c605a37b08e696fe96e49e7b21146cd93cc967bb -EBUILD kruler-19.08.2.ebuild 846 BLAKE2B 78015830d149c0828b8642bf8f0be277161578ff8a2fd64441760ea68275bf574963d655b0c8da0cb192f1ddeafd63d8b957b805c753f7bf1e358c453b556d8a SHA512 580bb29a11e6eb7471466de0e5b3bd91ea75fb065cfd24626636239ccc9ab8b112c270d1c7a4341c49f143866acf1c22a41475b3d39facd930a15def9003b182 +EBUILD kruler-19.08.3.ebuild 999 BLAKE2B 8e1080aab6ef1b3f8dbd3dfcc2b70b16ea34cbe25c62889666f08a461497d61629e4a34dbd9fddc85992808bbf36b606368877414d7c9aec4682ea4beab3b26c SHA512 1910220dc29e97e447bf31346b41f1537e35428b8257f68bf1cbc3e1d45aa4f1d08070df50e94868d665a4c249a9ca57c53a4e0420c0c33e41dcb38d9dc1a448 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch b/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch new file mode 100644 index 000000000000..ae87b047507f --- /dev/null +++ b/kde-apps/kruler/files/kruler-19.08.3-qt-5.14.patch @@ -0,0 +1,45 @@ +From 90ebe8e37b8699ef26c10fb2928cf673cad04a06 Mon Sep 17 00:00:00 2001 +From: Laurent Montel <montel@kde.org> +Date: Wed, 18 Sep 2019 06:41:34 +0200 +Subject: Make it compiles without deprecated method + +--- + klineal.cpp | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/klineal.cpp b/klineal.cpp +index 8b5d3c3..0f9bc48 100644 +--- a/klineal.cpp ++++ b/klineal.cpp +@@ -705,7 +705,7 @@ void KLineal::mouseReleaseEvent( QMouseEvent *inEvent ) + + void KLineal::wheelEvent( QWheelEvent *e ) + { +- int numDegrees = e->delta() / 8; ++ int numDegrees = e->angleDelta().y() / 8; + int numSteps = numDegrees / 15; + + // changing offset +@@ -756,8 +756,7 @@ void KLineal::drawScale( QPainter &painter ) + } + + if ( digit % 100 == 0 && digit != 0 ) { +- QString units; +- units.sprintf( "%d", digit ); ++ QString units = QStringLiteral("%1").arg(digit); + drawScaleText( painter, x, units ); + } + +@@ -771,9 +770,8 @@ void KLineal::drawScale( QPainter &painter ) + int x = (int)( i * step ); + + if ( i % 10 == 0 && i != 0 && i != 100 ) { +- QString units; + int value = mLeftToRight ? i : ( 100 - i ); +- units.sprintf( "%d%%", value ); ++ const QString units = QString::asprintf( "%d%%", value ); + drawScaleText( painter, x, units ); + len = MEDIUM2_TICK_SIZE; + } else { +-- +cgit v1.1 diff --git a/kde-apps/kruler/kruler-19.08.2.ebuild b/kde-apps/kruler/kruler-19.08.2.ebuild deleted file mode 100644 index 7f4f3fbd4ca5..000000000000 --- a/kde-apps/kruler/kruler-19.08.2.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 - -KDE_HANDBOOK="forceoptional" -inherit kde5 - -DESCRIPTION="Screen ruler for Plasma" -HOMEPAGE="https://kde.org/applications/graphics/kruler/" - -LICENSE="GPL-2+ handbook? ( FDL-1.2 )" -KEYWORDS="~amd64 ~arm64 ~x86" -IUSE="X" - -DEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtgui) - $(add_qt_dep qtwidgets) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libxcb - ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} diff --git a/kde-apps/kruler/kruler-19.08.3.ebuild b/kde-apps/kruler/kruler-19.08.3.ebuild new file mode 100644 index 000000000000..ae9cd336b7d1 --- /dev/null +++ b/kde-apps/kruler/kruler-19.08.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +KFMIN=5.60.0 +QTMIN=5.12.3 +inherit ecm kde.org + +DESCRIPTION="Screen ruler for Plasma" +HOMEPAGE="https://kde.org/applications/graphics/kruler/" + +LICENSE="GPL-2+ handbook? ( FDL-1.2 )" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="X" + +DEPEND=" + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libxcb + ) +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}"/${P}-qt-5.14.patch ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package X X11) + ) + + ecm_src_configure +} |