commit 6abe98d1dc5b95715a6c0e85f54305eface502d1 Author: Ed Maste Date: Mon Jun 14 14:02:33 2021 -0400 Downgrade textproc/kdiff3 to 1.8.5 kdiff3 1.9.0 and later produces corrupt output under certain conditions. Revert recent update commits and go back to 1.8.5. Set PORTEPOCH=1 as the version number is now lower. An upstream bug report is at https://bugs.kde.org/show_bug.cgi?id=437570. Revert "textproc/kdiff3: update to 1.9.2, latest upstream" This reverts commit 9b7974eba9eb509edac6fd2d2efca929ca797f39. Revert "textproc/kdiff3: update 1.9.1, latest upstream" This reverts commit f2bc66138d2c1027c5b77d9574d003008b10d0f5. Revert "textproc/kdiff3: update to 1.9.0" This reverts commit 5a4f78e2d1c2f55cc5c75e84d791a57eedd1417c. PR: 256606 Approved by: tcberner Sponsored by: The FreeBSD Foundation diff --git a/textproc/kdiff3/Makefile b/textproc/kdiff3/Makefile index 68a2f869c05d..221faf5b5dd6 100644 --- a/textproc/kdiff3/Makefile +++ b/textproc/kdiff3/Makefile @@ -1,5 +1,6 @@ PORTNAME= kdiff3 -DISTVERSION= 1.9.2 +DISTVERSION= 1.8.5 +PORTEPOCH= 1 CATEGORIES= textproc kde MASTER_SITES= KDE/stable/${PORTNAME} diff --git a/textproc/kdiff3/distinfo b/textproc/kdiff3/distinfo index 5ae5dc3e8ac5..547d9829f552 100644 --- a/textproc/kdiff3/distinfo +++ b/textproc/kdiff3/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1621514687 -SHA256 (kdiff3-1.9.2.tar.xz) = f1775f1ca501080363707b2923d493fc314ae4f0b00b172d4cad9b4d3cc2d805 -SIZE (kdiff3-1.9.2.tar.xz) = 1053404 +TIMESTAMP = 1611260106 +SHA256 (kdiff3-1.8.5.tar.xz) = bc92f7d04eb123f9c56dbe3047af67bf715240fa99487ac1d1ccf2a45e0854c1 +SIZE (kdiff3-1.8.5.tar.xz) = 1045812 diff --git a/textproc/kdiff3/pkg-plist b/textproc/kdiff3/pkg-plist index 6c888c2e00ae..6c2389e02b74 100644 --- a/textproc/kdiff3/pkg-plist +++ b/textproc/kdiff3/pkg-plist @@ -46,6 +46,7 @@ share/icons/hicolor/32x32/apps/kdiff3.png share/icons/hicolor/48x48/apps/kdiff3.png share/icons/hicolor/64x64/apps/kdiff3.png share/icons/hicolor/scalable/apps/kdiff3.svgz +share/kservices5/kdiff3part.desktop share/kxmlgui5/kdiff3/kdiff3_shell.rc share/kxmlgui5/kdiff3part/kdiff3_part.rc share/locale/ar/LC_MESSAGES/kdiff3.mo @@ -68,12 +69,12 @@ share/locale/da/LC_MESSAGES/kdiff3fileitemactionplugin.mo share/locale/de/LC_MESSAGES/diff_ext.mo share/locale/de/LC_MESSAGES/kdiff3.mo share/locale/de/LC_MESSAGES/kdiff3fileitemactionplugin.mo -share/locale/el/LC_MESSAGES/diff_ext.mo share/locale/el/LC_MESSAGES/kdiff3.mo share/locale/el/LC_MESSAGES/kdiff3fileitemactionplugin.mo share/locale/en_GB/LC_MESSAGES/diff_ext.mo share/locale/en_GB/LC_MESSAGES/kdiff3.mo share/locale/en_GB/LC_MESSAGES/kdiff3fileitemactionplugin.mo +share/locale/el/LC_MESSAGES/diff_ext.mo share/locale/eo/LC_MESSAGES/kdiff3.mo share/locale/es/LC_MESSAGES/diff_ext.mo share/locale/es/LC_MESSAGES/kdiff3.mo @@ -146,7 +147,6 @@ share/locale/rw/LC_MESSAGES/kdiff3.mo share/locale/sk/LC_MESSAGES/diff_ext.mo share/locale/sk/LC_MESSAGES/kdiff3.mo share/locale/sk/LC_MESSAGES/kdiff3fileitemactionplugin.mo -share/locale/sl/LC_MESSAGES/diff_ext.mo share/locale/sl/LC_MESSAGES/kdiff3.mo share/locale/sl/LC_MESSAGES/kdiff3fileitemactionplugin.mo share/locale/sr/LC_MESSAGES/kdiff3.mo