Update krename to 5.0.1

This commit is contained in:
rsadowski 2020-10-28 11:45:32 +00:00
parent 5e64bc493b
commit 80abf296df
7 changed files with 12 additions and 138 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.34 2020/09/08 19:45:39 rsadowski Exp $
# $OpenBSD: Makefile,v 1.35 2020/10/28 11:45:32 rsadowski Exp $
COMMENT = powerful batch file renamer
VERSION = 5.0.0
VERSION = 5.0.1
DISTNAME = krename-${VERSION}
REVISION = 4
CATEGORIES = sysutils x11

View File

@ -1,2 +1,2 @@
SHA256 (krename-5.0.0.tar.xz) = CmF2GFN4f9RrNfOnM8+HzeAN5d9jFygzKmTDjGcL0ow=
SIZE (krename-5.0.0.tar.xz) = 279968
SHA256 (krename-5.0.1.tar.xz) = yqx4r9O6BmE99Hu9FXC7kArPQYVUc1TW61iOcGVvan0=
SIZE (krename-5.0.1.tar.xz) = 321556

View File

@ -1,46 +0,0 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2020/05/14 19:16:25 rsadowski Exp $
https://gitweb.gentoo.org/repo/gentoo.git/plain/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -1,6 +1,7 @@
-project(krename)
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.7)
+
+project(krename VERSION "5.0.0")
# search packages used by KDE
find_package(ECM 0.0.11 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
@@ -39,10 +40,6 @@ add_definitions(
-DQT_STRICT_ITERATORS
)
-set(KRENAME_VERSION "5.0.0")
-
-include(FindGettext)
-
# Find taglib
set(TAGLIB_MIN_VERSION "1.5")
find_package(Taglib ${TAGLIB_MIN_VERSION})
@@ -52,11 +49,12 @@ set_package_properties(Taglib PROPERTIES
TYPE OPTIONAL)
# Find exiv2
-find_package(Exiv2 0.13) # AccessMode was added in 0.13
-set_package_properties(Exiv2 PROPERTIES
- DESCRIPTION "A library to access image metadata"
- URL "http://www.exiv2.org"
- TYPE OPTIONAL)
+find_package(LibExiv2 0.13) # AccessMode was added in 0.13
+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)

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-config-krename_h_cmake,v 1.1 2020/05/14 19:16:25 rsadowski Exp $
https://gitweb.gentoo.org/repo/gentoo.git/plain/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch
Index: config-krename.h.cmake
--- config-krename.h.cmake.orig
+++ config-krename.h.cmake
@@ -6,6 +6,9 @@
/* have Exiv2 */
#cmakedefine01 HAVE_EXIV2
+/* Defined if we have libexiv2 >= 0.27 */
+#cmakedefine HAVE_LIBEXIV2_0_27
+
/* have PoDoFo */
#cmakedefine01 HAVE_PODOFO

View File

@ -1,41 +0,0 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2020/09/08 19:45:39 rsadowski Exp $
https://gitweb.gentoo.org/repo/gentoo.git/plain/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -23,7 +23,7 @@ if(FREETYPE_FOUND)
include_directories(${FREETYPE_INCLUDE_DIRS})
endif()
-add_definitions(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS})
+add_definitions(${TAGLIB_CFLAGS})
# Exiv2 needs exceptions
kde_enable_exceptions()
@@ -67,7 +67,7 @@ set(krename_SRCS
snumplugin.cpp
)
-if(EXIV2_FOUND)
+if(LibExiv2_FOUND)
set(krename_SRCS ${krename_SRCS}
exiv2plugin.cpp
)
@@ -128,12 +128,12 @@ target_link_libraries(krename
)
if(TAGLIB_FOUND)
target_link_libraries(krename
- ${TAGLIB_LIBRARIES}
+ tag
)
endif()
-if(EXIV2_FOUND)
+if(LibExiv2_FOUND)
target_link_libraries(krename
- ${EXIV2_LIBRARIES}
+ LibExiv2::LibExiv2
)
endif()
if(PoDoFo_FOUND)

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-src_exiv2plugin_cpp,v 1.1 2020/05/14 19:16:25 rsadowski Exp $
https://gitweb.gentoo.org/repo/gentoo.git/plain/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch
Index: src/exiv2plugin.cpp
--- src/exiv2plugin.cpp.orig
+++ src/exiv2plugin.cpp
@@ -17,13 +17,19 @@
#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>
-#include <exiv2/xmp.hpp>
+#ifdef HAVE_LIBEXIV2_0_27
+ #include <exiv2/xmp_exiv2.hpp>
+#else
+ #include <exiv2/xmp.hpp>
+#endif
#include <exiv2/tags.hpp>
#include "batchrenamer.h"

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.12 2020/03/23 18:01:13 rsadowski Exp $
@comment $OpenBSD: PLIST,v 1.13 2020/10/28 11:45:32 rsadowski Exp $
@pkgpath sysutils/krename-kde4
@bin bin/krename
share/applications/org.kde.krename.desktop
@ -25,15 +25,22 @@ share/locale/de/LC_MESSAGES/krename.mo
share/locale/el/LC_MESSAGES/krename.mo
share/locale/en_GB/LC_MESSAGES/krename.mo
share/locale/es/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/gl/LC_MESSAGES/krename.mo
share/locale/hu/LC_MESSAGES/krename.mo
share/locale/ia/LC_MESSAGES/krename.mo
share/locale/it/LC_MESSAGES/krename.mo
share/locale/ja/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/pl/LC_MESSAGES/krename.mo
share/locale/pt/LC_MESSAGES/krename.mo
share/locale/pt_BR/LC_MESSAGES/krename.mo
share/locale/ro/LC_MESSAGES/krename.mo
share/locale/ru/LC_MESSAGES/krename.mo
share/locale/sk/LC_MESSAGES/krename.mo
share/locale/sl/LC_MESSAGES/krename.mo