diff options
| author |   Gordon Malm <gengor@gentoo.org> | 2009-04-06 23:01:33 +0000 |
|---|---|---|
| committer | Gordon Malm <gengor@gentoo.org> | 2009-04-06 23:01:33 +0000 |
| commit | 25c19d14f5884e602ba674ea3312c521f2876fd6 (patch) | |
| tree | d576756590990f5ef76f2611a28f91812b2600db /kde-base/ksmserver | |
| parent | Fixed hicolor icons, thanks ulm, added new upstream patch and fixed doc name ... (diff) | |
| download | gentoo-2-25c19d14f5884e602ba674ea3312c521f2876fd6.tar.gz gentoo-2-25c19d14f5884e602ba674ea3312c521f2876fd6.tar.bz2 gentoo-2-25c19d14f5884e602ba674ea3312c521f2876fd6.zip | |
Fix bug 256804 and remove stale files in FILESDIR
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'kde-base/ksmserver')
4 files changed, 22 insertions, 53 deletions
diff --git a/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch b/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch deleted file mode 100644 index 5fdc9af1a2e0..000000000000 --- a/kde-base/ksmserver/files/ksmserver-3.5.8-gdm_interop_197133.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp 2006/10/31 11:38:26 600659 -+++ branches/KDE/3.5/kdebase/kdmlib/dmctl.cpp 2007/11/01 22:10:25 731815 -@@ -65,21 +65,28 @@ - if ((fd = ::socket( PF_UNIX, SOCK_STREAM, 0 )) < 0) - return; - sa.sun_family = AF_UNIX; -- if (DMType == GDM) -- strcpy( sa.sun_path, "/tmp/.gdm_socket" ); -- else { -+ if (DMType == GDM) { -+ strcpy( sa.sun_path, "/var/run/gdm_socket" ); -+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { -+ strcpy( sa.sun_path, "/tmp/.gdm_socket" ); -+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { -+ ::close( fd ); -+ fd = -1; -+ break; -+ } -+ } -+ GDMAuthenticate(); -+ } else { - if ((ptr = strchr( dpy, ':' ))) - ptr = strchr( ptr, '.' ); - snprintf( sa.sun_path, sizeof(sa.sun_path), - "%s/dmctl-%.*s/socket", -- ctl, ptr ? ptr - dpy : 512, dpy ); -- } -- if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { -- ::close( fd ); -- fd = -1; -+ ctl, ptr ? int(ptr - dpy) : 512, dpy ); -+ if (::connect( fd, (struct sockaddr *)&sa, sizeof(sa) )) { -+ ::close( fd ); -+ fd = -1; -+ } - } -- if (DMType == GDM) -- GDMAuthenticate(); - break; - case OldKDM: - { diff --git a/kde-base/ksmserver/files/ksmserver-4.0.2-linkage.patch b/kde-base/ksmserver/files/ksmserver-4.0.2-linkage.patch deleted file mode 100644 index 35f4fcb4fd36..000000000000 --- a/kde-base/ksmserver/files/ksmserver-4.0.2-linkage.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ksmserver/CMakeLists.txt -+++ ksmserver/CMakeLists.txt -@@ -32,7 +32,7 @@ - - kde4_add_kdeinit_executable( ksmserver ${ksmserver_KDEINIT_SRCS}) - --target_link_libraries(kdeinit_ksmserver plasma solidcontrol kworkspace ${KDE4_KDEUI_LIBS} ${BLITZ_LIBRARIES} ${X11_LIBRARIES}) -+target_link_libraries(kdeinit_ksmserver plasma solidcontrol kworkspace ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${BLITZ_LIBRARIES} ${X11_LIBRARIES}) - - install(TARGETS kdeinit_ksmserver DESTINATION ${LIB_INSTALL_DIR}) - diff --git a/kde-base/ksmserver/files/ksmserver-4.2.1-disable-sse2-for-gcc3.patch b/kde-base/ksmserver/files/ksmserver-4.2.1-disable-sse2-for-gcc3.patch new file mode 100644 index 000000000000..362dd91c2cbe --- /dev/null +++ b/kde-base/ksmserver/files/ksmserver-4.2.1-disable-sse2-for-gcc3.patch @@ -0,0 +1,17 @@ +Added-By: Gordon Malm <gengor@gentoo.org> + +Disable SSE2 in fadeeffect for <gcc-4 + +See: http://bugs.gentoo.org/show_bug.cgi?id=256804 + +--- a/ksmserver/fadeeffect.cpp ++++ b/ksmserver/fadeeffect.cpp +@@ -41,7 +41,7 @@ + # if defined(__MMX__) + # define HAVE_MMX + # endif +-# if defined(__SSE2__) ++# if defined(__SSE2__) && __GNUC__ > 3 + # define HAVE_SSE2 + # endif + #endif diff --git a/kde-base/ksmserver/ksmserver-4.2.1.ebuild b/kde-base/ksmserver/ksmserver-4.2.1.ebuild index fa6fcd706126..642667b64112 100644 --- a/kde-base/ksmserver/ksmserver-4.2.1.ebuild +++ b/kde-base/ksmserver/ksmserver-4.2.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.2.1.ebuild,v 1.2 2009/03/08 14:00:20 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/ksmserver/ksmserver-4.2.1.ebuild,v 1.3 2009/04/06 23:01:33 gengor Exp $ EAPI="2" @@ -25,3 +25,7 @@ KMEXTRACTONLY=" " KMLOADLIBS="libkworkspace" + +# Disable SSE2 when compiling with <gcc-4, bug #256804 +PATCHES=( "$FILESDIR/${P}-disable-sse2-for-gcc3.patch" ) + |