From 646bdee9683c3ad4b51cb123e20631a2a9320836 Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Tue, 12 Dec 2006 03:42:10 +0000 Subject: [PATCH] Fix for bug #133772 provided by Thomas Green . Package-Manager: portage-2.1.2_rc2-r5 --- xfce-extra/xfce4-weather/ChangeLog | 8 ++++- xfce-extra/xfce4-weather/Manifest | 19 +++++++++--- .../files/digest-xfce4-weather-0.4.9-r2 | 3 ++ .../xfce4-weather/files/scrollbox.c.patch | 30 +++++++++++++++++++ .../xfce4-weather-0.4.9-r2.ebuild | 16 ++++++++++ 5 files changed, 71 insertions(+), 5 deletions(-) create mode 100644 xfce-extra/xfce4-weather/files/digest-xfce4-weather-0.4.9-r2 create mode 100644 xfce-extra/xfce4-weather/files/scrollbox.c.patch create mode 100644 xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r2.ebuild diff --git a/xfce-extra/xfce4-weather/ChangeLog b/xfce-extra/xfce4-weather/ChangeLog index 44002684880d..40b37a07b003 100644 --- a/xfce-extra/xfce4-weather/ChangeLog +++ b/xfce-extra/xfce4-weather/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for xfce-extra/xfce4-weather # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/ChangeLog,v 1.19 2006/12/12 03:14:02 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/ChangeLog,v 1.20 2006/12/12 03:42:10 nichoj Exp $ + +*xfce4-weather-0.4.9-r2 (12 Dec 2006) + + 12 Dec 2006; Joshua Nichols +files/scrollbox.c.patch, + +xfce4-weather-0.4.9-r2.ebuild: + Fix for bug #133772 provided by Thomas Green . 12 Dec 2006; Joshua Nichols -xfce4-weather-0.3.9.1-r1.ebuild, -xfce4-weather-0.4.0.ebuild, diff --git a/xfce-extra/xfce4-weather/Manifest b/xfce-extra/xfce4-weather/Manifest index 8f0eb73bd3f1..275f671bb3cd 100644 --- a/xfce-extra/xfce4-weather/Manifest +++ b/xfce-extra/xfce4-weather/Manifest @@ -1,9 +1,17 @@ +AUX scrollbox.c.patch 1167 RMD160 cb4d8e0b367802aabd89383d08479015095965c0 SHA1 3c77630f54bfbbf36512228792db16eb1ce8eda4 SHA256 4f2af7fe6d244e4653f3249514a97f271d8b8ac59d5ce0b48636f4d6c787cd46 +MD5 cfd79d23781a75ac2d1e899c0d52845c files/scrollbox.c.patch 1167 +RMD160 cb4d8e0b367802aabd89383d08479015095965c0 files/scrollbox.c.patch 1167 +SHA256 4f2af7fe6d244e4653f3249514a97f271d8b8ac59d5ce0b48636f4d6c787cd46 files/scrollbox.c.patch 1167 DIST xfce4-weather-plugin-0.4.9.tar.gz 642215 RMD160 0c7048a46e21cb12408c284b9be66c27db85c71f SHA1 32aac39dbf845b46ed1d6f09447fdc9fc623567b SHA256 c82044a943f3b43bf0b973c4859a3061e963c8ebd7e61e03342e646523fac669 DIST xfce4-weather-plugin-0.5.99.1.tar.bz2 577433 RMD160 7175f852d359cb9bda91739802eb357e1eaa32fe SHA1 42585967486afcab636ef70917777ea97f16d0a2 SHA256 5d95a8e93115bae209a95baa9f49ac674288b180176ed98d7579ab44d3ce97f5 EBUILD xfce4-weather-0.4.9-r1.ebuild 381 RMD160 32069edb23e81d909e8c22291d090fc87b5299d3 SHA1 efdcc4ab3e442e7cd9b696e4f70637460ffea089 SHA256 672b14c4a2c0111c6e74b0b8634dc13be69745201e2577b071e58d8b9aea20fc MD5 edebd3c8e1046e5ec4f68a2337eb872a xfce4-weather-0.4.9-r1.ebuild 381 RMD160 32069edb23e81d909e8c22291d090fc87b5299d3 xfce4-weather-0.4.9-r1.ebuild 381 SHA256 672b14c4a2c0111c6e74b0b8634dc13be69745201e2577b071e58d8b9aea20fc xfce4-weather-0.4.9-r1.ebuild 381 +EBUILD xfce4-weather-0.4.9-r2.ebuild 467 RMD160 d28d191e8f902b34e3e6d8e0cd896ba2b648e535 SHA1 5c5fc71084539fd9427965b97955964a1d77b962 SHA256 37a6c9a57ef533cac5f6d836231d1aaea4ce94147ae9e56d34359ef810298579 +MD5 832bf413bb3dea6b098670d61c624f10 xfce4-weather-0.4.9-r2.ebuild 467 +RMD160 d28d191e8f902b34e3e6d8e0cd896ba2b648e535 xfce4-weather-0.4.9-r2.ebuild 467 +SHA256 37a6c9a57ef533cac5f6d836231d1aaea4ce94147ae9e56d34359ef810298579 xfce4-weather-0.4.9-r2.ebuild 467 EBUILD xfce4-weather-0.4.9.ebuild 373 RMD160 11b315265095457496057c47012b8c622be93c8b SHA1 64a42f92e95af23db23b9d71f2bdf5b0e575c443 SHA256 9d0531b19d277e3787613cfe6964e387f9818054df0475b449e1ac0ca2f3c453 MD5 12b39d8dbbea0b333da878d8ce2ed5e0 xfce4-weather-0.4.9.ebuild 373 RMD160 11b315265095457496057c47012b8c622be93c8b xfce4-weather-0.4.9.ebuild 373 @@ -12,10 +20,10 @@ EBUILD xfce4-weather-0.5.99.1.ebuild 407 RMD160 c1fac7114c99e985817f8e664a4235d0 MD5 1e949f45c477c054dfc9048c07b46fab xfce4-weather-0.5.99.1.ebuild 407 RMD160 c1fac7114c99e985817f8e664a4235d099d6cd60 xfce4-weather-0.5.99.1.ebuild 407 SHA256 94f6975f13d91343061a6a16fbc0c9dcecf95104d14dd421aa7c0af9fa0dc5cd xfce4-weather-0.5.99.1.ebuild 407 -MISC ChangeLog 2518 RMD160 32dcaf0fcaec45a3050e54e731c1a4dc02cb2b10 SHA1 270e100ddc4a31ddcae5cea3f888db87ed620fab SHA256 609ab8363b995fd288663e39301575f8e3f20f1c782789c9b6068f6723f34dbc -MD5 c1afdf43e7097bae0787561cdd1884cd ChangeLog 2518 -RMD160 32dcaf0fcaec45a3050e54e731c1a4dc02cb2b10 ChangeLog 2518 -SHA256 609ab8363b995fd288663e39301575f8e3f20f1c782789c9b6068f6723f34dbc ChangeLog 2518 +MISC ChangeLog 2740 RMD160 e3f30b3a3d81a4827d47cf3ca19e1e87f3a58627 SHA1 bc66f8658dc9cf8f405e89f8199bdfc9b8e84301 SHA256 cc0da630b5a88d71895cf5097a5ee156148db907d04b35cd9bac54ee1a66ff78 +MD5 2b9c077c6bbe2f64a5beadad01414cd8 ChangeLog 2740 +RMD160 e3f30b3a3d81a4827d47cf3ca19e1e87f3a58627 ChangeLog 2740 +SHA256 cc0da630b5a88d71895cf5097a5ee156148db907d04b35cd9bac54ee1a66ff78 ChangeLog 2740 MISC metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 SHA1 7eae91f2588bdae8667d37a98fb3090d539eeca1 SHA256 44350daa7594842894d676413708d8ea77ccb0017bed24711af5b256281f5e61 MD5 c390804e060ffd11a5bbb143434b2b2d metadata.xml 157 RMD160 d7470fe88d1b96f3a7f1ef26fb7dc646b4a1b907 metadata.xml 157 @@ -26,6 +34,9 @@ SHA256 57fcd2ff09fd1fd013e6c0a2c2bdd7fdd5a279a8eed5e6ae4f2e14bb099392ac files/di MD5 db6b7aa2ae754899188935072b6d3c57 files/digest-xfce4-weather-0.4.9-r1 280 RMD160 92ea2aba52b979b73c9b05762773c5160bcdf813 files/digest-xfce4-weather-0.4.9-r1 280 SHA256 57fcd2ff09fd1fd013e6c0a2c2bdd7fdd5a279a8eed5e6ae4f2e14bb099392ac files/digest-xfce4-weather-0.4.9-r1 280 +MD5 db6b7aa2ae754899188935072b6d3c57 files/digest-xfce4-weather-0.4.9-r2 280 +RMD160 92ea2aba52b979b73c9b05762773c5160bcdf813 files/digest-xfce4-weather-0.4.9-r2 280 +SHA256 57fcd2ff09fd1fd013e6c0a2c2bdd7fdd5a279a8eed5e6ae4f2e14bb099392ac files/digest-xfce4-weather-0.4.9-r2 280 MD5 0611795e5057795a0137d8135710ba12 files/digest-xfce4-weather-0.5.99.1 292 RMD160 3661ed3a3098fb3d64267bbf829333cbb6ef6939 files/digest-xfce4-weather-0.5.99.1 292 SHA256 bbe641b1e907eda04e1bc248c7eb7fea61793de4def43f50d65a74ff61f0c9f3 files/digest-xfce4-weather-0.5.99.1 292 diff --git a/xfce-extra/xfce4-weather/files/digest-xfce4-weather-0.4.9-r2 b/xfce-extra/xfce4-weather/files/digest-xfce4-weather-0.4.9-r2 new file mode 100644 index 000000000000..0423d15ec993 --- /dev/null +++ b/xfce-extra/xfce4-weather/files/digest-xfce4-weather-0.4.9-r2 @@ -0,0 +1,3 @@ +MD5 1d5ba253c8eae5a9ad5e3d7002a0dae0 xfce4-weather-plugin-0.4.9.tar.gz 642215 +RMD160 0c7048a46e21cb12408c284b9be66c27db85c71f xfce4-weather-plugin-0.4.9.tar.gz 642215 +SHA256 c82044a943f3b43bf0b973c4859a3061e963c8ebd7e61e03342e646523fac669 xfce4-weather-plugin-0.4.9.tar.gz 642215 diff --git a/xfce-extra/xfce4-weather/files/scrollbox.c.patch b/xfce-extra/xfce4-weather/files/scrollbox.c.patch new file mode 100644 index 000000000000..0e07d6226694 --- /dev/null +++ b/xfce-extra/xfce4-weather/files/scrollbox.c.patch @@ -0,0 +1,30 @@ +diff -r -u xfce4-weather-plugin-0.4.9/panel-plugin/scrollbox.c xfce4-weather-plugin-0.4.9-updated/panel-plugin/scrollbox.c +--- xfce4-weather-plugin-0.4.9/panel-plugin/scrollbox.c 2006-06-11 12:27:28.000000000 +0100 ++++ xfce4-weather-plugin-0.4.9-updated/panel-plugin/scrollbox.c 2006-06-11 12:26:19.000000000 +0100 +@@ -17,7 +17,7 @@ + void free_label(struct label *lbl) + { + if (lbl->pixmap) +- g_free(lbl->pixmap); ++ g_object_unref(lbl->pixmap); + if (lbl->msg) + g_free(lbl->msg); + } +@@ -305,7 +305,7 @@ + { + struct label *lbl = (struct label*)g_ptr_array_index(self->labels, i); + +- g_free(lbl->pixmap); ++ g_object_unref(lbl->pixmap); + g_free(lbl->msg); + } + g_ptr_array_free(self->labels, TRUE); +@@ -337,7 +337,7 @@ + newpixmap = make_pixmap(self, lbl->msg); + + if (lbl->pixmap) +- g_free(lbl->pixmap); ++ g_object_unref(lbl->pixmap); + + lbl->pixmap = newpixmap; + } diff --git a/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r2.ebuild b/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r2.ebuild new file mode 100644 index 000000000000..f133858f6010 --- /dev/null +++ b/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r2.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/xfce-extra/xfce4-weather/xfce4-weather-0.4.9-r2.ebuild,v 1.1 2006/12/12 03:42:10 nichoj Exp $ + +inherit xfce42 eutils + +DESCRIPTION="Xfce panel weather monitor" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +goodies_plugin + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/scrollbox.c.patch +} -- 2.26.2