summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-wm/razorqt/ChangeLog8
-rw-r--r--x11-wm/razorqt/files/razorqt-0.4.1-add-missing-headers.patch22
-rw-r--r--x11-wm/razorqt/razorqt-0.4.1-r1.ebuild87
-rw-r--r--x11-wm/razorqt/razorqt-0.4.1-r2.ebuild3
4 files changed, 30 insertions, 90 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/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() {