[gentoo-commits] gentoo-x86 commit in kde-base/kwin: ChangeLog kwin-4.3.4-r1.ebuild kwin-4.3.4.ebuild

[gentoo-commits] gentoo-x86 commit in kde-base/kwin: ChangeLog kwin-4.3.4-r1.ebuild kwin-4.3.4.ebuild

[Robert Piasek (dagger)]

dagger      09/12/09 16:34:14

  Modified:             ChangeLog
  Added:                kwin-4.3.4-r1.ebuild
  Removed:              kwin-4.3.4.ebuild
  Log:
  Restored patch from 4.3.3-r1. Fixes bug #295811
  (Portage version: 2.1.7.11/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.177                kde-base/kwin/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/ChangeLog?rev=1.177&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/ChangeLog?rev=1.177&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/ChangeLog?r1=1.176&r2=1.177

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -r1.176 -r1.177
--- ChangeLog	1 Dec 2009 11:16:32 -0000	1.176
+++ ChangeLog	9 Dec 2009 16:34:14 -0000	1.177
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.176 2009/12/01 11:16:32 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.177 2009/12/09 16:34:14 dagger Exp $
+
+*kwin-4.3.4-r1 (09 Dec 2009)
+
+  09 Dec 2009; Robert Piasek <dagger@gentoo.org> -kwin-4.3.4.ebuild,
+  +kwin-4.3.4-r1.ebuild:
+  Fixed regression bug 295811
 
 *kwin-4.3.4 (01 Dec 2009)
 



1.1                  kde-base/kwin/kwin-4.3.4-r1.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/kwin-4.3.4-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kwin/kwin-4.3.4-r1.ebuild?rev=1.1&content-type=text/plain

Index: kwin-4.3.4-r1.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.3.4-r1.ebuild,v 1.1 2009/12/09 16:34:14 dagger Exp $

EAPI="2"

KMNAME="kdebase-workspace"
OPENGL_REQUIRED="optional"
inherit kde4-meta

DESCRIPTION="KDE window manager"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug xcomposite xinerama"

# NOTE disabled for now: captury? ( media-libs/libcaptury )
COMMONDEPEND="
	$(add_kdebase_dep kephal)
	$(add_kdebase_dep libkworkspace)
	x11-libs/libXdamage
	x11-libs/libXfixes
	>=x11-libs/libXrandr-1.2.1
	x11-libs/libXrender
	opengl? ( virtual/opengl )
	xcomposite? ( x11-libs/libXcomposite )
	xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
	x11-proto/damageproto
	x11-proto/fixesproto
	x11-proto/randrproto
	x11-proto/renderproto
	xcomposite? ( x11-proto/compositeproto )
	xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}"

PATCHES=(
        "${FILESDIR}/4.3.3-fix_no_opengl.patch"
)


src_prepare() {
# NOTE uncomment when enabled again by upstream
#	if ! use captury; then
#		sed -e 's:^PKGCONFIG..libcaptury:#DONOTFIND &:' \
#			-i kwin/effects/CMakeLists.txt || \
#			die "Making captury optional failed."
#	fi

	kde4-meta_src_prepare
}

src_configure() {
	mycmakeargs="${mycmakeargs}
		$(cmake-utils_use_with opengl OpenGL)"

	kde4-meta_src_configure
}