diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-12-13 02:01:50 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-12-13 02:01:50 +0000 |
| commit | 2a3e0d61b3d88306b6fae46756f9ba7d230222ae (patch) | |
| tree | a0d3259dd259861a49a2d3e6e9220beaa8ec39c2 /kde-misc/kdiff3 | |
| parent | 39c32f4d5dca9f6293fccb69e9d50baf494c8de4 (diff) | |
gentoo auto-resync : 13:12:2024 - 02:01:50
Diffstat (limited to 'kde-misc/kdiff3')
| -rw-r--r-- | kde-misc/kdiff3/Manifest | 5 | ||||
| -rw-r--r-- | kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch | 27 | ||||
| -rw-r--r-- | kde-misc/kdiff3/kdiff3-1.12.0.ebuild (renamed from kde-misc/kdiff3/kdiff3-1.11.4.ebuild) | 18 |
3 files changed, 37 insertions, 13 deletions
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest index 1c16da754746..1425c1124d71 100644 --- a/kde-misc/kdiff3/Manifest +++ b/kde-misc/kdiff3/Manifest @@ -1,5 +1,6 @@ -DIST kdiff3-1.11.4.tar.xz 1142276 BLAKE2B c3c15b454a403613f84b24fff9c6ba06be54c7225232d6ea430641a492625b500b8dd735c06d2dd9ff30d64e3268fd74e98953731804079169dcc5ee609ac483 SHA512 3e3d7d93bb86ce5cd644f1e22209679ed3f83037a6f465d6a4f7b652e229da28b8f738a7239f60168c2d95c7f2c465bfdf9d716532d6048b4c0721ac458fddc5 +AUX kdiff3-1.12.0-bogus-dep.patch 647 BLAKE2B 0c67980098d410373e3f1ccc852d750715a147db00b3ed59c2b23e850afa386043893fa7d48e5753ee161e7d988f546d65c0760fb47e1d5295f2e503502254f9 SHA512 30eab52039b0c0791cbc4d65de03f453b6914bc2ee62e1d113547e97ae31ecc7a6e3984da34230e05b84012781183304c3e3ee41ad5042c8ef1ff69525c2122d DIST kdiff3-1.11.5.tar.xz 1142840 BLAKE2B 9504049ecf82ddf020d40e2945c2d132149c4a082834523c8e6b44dbd787c37b0addf7ab920dcec80acbfffcfced3c6ebff0bd2476145b1b36622590814ec166 SHA512 1779209a8094d313fd57df08c873c690df9e17034dc6de09c4cde0921df3ec205ef483554843ed0235b6f2c5264db66049fdf9a422b627c949c4fc1f65fb19d3 -EBUILD kdiff3-1.11.4.ebuild 1103 BLAKE2B 15b9d2df96b3388e63e29bc0996c77fc9a14767ed0fbeed9d28b466c3174fd148e1597483ec77192353f66462729ca541b8e1d3c8e1a33b22605039f885c6605 SHA512 7ea68edc898051e600ce8db18a76c607debbc31e388e4d612a972743847bd9651b93511c53128eb1fe365d8bd30d520a42994f1b251bbce16d5188944f2724be +DIST kdiff3-1.12.0.tar.xz 1204256 BLAKE2B c320acc411fa6dd470657cec63d1c04611a78bcab3bd1501339cde11798098b0d5369eb10e8357677547ce27ded5fe4171b741c7413c4f53b6c5e9cd9301bd46 SHA512 d409f3be076ee2a4a736c201fe7b509304b29a843490b6e60b5f2e221dc34c5d78ba717e08c4ce053f9af28c6750c600658a84853e0ed5591161320e3bcef631 EBUILD kdiff3-1.11.5.ebuild 1103 BLAKE2B 15b9d2df96b3388e63e29bc0996c77fc9a14767ed0fbeed9d28b466c3174fd148e1597483ec77192353f66462729ca541b8e1d3c8e1a33b22605039f885c6605 SHA512 7ea68edc898051e600ce8db18a76c607debbc31e388e4d612a972743847bd9651b93511c53128eb1fe365d8bd30d520a42994f1b251bbce16d5188944f2724be +EBUILD kdiff3-1.12.0.ebuild 1057 BLAKE2B a26b080bc818ba4767e922244adce2feeb22f139db031f7be13d238aaf6129d9a8ce8a2392758bea7dbe4d573c4523da1e2abf2dcec099ae159331fef6668573 SHA512 57b1bd683113f0a8bdd6123e60114e0ea9c1a2d64cf875b7d2eae526354a557fd5de83465eefd262a3846f83e4b272428372e575dfa8a78b24e5adeb52f3e67d MISC metadata.xml 485 BLAKE2B fe3046c156af8000d379a96799587d89307e2664be0698ba9b847483f42031994707d16187740d9528a1d5ab26276802ae44218b820f949a35f3caef58223210 SHA512 f8c55957fdd76bf1019a3f543705bb4118deea1673d2fd1dab94528869f4ae65d34f81493f59bd4de40b02a64f9cacd054d7e576167fd8d18346b06e4bda5065 diff --git a/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch b/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch new file mode 100644 index 000000000000..982a0677a48a --- /dev/null +++ b/kde-misc/kdiff3/files/kdiff3-1.12.0-bogus-dep.patch @@ -0,0 +1,27 @@ +From b187d9235e466d5fc876dc513da2ed16c8bd7611 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Thu, 12 Dec 2024 01:46:44 +0100 +Subject: [PATCH] Drop unused Qt6Core5Compat + +Amends https://invent.kde.org/sdk/kdiff3/-/commit/342924de5000a2821736f2c4cd58f92c6ad9c159 + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 56f68e1a..4e61a6cb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -77,7 +77,6 @@ find_package( + Gui + Widgets + PrintSupport +- Core5Compat + ) + + find_package( +-- +GitLab + diff --git a/kde-misc/kdiff3/kdiff3-1.11.4.ebuild b/kde-misc/kdiff3/kdiff3-1.12.0.ebuild index 94dcccd38bf8..2974e51dbd71 100644 --- a/kde-misc/kdiff3/kdiff3-1.11.4.ebuild +++ b/kde-misc/kdiff3/kdiff3-1.12.0.ebuild @@ -4,8 +4,8 @@ EAPI=8 ECM_HANDBOOK="optional" -KFMIN=6.3.0 -QTMIN=6.6.2 +KFMIN=6.6.0 +QTMIN=6.7.2 inherit ecm kde.org DESCRIPTION="Frontend to diff3 based on KDE Frameworks" @@ -14,11 +14,11 @@ SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" IUSE="" COMMON_DEPEND=" - >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-libs/icu-70.0:= >=dev-qt/qtbase-${QTMIN}:6[gui,widgets] >=kde-frameworks/kconfig-${KFMIN}:6 >=kde-frameworks/kconfigwidgets-${KFMIN}:6 @@ -38,10 +38,6 @@ RDEPEND="${COMMON_DEPEND} sys-apps/diffutils " -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=ON - # TODO: -DENABLE_GDBINDEX? - ) - ecm_src_configure -} +PATCHES=( "${FILESDIR}/${P}-bogus-dep.patch" ) + +# TODO: -DENABLE_GDBINDEX? |