From ffe9827534790d0b1a1aec416b338606422930b7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20H=C3=BCttel?= Date: Fri, 30 Dec 2011 22:41:07 +0000 Subject: [PATCH] Fix crash bug 396377 Package-Manager: portage-2.1.10.41/cvs/Linux x86_64 --- kde-misc/krename/ChangeLog | 8 +++- kde-misc/krename/Manifest | 26 ++++++++----- .../files/krename-4.0.7-fix-segfault.patch | 15 +++++++ kde-misc/krename/krename-4.0.7-r1.ebuild | 39 +++++++++++++++++++ 4 files changed, 78 insertions(+), 10 deletions(-) create mode 100644 kde-misc/krename/files/krename-4.0.7-fix-segfault.patch create mode 100644 kde-misc/krename/krename-4.0.7-r1.ebuild diff --git a/kde-misc/krename/ChangeLog b/kde-misc/krename/ChangeLog index da859aedc4ce..576c9c29f4bf 100644 --- a/kde-misc/krename/ChangeLog +++ b/kde-misc/krename/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for kde-misc/krename # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.68 2011/12/14 11:05:54 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/ChangeLog,v 1.69 2011/12/30 22:41:06 dilfridge Exp $ + +*krename-4.0.7-r1 (30 Dec 2011) + + 30 Dec 2011; Andreas K. Huettel + +krename-4.0.7-r1.ebuild, +files/krename-4.0.7-fix-segfault.patch: + Fix crash bug 396377 14 Dec 2011; Johannes Huber -krename-4.0.5.ebuild: Cleanup. All arches stable on newer version. diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest index bf21a26582a8..2ee0aeae92fc 100644 --- a/kde-misc/krename/Manifest +++ b/kde-misc/krename/Manifest @@ -1,18 +1,26 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 +AUX krename-4.0.7-fix-segfault.patch 580 RMD160 b99034485ee3d613ea2a8e30c752567bfb944500 SHA1 3cc06f34d1a5f653ba70b4b0dc31370608724ab4 SHA256 88b05a42fad46546acaad744ceeb32e0736c65698f0b4bb8ad4b2c22d6392366 DIST krename-4.0.7.tar.bz2 237443 RMD160 be436dac02f0a48b78064ab3c5323debdb7c62e9 SHA1 c53d1819247a88bc4f49d52936f1e2bc7fa9850d SHA256 e251a2d6ddd5f9c675295702e89dedf7f655c47954c3772f01d13f7699e124d4 +EBUILD krename-4.0.7-r1.ebuild 1035 RMD160 a139e5f3daffb0685427409bd4f8200fa6802b84 SHA1 b0df15b6796048fffbb4f6f8d542f4bd6699c797 SHA256 1ed1d2f91a71ef67b4e6f3bd473a6e3c7933fd2e55479141b09d67e754a849b2 EBUILD krename-4.0.7.ebuild 973 RMD160 d579fc2b0ddfed08e879f7c87bf1e9e15fa5c068 SHA1 8a12aed318cb2388f743b7e08676076ae377678b SHA256 13c5c11e622e10e2f510a7a1233169f311d345dc35a4d98b063cf8f3029f84c3 -MISC ChangeLog 13522 RMD160 199fa69f1563257442e0ac02c4af3d101c6d533f SHA1 dbe48b14b8383cc0256a0e11d7c667cab25a4d78 SHA256 5a73aca7d427c94299a3445de311663a51d1f9dd4d5b0f46408f811e6791de75 +MISC ChangeLog 13710 RMD160 971b17841cc5a4657f73c1b1ff5952a45f50a5a4 SHA1 58a6f54315aa7998e47cd82d77e89d86c49be68d SHA256 f20f04f732cae301bcce6e6475d0f3bc2e89453f44b4c913c0b07f094c8a748a MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iQEcBAEBCgAGBQJO6IOMAAoJEO+t9ga+3I3aYjgH+gIKf+7XQoojHYRKJPj/BBxV -fQHXouXmGKltCRa+oQAiJxe0wrL/IFD+91BiPFPdgTHfyKU3+nO2VNUYF94FtYag -V0U/gGrrugNbOU7hv2ybnVaO6rgHjis3RBXiMAvt/F3zW78wJWX7t7PmylllxqWB -r/i5f3vFPFFpNBZMnE0jJLTbDAlp8xGmz+TL+pW/DdJxD+Z+5RflNlZrPHbM+ByN -Z5rxWIT58KRKDdFjrTD0S0P0T7WtZZEa2d7/A9d1Ct3kKFuLK1v0vqn7nimXF616 -fdWdbeo1YYKuJDCXf1UB2sXo8lA+Gzh88HOoTHkxB8aiPrA2iQd9vGKFHwU27Sk= -=X9wX +iQIcBAEBCgAGBQJO/j59AAoJEEb+UGWnxTyHWrcP/RSrHvGqOo75VQM1ON0QsmWz +rV9EP6t/l94Po5vQcpMEfL9xzsZJgQMvxjy299Cn3JKsEYJq7Omm1lT7JcNMEjye +t/5AR4rh1omGbGjh+9W0auhpChIo2CFkTWGQ9DO0Oq7rDbs66HKpyTaXbTsxsTxr +8S3GBbaqC1mf4X1Z86Y71q0qQYkgtluXbos43Z9jc6nMIqflh+/0K06b95iY8cHb +MxddVNsm1XenJ3l7872FglcH/KWpEYH18ulcxVLb3mL3pUtSX2EOsVkR/lSPhJKP +/zK28yxtH48KwnteExtNni6799XO82uzq8ZTznCtPZoh0aZ/W9DbODiTZ4vLoLZn +N1pwc15P5SBURz234zT7wnQvdu2wabrfALubaCN2OJ/nesxURisrsbSz6BEkPN4f +Jslz+aG7dP5OHoJUY4pUlL2zLD7LWZc3kIehu4JnMFhC10wykga8MWHIh13uMbNq +cndt1Pd7LTXe3qFOaDjVv6r7nAjxc9nv/WQAAO0hDXoXoMQz9J1uJjGERmAfr7PD +3eComJmAVguko1JtOZfZTD1gc0uCtEuk0929wq1aswurp/qK8wbB3T3nYyYwRwnz +V6wsvBge8/09SfElHqBqkGfVLuNZBFzmrSFQdyhPhwJDHm2kWKbBi1rQGSFWNS/u +95reSWX+bqVsAB2T9Hbk +=btUz -----END PGP SIGNATURE----- diff --git a/kde-misc/krename/files/krename-4.0.7-fix-segfault.patch b/kde-misc/krename/files/krename-4.0.7-fix-segfault.patch new file mode 100644 index 000000000000..a21bd779d357 --- /dev/null +++ b/kde-misc/krename/files/krename-4.0.7-fix-segfault.patch @@ -0,0 +1,15 @@ +Patch by Kevin Kofler, for more info see +https://bugzilla.redhat.com/show_bug.cgi?id=684908 + +diff -ur krename-4.0.7/src/plugin.cpp krename-4.0.7.new/src/plugin.cpp +--- krename-4.0.7/src/plugin.cpp 2010-12-20 11:56:56.000000000 -0600 ++++ krename-4.0.7.new/src/plugin.cpp 2011-12-28 20:19:45.027305094 -0600 +@@ -19,7 +19,7 @@ + + #include "tokenhelpdialog.h" + +-const QString Plugin::S_TOKEN_SEPARATOR = TokenHelpDialog::S_TOKEN_SEPARATOR; ++const QString Plugin::S_TOKEN_SEPARATOR = ";;"; + + Plugin::Plugin( PluginLoader* loader ) + : m_pluginLoader( loader ), m_enabled( false ) diff --git a/kde-misc/krename/krename-4.0.7-r1.ebuild b/kde-misc/krename/krename-4.0.7-r1.ebuild new file mode 100644 index 000000000000..efb34c414c2b --- /dev/null +++ b/kde-misc/krename/krename-4.0.7-r1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-misc/krename/krename-4.0.7-r1.ebuild,v 1.1 2011/12/30 22:41:06 dilfridge Exp $ + +EAPI=4 +KDE_LINGUAS="bs cs de el es fr hu it ja 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" + +DEPEND=" + exif? ( >=media-gfx/exiv2-0.13 ) + pdf? ( >=app-text/podofo-0.8 ) + taglib? ( >=media-libs/taglib-1.5 ) + truetype? ( media-libs/freetype:2 ) +" +RDEPEND="${DEPEND}" + +DOCS="AUTHORS README TODO" + +PATCHES=( "${FILESDIR}/${PN}-4.0.7-fix-segfault.patch" ) + +src_configure() { + 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 +} -- 2.26.2