From 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 14 Dec 2020 13:26:14 +0000 Subject: gentoo resync : 14.12.2020 --- kde-apps/kompare/Manifest | 5 ++- .../kompare/files/kompare-20.08.3-qt-5.15.2.patch | 44 ++++++++++++++++++++++ kde-apps/kompare/kompare-20.08.3.ebuild | 2 + kde-apps/kompare/kompare-20.12.0.ebuild | 40 ++++++++++++++++++++ 4 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch create mode 100644 kde-apps/kompare/kompare-20.12.0.ebuild (limited to 'kde-apps/kompare') diff --git a/kde-apps/kompare/Manifest b/kde-apps/kompare/Manifest index 356f502935d5..96ebed25755e 100644 --- a/kde-apps/kompare/Manifest +++ b/kde-apps/kompare/Manifest @@ -1,3 +1,6 @@ +AUX kompare-20.08.3-qt-5.15.2.patch 1479 BLAKE2B 1389a0c1b4639941708cc3adf7960d3bc571cb1b19766e52de90f04a4eb7a3657987f635a4679bb68b4b831965a07d8100dd3eb6b137eeb9388c07a97c490bde SHA512 6205ca6c89690f0b28d37146d9604ae55e6664bcfd8b2305c4f0df260bbcde5a541e130014e049148ae86cd035e8eaea1b90cbf04f2cb3299e76309c00b5f764 DIST kompare-20.08.3.tar.xz 924032 BLAKE2B 65940af6a4ef81ff0cdbf5b2e8ffc7b7ddf4b1baf71c5f6e7c7d55409085cfa7820e8b742f8d6b520cdae4c08585a4ff77bb3fbfa97710d729ad2f9f5c3492ef SHA512 0cb169296924e4dad2967052472fd7095092478819ba0925d82482f0e279719b2e29e75db9e732602cd845261918025ae9cf0e024c8ad0a250c04abe022deb4b -EBUILD kompare-20.08.3.ebuild 1101 BLAKE2B 6ce2e725aaca44e2655127c52ad201608f1e3075ab9424ed5a8eec0f36d2981a7b240e7bff08ba07f988299696722946c4002dbd8d94d1f535fce456f5fce7b7 SHA512 93ff5016dd539105530ffdf703f5f8c09ee10c4a81c952d81a4d106d1baa8279541648be456ce22cd6942631567188552f633939d35a2a722892861af7dc0dda +DIST kompare-20.12.0.tar.xz 921984 BLAKE2B a0266c331cdacba1f673f810d3492e47378b00be43f6038ebcc285265cf77d67bbacb8e6861516da463835578c0f497fdd16a50b4400158c8a309c8ea0d2b7ee SHA512 68affc37914152a1ec44077c20c11b254dc48a734a02df15eaa530f1757fc53a86a420fd71d9bea8d155fdf967d1da93ddc3854b5a27a06e1ebe6e55c4677c96 +EBUILD kompare-20.08.3.ebuild 1149 BLAKE2B ec389ff787c6b6fb7c196e535f7652f813b7c0734c80dd37ca5ceedf8a2eb8c38916c3da0c221b48305792ecddba3f7d1e3370bd73cbf1f4258179a1efc920a1 SHA512 ea8219929bfdbd30cc627fa990c4c85fe18ff4d2299924e1aae64bc67ba57037d087f55979064cc3bd14b6fda27db2ffb8ef323f1e720da9585ca217a0939e14 +EBUILD kompare-20.12.0.ebuild 1104 BLAKE2B d53b215835a49406727ff698069c1e227fd825992637effd9aad4ec0c96c6252ad775bcd7a5e204358b1821f68db412f18854f71d15827b9cfb633ae9b9b9568 SHA512 c6a3e29a4f56a322732a9ce6defa802091daa12321c28049d39a5784d657e0c244e1a63089620bd498d4002228e5ca612a8381c734e808238055b9fa5fa9d783 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch b/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch new file mode 100644 index 000000000000..c29f957d70d8 --- /dev/null +++ b/kde-apps/kompare/files/kompare-20.08.3-qt-5.15.2.patch @@ -0,0 +1,44 @@ +From 68d3eee36c48a2f44ccfd3f9e5a36311b829104b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= +Date: Thu, 17 Sep 2020 22:12:57 +0300 +Subject: [PATCH] Portaway from Obsolete methods of QPrinter + +setOrientation -> setPageOrientation +QPrinter::Landscape -> QPageLayout::Landscape +--- + komparepart/kompare_part.cpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/komparepart/kompare_part.cpp b/komparepart/kompare_part.cpp +index 42d3120..88346d6 100644 +--- a/komparepart/kompare_part.cpp ++++ b/komparepart/kompare_part.cpp +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -610,7 +611,7 @@ void KomparePart::saveDiff() + void KomparePart::slotFilePrint() + { + QPrinter printer; +- printer.setOrientation(QPrinter::Landscape); ++ printer.setPageOrientation(QPageLayout::Landscape); + QPrintDialog* dlg = new QPrintDialog(&printer, nullptr); + + if (dlg->exec() == QDialog::Accepted) +@@ -625,7 +626,7 @@ void KomparePart::slotFilePrint() + void KomparePart::slotFilePrintPreview() + { + QPrinter printer; +- printer.setOrientation(QPrinter::Landscape); ++ printer.setPageOrientation(QPageLayout::Landscape); + QPrintPreviewDialog dlg(&printer); + + connect(&dlg, &QPrintPreviewDialog::paintRequested, this, &KomparePart::slotPaintRequested); +-- +GitLab + diff --git a/kde-apps/kompare/kompare-20.08.3.ebuild b/kde-apps/kompare/kompare-20.08.3.ebuild index 528c7be9361e..bd56709d12e2 100644 --- a/kde-apps/kompare/kompare-20.08.3.ebuild +++ b/kde-apps/kompare/kompare-20.08.3.ebuild @@ -38,3 +38,5 @@ DEPEND=" >=kde-frameworks/kxmlgui-${KFMIN}:5 " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-qt-5.15.2.patch" ) diff --git a/kde-apps/kompare/kompare-20.12.0.ebuild b/kde-apps/kompare/kompare-20.12.0.ebuild new file mode 100644 index 000000000000..5e64ff7d1d87 --- /dev/null +++ b/kde-apps/kompare/kompare-20.12.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +PVCUT=$(ver_cut 1-3) +KFMIN=5.75.0 +QTMIN=5.15.1 +inherit ecm kde.org + +DESCRIPTION="A program to view the differences between files" +HOMEPAGE="https://apps.kde.org/en/kompare" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +DEPEND=" + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtprintsupport-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-apps/libkomparediff2-${PVCUT}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kcodecs-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kiconthemes-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/kparts-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktexteditor-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 +" +RDEPEND="${DEPEND}" -- cgit v1.2.3