Add patch to fix compilation with gcc-4.7 (bug #423759). Remove old revision.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

5 files changed, 33 insertions, 105 deletions

diff --git a/x11-wm/razorqt/ChangeLog b/x11-wm/razorqt/ChangeLog
index 121df28dc2e8..642ae3128780 100644
--- a/x11-wm/razorqt/ChangeLog
+++ b/x11-wm/razorqt/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/razorqt
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/razorqt/ChangeLog,v 1.4 2012/04/23 20:38:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/razorqt/ChangeLog,v 1.5 2012/06/30 06:17:05 yngwin Exp $
+
+  30 Jun 2012; Ben de Groot <yngwin@gentoo.org>
+  +files/razorqt-0.4.1-add-missing-headers.patch, -razorqt-0.4.1-r1.ebuild,
+  razorqt-0.4.1-r2.ebuild:
+  Add patch to fix compilation with gcc-4.7 (bug #423759). Remove old revision.
 
   23 Apr 2012; Michał Górny <mgorny@gentoo.org> razorqt-0.4.1-r1.ebuild,
   razorqt-0.4.1-r2.ebuild:
@@ -27,4 +32,3 @@
   +razorqt-0.4.1.ebuild:
   Initial commit of Razor-qt WM. Thanks to all the people who contributed on bug
   #382875
-
diff --git a/x11-wm/razorqt/Manifest b/x11-wm/razorqt/Manifest
index 14879dc9c651..14d44f6a0586 100644
--- a/x11-wm/razorqt/Manifest
+++ b/x11-wm/razorqt/Manifest
@@ -1,19 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX razorqt-0.4.1-add-missing-headers.patch 902 RMD160 1ec4040eac38c093962eae78532aedae581dcf23 SHA1 1e7764ab01d496b26b99e895f66a7774c65cd830 SHA256 c0922dd09b22e5ca2b5712774fa304c52ce84e88d99aff6acd1475c3885b6c73
 AUX razorqt-0.4.1-automagic.patch 560 RMD160 2032fad720ad39d8db68e612ba5d1b120e4e5f3b SHA1 477be9b774f9316ef43c6a5ef9cf6f3921975099 SHA256 d74ed8f93964708e4557b76fde57b48e9c4dae3db1a3e566b44e7f6171a49b3a
 AUX razorqt-0.4.1-unbundle-xdg-utils.patch 2273 RMD160 e607c5ea28a8c76575dd57167a4d84e0e20c54eb SHA1 4e0079e25830cdf975063a1d744e85e06a75508e SHA256 06f181c01af3866a7e75d1e8e19181ef1c062a71ff167cec2cc6b77f7960e4b8
 DIST razorqt-0.4.1.tar.bz2 9859818 RMD160 62985a827585359b5c4e28cf609680d6612b22ec SHA1 d05fb1b653381ae4632ce46929986077f98f246d SHA256 a730ab33266679afa9ffd204307b34369f132c539b68c28c0ccbb4e10e6b1eea
-EBUILD razorqt-0.4.1-r1.ebuild 1831 RMD160 2a258bfd3a0c074428b5da873340aadf4a0d699c SHA1 1859064d912a06dfb1ef165016283bd86a507bd3 SHA256 c1ab3df2a69defcfcaf46432a3a41751749cfcba56a10c6f044f99ef7259a0d7
-EBUILD razorqt-0.4.1-r2.ebuild 1943 RMD160 ee60b65afbfb7a75169c640371c0ba14945d4a7f SHA1 8093f3945987fa60b6152e934f44b8cc6eea7059 SHA256 1e029682689ad8b5bf06a2c69609d4783534cf705cd3219f81de74f27657f99a
-MISC ChangeLog 1094 RMD160 e7600c249df098b37c6626797f5156b2b9313c62 SHA1 dd4286b9cc6931509a95affa0f80aa82a9b3a56d SHA256 de2ed2f77d15f1502e0b7bb642cf7356c6d15a16c423a6fd8998021984873a58
+EBUILD razorqt-0.4.1-r2.ebuild 1989 RMD160 1d07ff6bfdd18a824b9e46f4549b333a50b6084e SHA1 ae48fc7e6ea77cf9a01a49fdb4231b42e90d21c4 SHA256 b3286680b44ca307bc89ff969e0af2b7640c970a87fa1b3ce8dba46fec04f0bb
+MISC ChangeLog 1325 RMD160 4f257c8b9bc7c0b31acdc0e3faecfb21f6f377af SHA1 f9e4832011c9068c7c794d7b18658edeba4655a5 SHA256 a3c9ea3498293c4c4ae4419c6aca6f63ee90fce01302600e808148d3c785f099
 MISC metadata.xml 203 RMD160 f21ab0adb7ed966ccbfb8706172574746bf83c45 SHA1 9929f57d84969eaa6e4f2b8d399921bc4c7ba1e4 SHA256 e70e3acb51ca19e8ef1c7b3fe1356e152781028e0bdccd400e0979db61b77070
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iJwEAQEIAAYFAk+VvgEACgkQfXuS5UK5QB1+jgQAis28E9F8HAhXzSf0jJmJzCm/
-PTOnMO2Nlci0bOIMlQQJjI6xQpT56Vfp/JlOPfZr0H3JvbMXv1yQE5jR5Fshc6Ep
-JOI63GbgbsybEwYbmFUIXtkKxyg0+7p0KcLUqTenbM5sH2xcrqNlPbGaaNONwJbk
-l09UQ2OACmXi0cx3fdY=
-=3VyI
------END PGP SIGNATURE-----
diff --git a/x11-wm/razorqt/files/razorqt-0.4.1-add-missing-headers.patch b/x11-wm/razorqt/files/razorqt-0.4.1-add-missing-headers.patch
new file mode 100644
index 000000000000..593d756fe162
--- /dev/null
+++ b/x11-wm/razorqt/files/razorqt-0.4.1-add-missing-headers.patch
@@ -0,0 +1,22 @@
+diff -burN razorqt-0.4.1.orig/razorqt-session/src/main.cpp razorqt-0.4.1/razorqt-session/src/main.cpp
+--- razorqt-0.4.1.orig/razorqt-session/src/main.cpp	2012-06-30 13:57:37.761145972 +0800
++++ razorqt-0.4.1/razorqt-session/src/main.cpp	2012-06-30 14:01:22.813260094 +0800
+@@ -27,6 +27,7 @@
+ 
+ #include <QApplication>
+ #include <QIcon>
++#include <unistd.h>
+ 
+ #include "razormodman.h"
+ #include "sessiondbusadaptor.h"
+diff -burN razorqt-0.4.1.orig/razorqt-session/src/razormodman.cpp razorqt-0.4.1/razorqt-session/src/razormodman.cpp
+--- razorqt-0.4.1.orig/razorqt-session/src/razormodman.cpp	2012-02-13 18:24:51.000000000 +0800
++++ razorqt-0.4.1/razorqt-session/src/razormodman.cpp	2012-06-30 14:02:05.859693558 +0800
+@@ -28,6 +28,7 @@
+ #include "razormodman.h"
+ #include <razorqt/razorsettings.h>
+ #include <qtxdg/xdgautostart.h>
++#include <unistd.h>
+ 
+ #include <QtDebug>
+ #include <QDBusInterface>
diff --git a/x11-wm/razorqt/razorqt-0.4.1-r1.ebuild b/x11-wm/razorqt/razorqt-0.4.1-r1.ebuild
deleted file mode 100644
index f0cfcc86a3ca..000000000000
--- a/x11-wm/razorqt/razorqt-0.4.1-r1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/razorqt/razorqt-0.4.1-r1.ebuild,v 1.2 2012/04/23 20:38:49 mgorny Exp $
-
-EAPI=4
-
-inherit cmake-utils
-
-DESCRIPTION="An advanced, easy-to-use, and fast desktop environment based on Qt"
-HOMEPAGE="http://razor-qt.org"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="git://github.com/Razor-qt/razor-qt.git"
-	EGIT_BRANCH="0.4.1"
-	KEYWORDS=""
-else
-	SRC_URI="mirror://github/Razor-qt/razor-qt/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="doc policykit"
-
-COMMON_DEPEND="sys-apps/file
-	policykit? (
-		dev-libs/glib:2
-		sys-auth/polkit-qt
-	)
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXcomposite
-	x11-libs/libXcursor
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/qt-core:4
-	x11-libs/qt-dbus:4
-	x11-libs/qt-gui:4
-	x11-libs/qt-script:4"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	dev-util/cmake"
-
-RDEPEND="${COMMON_DEPEND}
-	|| (
-		x11-wm/openbox
-		kde-base/kwin
-		x11-wm/metacity
-		xfce-base/xfwm4
-		x11-wm/enlightenment
-		x11-wm/fvwm
-		x11-wm/sawfish
-		x11-wm/windowmaker
-		)"
-
-PATCHES=( "${FILESDIR}/${P}-automagic.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_enable policykit)
-	)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_make
-
-	# build developer documentation using Doxygen
-	use doc && emake -C "${CMAKE_BUILD_DIR}" docs
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# install developer documentation
-	use doc && dodoc -r "${CMAKE_BUILD_DIR}/docs"
-}
-
-pkg_postinst() {
-	einfo "To be able to Shutdown/Reboot from Razor,"
-	einfo "make sure sys-power/upower is installed."
-	einfo "For the Removable Media plugin to work,"
-	einfo "make sure sys-fs/udisks is installed."
-}
diff --git a/x11-wm/razorqt/razorqt-0.4.1-r2.ebuild b/x11-wm/razorqt/razorqt-0.4.1-r2.ebuild
index 26c0aa575148..52a0a02dfaab 100644
--- a/x11-wm/razorqt/razorqt-0.4.1-r2.ebuild
+++ b/x11-wm/razorqt/razorqt-0.4.1-r2.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/x11-wm/razorqt/razorqt-0.4.1-r2.ebuild,v 1.2 2012/04/23 20:38:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/razorqt/razorqt-0.4.1-r2.ebuild,v 1.3 2012/06/30 06:17:05 yngwin Exp $
 
 EAPI=4
 
@@ -60,6 +60,7 @@ RDEPEND="${COMMON_DEPEND}
 PATCHES=(
 	"${FILESDIR}/${P}-automagic.patch"
 	"${FILESDIR}/${P}-unbundle-xdg-utils.patch"
+	"${FILESDIR}/${P}-add-missing-headers.patch"
 )
 
 src_configure() {