diff options
| author |   Johannes Huber <johu@gentoo.org> | 2012-08-25 08:24:09 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2012-08-25 08:24:09 +0000 |
| commit | 685d4ed0c9def9dff4fa8d92933036fc3353626e (patch) | |
| tree | 945d83ed3fedae03cf6bd510625b9e80170b120b | |
| parent | Removing the file that is actually older (diff) | |
| download | gentoo-2-685d4ed0c9def9dff4fa8d92933036fc3353626e.tar.gz gentoo-2-685d4ed0c9def9dff4fa8d92933036fc3353626e.tar.bz2 gentoo-2-685d4ed0c9def9dff4fa8d92933036fc3353626e.zip | |
Add upstream patch to fix build with gcc47 by Andrew Schenck <galiven@users.sourceforge.net> wrt bug #432596.
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
| -rw-r--r-- | app-portage/kuroo4/ChangeLog | 7 | ||||
| -rw-r--r-- | app-portage/kuroo4/files/kuroo4-0.90.2-gcc47.patch | 51 | ||||
| -rw-r--r-- | app-portage/kuroo4/kuroo4-0.90.2.ebuild | 4 |
3 files changed, 60 insertions, 2 deletions
diff --git a/app-portage/kuroo4/ChangeLog b/app-portage/kuroo4/ChangeLog index 4b39d5532efb..327ebe6ec29f 100644 --- a/app-portage/kuroo4/ChangeLog +++ b/app-portage/kuroo4/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-portage/kuroo4 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/kuroo4/ChangeLog,v 1.4 2012/08/05 20:45:42 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/kuroo4/ChangeLog,v 1.5 2012/08/25 08:24:09 johu Exp $ + + 25 Aug 2012; Johannes Huber <johu@gentoo.org> + +files/kuroo4-0.90.2-gcc47.patch, kuroo4-0.90.2.ebuild: + Add upstream patch to fix build with gcc47 by Andrew Schenck + <galiven@users.sourceforge.net> wrt bug #432596. 05 Aug 2012; Maciej Mrozowski <reavertm@gentoo.org> kuroo4-0.90.2.ebuild: Improve deps. diff --git a/app-portage/kuroo4/files/kuroo4-0.90.2-gcc47.patch b/app-portage/kuroo4/files/kuroo4-0.90.2-gcc47.patch new file mode 100644 index 000000000000..469e27210701 --- /dev/null +++ b/app-portage/kuroo4/files/kuroo4-0.90.2-gcc47.patch @@ -0,0 +1,51 @@ +Index: src/kurooinit.cpp +=================================================================== +--- src/kurooinit.cpp (revision 1608) ++++ src/kurooinit.cpp (revision 1609) +@@ -81,7 +81,7 @@ + exit(0); + } else { + chmod( kurooDir.toAscii(), 0770 ); +- chown( kurooDir.toAscii(), portageGid->gr_gid, portageUid->pw_uid ); ++ KIO::chown( KUrl(kurooDir), portageGid->gr_name, portageUid->pw_name); + } + + d.setCurrent( kurooDir ); +@@ -99,7 +99,7 @@ + } + else { + chmod( backupDir.toAscii(), 0770 ); +- chown( backupDir.toAscii(), portageGid->gr_gid, portageUid->pw_uid ); ++ KIO::chown( KUrl(backupDir), portageGid->gr_name, portageUid->pw_name); + } + } + +@@ -110,7 +110,7 @@ + QString logFile = LogSingleton::Instance()->init( this ); + if ( !logFile.isEmpty() ) { + chmod( logFile.toAscii(), 0660 ); +- chown( logFile.toAscii(), portageGid->gr_gid, portageUid->pw_uid ); ++ KIO::chown( KUrl(logFile), portageGid->gr_name, portageUid->pw_name ); + } + + // Initialize the database +@@ -136,7 +136,7 @@ + + // Give permissions to portage:portage to access the db also + chmod( databaseFile.toAscii(), 0660 ); +- chown( databaseFile.toAscii(), portageGid->gr_gid, portageUid->pw_uid ); ++ KIO::chown( KUrl(databaseFile), portageGid->gr_name, portageUid->pw_name ); + + // Initialize singletons objects + SignalistSingleton::Instance()->init( this ); +@@ -149,7 +149,7 @@ + FileWatcherSingleton::Instance()->init( this ); + + //Load packages in case /etc/portage.* changed +- //PortageFilesSingleton::Instance()->loadPackageFiles(); ++ PortageFilesSingleton::Instance()->loadPackageFiles(); + } + + KurooInit::~KurooInit() + +------------------------------------------------------------------------ diff --git a/app-portage/kuroo4/kuroo4-0.90.2.ebuild b/app-portage/kuroo4/kuroo4-0.90.2.ebuild index b45db28ba2dd..865a3743cd01 100644 --- a/app-portage/kuroo4/kuroo4-0.90.2.ebuild +++ b/app-portage/kuroo4/kuroo4-0.90.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/kuroo4/kuroo4-0.90.2.ebuild,v 1.3 2012/08/05 20:45:42 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/kuroo4/kuroo4-0.90.2.ebuild,v 1.4 2012/08/25 08:24:09 johu Exp $ EAPI=4 @@ -23,3 +23,5 @@ RDEPEND="${DEPEND} $(add_kdebase_dep kdesu) $(add_kdebase_dep kompare) " + +PATCHES=( "${FILESDIR}/${P}-gcc47.patch" ) |