diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2009-08-29 13:47:22 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2009-08-29 13:47:22 +0000 |
| commit | 5f2922b7e53d3e30632750da1891fedabe8c5fe4 (patch) | |
| tree | 69ed1324b4decf48cd9047b5bdfc56ddf2f160c3 | |
| parent | Fix issues, see ChangeLog (diff) | |
| download | historical-5f2922b7e53d3e30632750da1891fedabe8c5fe4.tar.gz historical-5f2922b7e53d3e30632750da1891fedabe8c5fe4.tar.bz2 historical-5f2922b7e53d3e30632750da1891fedabe8c5fe4.zip | |
Fixing segfault when battery applet is enabled but battery removed , bug #281093
Package-Manager: portage-2.1.6.13/cvs/Linux i686
| -rw-r--r-- | lxde-base/lxpanel/ChangeLog | 7 | ||||
| -rw-r--r-- | lxde-base/lxpanel/Manifest | 5 | ||||
| -rw-r--r-- | lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch | 14 | ||||
| -rw-r--r-- | lxde-base/lxpanel/lxpanel-0.5.3.ebuild | 3 |
4 files changed, 25 insertions, 4 deletions
diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog index 2d64ce87505f..4b17f1d083cf 100644 --- a/lxde-base/lxpanel/ChangeLog +++ b/lxde-base/lxpanel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for lxde-base/lxpanel # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.8 2009/08/11 15:14:44 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.9 2009/08/29 13:47:15 vostorga Exp $ + + 29 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> lxpanel-0.5.3.ebuild, + +files/lxpanel-0.5.3-battery.patch: + Fixing segfault when battery applet is enabled but battery removed , bug + #281093 *lxpanel-0.5.3 (11 Aug 2009) diff --git a/lxde-base/lxpanel/Manifest b/lxde-base/lxpanel/Manifest index c3736edec5b9..c7c4b61b2191 100644 --- a/lxde-base/lxpanel/Manifest +++ b/lxde-base/lxpanel/Manifest @@ -1,4 +1,5 @@ AUX lxpanel-0.5.1-sandbox.patch 833 RMD160 83957b8e65104c12c2220027faf24d846fe4b3b9 SHA1 24f5f2c737e56f5bc457fa49426c5115e9d15498 SHA256 1df1574a0faf8d02465f7673f7967b14b2d0bd33f8ac9c5769888ef6c4272489 +AUX lxpanel-0.5.3-battery.patch 347 RMD160 c39c2cff83876216b4876b050456a1efb179c8e0 SHA1 516be1c204212a28521a40c7df9b303d59e31481 SHA256 9b47b25cee0ef6c3fe7d9af11500db6d9e8821a0ddc53cae2f28d722501945e9 AUX lxpanel-sandbox.patch 880 RMD160 78c5267fc0c88accbf670b65c65837bb1f0db44e SHA1 2b30f2dde011bfbcdd1c04883e19f736791163da SHA256 04668583b9eb470ded27dbf6392c159f00ba3765e6c055823618fd9507f34af9 DIST lxpanel-0.3.8.1.tar.gz 711879 RMD160 f4368966baeb32b05efa4cd6aa54214dd0b003cb SHA1 bbe15008f84dd7d9dcabd1a3b9e66ae69d82156f SHA256 b3d3a06b946dba977007a84035da6667bbaa3617e1aecb83483d6a207c319021 DIST lxpanel-0.4.1.tar.gz 895314 RMD160 3a4e0b2d854e393c36fee8252518ab0d80778c20 SHA1 e8ee6ed5097304cb82ce2ef5bd12e705b4f6c413 SHA256 8027bb5784d67a48cf0eacd067bf88b86b227f765e7f7b8baa11de2e89bd1da4 @@ -9,6 +10,6 @@ EBUILD lxpanel-0.3.8.1.ebuild 1087 RMD160 d243c028d50f340d8cb8850ca4f7544592407f EBUILD lxpanel-0.4.1.ebuild 1080 RMD160 0498b76dfb7b9c1184d6adc237348d7f6e0dce81 SHA1 323b82f38bd1eb437d16a4a973070a30b84b6ce2 SHA256 21268875bb5957e3783a06145a2e597e8feba87cf6e20bd4ea32b50f0565b48d EBUILD lxpanel-0.5.1.ebuild 1005 RMD160 aea10959a4e17502f79103606f16fe2555a74ae9 SHA1 09c4e1745ce2b592bd67e605b8678259ac100c03 SHA256 97a932d03b38404b92599f9120dffbbcc14a34a25c393f36c0020ebc23d1907d EBUILD lxpanel-0.5.2.ebuild 1012 RMD160 9141e797f208b4323835f34d3258b3a0d65681bb SHA1 d0f3ea7de7df42e3378712457bd646e3f2ae3e08 SHA256 5151aaecd95127f51efbdbc15b70276634336d0322f54712473daf117a91696a -EBUILD lxpanel-0.5.3.ebuild 1014 RMD160 949b6cf00665cff7ec49a98bcff06c327125997b SHA1 f602f336c8eaadfa55bee63ee9856484eb2264a4 SHA256 43abc53834cdc74e4355d860736fadf5276d5116cd12c5e2c4dc0976e2387569 -MISC ChangeLog 1377 RMD160 f3ce08cba6fb7f4d9471b602f187a25122bb48b1 SHA1 25fa7e68b2a3bba8916f2234cabcbfd42488b5b0 SHA256 b721be6cc38004032d1ed75478e7d80d5e7821ad735fb7daab376efce7e070d8 +EBUILD lxpanel-0.5.3.ebuild 1055 RMD160 56f3a0fc961a83a23ad5faf11e8a98052de0617f SHA1 3d0d4cc912067d2b374f5411e50f8e67c0e1f037 SHA256 9d361abadb639b87086c4dbc57abb33cf43fcf2bb924c15e397d8084076df195 +MISC ChangeLog 1576 RMD160 65876f02ca7109cb9bbd8809cceda5b8d979d397 SHA1 b284abc6ea2c7668b84eb41fa0ee2cfb960e322d SHA256 aa1b4640eb496a06d271e009d6d2b4bad51d5acc197f6a46fc041cfd4f82473e MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch b/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch new file mode 100644 index 000000000000..1e6ad47e0dcd --- /dev/null +++ b/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch @@ -0,0 +1,14 @@ +--- trunk/lxpanel/src/plugins/batt/batt_sys.c 2009/06/16 22:09:10 1617 ++++ trunk/lxpanel/src/plugins/batt/batt_sys.c 2009/08/19 07:40:45 1950 +@@ -271,8 +271,10 @@ + if ( b->type_battery == TRUE ) + break; + /* ignore non-batteries */ +- else ++ else { + g_free(b); ++ b = NULL; ++ } + } + g_dir_close( dir ); + return b; diff --git a/lxde-base/lxpanel/lxpanel-0.5.3.ebuild b/lxde-base/lxpanel/lxpanel-0.5.3.ebuild index 19373d6117ab..256171b4fae1 100644 --- a/lxde-base/lxpanel/lxpanel-0.5.3.ebuild +++ b/lxde-base/lxpanel/lxpanel-0.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.3.ebuild,v 1.1 2009/08/11 15:14:44 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.3.ebuild,v 1.2 2009/08/29 13:47:15 vostorga Exp $ EAPI="2" inherit eutils autotools @@ -28,6 +28,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch + epatch "${FILESDIR}"/${P}-battery.patch eautoreconf } |