krename: update to 5.0.0.

Closes #14433.

Signed-off-by: Enno Boland <gottox@voidlinux.eu>
This commit is contained in:
Piotr Wójcik 2018-05-15 19:06:26 +02:00 committed by Enno Boland
parent e45f8e7054
commit 2597c0953c
No known key found for this signature in database
GPG Key ID: D09964719BDE9971
5 changed files with 12 additions and 78 deletions

View File

@ -1,30 +0,0 @@
From 517eda52bebb6a0c5df06b52ff81a19ed9b71740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Wed, 8 Nov 2017 12:41:22 +0100
Subject: [PATCH] Use newer minimal version of taglib
CMake rejects 1.11.1 as "greater" than 1.5, so let's use 1.10 as minimal
so it accepts.
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git CMakeLists.txt CMakeLists.txt
index f0fd6d5..c18e9f1 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -17,9 +17,9 @@ INCLUDE (MacroLibrary)
INCLUDE (FindGettext)
# Find taglib
-set(TAGLIB_MIN_VERSION "1.5")
+set(TAGLIB_MIN_VERSION "1.10")
macro_optional_find_package(Taglib REQUIRED)
-macro_log_feature( TAGLIB_FOUND "taglib" "Read and write tags in audio files" "http://www.freshmeat.net/projects/taglib" TRUE "1.5.0" "")
+macro_log_feature( TAGLIB_FOUND "taglib" "Read and write tags in audio files" "http://www.freshmeat.net/projects/taglib" TRUE "1.10.0" "")
IF(TAGLIB_FOUND)
ADD_DEFINITIONS( -DWITH_TAGLIB )
--
2.15.0

View File

@ -1,16 +0,0 @@
Source: Heiko Becker
Upstream: Submitted, https://sourceforge.net/tracker/?func=detail&aid=3256681&group_id=42805&atid=434230
Reason: Fix FindLIBPODOFO.cmake
diff -urB krename-4.0.7_orig/cmake/modules/FindLIBPODOFO.cmake krename-4.0.7/cmake/modules/FindLIBPODOFO.cmake
--- cmake/modules/FindLIBPODOFO.cmake 2011-02-21 23:00:30.000000000 +0100
+++ cmake/modules/FindLIBPODOFO.cmake 2011-03-29 10:29:03.606942001 +0200
@@ -23,7 +23,7 @@
ENDIF(LIBPODOFO_H)
FIND_LIBRARY(LIBPODOFO_LIB
- NAMES libpodofo-doc podofo-doc
+ NAMES libpodofo podofo libpodofo-doc podofo-doc
PATHS "${LIBPODOFO_DIR}/lib" "${LIBPODOFO_DIR}/src" "${LIBPODOFO_DIR}")
IF(LIBPODOFO_LIB)
MESSAGE("podofo lib: ${LIBPODOFO_LIB}")

View File

@ -1,12 +0,0 @@
diff -up krename-4.0.9/src/batchrenamer.cpp.fix krename-4.0.9/src/batchrenamer.cpp
--- src/batchrenamer.cpp.fix 2016-12-08 15:11:53.559881534 +0100
+++ src/batchrenamer.cpp 2016-12-08 15:14:00.345352643 +0100
@@ -402,7 +402,7 @@ void BatchRenamer::undoFiles( ProgressDi
break;
case eRenameMode_Link:
// In case of link delete created file
- job = KIO::file_delete( dstUrl, false );
+ job = KIO::file_delete( dstUrl, KIO::HideProgressInfo );
break;
case eRenameMode_Copy: // no undo possible
// TODO: Maybe we should delete the created files

View File

@ -1,12 +0,0 @@
diff -up krename-4.0.9/src/CMakeLists.txt.fix-freetype-includes krename-4.0.9/src/CMakeLists.txt
--- src/CMakeLists.txt.fix-freetype-includes 2013-03-18 08:34:07.375132971 +0100
+++ src/CMakeLists.txt 2013-03-18 08:34:24.268578880 +0100
@@ -18,7 +18,7 @@ IF(LIBPODOFO_FOUND)
ENDIF(LIBPODOFO_FOUND)
IF(FREETYPE_FOUND)
- INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIR} )
+ INCLUDE_DIRECTORIES( ${FREETYPE_INCLUDE_DIRS} )
ENDIF(FREETYPE_FOUND)
ADD_DEFINITIONS(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS} ${LIBPODOFO_CFLAGS} ${KDE4_DEFINITIONS} )

View File

@ -1,14 +1,18 @@
# Template file for 'krename'
pkgname=krename
version=4.0.9
version=5.0.0
revision=1
build_style=cmake
hostmakedepends="automoc4 pkg-config"
makedepends="exiv2-devel freetype-devel kdelibs-devel libpodofo-devel
libressl-devel phonon-devel qt-devel taglib-devel"
hostmakedepends="extra-cmake-modules pkg-config"
makedepends="exiv2-devel freetype-devel kjs-devel kparts-devel libpodofo-devel
taglib-devel"
short_desc="Powerful batch renamer for KDE"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
license="GPL-2"
homepage="http://www.krename.net/"
distfiles="${SOURCEFORGE_SITE}/project/${pkgname}/KDE4%20krename-stable/$version/${pkgname}-${version}.tar.bz2"
checksum=baf1f426360824c98ee3134a74fe2c93763ea01c15aea8801d6968d676796d85
license="GPL-2.0-or-later"
homepage="https://userbase.kde.org/KRename"
distfiles="${KDE_SITE}/${pkgname}/$version/src/${pkgname}-${version}.tar.xz"
checksum=0a61761853787fd46b35f3a733cf87cde00de5df631728332a64c38c670bd28c
if [ -n "$CROSS_BUILD" ]; then
hostmakedepends+=" python qt5-host-tools qt5-qmake"
fi