diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-03 18:32:39 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-05-03 18:32:39 +0000 |
| commit | 2389207f955fc79f8b98756bfd04760e8031051d (patch) | |
| tree | 18c45f50973925986033f2fb273c203051c6e96a /kde-base/ksplash | |
| parent | add ~amd64 (diff) | |
| download | gentoo-2-2389207f955fc79f8b98756bfd04760e8031051d.tar.gz gentoo-2-2389207f955fc79f8b98756bfd04760e8031051d.tar.bz2 gentoo-2-2389207f955fc79f8b98756bfd04760e8031051d.zip | |
Fix bug 312513, xinerama automagic, thanks for Andreas K. Huettel
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/ksplash')
| -rw-r--r-- | kde-base/ksplash/ChangeLog | 10 | ||||
| -rw-r--r-- | kde-base/ksplash/files/ksplash-4.4.2-xinerama_cmake_automagic.patch | 18 | ||||
| -rw-r--r-- | kde-base/ksplash/ksplash-4.4.2-r1.ebuild (renamed from kde-base/ksplash/ksplash-4.4.2.ebuild) | 4 |
3 files changed, 30 insertions, 2 deletions
diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog index dd7167009548..3eb332b12724 100644 --- a/kde-base/ksplash/ChangeLog +++ b/kde-base/ksplash/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for kde-base/ksplash # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.60 2010/03/31 23:06:07 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ChangeLog,v 1.61 2010/05/03 18:32:39 reavertm Exp $ + +*ksplash-4.4.2-r1 (03 May 2010) + + 03 May 2010; Maciej Mrozowski <reavertm@gentoo.org> -ksplash-4.4.2.ebuild, + +ksplash-4.4.2-r1.ebuild, + +files/ksplash-4.4.2-xinerama_cmake_automagic.patch: + Fix bug 312513, xinerama automagic, thanks for Andreas K. Huettel + (dilfridge) 31 Mar 2010; Dror Levin <spatz@gentoo.org> -ksplash-4.3.4.ebuild, -ksplash-4.4.0.ebuild: diff --git a/kde-base/ksplash/files/ksplash-4.4.2-xinerama_cmake_automagic.patch b/kde-base/ksplash/files/ksplash-4.4.2-xinerama_cmake_automagic.patch new file mode 100644 index 000000000000..5596f415d848 --- /dev/null +++ b/kde-base/ksplash/files/ksplash-4.4.2-xinerama_cmake_automagic.patch @@ -0,0 +1,18 @@ +diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-workspace-4.4.2/ConfigureChecks.cmake +--- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:36.000000000 +0100 ++++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.000000000 +0200 +@@ -71,7 +71,14 @@ + macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses + macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin + macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin ++ ++if(NOT WITH_X11_Xinerama) ++ set(X11_Xinerama_FOUND FALSE) ++ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.") ++endif(NOT WITH_X11_Xinerama) ++ + 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 diff --git a/kde-base/ksplash/ksplash-4.4.2.ebuild b/kde-base/ksplash/ksplash-4.4.2-r1.ebuild index cc4a0889d386..9f007648b15f 100644 --- a/kde-base/ksplash/ksplash-4.4.2.ebuild +++ b/kde-base/ksplash/ksplash-4.4.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.4.2.ebuild,v 1.1 2010/03/30 21:35:23 spatz Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksplash/ksplash-4.4.2-r1.ebuild,v 1.1 2010/05/03 18:32:39 reavertm Exp $ EAPI="3" @@ -20,6 +20,8 @@ DEPEND="${COMMONDEPEND} " RDEPEND="${COMMONDEPEND}" +PATCHES=( "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" ) + src_configure() { mycmakeargs=( $(cmake-utils_use_has 3dnow X86_3DNOW) |