Attachment 257596 Details for Bug 284858 – v1

[patch] v1

0001-graphics-kquickimageeditor-Update-to-0.5.0.patch (text/plain), 6.58 KB, created by Jason E. Hale on 2025-02-17 06:47:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason E. Hale

Created: 2025-02-17 06:47:56 UTC

Size: 6.58 KB

patch

obsolete

>From 2958757f6c29dc1581c998484174bde357e91f76 Mon Sep 17 00:00:00 2001
>From: "Jason E. Hale" <jhale@FreeBSD.org>
>Date: Mon, 17 Feb 2025 01:16:56 -0500
>Subject: [PATCH] graphics/kquickimageeditor: Update to 0.5.0
>
>Qt5 support has been removed upstream.
>
>Adjust consumers to use the unflavored port.
>
>PR:		XXXXXX
>---
> graphics/kquickimageeditor/Makefile           | 19 +++++--------------
> graphics/kquickimageeditor/distinfo           |  6 +++---
> .../{pkg-plist.qt6 => pkg-plist}              |  0
> graphics/kquickimageeditor/pkg-plist.qt5      | 11 -----------
> graphics/skanpage/Makefile                    |  6 +++---
> net-im/kaidan/Makefile                        |  5 +++--
> net-im/neochat/Makefile                       |  5 +++--
> 7 files changed, 17 insertions(+), 35 deletions(-)
> rename graphics/kquickimageeditor/{pkg-plist.qt6 => pkg-plist} (100%)
> delete mode 100644 graphics/kquickimageeditor/pkg-plist.qt5
>
>diff --git a/graphics/kquickimageeditor/Makefile b/graphics/kquickimageeditor/Makefile
>index 8784986fcf4f..1ff9d9bcc547 100644
>--- a/graphics/kquickimageeditor/Makefile
>+++ b/graphics/kquickimageeditor/Makefile
>@@ -1,8 +1,8 @@
> PORTNAME=	kquickimageeditor
>-DISTVERSION=	0.3.0
>+DISTVERSION=	0.5.0
> CATEGORIES=	graphics
> MASTER_SITES=	KDE/stable/${PORTNAME}/
>-PKGNAMESUFFIX=	-${FLAVOR}
>+PKGNAMESUFFIX=	-qt6
> 
> MAINTAINER=	adridg@FreeBSD.org
> COMMENT=	Simple image editor for QtQuick applications
>@@ -11,18 +11,9 @@ WWW=		https://invent.kde.org/libraries/kquickimageeditor
> LICENSE=	LGPL21+
> LICENSE_FILE=	${WRKSRC}/LICENSES/LGPL-2.1-or-later.txt
> 
>-FLAVORS=	qt6 qt5
>-FLAVOR?=	qt6
>-
>-USES=		cmake compiler:c++17-lang gl kde:${FLAVOR:S/qt//} pkgconfig \
>-		qt:${FLAVOR:S/qt//} tar:xz
>-USE_GL=		gl
>-_USE_QT_qt5=	core declarative gui network quickcontrols2 \
>-		buildtools:build linguist:build qmake:build
>-_USE_QT_qt6=	3d base
>-USE_QT=		${_USE_QT_${FLAVOR}}
>+USES=		cmake compiler:c++17-lang gl kde:6 qt:6 tar:xz
>+USE_GL=		gl opengl
> USE_KDE=	ecm:build
>-
>-PLIST=		pkg-plist.${FLAVOR}
>+USE_QT=		base declarative
> 
> .include <bsd.port.mk>
>diff --git a/graphics/kquickimageeditor/distinfo b/graphics/kquickimageeditor/distinfo
>index 65cd46ebc4f5..5ba6133a00f9 100644
>--- a/graphics/kquickimageeditor/distinfo
>+++ b/graphics/kquickimageeditor/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1709286187
>-SHA256 (kquickimageeditor-0.3.0.tar.xz) = 330ebf3653883eeebde54385d783c51c2d30ff77d41b294ece79af7e9c21c6f8
>-SIZE (kquickimageeditor-0.3.0.tar.xz) = 3286792
>+TIMESTAMP = 1739770768
>+SHA256 (kquickimageeditor-0.5.0.tar.xz) = 8ebbfdce39efbbb63679badc3320fe06eb3aa68a4da5f50740197645c985ad0f
>+SIZE (kquickimageeditor-0.5.0.tar.xz) = 3295008
>diff --git a/graphics/kquickimageeditor/pkg-plist.qt6 b/graphics/kquickimageeditor/pkg-plist
>similarity index 100%
>rename from graphics/kquickimageeditor/pkg-plist.qt6
>rename to graphics/kquickimageeditor/pkg-plist
>diff --git a/graphics/kquickimageeditor/pkg-plist.qt5 b/graphics/kquickimageeditor/pkg-plist.qt5
>deleted file mode 100644
>index c29fc60792bb..000000000000
>--- a/graphics/kquickimageeditor/pkg-plist.qt5
>+++ /dev/null
>@@ -1,11 +0,0 @@
>-lib/cmake/KQuickImageEditor/KQuickImageEditorConfig.cmake
>-lib/cmake/KQuickImageEditor/KQuickImageEditorConfigVersion.cmake
>-%%QT_MKSPECDIR%%/modules/qt_KQuickImageEditor.pri
>-%%QT_QMLDIR%%/org/kde/kquickimageeditor/BasicResizeHandle.qml
>-%%QT_QMLDIR%%/org/kde/kquickimageeditor/CropBackground.qml
>-%%QT_QMLDIR%%/org/kde/kquickimageeditor/RectangleCutout.qml
>-%%QT_QMLDIR%%/org/kde/kquickimageeditor/SelectionBackground.qml
>-%%QT_QMLDIR%%/org/kde/kquickimageeditor/SelectionHandle.qml
>-%%QT_QMLDIR%%/org/kde/kquickimageeditor/SelectionTool.qml
>-%%QT_QMLDIR%%/org/kde/kquickimageeditor/libkquickimageeditorplugin.so
>-%%QT_QMLDIR%%/org/kde/kquickimageeditor/qmldir
>diff --git a/graphics/skanpage/Makefile b/graphics/skanpage/Makefile
>index 4aa654954e20..b4e644759c7b 100644
>--- a/graphics/skanpage/Makefile
>+++ b/graphics/skanpage/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	skanpage
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	graphics kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -10,11 +11,10 @@ WWW=		https://invent.kde.org/utilities/skanpage
> LICENSE=	GPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
> 
>-BUILD_DEPENDS=	kquickimageeditor-qt6>=0:graphics/kquickimageeditor@qt6
>-RUN_DEPENDS=	kquickimageeditor-qt6>=0:graphics/kquickimageeditor@qt6
>-
>+BUILD_DEPENDS=	kquickimageeditor-qt6>=0:graphics/kquickimageeditor
> LIB_DEPENDS=	libKSaneCore6.so:graphics/ksanecore \
> 		libpng.so:graphics/png
>+RUN_DEPENDS=    kquickimageeditor-qt6>=0:graphics/kquickimageeditor
> 
> USES=		cmake compiler:c++11-lang gettext kde:6 qt:6 tar:xz
> USE_KDE=	auth codecs completion config configwidgets coreaddons crash \
>diff --git a/net-im/kaidan/Makefile b/net-im/kaidan/Makefile
>index 73bedb018193..77bc1f6f7e9a 100644
>--- a/net-im/kaidan/Makefile
>+++ b/net-im/kaidan/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	kaidan
> DISTVERSION=	0.11.0
>+PORTREVISION=	1
> CATEGORIES=	net-im kde
> MASTER_SITES=	KDE/unstable/${PORTNAME}/${DISTVERSION}
> 
>@@ -10,11 +11,11 @@ WWW=		https://apps.kde.org/kaidan/
> LICENSE=	GPLv3+
> LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-or-later.txt
> 
>-BUILD_DEPENDS=	kquickimageeditor-qt6>0:graphics/kquickimageeditor@qt6
>+BUILD_DEPENDS=	kquickimageeditor-qt6>0:graphics/kquickimageeditor
> LIB_DEPENDS=	libQXmppQt6.so:net-im/qxmpp \
> 		libicuuc.so:devel/icu \
> 		libxkbcommon.so:x11/libxkbcommon
>-RUN_DEPENDS=	kquickimageeditor-qt6>0:graphics/kquickimageeditor@qt6
>+RUN_DEPENDS=	kquickimageeditor-qt6>0:graphics/kquickimageeditor
> 
> USES=		cmake compiler:c++23-lang desktop-file-utils gl kde:6 \
> 		pkgconfig qt:6 tar:xz xorg
>diff --git a/net-im/neochat/Makefile b/net-im/neochat/Makefile
>index 9136c42d663e..9ffdd4bc0236 100644
>--- a/net-im/neochat/Makefile
>+++ b/net-im/neochat/Makefile
>@@ -1,5 +1,6 @@
> PORTNAME=	neochat
> DISTVERSION=	${KDE_APPLICATIONS_VERSION}
>+PORTREVISION=	1
> CATEGORIES=	net-im deskutils kde kde-applications
> 
> MAINTAINER=	kde@FreeBSD.org
>@@ -11,13 +12,13 @@ LICENSE_FILE=	${WRKSRC}/LICENSES/GPL-3.0-only.txt
> 
> # Quotient is a static lib, doesn't need to be in RUN_DEPENDS
> BUILD_DEPENDS=	libquotient>=0.9.0:net-im/libquotient \
>-		kquickimageeditor-qt6>=0.2.0:graphics/kquickimageeditor@qt6
>+		kquickimageeditor-qt6>=0.2.0:graphics/kquickimageeditor
> LIB_DEPENDS=	libQCoro6Core.so:devel/qcoro@qt6 \
> 		libcmark.so:textproc/cmark \
> 		libqt6keychain.so:security/qtkeychain@qt6 \
> 		libdbus-1.so:devel/dbus \
> 		libolm.so:security/olm
>-RUN_DEPENDS=	kquickimageeditor-qt6>=0.2.0:graphics/kquickimageeditor@qt6
>+RUN_DEPENDS=	kquickimageeditor-qt6>=0.2.0:graphics/kquickimageeditor
> 
> USES=		cmake compiler:c++20-lang desktop-file-utils gettext kde:6 \
> 		pkgconfig qt:6 tar:xz xorg
>-- 
>2.48.1
>

Actions: View | Diff

Attachments on bug 284858: 257596