From 8ec4220fefc5022c97ff19bf8a5a1aad8bcc4928 Mon Sep 17 00:00:00 2001 From: Daniel Gryniewicz Date: Tue, 20 Mar 2007 14:22:00 +0000 Subject: [PATCH] Take maintainership and add amd64 patch (bug #157376) Package-Manager: portage-2.1.2.2 --- x11-misc/gcolor2/ChangeLog | 6 ++- x11-misc/gcolor2/Manifest | 34 ++++++++------ .../gcolor2/files/gcolor2-0.4-amd64.patch | 46 +++++++++++++++++++ x11-misc/gcolor2/gcolor2-0.4-r2.ebuild | 5 +- x11-misc/gcolor2/metadata.xml | 4 +- 5 files changed, 75 insertions(+), 20 deletions(-) create mode 100644 x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch diff --git a/x11-misc/gcolor2/ChangeLog b/x11-misc/gcolor2/ChangeLog index a407c5794e81..688c0e92f840 100644 --- a/x11-misc/gcolor2/ChangeLog +++ b/x11-misc/gcolor2/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/gcolor2 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/ChangeLog,v 1.20 2007/03/19 01:24:35 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/ChangeLog,v 1.21 2007/03/20 14:22:00 dang Exp $ + + 20 Mar 2007; Daniel Gryniewicz + +files/gcolor2-0.4-amd64.patch, metadata.xml, gcolor2-0.4-r2.ebuild: + Take maintainership and add amd64 patch (bug #157376) 19 Mar 2007; Bryan Østergaard metadata.xml: Remove ka0ttic from metadata.xml due to retirement. diff --git a/x11-misc/gcolor2/Manifest b/x11-misc/gcolor2/Manifest index aff36a5b4ac8..3125243b1be8 100644 --- a/x11-misc/gcolor2/Manifest +++ b/x11-misc/gcolor2/Manifest @@ -1,6 +1,10 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX gcolor2-0.4-amd64.patch 1484 RMD160 6ece617db1254b30b9d5352382a41b73de089e96 SHA1 000905f7b086ac8f7f0a97e49a4e636ad541de80 SHA256 93b3218de6d522017cb2d14cb94cfe523100234a45fe9b46cee2274612887195 +MD5 5791378f6f86dd25a302ad8586292dd6 files/gcolor2-0.4-amd64.patch 1484 +RMD160 6ece617db1254b30b9d5352382a41b73de089e96 files/gcolor2-0.4-amd64.patch 1484 +SHA256 93b3218de6d522017cb2d14cb94cfe523100234a45fe9b46cee2274612887195 files/gcolor2-0.4-amd64.patch 1484 AUX modular-rgb.patch 784 RMD160 2b6b081b73221c6465265466d484e08a58cbe477 SHA1 e910503a792a02e3361fdb65b458ba05ced95096 SHA256 f6b8ab3fcacef9f494d97bb7cbc3950ed6015b0eb40f5771797c56ffd62a6944 MD5 f08da6a08e5db946e319122024967035 files/modular-rgb.patch 784 RMD160 2b6b081b73221c6465265466d484e08a58cbe477 files/modular-rgb.patch 784 @@ -10,18 +14,18 @@ EBUILD gcolor2-0.4-r1.ebuild 650 RMD160 14447b388924411e03dbf5abecddf979659f8d95 MD5 cfbb6684d1129df23d45bdc28d87a49f gcolor2-0.4-r1.ebuild 650 RMD160 14447b388924411e03dbf5abecddf979659f8d95 gcolor2-0.4-r1.ebuild 650 SHA256 b221ff991228be46a33364056c0bc7ce068513ae5981c23995c774dc6c04520f gcolor2-0.4-r1.ebuild 650 -EBUILD gcolor2-0.4-r2.ebuild 740 RMD160 af72c9be7f6dd353da871b061d2a70ab3dc9f1cd SHA1 bc0afbaa53eec6036971ecb5e7c083e9c0bf3617 SHA256 29f0fd35fe0226cb969e6d2d88a7ffca9e6ae03e8dae4f2c0210ad3c354ec785 -MD5 cea467119ffe3d4cb3ba01f35ff71e4d gcolor2-0.4-r2.ebuild 740 -RMD160 af72c9be7f6dd353da871b061d2a70ab3dc9f1cd gcolor2-0.4-r2.ebuild 740 -SHA256 29f0fd35fe0226cb969e6d2d88a7ffca9e6ae03e8dae4f2c0210ad3c354ec785 gcolor2-0.4-r2.ebuild 740 -MISC ChangeLog 2553 RMD160 afe61c8339cfe483c608dabbc05cc27f7b180ac1 SHA1 a6bad33bcb12c7568bd490816e1e5ec6d437fb7b SHA256 c21ce01fd64c577b2fe62cabb24f69b8a6af12f5f8a83a4e5f8320980bef6e4b -MD5 d719aedde52578a6d5135267c7b0566d ChangeLog 2553 -RMD160 afe61c8339cfe483c608dabbc05cc27f7b180ac1 ChangeLog 2553 -SHA256 c21ce01fd64c577b2fe62cabb24f69b8a6af12f5f8a83a4e5f8320980bef6e4b ChangeLog 2553 -MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 -MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236 -RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236 -SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 metadata.xml 236 +EBUILD gcolor2-0.4-r2.ebuild 784 RMD160 4f09a3e6a9d4f048c941904f9eab754892350ad7 SHA1 a9ccd9c07677def8b9eafd9d698107297dbff22b SHA256 6e1de6e43bcd35ea7be9311492cfdce402bd2b49c428ec1b2d16ef0d7713eede +MD5 9331eb9d064517a93ad6e832ef6018c2 gcolor2-0.4-r2.ebuild 784 +RMD160 4f09a3e6a9d4f048c941904f9eab754892350ad7 gcolor2-0.4-r2.ebuild 784 +SHA256 6e1de6e43bcd35ea7be9311492cfdce402bd2b49c428ec1b2d16ef0d7713eede gcolor2-0.4-r2.ebuild 784 +MISC ChangeLog 2730 RMD160 8901c04697303f3040947750bda71de4a84356c7 SHA1 e65d9c11506faacf44cf875f4c52ee8e2fe06978 SHA256 a3914407eea87da3f809707e70235c4d569de0b92bda91bb03294cfbbce09280 +MD5 91ba12aba81f73b8d5ec81ffdfbe09e8 ChangeLog 2730 +RMD160 8901c04697303f3040947750bda71de4a84356c7 ChangeLog 2730 +SHA256 a3914407eea87da3f809707e70235c4d569de0b92bda91bb03294cfbbce09280 ChangeLog 2730 +MISC metadata.xml 221 RMD160 c95cc10957c55d1612d2bff624c7592212cfeaff SHA1 56bed2e0b9e3aa6a60b73a66c793767865a6e2ef SHA256 894c9d35bceb1db3047970dee6ec54835bbd08d383c6862e086f18321d24bc8f +MD5 865112d2aa374ac197f9b8591cc421db metadata.xml 221 +RMD160 c95cc10957c55d1612d2bff624c7592212cfeaff metadata.xml 221 +SHA256 894c9d35bceb1db3047970dee6ec54835bbd08d383c6862e086f18321d24bc8f metadata.xml 221 MD5 8f89bda67f3b458a38fd9986c991a69e files/digest-gcolor2-0.4-r1 235 RMD160 992968f659a77feb1497ef30b500c1259b1356ff files/digest-gcolor2-0.4-r1 235 SHA256 173d193cecfa1d9c3596b12b340a71a0a8108a9fc0126191550413226f002dc1 files/digest-gcolor2-0.4-r1 235 @@ -31,7 +35,7 @@ SHA256 173d193cecfa1d9c3596b12b340a71a0a8108a9fc0126191550413226f002dc1 files/di -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFF/eYbugEuf3OQ0akRAquZAJ9B3r9evdMWvjSOXD2keU/U0xTLTwCcCWEw -pxsm6uIy0HQehnxQLY5R4Uw= -=//Og +iD8DBQFF/+4JomPajV0RnrERAj52AJ0TxWfbTK0Whn0iTTXrvhyJ9W+pIwCfY53g +Xi81SIp2uU2mbzov1OycSDg= +=J44v -----END PGP SIGNATURE----- diff --git a/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch b/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch new file mode 100644 index 000000000000..cd06a8315f98 --- /dev/null +++ b/x11-misc/gcolor2/files/gcolor2-0.4-amd64.patch @@ -0,0 +1,46 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c +--- gcolor2-0.4.orig/src/callbacks.c 2005-07-12 14:06:12.000000000 -0400 ++++ gcolor2-0.4/src/callbacks.c 2007-02-17 19:19:38.000000000 -0500 +@@ -4,6 +4,9 @@ + + #include + #include ++#include ++#include ++#include + + #include "callbacks.h" + #include "interface.h" +@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate + gtk_clipboard_set_text (cb, hex, strlen (hex)); + } + ++void add_rgb_file (gchar *filename, gchar *type); ++gchar* get_system_file (void); ++ + void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data) + { + if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem))) +@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton * + gtk_widget_destroy (savedialog); + } + ++void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color); ++ + void add_color_to_treeview () + { + GtkTreeView *treeview; +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c +--- gcolor2-0.4.orig/src/main.c 2005-07-11 10:55:49.000000000 -0400 ++++ gcolor2-0.4/src/main.c 2007-02-17 19:18:23.000000000 -0500 +@@ -4,6 +4,10 @@ + + #include + #include ++#include ++#include ++#include ++#include + + #include "interface.h" + #include "support.h" diff --git a/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild index 5dcb4232c05a..79991ad4577b 100644 --- a/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild +++ b/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild,v 1.5 2007/03/10 19:54:55 welp Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/gcolor2/gcolor2-0.4-r2.ebuild,v 1.6 2007/03/20 14:22:00 dang Exp $ inherit eutils @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="ppc ppc64 x86 ~x86-fbsd" +KEYWORDS="~amd64 ppc ppc64 x86 ~x86-fbsd" IUSE="" DEPEND=">=x11-libs/gtk+-2.4" @@ -19,6 +19,7 @@ src_unpack() { unpack ${A} cd ${S}/src epatch ${FILESDIR}/modular-rgb.patch + epatch ${FILESDIR}/${P}-amd64.patch } src_install() { diff --git a/x11-misc/gcolor2/metadata.xml b/x11-misc/gcolor2/metadata.xml index 9f3fdee2246b..3070e097eed5 100644 --- a/x11-misc/gcolor2/metadata.xml +++ b/x11-misc/gcolor2/metadata.xml @@ -1,8 +1,8 @@ - no-herd + gnome - maintainer-needed@gentoo.org + dang@gentoo.org -- 2.26.2