diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2009-07-29 16:18:22 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2009-07-29 16:18:22 +0000 |
| commit | a169f3ba04d91e771ed3fc4c67348d226757e719 (patch) | |
| tree | 9eb55e78b8a326311a93b9c78aca6a86a1821373 /sys-apps | |
| parent | unmask net-im/psi{,meida}: it's now released. (diff) | |
| download | gentoo-2-a169f3ba04d91e771ed3fc4c67348d226757e719.tar.gz gentoo-2-a169f3ba04d91e771ed3fc4c67348d226757e719.tar.bz2 gentoo-2-a169f3ba04d91e771ed3fc4c67348d226757e719.zip | |
Allowing sys-apps/qtparted-0.4.5 to build against sys-apps/parted-1.9.0
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/qtparted/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/qtparted/files/qtparted-0.4.5-parted-1.9-fix.patch | 21 | ||||
| -rw-r--r-- | sys-apps/qtparted/qtparted-0.4.5.ebuild | 7 |
3 files changed, 32 insertions, 4 deletions
diff --git a/sys-apps/qtparted/ChangeLog b/sys-apps/qtparted/ChangeLog index a980b4cc82bc..db067f019439 100644 --- a/sys-apps/qtparted/ChangeLog +++ b/sys-apps/qtparted/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/qtparted -# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/ChangeLog,v 1.32 2008/08/23 06:22:05 cardoe Exp $ +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/ChangeLog,v 1.33 2009/07/29 16:18:22 vostorga Exp $ + + 29 Jul 2009; Víctor Ostorga <vostorga@gentoo.org> qtparted-0.4.5.ebuild, + +files/qtparted-0.4.5-parted-1.9-fix.patch: + Allowing sys-apps/qtparted-0.4.5 to build against sys-apps/parted-1.9.0 23 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml: add GLEP 56 USE flag desc from use.local.desc diff --git a/sys-apps/qtparted/files/qtparted-0.4.5-parted-1.9-fix.patch b/sys-apps/qtparted/files/qtparted-0.4.5-parted-1.9-fix.patch new file mode 100644 index 000000000000..2899e4fc5834 --- /dev/null +++ b/sys-apps/qtparted/files/qtparted-0.4.5-parted-1.9-fix.patch @@ -0,0 +1,21 @@ +diff -NrU5 qtparted-0.4.5.original/src/qp_libparted.cpp qtparted-0.4.5/src/qp_libparted.cpp +--- qtparted-0.4.5.original/src/qp_libparted.cpp 2009-07-29 15:42:54.000000000 +0000 ++++ qtparted-0.4.5/src/qp_libparted.cpp 2009-07-29 15:49:16.000000000 +0000 +@@ -1746,15 +1746,15 @@ + if (ped_exception_throw(PED_EXCEPTION_ERROR, + (PedExceptionOption)PED_EXCEPTION_IGNORE_CANCEL, + label.latin1(), + path) != PED_EXCEPTION_IGNORE) goto error_free_path; + } +- ped_free(path); ++ free(path); + return true; + + error_free_path: +- ped_free(path); ++ free(path); + + //error: + return false; + } + diff --git a/sys-apps/qtparted/qtparted-0.4.5.ebuild b/sys-apps/qtparted/qtparted-0.4.5.ebuild index 5936d33d046a..0fcf94d2311b 100644 --- a/sys-apps/qtparted/qtparted-0.4.5.ebuild +++ b/sys-apps/qtparted/qtparted-0.4.5.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/qtparted-0.4.5.ebuild,v 1.7 2008/07/28 21:23:23 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/qtparted/qtparted-0.4.5.ebuild,v 1.8 2009/07/29 16:18:22 vostorga Exp $ EAPI=1 @@ -34,6 +34,9 @@ src_unpack() { # Fix up for parted v1.7 epatch "${FILESDIR}"/qtparted-0.4.5-parted-1.7-fix.patch + # Fix up for parted v 1.9 + epatch "${FILESDIR}"/${P}-parted-1.9-fix.patch + # Switch from gksu to kdesu for the KDE desktop. if use kde; then use gnome || sed -i -e 's/gksu/kdesu/' debian/menu || |