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 | 837235d4513173e6d4b6f4c8cd5928dfc6170624 (patch) | |
| tree | e9a22db91471cef615be8ed2d8e9f9a455885c35 /kde-base | |
| parent | Fixed hicolor icons, thanks ulm, added new upstream patch and fixed doc name ... (diff) | |
| download | historical-837235d4513173e6d4b6f4c8cd5928dfc6170624.tar.gz historical-837235d4513173e6d4b6f4c8cd5928dfc6170624.tar.bz2 historical-837235d4513173e6d4b6f4c8cd5928dfc6170624.zip | |
Fix bug 256804 and remove stale files in FILESDIR
Package-Manager: portage-2.1.6.7/cvs/Linux i686
Diffstat (limited to 'kde-base')
5 files changed, 24 insertions, 66 deletions
diff --git a/kde-base/ksmserver/Manifest b/kde-base/ksmserver/Manifest index 85f5e1c11009..57c399602b5b 100644 --- a/kde-base/ksmserver/Manifest +++ b/kde-base/ksmserver/Manifest @@ -1,20 +1,9 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX ksmserver-3.5.8-gdm_interop_197133.patch 1224 RMD160 800d158dab30766f09ebe929ec1bde52c9337951 SHA1 c1501c1a388a215f1700a47ada4f15371b350e16 SHA256 705f8b644d0d25f4692818dd3c6c0919505e5af33424f34913bf7052ac055e11 -AUX ksmserver-4.0.2-linkage.patch 492 RMD160 39d618022dad352b6bd3fda6ec39b304e960ae91 SHA1 795bdcbec86891b4749a6e5a1613bf35afeecc14 SHA256 b914a7906e9fb07afcd068a75b6a2ae5ddf837af702a22c3bf92bdb7541c82da +AUX ksmserver-4.2.1-disable-sse2-for-gcc3.patch 377 RMD160 79be90193d2d511d3ef83dc7e3514f6a6e034979 SHA1 c631530e352c482968cbb2f14ca11cebd0e64784 SHA256 4c7df9d5ad96e2f16295a6905e020852d324a5aacb649ece0a7939120e494920 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61 DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4a33 SHA1 a6a19e0b26ed7a2b138a4a7594c8486e26610de8 SHA256 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e DIST kdebase-workspace-4.2.1.tar.bz2 50777207 RMD160 fe1debd87fb62c652925f6709905d0cf416b39c4 SHA1 412b8a6778d5c71a366c054b0136edae309bbef0 SHA256 fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98 EBUILD ksmserver-3.5.10.ebuild 702 RMD160 d18c618e647dca5f6364daf7f7ec6c60a55a3dc3 SHA1 7db63e0be1007ed98d20494ba0d767ce78f712f9 SHA256 cf403c1a28940ecd15700f8e4c79851fa97b48bce2073dd3afbfbac7c5698bae EBUILD ksmserver-3.5.9.ebuild 725 RMD160 6dbc9b1830cae9b8c8bd20a76f86eae6f84788ce SHA1 4c2f2f53fdf747bd06560a9088a5e3959fc55f94 SHA256 7ae9582ac8b5443a57f478676fe8247769b075fdbfa77c031c7fb70c4fe6f185 -EBUILD ksmserver-4.2.1.ebuild 671 RMD160 232dda335de51a05e5aaf5423e84f684e83661d6 SHA1 d294608378f9d14f07f9a0ec7c4fa89d8a286250 SHA256 f4b5e67f02c68defab1616ef1b3b1bc665fbbbbadc1b4709374eaa4bc82c055f +EBUILD ksmserver-4.2.1.ebuild 782 RMD160 9b3b10b52bd83ec53885694b3dc06f59bf223f94 SHA1 d59e2c23d9306dfcb086a62313927a0920dfeddf SHA256 70cfcbdf244e6ec95c0f5f1c3ebfeb7953b74d78e40163a056b7b38707c72618 MISC ChangeLog 13649 RMD160 8befc5b38481ea63b24f224b8682f3f3350892e3 SHA1 6f5563460afc8cf04dcb2430f235d12517cb627b SHA256 a92ae0d0b6b8e422f1d4c96401e2335e8392e2706338cc9b5294fd4db4e30074 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.10 (GNU/Linux) - -iEYEARECAAYFAkm0KZUACgkQ5BmOA85PVLgaJQCgiTVF4c/A7r1WwCDsRyqZYhoh -W28AoJni0ffUa46WVKHM7hdaXlFPkJYk -=hAn0 ------END PGP SIGNATURE----- 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" ) + |