Fix bug 312513, xinerama automagic, thanks for Andreas K. Huettel

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/ksplash/ChangeLog b/kde-base/ksplash/ChangeLog
index dd7167009548d78200fa5eca10db75327519dc36..3eb332b127247610a2b9b2a641d65cf85218b52e 100644 (file)
--- 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/Manifest b/kde-base/ksplash/Manifest
index 2016cf6b4e086ef341906b378cd046555ad4610d..1db003f15445d17d67a11b0e57ee220d1b5385d1 100644 (file)
--- a/kde-base/ksplash/Manifest
+++ b/kde-base/ksplash/Manifest
@@ -1,3 +1,4 @@
+AUX ksplash-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 DIST kdebase-workspace-4.3.3.tar.bz2 62496238 RMD160 48ab90a519c7811e9fe4aa4e77f06134d2dc4afa SHA1 2839e913cecef8ead0685bd50e9515ccd8bc0a9d SHA256 b66b4e3eefe88edfd9ddd0501b2b6eece39b85fd78f2320967b937f2529c6d3b
 DIST kdebase-workspace-4.3.5.tar.bz2 62525359 RMD160 dcf04a40412ba236365423afc877ea0c2066f972 SHA1 703582cb8a3471c5821986dbdfc3c6deedac0ff3 SHA256 7985634ed1f87889bcd6613ef41127196df442017bf895be6fb2afb196ce149b
 DIST kdebase-workspace-4.4.1.tar.bz2 77053467 RMD160 e841cdfda3d35c1f76acad137abf7fa7644da541 SHA1 f72e0e31c2ea4dc377e7fc14f2a0f5fb6304e71e SHA256 b25c0e13ab1798ffe067e2cd7d5c9afb5f05d0b771306eb84a4bd76a4574ac6a
@@ -5,6 +6,6 @@ DIST kdebase-workspace-4.4.2.tar.bz2 77039701 RMD160 0558ff2102cb380127667a94b69
 EBUILD ksplash-4.3.3.ebuild 964 RMD160 b096caf0824cc4d1e7b3988a7526540b7aeb016b SHA1 b861e93c8110ee6861332d844da7b45adb76e608 SHA256 d8ee2db50c357623831abc811f5ad5bc106bae059553c4d41f5a44b3c0682056
 EBUILD ksplash-4.3.5.ebuild 986 RMD160 2080e9eeb6ceb42efe5d99a80832ab5a47c2d543 SHA1 444a5a175c7d3d6d3f8cbe6bef503ba5549a2b22 SHA256 a7ee16ffb5628f4ad948e566b85230e88cb7f3959ee6918cbcc841ab8fbdb06d
 EBUILD ksplash-4.4.1.ebuild 992 RMD160 87a634cb7011f8642fbf2898a9ccecdc2ced3d1e SHA1 d17c8885511142262de4e8e63499d309fac216f4 SHA256 518f649e997f8ac99959c7b872cdb5c3083a2781620394e8510ed089b365f28e
-EBUILD ksplash-4.4.2.ebuild 988 RMD160 d2c37f41a5b0fbf4878ff8ed8180cf788c1b2904 SHA1 8abd3395c173db55365db167d7ea7f6ff29b8fdb SHA256 113dad6c2079ef304a183d3b55d5f425cb95d7a912b36dfa593f72007598d21e
-MISC ChangeLog 7090 RMD160 b53fbbe8c0490bde7728acb7e459a9b72be367bf SHA1 6138db69f26ef1c4759b0039dbd05464d5a708af SHA256 eb2afbe0ebd48b400a3f6a21994236b271d406a8d68412bb0164bb72ecfaa190
+EBUILD ksplash-4.4.2-r1.ebuild 1064 RMD160 50b6d5a2eae5aa75b7ca981fb291434c0a15c12d SHA1 16a1763509e9bd147679c32d68c5b0cec60bb863 SHA256 1da7a67bf8a2fb61fbc56d6d6b9bb1fdd945c092ef32e935254a814e31660186
+MISC ChangeLog 7369 RMD160 70eeca4d79be7c259ea5d9b1bcc2f022fd342330 SHA1 afe50ea5a6305b3ee126932130eb40a832cbe24b SHA256 e492bd95391efcbfdbfed7009c4f90b6d40a3ec6847846b679156b73f9670d90
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a

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 (file)
index 0000000..5596f41
--- /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
similarity index 88%
rename from kde-base/ksplash/ksplash-4.4.2.ebuild
rename to kde-base/ksplash/ksplash-4.4.2-r1.ebuild
index cc4a0889d3862347ba6ed7feee778e65d1f2850d..9f007648b15f3573d8919e8733618ec0ea403ace 100644 (file)
--- 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)