From 4c27525b0339f0af4c47f63bd54298866a812be8 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Thu, 22 Feb 2007 22:35:05 +0000 Subject: [PATCH] Bump to 2.8.2-r1 - fix crasher in smooth engine. Bug #167569 Package-Manager: portage-2.1.2-r10 --- x11-themes/gtk-engines/ChangeLog | 9 +- x11-themes/gtk-engines/Manifest | 27 ++++-- .../files/digest-gtk-engines-2.8.2-r1 | 3 + .../gtk-engines-2.8.2-smooth-arrow.patch | 87 +++++++++++++++++++ .../gtk-engines/gtk-engines-2.8.2-r1.ebuild | 25 ++++++ 5 files changed, 142 insertions(+), 9 deletions(-) create mode 100644 x11-themes/gtk-engines/files/digest-gtk-engines-2.8.2-r1 create mode 100644 x11-themes/gtk-engines/files/gtk-engines-2.8.2-smooth-arrow.patch create mode 100644 x11-themes/gtk-engines/gtk-engines-2.8.2-r1.ebuild diff --git a/x11-themes/gtk-engines/ChangeLog b/x11-themes/gtk-engines/ChangeLog index 06cd7f42f4cc..27791f542a23 100644 --- a/x11-themes/gtk-engines/ChangeLog +++ b/x11-themes/gtk-engines/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for x11-themes/gtk-engines # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.88 2007/01/09 05:57:10 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/ChangeLog,v 1.89 2007/02/22 22:35:05 dang Exp $ + +*gtk-engines-2.8.2-r1 (22 Feb 2007) + + 22 Feb 2007; Daniel Gryniewicz + +files/gtk-engines-2.8.2-smooth-arrow.patch, +gtk-engines-2.8.2-r1.ebuild: + Bump to 2.8.2-r1 + - fix crasher in smooth engine. Bug #167569 09 Jan 2007; Mart Raudsepp -gtk-engines-2.8.1.ebuild: Remove old diff --git a/x11-themes/gtk-engines/Manifest b/x11-themes/gtk-engines/Manifest index 054ffded4578..e755a4088aec 100644 --- a/x11-themes/gtk-engines/Manifest +++ b/x11-themes/gtk-engines/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX gtk-engines-2.8.2-smooth-arrow.patch 3134 RMD160 71f4a7f830bb4d38e925ca4f0f8810f161560f2c SHA1 05d54210d7ec262e1f63ec69f94f0f9d7b575196 SHA256 919782f16119705c352d6cae72195c137d7049bce12a64fb98d08867583731df +MD5 ae06e750e8e30ae63d359c220af6cade files/gtk-engines-2.8.2-smooth-arrow.patch 3134 +RMD160 71f4a7f830bb4d38e925ca4f0f8810f161560f2c files/gtk-engines-2.8.2-smooth-arrow.patch 3134 +SHA256 919782f16119705c352d6cae72195c137d7049bce12a64fb98d08867583731df files/gtk-engines-2.8.2-smooth-arrow.patch 3134 DIST gtk-engines-0.12.tar.gz 653438 RMD160 2c738c02bbb2ad4cae11caf21d65adfaaef35bbc SHA1 80472a42b5eaf5ced352b8a3cf450fe34998b870 SHA256 4a112e5b138786b2b1a2da0c9dc53899ca6364333d9ed151f32e040268121b35 DIST gtk-engines-2.6.10.tar.bz2 472374 RMD160 dc9b415471109f7c645888edd810ff10abf6add7 SHA1 5c3f88893c1d1d7665709271dbac37f1f7e30758 SHA256 83df135980c0b3ebe18efe030b311f3eb59c1679730eda3dfd1a2a377ee4c0a6 DIST gtk-engines-2.6.9.tar.bz2 465622 RMD160 5cf0f3b12c1dd01c570b921ed483ceac73337348 SHA1 cee5d8003489b6f0eec139b87cf82f1f7879573c SHA256 2cdb52a5cf9889f439cac2320aceaed0116930c9dcd68b01fbcca9715b3cc54a @@ -17,14 +21,18 @@ EBUILD gtk-engines-2.6.9.ebuild 671 RMD160 843221be59160cd67d3a27e3d56a8fcb544ce MD5 bf9b6e1d0c9a76e570bc87a970870209 gtk-engines-2.6.9.ebuild 671 RMD160 843221be59160cd67d3a27e3d56a8fcb544ce642 gtk-engines-2.6.9.ebuild 671 SHA256 029b32c3ed24d2c8ba27d66d731b51497f79d1be2d289172414e5db38d5a19b7 gtk-engines-2.6.9.ebuild 671 +EBUILD gtk-engines-2.8.2-r1.ebuild 729 RMD160 e1f3655b775e4cba6df3995df6caa368881a400e SHA1 f3bc83e7be0bbf39e34d371e920d2ef1e71d7680 SHA256 faced7bbf91788f7f5e40774b949e4bb18c0bbf7d5e1a8bb582b3ef93d3c3022 +MD5 ad0558069c92f7bbeef01e0c706be782 gtk-engines-2.8.2-r1.ebuild 729 +RMD160 e1f3655b775e4cba6df3995df6caa368881a400e gtk-engines-2.8.2-r1.ebuild 729 +SHA256 faced7bbf91788f7f5e40774b949e4bb18c0bbf7d5e1a8bb582b3ef93d3c3022 gtk-engines-2.8.2-r1.ebuild 729 EBUILD gtk-engines-2.8.2.ebuild 729 RMD160 2c26d06e3e7f41dfec68ea57b2b3b2e9447f9a19 SHA1 cac00fbfed344ff29fbf6cb50c7cd5ace0afc8bd SHA256 467b2a569ebf1af02354eb7acbaa9718927dde22e998ff2562b527fd5ef788af MD5 5438c83a5e85c4fb89800de85bf016d8 gtk-engines-2.8.2.ebuild 729 RMD160 2c26d06e3e7f41dfec68ea57b2b3b2e9447f9a19 gtk-engines-2.8.2.ebuild 729 SHA256 467b2a569ebf1af02354eb7acbaa9718927dde22e998ff2562b527fd5ef788af gtk-engines-2.8.2.ebuild 729 -MISC ChangeLog 10453 RMD160 ed3c8ec0472a292efd461c50514f6c47f4624d66 SHA1 afb42e711bf17fa52fe3a4f2c5de912371d907ad SHA256 ed7ed8b9091113a7e2e7e08f1eb4f0f452dee82e0eb1b2a6400eb41d2bca5625 -MD5 59f0e1c04ce77392b194e881c8bf7b0b ChangeLog 10453 -RMD160 ed3c8ec0472a292efd461c50514f6c47f4624d66 ChangeLog 10453 -SHA256 ed7ed8b9091113a7e2e7e08f1eb4f0f452dee82e0eb1b2a6400eb41d2bca5625 ChangeLog 10453 +MISC ChangeLog 10686 RMD160 6530327cb8ccec435077a39721b3db581061c2ee SHA1 7af803602f3c50017d7df47be1f5e0c706e054c0 SHA256 68d7e1a92e69e10db4ad214e34ebd825a7e100a7b218fcc5c7ff7656f5f1095d +MD5 de8e83351a8c58e7b3a9cd1a2123666c ChangeLog 10686 +RMD160 6530327cb8ccec435077a39721b3db581061c2ee ChangeLog 10686 +SHA256 68d7e1a92e69e10db4ad214e34ebd825a7e100a7b218fcc5c7ff7656f5f1095d ChangeLog 10686 MISC metadata.xml 568 RMD160 55afc3bd5e963a38ca159fe1855fb86c1d205ed1 SHA1 fefe96510715292236a409394ac78e1b092043bc SHA256 cfae48dc83100358d4370ba22eaa6284c74288b749e2f34525358e3627fa8a89 MD5 36faf46cc298a5e4b601aafac15ec93b metadata.xml 568 RMD160 55afc3bd5e963a38ca159fe1855fb86c1d205ed1 metadata.xml 568 @@ -41,10 +49,13 @@ SHA256 93905d6c2e2cc255a86ae6450717e8eec198098d1a170398b80427e0136591af files/di MD5 92624d242be9c98515d6264b15b11e64 files/digest-gtk-engines-2.8.2 256 RMD160 e1b96691e53bf48814a1d2a0238733f7568a7b9b files/digest-gtk-engines-2.8.2 256 SHA256 11055e66dc225b1ae763d72fbf8aaea803e2a8c75ba79b0ded6898ce90736540 files/digest-gtk-engines-2.8.2 256 +MD5 92624d242be9c98515d6264b15b11e64 files/digest-gtk-engines-2.8.2-r1 256 +RMD160 e1b96691e53bf48814a1d2a0238733f7568a7b9b files/digest-gtk-engines-2.8.2-r1 256 +SHA256 11055e66dc225b1ae763d72fbf8aaea803e2a8c75ba79b0ded6898ce90736540 files/digest-gtk-engines-2.8.2-r1 256 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFucs48bi6rjpTunYRAs0SAJ46EUstRfhBqat8F0Y/nLym4UQYugCgjdA6 -JBwgbzaqHVHviBZqsC5jpQw= -=8dra +iD8DBQFF3hpIomPajV0RnrERAjaPAJ9cqVRJ5zyc16rA/+ei0q23zJIPDQCggWHM +URNAaOd6QUpqTuw7drizPdg= +=G7ZZ -----END PGP SIGNATURE----- diff --git a/x11-themes/gtk-engines/files/digest-gtk-engines-2.8.2-r1 b/x11-themes/gtk-engines/files/digest-gtk-engines-2.8.2-r1 new file mode 100644 index 000000000000..03a47b9f5b4e --- /dev/null +++ b/x11-themes/gtk-engines/files/digest-gtk-engines-2.8.2-r1 @@ -0,0 +1,3 @@ +MD5 0c5b0254b57910b1ebcda47ac6a3b1ba gtk-engines-2.8.2.tar.bz2 461623 +RMD160 f82a5d5a5a3833759a3edba4f18f9135b1daccbf gtk-engines-2.8.2.tar.bz2 461623 +SHA256 c789ceb35f9972cdc41655d663e579150bfb3703a917a8be254f227c57730734 gtk-engines-2.8.2.tar.bz2 461623 diff --git a/x11-themes/gtk-engines/files/gtk-engines-2.8.2-smooth-arrow.patch b/x11-themes/gtk-engines/files/gtk-engines-2.8.2-smooth-arrow.patch new file mode 100644 index 000000000000..60953902ce05 --- /dev/null +++ b/x11-themes/gtk-engines/files/gtk-engines-2.8.2-smooth-arrow.patch @@ -0,0 +1,87 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gtk-engines-2.8.2.orig/engines/smooth/src/engine/shared/gtk/smooth_gtk_rc.c gtk-engines-2.8.2/engines/smooth/src/engine/shared/gtk/smooth_gtk_rc.c +--- gtk-engines-2.8.2.orig/engines/smooth/src/engine/shared/gtk/smooth_gtk_rc.c 2006-11-13 11:07:12.000000000 -0500 ++++ gtk-engines-2.8.2/engines/smooth/src/engine/shared/gtk/smooth_gtk_rc.c 2007-02-22 16:12:41.000000000 -0500 +@@ -2207,11 +2207,12 @@ smooth_arrow_merge (SmoothArrowPart *des + { + SmoothArrow dummy; + +- if (dest_arrow->DefaultStyle) +- g_free(dest_arrow->DefaultStyle); +- ++ /* what is this for? */ + smooth_style_get_arrow(src_arrow, 0, 0, &dummy); +- memcpy(dest_arrow, src_arrow, sizeof(SmoothArrowPart)); ++ ++ SmoothCopyArrowPart(dest_arrow, src_arrow); ++ ++ /* Only used to inherit in one rc style. So this should work fine, I think. */ + dest_arrow->Inherited = NULL; + } + +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gtk-engines-2.8.2.orig/engines/smooth/src/utils/draw_arrows.c gtk-engines-2.8.2/engines/smooth/src/utils/draw_arrows.c +--- gtk-engines-2.8.2.orig/engines/smooth/src/utils/draw_arrows.c 2006-07-25 05:46:47.000000000 -0400 ++++ gtk-engines-2.8.2/engines/smooth/src/utils/draw_arrows.c 2007-02-22 16:12:41.000000000 -0500 +@@ -685,3 +685,52 @@ void SmoothFreeArrowStyles(SmoothArrowPa + } + } + } ++ ++ ++void SmoothCopyArrowPart(SmoothArrowPart *dst, SmoothArrowPart *src) ++{ ++ gint i, j; ++ g_assert (dst != NULL); ++ g_assert (src != NULL); ++ ++ SmoothFreeArrowStyles(dst); ++ ++ if (src->DefaultStyle) ++ { ++ dst->DefaultStyle = g_new0(SmoothArrow, 1); ++ memcpy(dst->DefaultStyle, src->DefaultStyle, sizeof(SmoothArrow)); ++ } ++ ++ if (src->DefaultStateStyles) ++ { ++ dst->DefaultStateStyles = g_new0(SmoothArrow, 1); ++ memcpy(dst->DefaultStateStyles, src->DefaultStateStyles, sizeof(SmoothArrow)); ++ } ++ ++ if (src->DefaultTypeStyles) ++ { ++ dst->DefaultTypeStyles = g_new0(SmoothArrow, 1); ++ memcpy(dst->DefaultTypeStyles, src->DefaultTypeStyles, sizeof(SmoothArrow)); ++ } ++ ++ for (i=0; i < 5; i++) ++ { ++ if (src->Styles[i]) ++ { ++ dst->Styles[i] = g_new0(SmoothArrow, 1); ++ memcpy(dst->Styles[i], src->Styles[i], sizeof(SmoothArrow)); ++ } ++ } ++ ++ dst->StylesFreed = src->StylesFreed; ++ dst->Inherited = src->Inherited; ++ ++ for (i=0; i < 5; i++) ++ { ++ for (j=0; j < SMOOTH_ARROW_TYPE_COUNT; j++) ++ { ++ dst->CompositeArrows[i][j] = src->CompositeArrows[i][j]; ++ dst->CompositeArrowsSet[i][j] = src->CompositeArrowsSet[i][j]; ++ } ++ } ++} +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gtk-engines-2.8.2.orig/engines/smooth/src/utils/draw_arrows.h gtk-engines-2.8.2/engines/smooth/src/utils/draw_arrows.h +--- gtk-engines-2.8.2.orig/engines/smooth/src/utils/draw_arrows.h 2006-08-14 15:25:41.000000000 -0400 ++++ gtk-engines-2.8.2/engines/smooth/src/utils/draw_arrows.h 2007-02-22 16:12:41.000000000 -0500 +@@ -112,5 +112,7 @@ SmoothDrawArrow(SmoothCanvas *Canvas, + + GE_INTERNAL void + SmoothFreeArrowStyles(SmoothArrowPart *arrow); ++GE_INTERNAL void ++SmoothCopyArrowPart(SmoothArrowPart *dst, SmoothArrowPart *src); + + #endif /* DRAW_ARROWS_H */ diff --git a/x11-themes/gtk-engines/gtk-engines-2.8.2-r1.ebuild b/x11-themes/gtk-engines/gtk-engines-2.8.2-r1.ebuild new file mode 100644 index 000000000000..e07235940171 --- /dev/null +++ b/x11-themes/gtk-engines/gtk-engines-2.8.2-r1.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-themes/gtk-engines/gtk-engines-2.8.2-r1.ebuild,v 1.1 2007/02/22 22:35:05 dang Exp $ + +inherit gnome2 + +DESCRIPTION="GTK+2 standard engines and themes" +HOMEPAGE="http://www.gtk.org/" + +LICENSE="GPL-2 LGPL-2.1" +SLOT="2" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd" +IUSE="accessibility static" + +RDEPEND=">=x11-libs/gtk+-2.8 + !<=x11-themes/gnome-themes-2.8.2" +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9" + +DOCS="AUTHORS ChangeLog NEWS README" + +pkg_setup() { + G2CONF="$(use_enable static) --enable-animation" + use accessibility || G2CONF="${G2CONF} --disable-hc" +} -- 2.26.2