From 89040f0f1fdca216b51a7c89283220f65a8c4fa0 Mon Sep 17 00:00:00 2001 From: Alon Bar-Lev Date: Sun, 11 Feb 2007 10:23:47 +0000 Subject: [PATCH] Readd glibc fix to new version Package-Manager: portage-2.1.2-r9 --- sys-apps/suspend2-userui/ChangeLog | 6 ++++- sys-apps/suspend2-userui/Manifest | 20 +++++++++------ .../files/suspend2-userui-0.7.0-syscall.patch | 25 +++++++++++++++++++ .../suspend2-userui-0.7.0.ebuild | 8 +++++- 4 files changed, 49 insertions(+), 10 deletions(-) create mode 100644 sys-apps/suspend2-userui/files/suspend2-userui-0.7.0-syscall.patch diff --git a/sys-apps/suspend2-userui/ChangeLog b/sys-apps/suspend2-userui/ChangeLog index 52aa67ae88ca..d5ef21fa4e55 100644 --- a/sys-apps/suspend2-userui/ChangeLog +++ b/sys-apps/suspend2-userui/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/suspend2-userui # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.21 2007/02/09 21:39:16 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.22 2007/02/11 10:23:47 alonbl Exp $ + + 11 Feb 2007; Alon Bar-Lev + +files/suspend2-userui-0.7.0-syscall.patch, suspend2-userui-0.7.0.ebuild: + Readd glibc fix to new version *suspend2-userui-0.7.0 (09 Feb 2007) diff --git a/sys-apps/suspend2-userui/Manifest b/sys-apps/suspend2-userui/Manifest index 7bb70085bed3..f5392a8e50f0 100644 --- a/sys-apps/suspend2-userui/Manifest +++ b/sys-apps/suspend2-userui/Manifest @@ -10,6 +10,10 @@ AUX suspend2-userui-0.6.4-syscall.patch 633 RMD160 fdb5b934e1f4b42764d6de265c880 MD5 d4c850fe3113b4cb669432815dc12084 files/suspend2-userui-0.6.4-syscall.patch 633 RMD160 fdb5b934e1f4b42764d6de265c88099d089de513 files/suspend2-userui-0.6.4-syscall.patch 633 SHA256 9ff6ec9eca9bf299f1f6f8082490827be19e8338ae6656bb05178520b6dfd05f files/suspend2-userui-0.6.4-syscall.patch 633 +AUX suspend2-userui-0.7.0-syscall.patch 775 RMD160 0613cb37a8f0f1d15c4ae7510633f5111fc47c8b SHA1 b97626bafd8119f4028f9d35a134f239bdf21a95 SHA256 15dd34d1214ed1a519667318c9926dc780f012fe5cf91e8b63efc603071073ad +MD5 a7596519b20cc79e6c99338cd70ce478 files/suspend2-userui-0.7.0-syscall.patch 775 +RMD160 0613cb37a8f0f1d15c4ae7510633f5111fc47c8b files/suspend2-userui-0.7.0-syscall.patch 775 +SHA256 15dd34d1214ed1a519667318c9926dc780f012fe5cf91e8b63efc603071073ad files/suspend2-userui-0.7.0-syscall.patch 775 DIST suspend2-userui-0.6.4.tar.gz 91817 RMD160 1f00e32ae28d0d19666db106dc2f64ff9ce99de5 SHA1 9bcfa2575ee10bde27f9d14d83ae1fb9a1143d01 SHA256 5b9b74832073df26d74158306ce673d1765246a2b630a8b68cd8ef21cb79b076 DIST suspend2-userui-0.7.0.tar.gz 91961 RMD160 fe85fa434273b4a08d6d42d23d1bdab283ba3428 SHA1 ad62913f15be638e85472e9406e6ad71a02c31e5 SHA256 a8cc5ed9b5916996e948026ebe3864e31bf62539d3bee79b3637d376be1fa7ca EBUILD suspend2-userui-0.6.4-r1.ebuild 1814 RMD160 85f4b88040fb351d7c88640694f7c9493d755451 SHA1 57089c6b82a106b11d01b2652430ad3a0f40c0ad SHA256 295af1d12a9405bb1d6a233cb298cca17ec162d4dc7142fc9aec52593daab4c7 @@ -20,14 +24,14 @@ EBUILD suspend2-userui-0.6.4-r2.ebuild 1818 RMD160 05543ad2b5d75133726c737f3f4f8 MD5 e24ea2c04ca7105b7db9fe1856079053 suspend2-userui-0.6.4-r2.ebuild 1818 RMD160 05543ad2b5d75133726c737f3f4f8adef71e7380 suspend2-userui-0.6.4-r2.ebuild 1818 SHA256 3e7f10431538159beec5bfab9ebad55b3341e1e89b8eb8e53ec6db399ccd5b03 suspend2-userui-0.6.4-r2.ebuild 1818 -EBUILD suspend2-userui-0.7.0.ebuild 1685 RMD160 8beb6957a347fc5c37bc129b559d94b1a98eb2f0 SHA1 eb5ca2f5642ab058ba76afe83756494f59266fba SHA256 c1bfb2f286671978eb88f886e9831caf21afb8fcdbaff5681c649b57b3570a26 -MD5 5548fdcd1b661595b5458ca4a5773cee suspend2-userui-0.7.0.ebuild 1685 -RMD160 8beb6957a347fc5c37bc129b559d94b1a98eb2f0 suspend2-userui-0.7.0.ebuild 1685 -SHA256 c1bfb2f286671978eb88f886e9831caf21afb8fcdbaff5681c649b57b3570a26 suspend2-userui-0.7.0.ebuild 1685 -MISC ChangeLog 3633 RMD160 7349e7f6ecd1cadadffd16bcc3abe35839dd40e1 SHA1 42a4fdda610ded19b35c31a6f73243ad45a4ce12 SHA256 7563647f70749c02025f7c385306682286792ede854978e8ace2a5f1a59ef516 -MD5 54b261efd900ab5d99363868650b0e9b ChangeLog 3633 -RMD160 7349e7f6ecd1cadadffd16bcc3abe35839dd40e1 ChangeLog 3633 -SHA256 7563647f70749c02025f7c385306682286792ede854978e8ace2a5f1a59ef516 ChangeLog 3633 +EBUILD suspend2-userui-0.7.0.ebuild 1768 RMD160 cd2b36de95e7368b1cd1fd4d7f4e80623b4771f9 SHA1 2a8af7f5e71de626f54b52079731414606bbe873 SHA256 288bc30c85011cc6d3be94d80bf1b374cae04f488467d6f442ea85c73b584cfd +MD5 4ef633a395cd8a6093be1e2128fe9f2d suspend2-userui-0.7.0.ebuild 1768 +RMD160 cd2b36de95e7368b1cd1fd4d7f4e80623b4771f9 suspend2-userui-0.7.0.ebuild 1768 +SHA256 288bc30c85011cc6d3be94d80bf1b374cae04f488467d6f442ea85c73b584cfd suspend2-userui-0.7.0.ebuild 1768 +MISC ChangeLog 3791 RMD160 8975e552c96b06570aaebb79332982dd7006bf6e SHA1 4c61a02643f08a9aba6f16873cfe8695cbf55c1a SHA256 f2b904129b81f8dad4398b18457b23d2091fe0ac0db37da489595bd5f92b16aa +MD5 bde4272a53bd546ac3ba2bebfe9a43da ChangeLog 3791 +RMD160 8975e552c96b06570aaebb79332982dd7006bf6e ChangeLog 3791 +SHA256 f2b904129b81f8dad4398b18457b23d2091fe0ac0db37da489595bd5f92b16aa ChangeLog 3791 MISC metadata.xml 247 RMD160 d8749371cfc49b45025d6bc5c71eb9b2536f418b SHA1 edc7253d34677f69b45bbcee472908989269cd5d SHA256 330b68cdad708d1490b912def754cef1be6c0b15e903977951dbbe283cd85ceb MD5 270d3b4ec6bc63c529761a90458eb929 metadata.xml 247 RMD160 d8749371cfc49b45025d6bc5c71eb9b2536f418b metadata.xml 247 diff --git a/sys-apps/suspend2-userui/files/suspend2-userui-0.7.0-syscall.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.7.0-syscall.patch new file mode 100644 index 000000000000..9ea0c849b3b1 --- /dev/null +++ b/sys-apps/suspend2-userui/files/suspend2-userui-0.7.0-syscall.patch @@ -0,0 +1,25 @@ +diff -urNp suspend2-userui-0.7.0.org/userui.h suspend2-userui-0.7.0/userui.h +--- suspend2-userui-0.7.0.org/userui.h 2007-01-17 00:16:46.000000000 +0200 ++++ suspend2-userui-0.7.0/userui.h 2007-02-11 12:21:22.000000000 +0200 +@@ -1,7 +1,7 @@ + #ifndef _USERUI_H_ + #define _USERUI_H_ + +-#include ++#include + #include + #include "suspend_userui.h" + +@@ -124,11 +124,6 @@ static __inline__ int generic_fls(int x) + /* + * Work around random glibc bugs where getpid() caches an invalid pid. + */ +-#ifdef _syscall0 +-#define __NR_xgetpid __NR_getpid +-static inline _syscall0(pid_t, xgetpid); +-#else +-static inline pid_t xgetpid(void) { return syscall(__NR_getpid); } +-#endif ++#define xgetpid() syscall(SYS_getpid) + + #endif /* _USERUI_H_ */ diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild index 54c1b23a0757..41a94dd701cd 100644 --- a/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild +++ b/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild,v 1.1 2007/02/09 21:39:16 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/suspend2-userui-0.7.0.ebuild,v 1.2 2007/02/11 10:23:47 alonbl Exp $ inherit toolchain-funcs eutils @@ -21,6 +21,12 @@ DEPEND="virtual/libc >=media-libs/libmng-1.0.5 media-libs/libpng )" +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}/${P}-syscall.patch" +} + src_compile() { # allow for static linking for use in initramfs/initrd use static && LDFLAGS="${LDFLAGS} -static" -- 2.26.2