From 49d92664777a2dd87c08a529e8d793cf51eab9e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 8 Jun 2006 16:43:18 +0000 Subject: [PATCH] Add a patch to fix the few warnings spawning (fixes one format string error, maybe not vulnerability but always better to fix), and fix the path for documentation. Package-Manager: portage-2.1_rc4-r4 --- dev-util/valkyrie/ChangeLog | 8 ++- dev-util/valkyrie/Manifest | 26 +++++---- .../files/valkyrie-1.2.0-warnings.patch | 53 +++++++++++++++++++ dev-util/valkyrie/valkyrie-1.2.0.ebuild | 14 ++++- 4 files changed, 88 insertions(+), 13 deletions(-) create mode 100644 dev-util/valkyrie/files/valkyrie-1.2.0-warnings.patch diff --git a/dev-util/valkyrie/ChangeLog b/dev-util/valkyrie/ChangeLog index 0cdd4c1af4c9..66a0a6411916 100644 --- a/dev-util/valkyrie/ChangeLog +++ b/dev-util/valkyrie/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-util/valkyrie # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/ChangeLog,v 1.2 2006/06/08 12:05:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/ChangeLog,v 1.3 2006/06/08 16:43:18 flameeyes Exp $ + + 08 Jun 2006; Diego Pettenò + +files/valkyrie-1.2.0-warnings.patch, valkyrie-1.2.0.ebuild: + Add a patch to fix the few warnings spawning (fixes one format string error, + maybe not vulnerability but always better to fix), and fix the path for + documentation. 08 Jun 2006; Diego Pettenò valkyrie-1.2.0.ebuild: Add ~ppc (okay'd by lu_zero), and use emake for install. diff --git a/dev-util/valkyrie/Manifest b/dev-util/valkyrie/Manifest index c5316f957fc0..1ae7612e2ae2 100644 --- a/dev-util/valkyrie/Manifest +++ b/dev-util/valkyrie/Manifest @@ -1,15 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX valkyrie-1.2.0-warnings.patch 2206 RMD160 a826fd8f36f0502fa3c385821f7d84694961eb37 SHA1 fdf80889f1bd1f94c37ed4a7a55218a6a68947f5 SHA256 3d4a78c20f44bca6dcca6f1a34060b51d5b677367d5ebdaaa41306c75cfe5f37 +MD5 a488d601c88bab50e7ce8e3df4c035ec files/valkyrie-1.2.0-warnings.patch 2206 +RMD160 a826fd8f36f0502fa3c385821f7d84694961eb37 files/valkyrie-1.2.0-warnings.patch 2206 +SHA256 3d4a78c20f44bca6dcca6f1a34060b51d5b677367d5ebdaaa41306c75cfe5f37 files/valkyrie-1.2.0-warnings.patch 2206 DIST valkyrie-1.2.0.tar.bz2 369806 RMD160 5afbb8e461bd6f85dd426eef45892136104f0256 SHA1 ca2711c473b9c1c7fc1b831febd99bbee9b6716d SHA256 a93192748d4134eacd072b74743404326925bf1669c52df2b4e75ef5118ec43b -EBUILD valkyrie-1.2.0.ebuild 897 RMD160 6e2ddc6c5420a9e0304abdc3d08629f45949337a SHA1 74e2fdaad974964d7fe5713a182f93f4ac0613b8 SHA256 01bf6b2b10cc17ff40e88017ff7e585812366441c4625c08fd3847bb9a3f9e76 -MD5 98f7b17db54021b40b064e6a1a8f5448 valkyrie-1.2.0.ebuild 897 -RMD160 6e2ddc6c5420a9e0304abdc3d08629f45949337a valkyrie-1.2.0.ebuild 897 -SHA256 01bf6b2b10cc17ff40e88017ff7e585812366441c4625c08fd3847bb9a3f9e76 valkyrie-1.2.0.ebuild 897 -MISC ChangeLog 538 RMD160 9a34826a352460e42ae26f5620ac047ed3ea1d5f SHA1 bed50148209284828828befc6b8cc8fbc628aac0 SHA256 b9a5858c6a4cd164bcef5ab74103ccc85c9be5a9235105f28397685709076133 -MD5 06c9e691d5b93c012f07cc75e2d87be0 ChangeLog 538 -RMD160 9a34826a352460e42ae26f5620ac047ed3ea1d5f ChangeLog 538 -SHA256 b9a5858c6a4cd164bcef5ab74103ccc85c9be5a9235105f28397685709076133 ChangeLog 538 +EBUILD valkyrie-1.2.0.ebuild 1110 RMD160 7f89404b774acd67c595759bcbd476d0349bea69 SHA1 7997c6b5f6f896a7a3f8ced3c9778fa0dd8f1021 SHA256 42882fae3476bdeb09c7c28f055a74031c6a7fa59768bf5c4b6346e9c65e436a +MD5 0b6da9d0996d5d6a15459625282ea399 valkyrie-1.2.0.ebuild 1110 +RMD160 7f89404b774acd67c595759bcbd476d0349bea69 valkyrie-1.2.0.ebuild 1110 +SHA256 42882fae3476bdeb09c7c28f055a74031c6a7fa59768bf5c4b6346e9c65e436a valkyrie-1.2.0.ebuild 1110 +MISC ChangeLog 825 RMD160 b13f6f6f5868f6408c6773c3d0f4647031b6d049 SHA1 394814c00153f4edee4c90ec2bfca2d14ff35ac1 SHA256 18f59e9b0850cf6e09d8bbd1662f36ae5122f01e0545efc28fe6a4b20792c05b +MD5 0003611b1e1f7fb37810f9b9a322873b ChangeLog 825 +RMD160 b13f6f6f5868f6408c6773c3d0f4647031b6d049 ChangeLog 825 +SHA256 18f59e9b0850cf6e09d8bbd1662f36ae5122f01e0545efc28fe6a4b20792c05b ChangeLog 825 MISC metadata.xml 251 RMD160 30a64bf83060c110066f4c8077576aa16e55b8ca SHA1 96ef22990f891fc86990af758532d6d88d3416db SHA256 d919cadb6db629b0ca6d8f3875bf2e74846590cfa47fd59035ba1ef43248c14e MD5 e9be3a3468b13dd54a3aab0799fbed8d metadata.xml 251 RMD160 30a64bf83060c110066f4c8077576aa16e55b8ca metadata.xml 251 @@ -20,7 +24,7 @@ SHA256 9f5ae46be122d2e3d752d4f2a75bac7c70d4f9f9dce9bfeb0c616cba74259353 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (GNU/Linux) -iD8DBQFEiBJyAiZjviIA2XgRAn1cAJ9SbNPVL1Ty5RQ3jNh8HiKk8bURGACgxhVE -kO5LmNquPJXDBWa9fptJ/XQ= -=DUeH +iD8DBQFEiFOyAiZjviIA2XgRArOgAJ9PTl+pwjzYk6te1Cx1Io1FEsynJwCfXOvS +8SSFMLvA2y+wPM/k1lgtaag= +=bLFY -----END PGP SIGNATURE----- diff --git a/dev-util/valkyrie/files/valkyrie-1.2.0-warnings.patch b/dev-util/valkyrie/files/valkyrie-1.2.0-warnings.patch new file mode 100644 index 000000000000..7dccfe1e9407 --- /dev/null +++ b/dev-util/valkyrie/files/valkyrie-1.2.0-warnings.patch @@ -0,0 +1,53 @@ +Index: valkyrie-1.2.0/valkyrie/tool_utils/vglog.cpp +=================================================================== +--- valkyrie-1.2.0.orig/valkyrie/tool_utils/vglog.cpp ++++ valkyrie-1.2.0/valkyrie/tool_utils/vglog.cpp +@@ -863,7 +863,7 @@ bool VgLog::mergeErrors( VgErrorList sEr + { + VgErrCounts mErrCounts = errorcounts(); + +- vklmPrint( 2, "--- update matches (n=%d) --- ", sErrors.count()); ++ vklmPrint( 2, "--- update matches (n=%zu) --- ", sErrors.count()); + + /* --- find matches: update master err, delete slave err --- */ + +@@ -927,7 +927,7 @@ bool VgLog::mergeErrors( VgErrorList sEr + vklmPrint( 2, " "); + } + +- vklmPrint( 2, "--- append non-matches (n=%d) --- ", sErrors.count() ); ++ vklmPrint( 2, "--- append non-matches (n=%zu) --- ", sErrors.count() ); + + /* if no errcounts, and sErrors > 0, create empty errcounts */ + if ( mErrCounts.isNull() && sErrors.count() > 0 ) { +@@ -965,7 +965,7 @@ bool VgLog::mergeErrors( VgErrorList sEr + + bool VgLog::mergeLeakErrors( VgErrorList sLeakErrors ) + { +- vklmPrint( 2, "--- update matches (n=%d) ---", sLeakErrors.count() ); ++ vklmPrint( 2, "--- update matches (n=%zu) ---", sLeakErrors.count() ); + + /* --- for each leak in master --- */ + VgErrorList errs = leaks(); +@@ -1001,7 +1001,7 @@ bool VgLog::mergeLeakErrors( VgErrorList + vklmPrint( 2, " "); + } + +- vklmPrint( 2, "--- append non-matches (n=%d) ---", sLeakErrors.count() ); ++ vklmPrint( 2, "--- append non-matches (n=%zu) ---", sLeakErrors.count() ); + + /* --- append remaining slave leaks to master --- */ + VgErrorList::Iterator sIt; +Index: valkyrie-1.2.0/valkyrie/vk_file_utils.cpp +=================================================================== +--- valkyrie-1.2.0.orig/valkyrie/vk_file_utils.cpp ++++ valkyrie-1.2.0/valkyrie/vk_file_utils.cpp +@@ -3021,7 +3021,7 @@ void FileDialog::urlFinished( QNetworkOp + if ( d->paths->hasFocus() ) + d->ignoreNextKeyPress = true; + +- vkWarn( this, "Error", op->protocolDetail().latin1() ); ++ vkWarn( this, "Error", "%s", op->protocolDetail().latin1() ); + switch ( op->errorCode() ) { + case QNetworkProtocol::ErrParse: + case QNetworkProtocol::ErrValid: diff --git a/dev-util/valkyrie/valkyrie-1.2.0.ebuild b/dev-util/valkyrie/valkyrie-1.2.0.ebuild index b0b72873108f..469c7c87aa91 100644 --- a/dev-util/valkyrie/valkyrie-1.2.0.ebuild +++ b/dev-util/valkyrie/valkyrie-1.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/valkyrie-1.2.0.ebuild,v 1.2 2006/06/08 12:05:00 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/valkyrie/valkyrie-1.2.0.ebuild,v 1.3 2006/06/08 16:43:18 flameeyes Exp $ inherit eutils qt3 @@ -16,6 +16,13 @@ IUSE="debug" DEPEND="$(qt_min_version 3) >=dev-util/valgrind-3.2.0" +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-warnings.patch" +} + src_compile() { use debug || sed -i -e '/#define DEBUG_ON/ s:1:0:' \ "${S}/valkyrie/vk_utils.h" @@ -23,6 +30,11 @@ src_compile() { econf \ --disable-dependency-tracking \ --with-Qt-dir="${QTDIR}" || die "econf failed" + + # Use the right path for the documentation + sed -i -e '/VK_DOC_PATH/ s:/doc/:/share/doc/'${PF}'/html/:g' \ + "${S}/config.h" + emake || die "emake failed" } -- 2.26.2