diff options
4 files changed, 87 insertions, 12 deletions
diff --git a/xfce-extra/xfce4-sensors-plugin/ChangeLog b/xfce-extra/xfce4-sensors-plugin/ChangeLog index 21330a36ab47..7c177c00b373 100644 --- a/xfce-extra/xfce4-sensors-plugin/ChangeLog +++ b/xfce-extra/xfce4-sensors-plugin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for xfce-extra/xfce4-sensors-plugin # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.12 2010/08/11 20:50:52 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/ChangeLog,v 1.13 2010/12/18 18:23:39 ssuominen Exp $ + +*xfce4-sensors-plugin-1.0.0-r1 (18 Dec 2010) + + 18 Dec 2010; Samuli Suominen <ssuominen@gentoo.org> + +xfce4-sensors-plugin-1.0.0-r1.ebuild, + +files/xfce4-sensors-plugin-1.0.0-segfault_workaround.patch: + Apply a workaround for segfault wrt #318755 by Livid. 11 Aug 2010; Joseph Jezak <josejx@gentoo.org> xfce4-sensors-plugin-1.0.0.ebuild: diff --git a/xfce-extra/xfce4-sensors-plugin/Manifest b/xfce-extra/xfce4-sensors-plugin/Manifest index 6867cd250d36..414dbe144c39 100644 --- a/xfce-extra/xfce4-sensors-plugin/Manifest +++ b/xfce-extra/xfce4-sensors-plugin/Manifest @@ -1,18 +1,10 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX xfce4-sensors-plugin-1.0.0-missing_includedir.patch 345 RMD160 2c929bbde43af885193ad8a1c57f3be4b4a91278 SHA1 6ee9594b60134f5d8e704616c903e6c7797c94d7 SHA256 11970e9b66361ffbe0b121b08a83f6831603ee7401c532b7fb3fc01c0acd2e69 +AUX xfce4-sensors-plugin-1.0.0-segfault_workaround.patch 438 RMD160 49898b95a5074091e5060e44f4c8517632562440 SHA1 921b14cf608af70c3e095c0d275aad6f2cea0c20 SHA256 8651a9fa0af44e08a61633928a0ad2325425be07d2e8f50813e07e1bc9e4bb86 AUX xfce4-sensors-plugin-1.0.0-without_libnotify.patch 350 RMD160 1fac5102e36acd6907dc14356fa6a45e145a9876 SHA1 3f8f0c4d6064b3328cb0be2e417a82b2410780d1 SHA256 4d486593b1c2bc2557458520605648ce515bbd6f5969209ddbcca4d7054dcff1 DIST xfce4-sensors-plugin-0.10.99.6.tar.bz2 355252 RMD160 ffbdcb365b3b3617ce7dc525d8d20a7c86dafa21 SHA1 e3af1179d3381629f23e81eb4903caf952ebb1c1 SHA256 73d4c26c9f6d98f8529d954db742ffac5559f50169a45a07a409d7cf901d3f88 DIST xfce4-sensors-plugin-1.0.0.tar.bz2 406484 RMD160 7ba21cddf98bb9a90ff8c9abf89a994819de7fdc SHA1 5c0f2e30463068ac4ae619faf8b4966ee8d77710 SHA256 c0b1f8b63982b25c0a043f2efa0e358f9727c6eb3a55d93ff74efd76992aeae9 EBUILD xfce4-sensors-plugin-0.10.99.6.ebuild 1404 RMD160 9008c502b40ad325e1a48947664a87118fe64bba SHA1 d3599412b1cd1d9cc19aac1af4ad10dba7892bfa SHA256 01b2368a97d241ec88942f79e6c681e149126da095b66ba047f1bd69f9d323e2 +EBUILD xfce4-sensors-plugin-1.0.0-r1.ebuild 1653 RMD160 8a5a292239ea87dee4283feb82ad49649c8196c9 SHA1 414664eb274b0add364b6bee9109e8a8532d92db SHA256 a44ca9f934c1586bae33512c15764c7652ccb069fea478c3d630333fc191c4c4 EBUILD xfce4-sensors-plugin-1.0.0.ebuild 1615 RMD160 1fe2d4babef405a58c43f130e8f21b612bebd6dc SHA1 251c9347217466c70994d304484134f94e7c968b SHA256 8c3884e8b1d336c9f2c66575a0f48a3781b5fd4a0c09d400b22b4ec97406dfc0 -MISC ChangeLog 2093 RMD160 0cd105612f22ce9e7ae542040ee0c0e1c8134ad1 SHA1 4279b769fcab68b76959e8e0b08f7e6ec077afd7 SHA256 0ade03fd3e335578d9a5bde2af86a162d7e2d7a16abc63652bd3c73403539820 +MISC ChangeLog 2357 RMD160 c446a950c6f0571f569055c16a3d49575244ec99 SHA1 aaf235a116d602b3b8865f99dc43b41c3e1121ee SHA256 3292d8ddcecc573aadb5469589c22d0b2c9b3b70fc2b66693f26962411a11bb0 MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iEYEARECAAYFAkxjDOAACgkQcsIHjyDViGSVOQCgx1BQpoUkq8ElmE+XpA/x5SXT -uB4AnRch/xFtIOW+QysWGkXQLVYNS9nj -=lFX2 ------END PGP SIGNATURE----- diff --git a/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-segfault_workaround.patch b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-segfault_workaround.patch new file mode 100644 index 000000000000..97722fec1230 --- /dev/null +++ b/xfce-extra/xfce4-sensors-plugin/files/xfce4-sensors-plugin-1.0.0-segfault_workaround.patch @@ -0,0 +1,14 @@ +http://bugs.gentoo.org/318755 +http://bugzilla.xfce.org/show_bug.cgi?id=6603 + +--- lib/configuration.c ++++ lib/configuration.c +@@ -107,7 +107,7 @@ + xfce_rc_write_int_entry (rc, "Font_Size_Numerical", + sensors->font_size_numerical); + +- xfce_rc_write_entry (rc, "Font", font); ++ /* xfce_rc_write_entry (rc, "Font", font); */ + + xfce_rc_write_int_entry (rc, "Lines_Size", sensors->lines_size); + diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild new file mode 100644 index 000000000000..c243d02ae55c --- /dev/null +++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.0.0-r1.ebuild,v 1.1 2010/12/18 18:23:39 ssuominen Exp $ + +EAPI=3 +EAUTORECONF=yes +inherit xfconf + +DESCRIPTION="acpi, lm_sensors and hddtemp panel plugin" +HOMEPAGE="http://www.xfce.org/" +SRC_URI="mirror://xfce/src/panel-plugins/${PN}/1.0/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="acpi debug hddtemp libnotify lm_sensors" + +RDEPEND=">=x11-libs/gtk+-2.10:2 + >=xfce-base/libxfce4util-4.4 + >=xfce-base/libxfcegui4-4.4 + >=xfce-base/xfce4-panel-4.4 + libnotify? ( >=x11-libs/libnotify-0.4 ) + lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 ) + hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat )" +DEPEND="${RDEPEND} + dev-util/intltool + dev-util/pkgconfig" + +pkg_setup() { + PATCHES=( + "${FILESDIR}"/${P}-missing_includedir.patch + "${FILESDIR}"/${P}-without_libnotify.patch + "${FILESDIR}"/${P}-segfault_workaround.patch + ) + + XFCONF=( + --disable-dependency-tracking + --disable-static + $(use_enable hddtemp) + $(use_enable hddtemp netcat) + $(use_enable lm_sensors libsensors) + $(use_enable acpi procacpi) + $(use_enable acpi sysfsacpi) + $(use_enable libnotify notification) + $(xfconf_use_debug) + ) + + if ! use hddtemp && ! use lm_sensors && ! use acpi; then + XFCONF+=( + --enable-procacpi + --enable-sysfsacpi + ) + fi + + DOCS="AUTHORS ChangeLog NEWS NOTES README TODO" +} + +src_prepare() { + sed -i -e '/-no-undefined/d' src/Makefile.am || die + sed -i -e 's/-Werror//' -e '/^XDT_I18N/s/nl//' configure.in || die + xfconf_src_prepare +} |