diff options
| author |   Justin Lecher <jlec@gentoo.org> | 2011-11-24 14:34:22 +0000 |
|---|---|---|
| committer | Justin Lecher <jlec@gentoo.org> | 2011-11-24 14:34:22 +0000 |
| commit | 6f248b32b6b6d4b1b6d1afdd326ef44df16a1274 (patch) | |
| tree | a8f3117127243579087cc51e502774a70370c7b7 /gnome-extra/sensors-applet | |
| parent | Take the package (diff) | |
| download | gentoo-2-6f248b32b6b6d4b1b6d1afdd326ef44df16a1274.tar.gz gentoo-2-6f248b32b6b6d4b1b6d1afdd326ef44df16a1274.tar.bz2 gentoo-2-6f248b32b6b6d4b1b6d1afdd326ef44df16a1274.zip | |
Patch against underlinking when using gold, #369959
(Portage version: 2.2.0_alpha77/cvs/Linux x86_64)
Diffstat (limited to 'gnome-extra/sensors-applet')
3 files changed, 46 insertions, 3 deletions
diff --git a/gnome-extra/sensors-applet/ChangeLog b/gnome-extra/sensors-applet/ChangeLog index d59f708276e9..5c599c1d7ddb 100644 --- a/gnome-extra/sensors-applet/ChangeLog +++ b/gnome-extra/sensors-applet/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/sensors-applet # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.55 2011/04/29 17:34:42 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/ChangeLog,v 1.56 2011/11/24 14:34:22 jlec Exp $ + + 24 Nov 2011; Justin Lecher <jlec@gentoo.org> sensors-applet-2.2.7-r1.ebuild, + +files/sensors-applet-2.2.7-underlinking.patch: + Patch against underlinking when using gold, #369959 29 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> sensors-applet-2.2.7-r1.ebuild: diff --git a/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-underlinking.patch b/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-underlinking.patch new file mode 100644 index 000000000000..8df1953b7b40 --- /dev/null +++ b/gnome-extra/sensors-applet/files/sensors-applet-2.2.7-underlinking.patch @@ -0,0 +1,37 @@ + sensors-applet/Makefile.am | 4 ++-- + sensors-applet/Makefile.in | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sensors-applet/Makefile.am b/sensors-applet/Makefile.am +index a87feb0..097122e 100644 +--- a/sensors-applet/Makefile.am ++++ b/sensors-applet/Makefile.am +@@ -11,7 +11,7 @@ INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale/"\" \ + $(GLIB_CFLAGS) $(GTK_CFLAGS) $(GNOME_CFLAGS) $(CAIRO_CFLAGS) $(LIBNOTIFY_CFLAGS) + + +-LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) ++LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) -ldl + + if LIBNOTIFY + libnotify_SRC = active-sensor-libnotify.c \ +@@ -47,4 +47,4 @@ headerdir = $(prefix)/include/sensors-applet + header_DATA = $(INST_H_FILES) + + # since it is separate +-EXTRA_DIST = sensors-applet-plugin.h +\ No newline at end of file ++EXTRA_DIST = sensors-applet-plugin.h +diff --git a/sensors-applet/Makefile.in b/sensors-applet/Makefile.in +index dd6765f..3b0b8ac 100644 +--- a/sensors-applet/Makefile.in ++++ b/sensors-applet/Makefile.in +@@ -167,7 +167,7 @@ LIBATASMART_LIBS = @LIBATASMART_LIBS@ + LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ + LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ + LIBOBJS = @LIBOBJS@ +-LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) ++LIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOME_LIBS) $(CAIRO_LIBS) $(LIBNOTIFY_LIBS) -ldl + LIBSENSORS_CFLAGS = @LIBSENSORS_CFLAGS@ + LIBSENSORS_LIBS = @LIBSENSORS_LIBS@ + LIBTOOL = @LIBTOOL@ diff --git a/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild b/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild index 82a802b31ca7..2b6b46e3c0ca 100644 --- a/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild +++ b/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild,v 1.6 2011/04/29 17:34:42 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/sensors-applet/sensors-applet-2.2.7-r1.ebuild,v 1.7 2011/11/24 14:34:22 jlec Exp $ EAPI="2" GCONF_DEBUG="no" @@ -65,7 +65,9 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch + epatch \ + "${FILESDIR}"/${P}-libnotify-0.7.patch \ + "${FILESDIR}"/${P}-underlinking.patch gnome2_src_prepare } |