From: "Michael Palimaka" <kensington@astralcloak.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/
Date: Wed, 2 May 2012 16:42:32 +0000 (UTC) [thread overview]
Message-ID: <1335976884.b89d72e69460a641b8f92a11fb1717c68cd02323.kensington@gentoo> (raw)
commit: b89d72e69460a641b8f92a11fb1717c68cd02323
Author: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
AuthorDate: Wed May 2 16:41:24 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed May 2 16:41:24 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b89d72e6
[kde-base/systemsettings] Remove unused xinerama use flag and patch.
(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)
---
...emsettings-4.4.2-xinerama_cmake_automagic.patch | 18 ------------------
.../systemsettings/systemsettings-4.8.3.ebuild | 9 +--------
.../systemsettings-4.8.49.9999.ebuild | 9 +--------
kde-base/systemsettings/systemsettings-9999.ebuild | 9 +--------
4 files changed, 3 insertions(+), 42 deletions(-)
diff --git a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch b/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch
deleted file mode 100644
index 5596f41..0000000
--- a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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/systemsettings/systemsettings-4.8.3.ebuild b/kde-base/systemsettings/systemsettings-4.8.3.ebuild
index 9ebd70a..6548761 100644
--- a/kde-base/systemsettings/systemsettings-4.8.3.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.8.3.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
inherit kde4-meta
DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
x11-libs/libXtst
opengl? ( virtual/opengl )
usb? ( =virtual/libusb-0* )
- xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
x11-proto/kbproto
x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}
sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
add_blocker kdeaccessibility-colorschemes '<4.6.50'
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
src_unpack() {
if use handbook; then
KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
-DWITH_GLIB2=ON -DWITH_GObject=ON
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with usb)
- $(cmake-utils_use_with xinerama X11_Xinerama)
)
kde4-meta_src_configure
diff --git a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
index d7c9582..9400782 100644
--- a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
inherit kde4-meta
DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
KEYWORDS=""
COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
x11-libs/libXtst
opengl? ( virtual/opengl )
usb? ( =virtual/libusb-0* )
- xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
x11-proto/kbproto
x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}
sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
add_blocker kdeaccessibility-colorschemes '<4.6.50'
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
src_unpack() {
if use handbook; then
KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
-DWITH_GLIB2=ON -DWITH_GObject=ON
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with usb)
- $(cmake-utils_use_with xinerama X11_Xinerama)
)
kde4-meta_src_configure
diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
index d7c9582..9400782 100644
--- a/kde-base/systemsettings/systemsettings-9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-9999.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
inherit kde4-meta
DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
KEYWORDS=""
COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
x11-libs/libXtst
opengl? ( virtual/opengl )
usb? ( =virtual/libusb-0* )
- xinerama? ( x11-libs/libXinerama )
"
DEPEND="${COMMONDEPEND}
x11-proto/kbproto
x11-proto/xextproto
- xinerama? ( x11-proto/xineramaproto )
"
RDEPEND="${COMMONDEPEND}
sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
add_blocker kdeaccessibility-colorschemes '<4.6.50'
-PATCHES=(
- "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
src_unpack() {
if use handbook; then
KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
-DWITH_GLIB2=ON -DWITH_GObject=ON
$(cmake-utils_use_with opengl OpenGL)
$(cmake-utils_use_with usb)
- $(cmake-utils_use_with xinerama X11_Xinerama)
)
kde4-meta_src_configure
next reply other threads:[~2012-05-02 16:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-02 16:42 Michael Palimaka [this message]
-- strict thread matches above, loose matches on Subject: below --
2014-04-24 22:45 [gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/ Johannes Huber
2013-09-01 14:33 Michael Palimaka
2013-03-25 22:13 Andreas Hüttel
2012-01-17 10:11 Johannes Huber
2011-12-25 13:49 Andreas Hüttel
2011-04-04 21:47 Andreas K. Huettel
2011-04-03 8:09 Andreas K. Huettel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1335976884.b89d72e69460a641b8f92a11fb1717c68cd02323.kensington@gentoo \
--to=kensington@astralcloak.net \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox