diff options
author | Mike Gardiner <obz@gentoo.org> | 2003-09-11 08:42:27 +0000 |
---|---|---|
committer | Mike Gardiner <obz@gentoo.org> | 2003-09-11 08:42:27 +0000 |
commit | 8f6865a071ca27e0cf24e3965acd9769be225a5f (patch) | |
tree | 35c1cea8d2703c330c1d4dd8c34a9b6cef314a3d /gnome-extra | |
parent | version bump (diff) | |
download | gentoo-2-8f6865a071ca27e0cf24e3965acd9769be225a5f.tar.gz gentoo-2-8f6865a071ca27e0cf24e3965acd9769be225a5f.tar.bz2 gentoo-2-8f6865a071ca27e0cf24e3965acd9769be225a5f.zip |
Added Sensors build patch
Diffstat (limited to 'gnome-extra')
-rw-r--r-- | gnome-extra/gdesklets-core/ChangeLog | 7 | ||||
-rw-r--r-- | gnome-extra/gdesklets-core/Manifest | 7 | ||||
-rw-r--r-- | gnome-extra/gdesklets-core/files/gdesklets-core-0.21-Sensors.patch | 33 | ||||
-rw-r--r-- | gnome-extra/gdesklets-core/gdesklets-core-0.21.ebuild | 12 |
4 files changed, 54 insertions, 5 deletions
diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog index 03f47fdc86ef..e6aeb2c04af7 100644 --- a/gnome-extra/gdesklets-core/ChangeLog +++ b/gnome-extra/gdesklets-core/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gdesklets-core # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.3 2003/09/10 12:47:12 obz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.4 2003/09/11 08:42:04 obz Exp $ + + 11 Sep 2003; Mike Gardiner <obz@gentoo.org> gdesklets-core-0.21.ebuild, + files/gdesklets-core-0.21-Sensors.patch: + Added a patch against 0.21 to prevent building the included Sensors, because + they dont work, and we have them in x11-plugins *gdesklets-core-0.21 (10 Sep 2003) diff --git a/gnome-extra/gdesklets-core/Manifest b/gnome-extra/gdesklets-core/Manifest index 142245c7849b..13266914a97c 100644 --- a/gnome-extra/gdesklets-core/Manifest +++ b/gnome-extra/gdesklets-core/Manifest @@ -1,7 +1,8 @@ -MD5 15ef9642da35a26b0661b93a9c45c0b1 ChangeLog 733 MD5 c6b95a8df71cf2e12278e0f7593dffdf gdesklets-core-0.20.ebuild 1750 +MD5 cbde3b8c0627f3b9a4c35682514b54cc gdesklets-core-0.21.ebuild 2111 +MD5 09eef844f52c99273a01a1d61fcd2089 ChangeLog 980 MD5 a175a96fb7e85b152ade748dbd2360e0 metadata.xml 213 -MD5 544b94c48bf50c21a57a9f4953e88bfa gdesklets-core-0.21.ebuild 1922 MD5 4a9e54728f78ea45b924fdec528d44fc files/digest-gdesklets-core-0.20 67 -MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230 MD5 aeb8d1d16684f2153375e498ab24ee61 files/digest-gdesklets-core-0.21 67 +MD5 f6665800ba401c296ee9090ec0430ad8 files/gdesklets-core-0.21-Sensors.patch 1775 +MD5 01751d3aa9192793a33c02d2126192c1 files/gdesklets-displays.desktop 230 diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.21-Sensors.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.21-Sensors.patch new file mode 100644 index 000000000000..b2a2dccdeff8 --- /dev/null +++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.21-Sensors.patch @@ -0,0 +1,33 @@ +--- configure.old 2003-09-11 16:28:53.633506672 +0800 ++++ configure 2003-09-11 16:29:35.545135136 +0800 +@@ -9617,7 +9617,7 @@ + fi + + +- ac_config_files="$ac_config_files Makefile config/Makefile data/Makefile desktop/Makefile doc/Makefile doc/man/Makefile display/Makefile factory/Makefile libdesklets/Makefile locale/Makefile main/Makefile po/Makefile sensor/Makefile Sensors/Makefile Sensors/External/Makefile Sensors/FontSelector/Makefile utils/Makefile gdesklets-core.pc" ++ ac_config_files="$ac_config_files Makefile config/Makefile data/Makefile desktop/Makefile doc/Makefile doc/man/Makefile display/Makefile factory/Makefile libdesklets/Makefile locale/Makefile main/Makefile po/Makefile sensor/Makefile utils/Makefile gdesklets-core.pc" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +--- configure.in.old 2003-09-11 16:29:00.404477328 +0800 ++++ configure.in 2003-09-11 16:30:52.633415936 +0800 +@@ -66,9 +66,6 @@ + main/Makefile + po/Makefile + sensor/Makefile +-Sensors/Makefile +-Sensors/External/Makefile +-Sensors/FontSelector/Makefile + utils/Makefile + gdesklets-core.pc + ]) +--- Makefile.in.old 2003-09-11 16:29:06.695520944 +0800 ++++ Makefile.in 2003-09-11 16:31:11.226589344 +0800 +@@ -181,7 +181,6 @@ + AUTOMAKE_OPTIONS = 1.6 dist-bzip2 + + SUBDIRS = \ +- Sensors \ + config \ + data \ + desktop \ diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.21.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.21.ebuild index 8fea223da9de..f691ce74b2a6 100644 --- a/gnome-extra/gdesklets-core/gdesklets-core-0.21.ebuild +++ b/gnome-extra/gdesklets-core/gdesklets-core-0.21.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.21.ebuild,v 1.2 2003/09/11 01:39:08 msterret Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.21.ebuild,v 1.3 2003/09/11 08:42:04 obz Exp $ inherit gnome2 @@ -30,6 +30,16 @@ DEPEND="${RDEPEND} USE_DESTDIR="1" DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO" +src_unpack( ) { + + unpack ${A} + cd ${S} + # patch to prevent building the Sensors that are + # included here, we have them in x11-plugins/ + epatch ${FILESDIR}/gdesklets-core-0.21-Sensors.patch + +} + src_install( ) { gnome2_src_install |