From: Alon Bar-Lev Date: Mon, 22 Jan 2007 10:46:02 +0000 (+0000) Subject: Fix for glib-2.5 (again) X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=27d20e4edeeda167a258c9b78df275c4f700b116;p=gentoo.git Fix for glib-2.5 (again) Package-Manager: portage-2.1.2-r2 --- diff --git a/sys-apps/suspend2-userui/ChangeLog b/sys-apps/suspend2-userui/ChangeLog index 478b6467b8af..7a7c0a9ba518 100644 --- a/sys-apps/suspend2-userui/ChangeLog +++ b/sys-apps/suspend2-userui/ChangeLog @@ -1,6 +1,13 @@ # 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.19 2007/01/09 10:10:29 alonbl Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/suspend2-userui/ChangeLog,v 1.20 2007/01/22 10:46:02 alonbl Exp $ + +*suspend2-userui-0.6.4-r2 (22 Jan 2007) + + 22 Jan 2007; Alon Bar-Lev + +files/suspend2-userui-0.6.4-syscall.patch, + +suspend2-userui-0.6.4-r2.ebuild: + Fix for glib-2.5 (again) 09 Jan 2007; Alon Bar-Lev -files/suspend2-userui-0.6.3-skewed-image.patch, diff --git a/sys-apps/suspend2-userui/Manifest b/sys-apps/suspend2-userui/Manifest index 6eff21dfb654..05cdc13f201d 100644 --- a/sys-apps/suspend2-userui/Manifest +++ b/sys-apps/suspend2-userui/Manifest @@ -6,15 +6,23 @@ AUX suspend2-userui-0.6.4-remove-debug.patch 580 RMD160 696462ca16cee491dc0dee1a MD5 914b309d095d1ba985ebb419a5fcabf8 files/suspend2-userui-0.6.4-remove-debug.patch 580 RMD160 696462ca16cee491dc0dee1ae581b8c5a0d3b72f files/suspend2-userui-0.6.4-remove-debug.patch 580 SHA256 e0ddd798c53ff576fc5e3431cdf0b6c91686f5ede81388abca178ee64e4ed0a4 files/suspend2-userui-0.6.4-remove-debug.patch 580 +AUX suspend2-userui-0.6.4-syscall.patch 633 RMD160 fdb5b934e1f4b42764d6de265c88099d089de513 SHA1 0026362896bca6e18a20f025d3b1801e45b0a892 SHA256 9ff6ec9eca9bf299f1f6f8082490827be19e8338ae6656bb05178520b6dfd05f +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 DIST suspend2-userui-0.6.4.tar.gz 91817 RMD160 1f00e32ae28d0d19666db106dc2f64ff9ce99de5 SHA1 9bcfa2575ee10bde27f9d14d83ae1fb9a1143d01 SHA256 5b9b74832073df26d74158306ce673d1765246a2b630a8b68cd8ef21cb79b076 EBUILD suspend2-userui-0.6.4-r1.ebuild 1814 RMD160 85f4b88040fb351d7c88640694f7c9493d755451 SHA1 57089c6b82a106b11d01b2652430ad3a0f40c0ad SHA256 295af1d12a9405bb1d6a233cb298cca17ec162d4dc7142fc9aec52593daab4c7 MD5 060f7f57385fdb9358a51bae1f4d4d83 suspend2-userui-0.6.4-r1.ebuild 1814 RMD160 85f4b88040fb351d7c88640694f7c9493d755451 suspend2-userui-0.6.4-r1.ebuild 1814 SHA256 295af1d12a9405bb1d6a233cb298cca17ec162d4dc7142fc9aec52593daab4c7 suspend2-userui-0.6.4-r1.ebuild 1814 -MISC ChangeLog 3299 RMD160 ea0d012149689c0a23ffe2d241dc04914029ae6d SHA1 acc8640c04c4f612c74ea335ca6f1009c98c589a SHA256 29a6dfda8077c4cadf2317d8bbac22ea0e9700f08142d004fec0052755958029 -MD5 445ecd03fb0565d8ca2fbc29e093cd7a ChangeLog 3299 -RMD160 ea0d012149689c0a23ffe2d241dc04914029ae6d ChangeLog 3299 -SHA256 29a6dfda8077c4cadf2317d8bbac22ea0e9700f08142d004fec0052755958029 ChangeLog 3299 +EBUILD suspend2-userui-0.6.4-r2.ebuild 1818 RMD160 05543ad2b5d75133726c737f3f4f8adef71e7380 SHA1 5d1d55e53a0c9fe5df9862fe74174d00143e1dbb SHA256 3e7f10431538159beec5bfab9ebad55b3341e1e89b8eb8e53ec6db399ccd5b03 +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 +MISC ChangeLog 3498 RMD160 1d0fe59a7af987d3911a981a9a3835e59eede830 SHA1 11b9cc67e5e72b600dd48ced85620a3142999bca SHA256 eff027b6ad9ac255c9068cb208b8ff5c5ec16e53b69f61b01d2255e0ad703b0b +MD5 b1cf0207d0baeb48b68485d884b5fd2a ChangeLog 3498 +RMD160 1d0fe59a7af987d3911a981a9a3835e59eede830 ChangeLog 3498 +SHA256 eff027b6ad9ac255c9068cb208b8ff5c5ec16e53b69f61b01d2255e0ad703b0b ChangeLog 3498 MISC metadata.xml 247 RMD160 d8749371cfc49b45025d6bc5c71eb9b2536f418b SHA1 edc7253d34677f69b45bbcee472908989269cd5d SHA256 330b68cdad708d1490b912def754cef1be6c0b15e903977951dbbe283cd85ceb MD5 270d3b4ec6bc63c529761a90458eb929 metadata.xml 247 RMD160 d8749371cfc49b45025d6bc5c71eb9b2536f418b metadata.xml 247 @@ -22,3 +30,6 @@ SHA256 330b68cdad708d1490b912def754cef1be6c0b15e903977951dbbe283cd85ceb metadata MD5 a042dcb3843107867683e3a673af1ef7 files/digest-suspend2-userui-0.6.4-r1 262 RMD160 5b87fa9d284c99c6ab0e8781c2f421a1aa45733b files/digest-suspend2-userui-0.6.4-r1 262 SHA256 61eb66b0d1215949059ebef4b8c55ef87f0bb5264ba3e89d91f7dc943a17555f files/digest-suspend2-userui-0.6.4-r1 262 +MD5 a042dcb3843107867683e3a673af1ef7 files/digest-suspend2-userui-0.6.4-r2 262 +RMD160 5b87fa9d284c99c6ab0e8781c2f421a1aa45733b files/digest-suspend2-userui-0.6.4-r2 262 +SHA256 61eb66b0d1215949059ebef4b8c55ef87f0bb5264ba3e89d91f7dc943a17555f files/digest-suspend2-userui-0.6.4-r2 262 diff --git a/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r2 b/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r2 new file mode 100644 index 000000000000..b69cd4626edc --- /dev/null +++ b/sys-apps/suspend2-userui/files/digest-suspend2-userui-0.6.4-r2 @@ -0,0 +1,3 @@ +MD5 737427dd2eb076907674a4334735c2ef suspend2-userui-0.6.4.tar.gz 91817 +RMD160 1f00e32ae28d0d19666db106dc2f64ff9ce99de5 suspend2-userui-0.6.4.tar.gz 91817 +SHA256 5b9b74832073df26d74158306ce673d1765246a2b630a8b68cd8ef21cb79b076 suspend2-userui-0.6.4.tar.gz 91817 diff --git a/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-syscall.patch b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-syscall.patch new file mode 100644 index 000000000000..56593df648b4 --- /dev/null +++ b/sys-apps/suspend2-userui/files/suspend2-userui-0.6.4-syscall.patch @@ -0,0 +1,23 @@ +diff -ru suspend2-userui-0.6.4/userui.h suspend2-userui-0.6.4-new/userui.h +--- suspend2-userui-0.6.4/userui.h 2006-06-07 03:25:12.000000000 +1000 ++++ suspend2-userui-0.6.4-new/userui.h 2006-10-14 01:57:51.000000000 +1000 +@@ -1,7 +1,7 @@ + #ifndef _USERUI_H_ + #define _USERUI_H_ + +-#include ++#include + #include + #include "suspend_userui.h" + +@@ -124,8 +124,7 @@ + /* + * Work around random glibc bugs where getpid() caches an invalid pid. + */ +-#define __NR_xgetpid __NR_getpid +-static inline _syscall0(pid_t, xgetpid); ++#define xgetpid() syscall(SYS_getpid) + + + #endif /* _USERUI_H_ */ + diff --git a/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r2.ebuild b/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r2.ebuild new file mode 100644 index 000000000000..a440c888d5fd --- /dev/null +++ b/sys-apps/suspend2-userui/suspend2-userui-0.6.4-r2.ebuild @@ -0,0 +1,68 @@ +# 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.6.4-r2.ebuild,v 1.1 2007/01/22 10:46:02 alonbl Exp $ + +inherit toolchain-funcs eutils + +DESCRIPTION="User Interface for Software Suspend 2" +HOMEPAGE="http://www.suspend2.net" +SRC_URI="http://www.suspend2.net/downloads/all/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="fbsplash static" +DEPEND="virtual/libc + fbsplash? ( sys-libs/zlib + media-libs/freetype + media-libs/jpeg + media-libs/lcms + >=media-libs/libmng-1.0.5 + media-libs/libpng )" + +src_unpack() { + unpack ${A} + + cd "${S}" + epatch "${FILESDIR}/${P}-remove-debug.patch" + epatch "${FILESDIR}/${P}-syscall.patch" +} + +src_compile() { + # allow for static linking for use in initramfs/initrd + use static && LDFLAGS="${LDFLAGS} -static" + + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + suspend2ui_text || die "emake suspend2ui_text failed" + + if use fbsplash; then + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + fbsplash || die "emake fbsplash failed" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ + suspend2ui_fbsplash || die "emake suspend2ui_fbsplash failed" + fi +} + +src_install() { + into / + dosbin suspend2ui_text + use fbsplash && dosbin suspend2ui_fbsplash + + dodoc AUTHORS ChangeLog KERNEL_API README TODO USERUI_API +} + +pkg_postinst() { + if use fbsplash; then + einfo + einfo "You must create a symlink from /etc/splash/suspend2" + einfo "to the theme you want suspend2ui_fbsplash to use, e.g.:" + einfo + einfo " # ln -sfn /etc/splash/emergence /etc/splash/suspend2" + fi + + einfo + einfo "Please see /usr/share/doc/${PF}/README.gz for further" + einfo "instructions." + einfo +}