Simple Qt6 migration to krename-5.0.3pre0. Tested on amd64. OK?
Cheers Rafael
diff --git a/sysutils/krename/Makefile b/sysutils/krename/Makefile
index dc106292d1a..6d32dee9f33 100644
--- a/sysutils/krename/Makefile
+++ b/sysutils/krename/Makefile
@@ -1,8 +1,8 @@
COMMENT = powerful batch file renamer
-VERSION = 5.0.2
-DISTNAME = krename-${VERSION}
-REVISION = 5
+DISTNAME = krename-5.0.3pre0
+
+DIST_TUPLE = kde utilities krename efe0939c354f3a21ecbf0da9571cac9ead855be3 .
CATEGORIES = sysutils x11
@@ -13,18 +13,16 @@ MAINTAINER = Rafael Sadowski <[email protected]>
# GPLv2+
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} KF5Auth KF5AuthCore KF5Bookmarks
-WANTLIB += KF5Codecs KF5Completion KF5ConfigCore KF5ConfigGui
-WANTLIB += KF5ConfigWidgets KF5CoreAddons KF5Crash KF5I18n KF5IconThemes
-WANTLIB += KF5ItemViews KF5JSApi KF5JobWidgets KF5KIOCore KF5KIOFileWidgets
-WANTLIB += KF5KIOGui KF5KIOWidgets KF5Service KF5Solid KF5WidgetsAddons
-WANTLIB += KF5WindowSystem KF5XmlGui Qt5Concurrent Qt5Core Qt5DBus
-WANTLIB += Qt5Gui Qt5Network Qt5Widgets Qt5Xml c exiv2 freetype
-WANTLIB += m podofo tag z X11
-
-SITES = ${SITE_KDE:=Attic/krename/${VERSION}/src/}
+WANTLIB += ${COMPILER_LIBCXX} GL KF6Archive KF6Bookmarks KF6ColorScheme
+WANTLIB += KF6Completion KF6ConfigCore KF6ConfigGui KF6ConfigWidgets
+WANTLIB += KF6CoreAddons KF6Crash KF6GuiAddons KF6I18n KF6IconThemes
+WANTLIB += KF6ItemViews KF6JobWidgets KF6KIOCore KF6KIOFileWidgets
+WANTLIB += KF6KIOGui KF6KIOWidgets KF6Service KF6Solid KF6WidgetsAddons
+WANTLIB += KF6XmlGui Qt6Core Qt6Core5Compat Qt6DBus Qt6Gui Qt6Network
+WANTLIB += Qt6Qml Qt6Widgets Qt6Xml c exiv2 freetype m podofo
+WANTLIB += tag
-MODULES = devel/kf5
+MODULES = devel/kf6
BUILD_DEPENDS = devel/gettext,-tools
@@ -34,20 +32,17 @@ RUN_DEPENDS = devel/desktop-file-utils \
LIB_DEPENDS = audio/taglib \
graphics/exiv2 \
- textproc/podofo>=0.10 \
- devel/kf5/kcompletion \
- devel/kf5/kconfig \
- devel/kf5/kcoreaddons \
- devel/kf5/ki18n \
- devel/kf5/kiconthemes \
- devel/kf5/kitemviews \
- devel/kf5/kjobwidgets \
- devel/kf5/kjs \
- devel/kf5/kio \
- devel/kf5/kservice \
- devel/kf5/kwidgetsaddons \
- devel/kf5/kxmlgui
-
-MODCMAKE_POLICY_VERSION_OVERRIDE = Yes
+ textproc/podofo \
+ devel/kf6/kcompletion \
+ devel/kf6/kconfig \
+ devel/kf6/kcoreaddons \
+ devel/kf6/ki18n \
+ devel/kf6/kiconthemes \
+ devel/kf6/kitemviews \
+ devel/kf6/kjobwidgets \
+ devel/kf6/kio \
+ devel/kf6/kservice \
+ devel/kf6/kwidgetsaddons \
+ devel/kf6/kxmlgui
.include <bsd.port.mk>
diff --git a/sysutils/krename/distinfo b/sysutils/krename/distinfo
index 5ad20968456..e2df84a6929 100644
--- a/sysutils/krename/distinfo
+++ b/sysutils/krename/distinfo
@@ -1,2 +1,2 @@
-SHA256 (krename-5.0.2.tar.xz) = sjxgp93Z9ttN1/VaxV/MqKVY+miq+PpcuJ4er2kvI+0=
-SIZE (krename-5.0.2.tar.xz) = 337908
+SHA256 (utilities-krename-efe0939c354f3a21ecbf0da9571cac9ead855be3.tar.gz) =
sJkZyRH+SdkCW20RnVtQqVZXeuqgD70qIXorMIUFXqk=
+SIZE (utilities-krename-efe0939c354f3a21ecbf0da9571cac9ead855be3.tar.gz) =
856439
diff --git a/sysutils/krename/patches/patch-CMakeLists_txt
b/sysutils/krename/patches/patch-CMakeLists_txt
deleted file mode 100644
index ae86949260c..00000000000
--- a/sysutils/krename/patches/patch-CMakeLists_txt
+++ /dev/null
@@ -1,32 +0,0 @@
-From e7dd767a9a1068ee1fe1502c4d619b57d3b12add Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <[email protected]>
-Date: Fri, 26 May 2023 23:23:10 +0200
-Subject: [PATCH] Fix build with >=exiv2-0.28, raise minimum to 0.27
-
-Index: CMakeLists.txt
---- CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -1,8 +1,7 @@
--cmake_minimum_required(VERSION 3.7)
-+cmake_minimum_required(VERSION 3.16)
-
- project(krename)
-
--cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
- # search packages used by KDE
- find_package(ECM 0.0.11 REQUIRED NO_MODULE)
- set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
-@@ -54,12 +53,8 @@ set_package_properties(Taglib PROPERTIES
- TYPE OPTIONAL)
-
- # Find exiv2
--find_package(LibExiv2 0.13) # AccessMode was added in 0.13
-+find_package(LibExiv2 0.27) # EXIV2_TEST_VERSION was added in 0.27
- set_package_properties(LibExiv2 PROPERTIES TYPE OPTIONAL)
--
--if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27")
-- set(HAVE_LIBEXIV2_0_27 TRUE)
--endif()
-
- # Find podofo
- find_package(PoDoFo)
diff --git a/sysutils/krename/patches/patch-cmake_modules_FindPoDoFo_cmake
b/sysutils/krename/patches/patch-cmake_modules_FindPoDoFo_cmake
deleted file mode 100644
index c1e0e6531c9..00000000000
--- a/sysutils/krename/patches/patch-cmake_modules_FindPoDoFo_cmake
+++ /dev/null
@@ -1,62 +0,0 @@
-https://gitlab.archlinux.org/archlinux/packaging/packages/krename/-/blob/main/podofo-0.10.patch?ref_type=heads
-
-Index: cmake/modules/FindPoDoFo.cmake
---- cmake/modules/FindPoDoFo.cmake.orig
-+++ cmake/modules/FindPoDoFo.cmake
-@@ -36,16 +36,9 @@
- # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--find_path(PoDoFo_INCLUDE_DIRS
-- NAMES podofo/podofo.h
--)
--find_library(PoDoFo_LIBRARIES
-- NAMES libpodofo podofo
--)
-+include(FindPkgConfig)
-+pkg_search_module(PoDoFo libpodofo libpodofo-0)
-
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(PoDoFo DEFAULT_MSG PoDoFo_LIBRARIES
PoDoFo_INCLUDE_DIRS)
--
- set(PoDoFo_DEFINITIONS)
- if(PoDoFo_FOUND)
- if(WIN32)
-@@ -61,17 +54,19 @@ if(PoDoFo_FOUND)
- endif()
- endif()
-
-- # PoDoFo-0.9.5 unconditionally includes openssl/opensslconf.h in a public
-- # header. The fix is in https://sourceforge.net/p/podofo/code/1830/ and will
-- # hopefully be released soon with 0.9.6. Note that krename doesn't use
-- # OpenSSL in any way.
-- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h"
PoDoFo_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$")
-- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h"
PoDoFo_MINOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+[0-9]+$")
-- file(STRINGS "${PoDoFo_INCLUDE_DIRS}/podofo/base/podofo_config.h"
PoDoFo_PATCH_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+[0-9]+$")
-+ find_file(PoDoFo_CONFIG podofo_config.h PATHS ${PoDoFo_INCLUDE_DIRS}
PATH_SUFFIXES auxiliary base)
-+ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_MAJOR_VER_LINE REGEX "^#define[
\t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$")
-+ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_MINOR_VER_LINE REGEX "^#define[
\t]+PODOFO_VERSION_MINOR[ \t]+[0-9]+$")
-+ file(STRINGS "${PoDoFo_CONFIG}" PoDoFo_PATCH_VER_LINE REGEX "^#define[
\t]+PODOFO_VERSION_PATCH[ \t]+[0-9]+$")
- string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+([0-9]+)$"
"\\1" PoDoFo_MAJOR_VER "${PoDoFo_MAJOR_VER_LINE}")
- string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+([0-9]+)$"
"\\1" PoDoFo_MINOR_VER "${PoDoFo_MINOR_VER_LINE}")
- string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+([0-9]+)$"
"\\1" PoDoFo_PATCH_VER "${PoDoFo_PATCH_VER_LINE}")
- set(PoDoFo_VERSION
"${PoDoFo_MAJOR_VER}.${PoDoFo_MINOR_VER}.${PoDoFo_PATCH_VER}")
-+
-+ # PoDoFo-0.9.5 unconditionally includes openssl/opensslconf.h in a public
-+ # header. The fix is in https://sourceforge.net/p/podofo/code/1830/ and will
-+ # hopefully be released soon with 0.9.6. Note that krename doesn't use
-+ # OpenSSL in any way.
- if(PoDoFo_VERSION VERSION_EQUAL "0.9.5")
- find_package(OpenSSL)
- if (OpenSSL_FOUND)
-@@ -82,6 +77,10 @@ if(PoDoFo_FOUND)
- message("OpenSSL NOT found, which is required for this version of
PoDofo (0.9.5)")
- endif()
- endif()
-+endif()
-+
-+if(PoDoFo_VERSION VERSION_GREATER_EQUAL 0.10.0)
-+ set(CMAKE_CXX_STANDARD 17)
- endif()
-
- mark_as_advanced(PoDoFo_INCLUDE_DIRS PoDoFo_LIBRARIES PoDoFo_DEFINITIONS)
diff --git a/sysutils/krename/patches/patch-config-krename_h_cmake
b/sysutils/krename/patches/patch-config-krename_h_cmake
deleted file mode 100644
index adb1062ae81..00000000000
--- a/sysutils/krename/patches/patch-config-krename_h_cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-From e7dd767a9a1068ee1fe1502c4d619b57d3b12add Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <[email protected]>
-Date: Fri, 26 May 2023 23:23:10 +0200
-Subject: [PATCH] Fix build with >=exiv2-0.28, raise minimum to 0.27
-
-Index: config-krename.h.cmake
---- config-krename.h.cmake.orig
-+++ config-krename.h.cmake
-@@ -6,9 +6,6 @@
- /* have Exiv2 */
- #cmakedefine01 HAVE_EXIV2
-
--/* Defined if we have libexiv2 >= 0.27 */
--#cmakedefine HAVE_LIBEXIV2_0_27
--
- /* have PoDoFo */
- #cmakedefine01 HAVE_PODOFO
-
diff --git a/sysutils/krename/patches/patch-src_exiv2plugin_cpp
b/sysutils/krename/patches/patch-src_exiv2plugin_cpp
deleted file mode 100644
index 46674721900..00000000000
--- a/sysutils/krename/patches/patch-src_exiv2plugin_cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-From e7dd767a9a1068ee1fe1502c4d619b57d3b12add Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <[email protected]>
-Date: Fri, 26 May 2023 23:23:10 +0200
-Subject: [PATCH] Fix build with >=exiv2-0.28, raise minimum to 0.27
-
-Index: src/exiv2plugin.cpp
---- src/exiv2plugin.cpp.orig
-+++ src/exiv2plugin.cpp
-@@ -17,20 +17,9 @@
-
- #include "exiv2plugin.h"
-
--#include "../config-krename.h"
--
- #include <KLocalizedString>
-
--#include <exiv2/error.hpp>
--#include <exiv2/exif.hpp>
--#include <exiv2/image.hpp>
--#include <exiv2/iptc.hpp>
--#ifdef HAVE_LIBEXIV2_0_27
-- #include <exiv2/xmp_exiv2.hpp>
--#else
-- #include <exiv2/xmp.hpp>
--#endif
--#include <exiv2/tags.hpp>
-+#include <exiv2/exiv2.hpp>
-
- #include "batchrenamer.h"
- #include "tokenhelpdialog.h"
-@@ -395,7 +384,11 @@ QString Exiv2Plugin::processFile(BatchRenamer *b, int
- std::string strFilename(asc.constData(), asc.length());
-
- try {
-+#if EXIV2_TEST_VERSION(0,28,0)
-+ Image::UniquePtr image = Exiv2::ImageFactory::open(strFilename);
-+#else
- Image::AutoPtr image = Exiv2::ImageFactory::open(strFilename);
-+#endif
- if (image.get() != nullptr && image->good()) {
- image->readMetadata();
-
diff --git a/sysutils/krename/patches/patch-src_podofoplugin_cpp
b/sysutils/krename/patches/patch-src_podofoplugin_cpp
deleted file mode 100644
index f413baba3de..00000000000
--- a/sysutils/krename/patches/patch-src_podofoplugin_cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-https://gitlab.archlinux.org/archlinux/packaging/packages/krename/-/blob/main/podofo-0.10.patch?ref_type=heads
-
-Index: src/podofoplugin.cpp
---- src/podofoplugin.cpp.orig
-+++ src/podofoplugin.cpp
-@@ -61,6 +61,26 @@ QString PodofoPlugin::processFile(BatchRenamer *b, int
- try {
- PdfMemDocument doc;
- doc.Load(filename.toUtf8().data());
-+#if (PODOFO_VERSION_MINOR>=10 || PODOFO_VERSION_MAJOR>=1)
-+ const PdfInfo *info = doc.GetInfo();
-+
-+ if (token == "pdfauthor") {
-+
-+ return info->GetAuthor().has_value() ?
QString::fromUtf8(info->GetAuthor()->GetString().c_str()) : QString();
-+ } else if (token == "pdfcreator") {
-+ return info->GetCreator().has_value() ?
QString::fromUtf8(info->GetCreator()->GetString().c_str()) : QString();
-+ } else if (token == "pdfkeywords") {
-+ return info->GetKeywords().has_value() ?
QString::fromUtf8(info->GetKeywords()->GetString().c_str()) : QString();
-+ } else if (token == "pdfsubject") {
-+ return info->GetSubject().has_value() ?
QString::fromUtf8(info->GetSubject()->GetString().c_str()) : QString();
-+ } else if (token == "pdftitle") {
-+ return info->GetTitle().has_value() ?
QString::fromUtf8(info->GetTitle()->GetString().c_str()) : QString();
-+ } else if (token == "pdfproducer") {
-+ return info->GetProducer().has_value() ?
QString::fromUtf8(info->GetProducer()->GetString().c_str()) : QString();
-+ } else if (token == "pdfpages") {
-+ return QString::number(doc.GetPages().GetCount());
-+ }
-+#else
- PdfInfo *info = doc.GetInfo();
-
- if (token == "pdfauthor") {
-@@ -78,6 +98,7 @@ QString PodofoPlugin::processFile(BatchRenamer *b, int
- } else if (token == "pdfpages") {
- return QString::number(doc.GetPageCount());
- }
-+#endif
- } catch (PdfError &error) {
- return QString::fromUtf8(error.what());
- }
diff --git a/sysutils/krename/pkg/PLIST b/sysutils/krename/pkg/PLIST
index b07f379efbc..fa27179529f 100644
--- a/sysutils/krename/pkg/PLIST
+++ b/sysutils/krename/pkg/PLIST
@@ -1,14 +1,16 @@
@pkgpath sysutils/krename-kde4
@bin bin/krename
share/applications/org.kde.krename.desktop
+share/icons/hicolor/128x128/apps/krename.png
share/icons/hicolor/16x16/apps/krename.png
+share/icons/hicolor/22x22/apps/krename.png
share/icons/hicolor/32x32/apps/krename.png
share/icons/hicolor/48x48/apps/krename.png
-share/kservices5/ServiceMenus/
-share/kservices5/ServiceMenus/krename_all_nonrec.desktop
-share/kservices5/ServiceMenus/krename_dir_rec.desktop
+share/kio/
+share/kio/servicemenus/
+share/kio/servicemenus/krename_all_nonrec.desktop
+share/kio/servicemenus/krename_dir_rec.desktop
share/locale/ar/LC_MESSAGES/krename.mo
-share/locale/ast/LC_MESSAGES/krename.mo
share/locale/bs/LC_MESSAGES/krename.mo
share/locale/ca/LC_MESSAGES/krename.mo
share/locale/ca@valencia/LC_MESSAGES/krename.mo
@@ -17,21 +19,26 @@ share/locale/da/LC_MESSAGES/krename.mo
share/locale/de/LC_MESSAGES/krename.mo
share/locale/el/LC_MESSAGES/krename.mo
share/locale/en_GB/LC_MESSAGES/krename.mo
+share/locale/eo/LC_MESSAGES/krename.mo
share/locale/es/LC_MESSAGES/krename.mo
share/locale/et/LC_MESSAGES/krename.mo
share/locale/eu/LC_MESSAGES/krename.mo
share/locale/fi/LC_MESSAGES/krename.mo
share/locale/fr/LC_MESSAGES/krename.mo
+share/locale/ga/LC_MESSAGES/krename.mo
share/locale/gl/LC_MESSAGES/krename.mo
+share/locale/he/LC_MESSAGES/krename.mo
share/locale/hu/LC_MESSAGES/krename.mo
share/locale/ia/LC_MESSAGES/krename.mo
share/locale/id/LC_MESSAGES/krename.mo
share/locale/it/LC_MESSAGES/krename.mo
share/locale/ja/LC_MESSAGES/krename.mo
+share/locale/ka/LC_MESSAGES/krename.mo
share/locale/ko/LC_MESSAGES/krename.mo
share/locale/lt/LC_MESSAGES/krename.mo
share/locale/nl/LC_MESSAGES/krename.mo
share/locale/nn/LC_MESSAGES/krename.mo
+share/locale/pa/LC_MESSAGES/krename.mo
share/locale/pl/LC_MESSAGES/krename.mo
share/locale/pt/LC_MESSAGES/krename.mo
share/locale/pt_BR/LC_MESSAGES/krename.mo
@@ -41,6 +48,7 @@ share/locale/sk/LC_MESSAGES/krename.mo
share/locale/sl/LC_MESSAGES/krename.mo
share/locale/sv/LC_MESSAGES/krename.mo
share/locale/tr/LC_MESSAGES/krename.mo
+share/locale/ug/LC_MESSAGES/krename.mo
share/locale/uk/LC_MESSAGES/krename.mo
share/locale/zh_CN/LC_MESSAGES/krename.mo
share/locale/zh_TW/LC_MESSAGES/krename.mo
