* [gentoo-commits] repo/gentoo:master commit in: kde-misc/krename/, kde-misc/krename/files/
@ 2016-07-09 19:05 Johannes Huber
0 siblings, 0 replies; 3+ messages in thread
From: Johannes Huber @ 2016-07-09 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 577852946efdb0d29df022f045aeff6448ce3bd8
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 19:05:13 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 19:05:26 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57785294
kde-misc/krename: Fix build with gcc-6
Revision bump adds patch from Arch Linux. Spotted by George Diamantopoulos
<georgediam <AT> gmail.com>.
Gentoo-bug: 587994
Package-Manager: portage-2.3.0
kde-misc/krename/files/krename-4.0.9-gcc6.patch | 11 ++++++
kde-misc/krename/krename-4.0.9-r4.ebuild | 45 +++++++++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/kde-misc/krename/files/krename-4.0.9-gcc6.patch b/kde-misc/krename/files/krename-4.0.9-gcc6.patch
new file mode 100644
index 0000000..b168792
--- /dev/null
+++ b/kde-misc/krename/files/krename-4.0.9-gcc6.patch
@@ -0,0 +1,11 @@
+--- krename-4.0.9/src/batchrenamer.cpp.orig 2016-05-07 12:50:29.243165528 +0000
++++ krename-4.0.9/src/batchrenamer.cpp 2016-05-07 12:50:52.543081000 +0000
+@@ -402,7 +402,7 @@
+ break;
+ case eRenameMode_Link:
+ // In case of link delete created file
+- job = KIO::file_delete( dstUrl, false );
++ job = KIO::file_delete( dstUrl, NULL );
+ break;
+ case eRenameMode_Copy: // no undo possible
+ // TODO: Maybe we should delete the created files
diff --git a/kde-misc/krename/krename-4.0.9-r4.ebuild b/kde-misc/krename/krename-4.0.9-r4.ebuild
new file mode 100644
index 0000000..638803e
--- /dev/null
+++ b/kde-misc/krename/krename-4.0.9-r4.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_LINGUAS="bs cs de el es fr hu it ja lt nl pl pt ru sl sv tr uk zh_CN"
+inherit kde4-base
+
+DESCRIPTION="KRename - a very powerful batch file renamer"
+HOMEPAGE="http://www.krename.net/"
+SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug exif pdf taglib truetype"
+
+RDEPEND="
+ exif? ( >=media-gfx/exiv2-0.13:= )
+ pdf? ( >=app-text/podofo-0.8 )
+ taglib? ( >=media-libs/taglib-1.5 )
+ truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-freetype-include.patch"
+ "${FILESDIR}/${P}-desktop-file.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
+)
+DOCS=( AUTHORS README TODO )
+
+src_configure() {
+ local mycmakeargs=(
+ -DWITH_Exiv2=$(usex exif)
+ -DWITH_Taglib=$(usex taglib)
+ -DWITH_LIBPODOFO=$(usex pdf)
+ -DWITH_Freetype=$(usex truetype)
+ )
+
+ kde4-base_src_configure
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/krename/, kde-misc/krename/files/
@ 2017-07-17 18:03 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2017-07-17 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 6f0776370f5bf8c65e6009da294d2c6ecf7bb78c
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 17 17:58:34 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jul 17 17:58:34 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f077637
kde-misc/krename: Drop slot 4
Package-Manager: Portage-2.3.6, Repoman-2.3.1
kde-misc/krename/Manifest | 1 -
.../krename/files/krename-4.0.9-desktop-file.patch | 14 -------
.../files/krename-4.0.9-freetype-include.patch | 12 ------
kde-misc/krename/files/krename-4.0.9-gcc6.patch | 11 ------
kde-misc/krename/krename-4.0.9-r3.ebuild | 43 ---------------------
kde-misc/krename/krename-4.0.9-r4.ebuild | 44 ----------------------
6 files changed, 125 deletions(-)
diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest
index a42f10aad6b..06eed5c683d 100644
--- a/kde-misc/krename/Manifest
+++ b/kde-misc/krename/Manifest
@@ -1,2 +1 @@
-DIST krename-4.0.9.tar.bz2 244658 SHA256 baf1f426360824c98ee3134a74fe2c93763ea01c15aea8801d6968d676796d85 SHA512 13805de37b816c8475189a35c08febe8657101fb0a2b2a830c92c86320199eec193f582945b0f516f9ac4b08164b17d8af161cb2e890616b2ccf60ed5228dc42 WHIRLPOOL f0107ec77d96e1b47968d17e812425deb93e17e5585e2f5f10ab01d57f78e24efa43b222486d0d6aa18315057d1a5ce63190b9abea559f5e7f033bff5da5fe9f
DIST krename-4.0.9_p20170610.tar.xz 117888 SHA256 88278f3a3bc68a9acabdf55edb1d2e109adce2d4d78742bde23676f4ee92d760 SHA512 a406650f9c2b9094e21ea5224166b6f621da8cab9720737ded37b92c8fd0942ef10cdedc475a08ab363320719ffb203e3f7e0e72de4e64658fc68ad0600736fa WHIRLPOOL 73e5a162c7319ce16b25a7d55276bb08f438fcc8efeea94abd3297eb6367823b3bf1700663bb6d0d732ce404db4b45340b894e75ad27630c139fe41ab6e55f84
diff --git a/kde-misc/krename/files/krename-4.0.9-desktop-file.patch b/kde-misc/krename/files/krename-4.0.9-desktop-file.patch
deleted file mode 100644
index bb7dbacb3af..00000000000
--- a/kde-misc/krename/files/krename-4.0.9-desktop-file.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN krename-4.0.9.old/src/krename.desktop krename-4.0.9/src/krename.desktop
---- krename-4.0.9.old/src/krename.desktop 2007-03-18 17:54:10.000000000 +0100
-+++ krename-4.0.9/src/krename.desktop 2014-04-29 18:37:34.171237934 +0200
-@@ -1,8 +1,7 @@
- [Desktop Entry]
- Type=Application
--Exec=krename -caption "%c" %i %m %U
--Icon=krename.png
--MiniIcon=krename.png
-+Exec=krename -caption "%c" %i %U
-+Icon=krename
- DocPath=krename/index.html
- Comment=A batch renamer
- Comment[de]=Ein Batch Umbenenner
diff --git a/kde-misc/krename/files/krename-4.0.9-freetype-include.patch b/kde-misc/krename/files/krename-4.0.9-freetype-include.patch
deleted file mode 100644
index c6c70a584cf..00000000000
--- a/kde-misc/krename/files/krename-4.0.9-freetype-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ur krename-4.0.9_old/src/CMakeLists.txt krename-4.0.9/src/CMakeLists.txt
---- krename-4.0.9_old/src/CMakeLists.txt 2010-09-26 08:50:36.000000000 +0200
-+++ krename-4.0.9/src/CMakeLists.txt 2013-02-24 11:28:04.966613874 +0100
-@@ -18,7 +18,7 @@
- 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} )
diff --git a/kde-misc/krename/files/krename-4.0.9-gcc6.patch b/kde-misc/krename/files/krename-4.0.9-gcc6.patch
deleted file mode 100644
index b1687926d0b..00000000000
--- a/kde-misc/krename/files/krename-4.0.9-gcc6.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- krename-4.0.9/src/batchrenamer.cpp.orig 2016-05-07 12:50:29.243165528 +0000
-+++ krename-4.0.9/src/batchrenamer.cpp 2016-05-07 12:50:52.543081000 +0000
-@@ -402,7 +402,7 @@
- break;
- case eRenameMode_Link:
- // In case of link delete created file
-- job = KIO::file_delete( dstUrl, false );
-+ job = KIO::file_delete( dstUrl, NULL );
- break;
- case eRenameMode_Copy: // no undo possible
- // TODO: Maybe we should delete the created files
diff --git a/kde-misc/krename/krename-4.0.9-r3.ebuild b/kde-misc/krename/krename-4.0.9-r3.ebuild
deleted file mode 100644
index 1567329e4bc..00000000000
--- a/kde-misc/krename/krename-4.0.9-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-KDE_LINGUAS="bs cs de el es fr hu it ja lt nl pl pt ru sl sv tr uk zh_CN"
-inherit kde4-base
-
-DESCRIPTION="KRename - a very powerful batch file renamer"
-HOMEPAGE="http://www.krename.net/"
-SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug exif pdf taglib truetype"
-
-RDEPEND="
- exif? ( >=media-gfx/exiv2-0.13:= )
- pdf? ( >=app-text/podofo-0.8 )
- taglib? ( >=media-libs/taglib-1.5 )
- truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-freetype-include.patch"
- "${FILESDIR}/${P}-desktop-file.patch"
-)
-DOCS=( AUTHORS README TODO )
-
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_with exif Exiv2)
- $(cmake-utils_use_with taglib)
- $(cmake-utils_use_with pdf LIBPODOFO)
- $(cmake-utils_use_with truetype Freetype)
- )
-
- kde4-base_src_configure
-}
diff --git a/kde-misc/krename/krename-4.0.9-r4.ebuild b/kde-misc/krename/krename-4.0.9-r4.ebuild
deleted file mode 100644
index cd80c0d3154..00000000000
--- a/kde-misc/krename/krename-4.0.9-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_LINGUAS="bs cs de el es fr hu it ja lt nl pl pt ru sl sv tr uk zh_CN"
-inherit kde4-base
-
-DESCRIPTION="KRename - a very powerful batch file renamer"
-HOMEPAGE="http://www.krename.net/"
-SRC_URI="mirror://sourceforge/krename/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif pdf taglib truetype"
-
-RDEPEND="
- exif? ( >=media-gfx/exiv2-0.13:= )
- pdf? ( >=app-text/podofo-0.8 )
- taglib? ( >=media-libs/taglib-1.5 )
- truetype? ( media-libs/freetype:2 )
-"
-DEPEND="${RDEPEND}
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-freetype-include.patch"
- "${FILESDIR}/${P}-desktop-file.patch"
- "${FILESDIR}/${P}-gcc6.patch"
-)
-DOCS=( AUTHORS README TODO )
-
-src_configure() {
- local mycmakeargs=(
- -DWITH_Exiv2=$(usex exif)
- -DWITH_Taglib=$(usex taglib)
- -DWITH_LIBPODOFO=$(usex pdf)
- -DWITH_Freetype=$(usex truetype)
- )
-
- kde4-base_src_configure
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: kde-misc/krename/, kde-misc/krename/files/
@ 2020-07-18 22:25 Andreas Sturmlechner
0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2020-07-18 22:25 UTC (permalink / raw
To: gentoo-commits
commit: b61e1102c86c9ef0058ef316023b9e4681966a96
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 18 22:02:42 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jul 18 22:24:49 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b61e1102
kde-misc/krename: Prioritise local copy of FindTaglib.cmake
Fixes build with ECM 5.72 which ships a newer incompatible version.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/krename-5.0.0-kf-5.72-findtaglib.patch | 36 ++++++++++++++++++++++
kde-misc/krename/krename-5.0.0-r1.ebuild | 5 ++-
2 files changed, 40 insertions(+), 1 deletion(-)
diff --git a/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
new file mode 100644
index 00000000000..672d0c10681
--- /dev/null
+++ b/kde-misc/krename/files/krename-5.0.0-kf-5.72-findtaglib.patch
@@ -0,0 +1,36 @@
+From c1e0259445f32516785a6cb6e82e7cb401b6df37 Mon Sep 17 00:00:00 2001
+From: Jonathan Riddell <jr@jriddell.org>
+Date: Fri, 19 Jun 2020 16:44:47 +0100
+Subject: [PATCH] use local cmake modules first, fixes build failure
+
+---
+ CMakeLists.txt | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 602129b..4550621 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,7 +3,7 @@ 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} ${ECM_KDE_MODULE_DIR})
++set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
+
+ include(KDEInstallDirs)
+ include(ECMInstallIcons)
+@@ -28,8 +28,8 @@ find_package(KF5 REQUIRED COMPONENTS
+ XmlGui
+ )
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+- ${CMAKE_SOURCE_DIR}/cmake/modules)
++set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules
++ ${CMAKE_MODULE_PATH})
+
+ add_definitions(
+ -DQT_DEPRECATED_WARNINGS
+--
+GitLab
+
diff --git a/kde-misc/krename/krename-5.0.0-r1.ebuild b/kde-misc/krename/krename-5.0.0-r1.ebuild
index 3884d54fa10..b650df235fa 100644
--- a/kde-misc/krename/krename-5.0.0-r1.ebuild
+++ b/kde-misc/krename/krename-5.0.0-r1.ebuild
@@ -45,7 +45,10 @@ RDEPEND="${DEPEND}
!kde-misc/krename:4
"
-PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-exiv2-0.27.patch"
+ "${FILESDIR}/${P}-kf-5.72-findtaglib.patch"
+)
src_configure() {
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-18 22:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-17 18:03 [gentoo-commits] repo/gentoo:master commit in: kde-misc/krename/, kde-misc/krename/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2020-07-18 22:25 Andreas Sturmlechner
2016-07-09 19:05 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox