diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-13 20:38:26 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2011-06-13 20:38:26 +0000 |
| commit | 5a2d66edcf53f012746d4fea4323e8d056e865bd (patch) | |
| tree | 980c4cf060dfae42da947ae119ed292e78b14322 /kde-base | |
| parent | Version bump, remove old (diff) | |
| download | gentoo-2-5a2d66edcf53f012746d4fea4323e8d056e865bd.tar.gz gentoo-2-5a2d66edcf53f012746d4fea4323e8d056e865bd.tar.bz2 gentoo-2-5a2d66edcf53f012746d4fea4323e8d056e865bd.zip | |
Fix automagic dependency on libXxf86misc, bug 358655
(Portage version: 2.1.10.2/cvs/Linux x86_64)
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/kscreensaver/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch | 12 | ||||
| -rw-r--r-- | kde-base/kscreensaver/kscreensaver-4.6.4.ebuild | 10 |
3 files changed, 24 insertions, 4 deletions
diff --git a/kde-base/kscreensaver/ChangeLog b/kde-base/kscreensaver/ChangeLog index 63c0ea97c472..978b51335520 100644 --- a/kde-base/kscreensaver/ChangeLog +++ b/kde-base/kscreensaver/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/kscreensaver # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.184 2011/06/10 21:30:10 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/ChangeLog,v 1.185 2011/06/13 20:38:26 dilfridge Exp $ + + 13 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> + kscreensaver-4.6.4.ebuild, +files/kscreensaver-4.6.4-xf86misc.patch: + Fix automagic dependency on libXxf86misc, bug 358655 10 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> Manifest: Remanifest as tarball was changed diff --git a/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch new file mode 100644 index 000000000000..7eb00b6f860d --- /dev/null +++ b/kde-base/kscreensaver/files/kscreensaver-4.6.4-xf86misc.patch @@ -0,0 +1,12 @@ +diff -ruN kscreensaver-4.6.4.orig/ConfigureChecks.cmake kscreensaver-4.6.4/ConfigureChecks.cmake +--- kscreensaver-4.6.4.orig/ConfigureChecks.cmake 2011-02-25 22:54:48.000000000 +0100 ++++ kscreensaver-4.6.4/ConfigureChecks.cmake 2011-06-13 22:34:10.713760997 +0200 +@@ -73,7 +73,7 @@ + macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) + macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin + macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kicker +-macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock ++macro_bool_to_01(FALSE HAVE_XF86MISC) # kdesktop and kcontrol/lock + macro_bool_to_01(X11_dpms_FOUND HAVE_DPMS) # kdesktop + macro_bool_to_01(X11_XSync_FOUND HAVE_XSYNC) # kwin + diff --git a/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild b/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild index 1988b275bc49..7d9e1a5b4cc7 100644 --- a/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild +++ b/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild,v 1.1 2011/06/10 17:59:45 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kscreensaver/kscreensaver-4.6.4.ebuild,v 1.2 2011/06/13 20:38:26 dilfridge Exp $ EAPI=4 @@ -25,13 +25,17 @@ DEPEND="${RDEPEND} x11-proto/randrproto " -PATCHES=( "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" - "${FILESDIR}/${PN}-4.5.95-nsfw.patch" ) +PATCHES=( + "${FILESDIR}/kdebase-4.0.2-pam-optional.patch" + "${FILESDIR}/${PN}-4.5.95-nsfw.patch" + "${FILESDIR}/${PN}-4.6.4-xf86misc.patch" +) src_configure() { mycmakeargs=( $(cmake-utils_use_with opengl OpenGL) $(cmake-utils_use_with pam) + -DHAVE_XF86MISC=0 ) kde4-meta_src_configure |