From 2c1a04439cd0d167b899e3206e0570e10ca599b0 Mon Sep 17 00:00:00 2001 From: Remi Cardona Date: Tue, 21 Nov 2006 08:16:05 +0000 Subject: [PATCH] fixing bug #153294, and droping ~alpha and ~ppc64 for this bump Package-Manager: portage-2.1.2_rc2 --- dev-cpp/gtkmm/ChangeLog | 10 ++++- dev-cpp/gtkmm/Manifest | 29 ++++++------ dev-cpp/gtkmm/files/digest-gtkmm-2.10.2-r1 | 3 ++ ...ove_atk_from_gtk_pc_during_configure.patch | 27 ++++++++++++ dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild | 44 +++++++++++++++++++ 5 files changed, 98 insertions(+), 15 deletions(-) create mode 100644 dev-cpp/gtkmm/files/digest-gtkmm-2.10.2-r1 create mode 100644 dev-cpp/gtkmm/files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch create mode 100644 dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild diff --git a/dev-cpp/gtkmm/ChangeLog b/dev-cpp/gtkmm/ChangeLog index b12038ec3541..fb80dc69ad94 100644 --- a/dev-cpp/gtkmm/ChangeLog +++ b/dev-cpp/gtkmm/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-cpp/gtkmm # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.101 2006/11/20 13:10:27 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/ChangeLog,v 1.102 2006/11/21 08:16:05 remi Exp $ + +*gtkmm-2.10.2-r1 (21 Nov 2006) + + 21 Nov 2006; Remi Cardona + +files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch, + +gtkmm-2.10.2-r1.ebuild: + Patch for bug #153294 (remove atkmm from gtkmm-2.4.pc if -accessibility is set) + Submitted patch upstream : http://bugzilla.gnome.org/show_bug.cgi?id=366930 20 Nov 2006; Diego Pettenò gtkmm-2.10.2.ebuild: Remove ~x86-fbsd keyword till I can get glibmm to build. diff --git a/dev-cpp/gtkmm/Manifest b/dev-cpp/gtkmm/Manifest index d9818393bbce..f5f14d5b87f4 100644 --- a/dev-cpp/gtkmm/Manifest +++ b/dev-cpp/gtkmm/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX gtkmm-1.2.9-gcc3.1-gentoo.patch 518 RMD160 2c516c51c0b97d26638150a9741f9f196a0b037e SHA1 d6330370dac2f9a6cf08db9be3d5c6ee36c28b5e SHA256 be2e4bb78de8d55824a3564427e6078bb65a525ed05164128b4857dffc487705 MD5 53f860d6754e3cb516cc67a11c36fc7f files/gtkmm-1.2.9-gcc3.1-gentoo.patch 518 RMD160 2c516c51c0b97d26638150a9741f9f196a0b037e files/gtkmm-1.2.9-gcc3.1-gentoo.patch 518 @@ -13,6 +10,10 @@ AUX gtkmm-1.2.9-gcc4.patch 1382 RMD160 681cb464e36f0ad7d89029fd384bb7496c48eeb3 MD5 ec017b1d591242271632f34bef93d36a files/gtkmm-1.2.9-gcc4.patch 1382 RMD160 681cb464e36f0ad7d89029fd384bb7496c48eeb3 files/gtkmm-1.2.9-gcc4.patch 1382 SHA256 45a907630a651e8bd1355b837253a75ecd6e1e8f9e80d8e6668669a85c2d5a41 files/gtkmm-1.2.9-gcc4.patch 1382 +AUX gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch 955 RMD160 1e72a0a44c0241022382dd3d84a7e43fa658c2c5 SHA1 3163297c6779f2eda39bf6536d4714da5aea4d51 SHA256 94e9df33e8ca5b284f309e0d6b8013509437d5ea523a733e0786e7bb11e1a96e +MD5 de89a3d8c295586042b38d376f522329 files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch 955 +RMD160 1e72a0a44c0241022382dd3d84a7e43fa658c2c5 files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch 955 +SHA256 94e9df33e8ca5b284f309e0d6b8013509437d5ea523a733e0786e7bb11e1a96e files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch 955 DIST gtkmm-1.2.9.tar.gz 716656 RMD160 d5248981343fea5f3c0b7e59b190f7fe9273021a SHA1 42c87bba55fa72452bf3fcc18b169478a825fbf6 SHA256 fb8e59cee2d9825e4060b72937461bde488f673362bab258f6fe78e9db93925c DIST gtkmm-2.10.2.tar.bz2 7056116 RMD160 7c9dc8d9d45efc073c6036bd3a5e3c04518ccee2 SHA1 da960e7acbd24c98d53ddb1ba2485f9486070127 SHA256 57e95e857dc37be8a2813e618f627f4986c073aa8b6f1ce9bcd07193545f358b DIST gtkmm-2.2.10.tar.bz2 3861874 RMD160 a406194f9cf6c5b43063aa53bc1befc2c61e83b5 SHA1 3f8072f5ca07938bd996b44c96e5984b3bb02ddd SHA256 8266d56de2e5ba1daf4eb941f44b60df42723f8eb88669d179a5b423a50b1730 @@ -32,6 +33,10 @@ EBUILD gtkmm-1.2.9-r2.ebuild 1334 RMD160 043d3149c52da7c2793dbf7b2130955b9375a6f MD5 fe429fac66501594d9a0a904bbc2393f gtkmm-1.2.9-r2.ebuild 1334 RMD160 043d3149c52da7c2793dbf7b2130955b9375a6f7 gtkmm-1.2.9-r2.ebuild 1334 SHA256 e46a829d841c977aac7cca9f540d515d302e27a825823b2a2981964c73e730a7 gtkmm-1.2.9-r2.ebuild 1334 +EBUILD gtkmm-2.10.2-r1.ebuild 1074 RMD160 912097bae3da0b18756f5aac2792671dfbf5bd25 SHA1 e1f34805023ffeea6f085f8e4f5134624939573b SHA256 6c5642721e09279f55566c37b9169dcee3511d2a0280226037d9da67805984df +MD5 f8e27a8180c79444921cc3db63c0bfd8 gtkmm-2.10.2-r1.ebuild 1074 +RMD160 912097bae3da0b18756f5aac2792671dfbf5bd25 gtkmm-2.10.2-r1.ebuild 1074 +SHA256 6c5642721e09279f55566c37b9169dcee3511d2a0280226037d9da67805984df gtkmm-2.10.2-r1.ebuild 1074 EBUILD gtkmm-2.10.2.ebuild 864 RMD160 5450d0e87708c55225db237679237ed2468ab313 SHA1 fb2f7f93c3e38178aa6038b811bbc51c51c45155 SHA256 be810aa7f5ce762d4b60f10a66cabfe17e1ae1e6bc3f02455affe1914b342ae6 MD5 cbb7e09be264b4896a9667821074a444 gtkmm-2.10.2.ebuild 864 RMD160 5450d0e87708c55225db237679237ed2468ab313 gtkmm-2.10.2.ebuild 864 @@ -88,10 +93,10 @@ EBUILD gtkmm-2.8.3.ebuild 660 RMD160 bea889f9583930e6e060639c8e4d2aaf792e7e8c SH MD5 9bee8e83c3174b232a1033ecaa3184d1 gtkmm-2.8.3.ebuild 660 RMD160 bea889f9583930e6e060639c8e4d2aaf792e7e8c gtkmm-2.8.3.ebuild 660 SHA256 9875c0bc1f0d33efc62a93061eb9743f396e937f74e46ca04f8acb9912948a51 gtkmm-2.8.3.ebuild 660 -MISC ChangeLog 14420 RMD160 e2e8ec4f24212790c7c1d4de08b7987e372902e1 SHA1 45b14f099da819c5206595f951551220566f41ec SHA256 4bf6aeb09fc7d05040f83c4cd5207d4b4522a6334772584829eaae18ab233f9d -MD5 8add0c8676b8fb321d9ed0c0c41c6e99 ChangeLog 14420 -RMD160 e2e8ec4f24212790c7c1d4de08b7987e372902e1 ChangeLog 14420 -SHA256 4bf6aeb09fc7d05040f83c4cd5207d4b4522a6334772584829eaae18ab233f9d ChangeLog 14420 +MISC ChangeLog 14749 RMD160 02b95559760e1a482ec2fe3bd1e711d7ffa7f2a4 SHA1 c2faf75217f35011c53e612276cc9e5f1a9912d9 SHA256 727635b936d19e36c1e858ac50d82757e0967d512062021108ad875d1e34dbd7 +MD5 3f3378bda41b6041b2b14ca3dd03e027 ChangeLog 14749 +RMD160 02b95559760e1a482ec2fe3bd1e711d7ffa7f2a4 ChangeLog 14749 +SHA256 727635b936d19e36c1e858ac50d82757e0967d512062021108ad875d1e34dbd7 ChangeLog 14749 MISC metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a SHA1 b034f3d668b50c57826ead5cfd17fcd2b68d19d6 SHA256 00ba82c241ad7007fe861877db3ae5aeaa967e05f0a6478e6ba9eb60ba31a3b6 MD5 d55015f2e0ee69e92ab287320c27c5b2 metadata.xml 161 RMD160 1988530f97a742d78d3f3e99d15625f8a674260a metadata.xml 161 @@ -102,6 +107,9 @@ SHA256 76b01e4d4ec3e63e197dbc356e88988d716b93b5be557f98cf76f38599b4a5d0 files/di MD5 d2c6ee3add941667595a88722e850cce files/digest-gtkmm-2.10.2 244 RMD160 f12a8eb1deabc989f0b875b4e0555abd62df5b6b files/digest-gtkmm-2.10.2 244 SHA256 1287d59afc3c39bb8339d4089e1b9103e1ba2d20cd3043347fdb27768ac4850c files/digest-gtkmm-2.10.2 244 +MD5 d2c6ee3add941667595a88722e850cce files/digest-gtkmm-2.10.2-r1 244 +RMD160 f12a8eb1deabc989f0b875b4e0555abd62df5b6b files/digest-gtkmm-2.10.2-r1 244 +SHA256 1287d59afc3c39bb8339d4089e1b9103e1ba2d20cd3043347fdb27768ac4850c files/digest-gtkmm-2.10.2-r1 244 MD5 a1767624831e06c60c69e61718ef27f8 files/digest-gtkmm-2.2.10 244 RMD160 ad9c23565266d3fd838175ea302649dfc30a85ed files/digest-gtkmm-2.2.10 244 SHA256 d7001275984c2c35c6d2422a98865db9406ca0cbea6294edd6bbd63b2066ceee files/digest-gtkmm-2.2.10 244 @@ -141,10 +149,3 @@ SHA256 16ab7d600e7b4f9070ffa9f4e11c083f287df9ca4972843c337a96918ea026e7 files/di MD5 df83fd28d052bf5d370abed96c17ab66 files/digest-gtkmm-2.8.3 241 RMD160 ad95715bd14fb6cda5d8311111631dda160d9559 files/digest-gtkmm-2.8.3 241 SHA256 1218796717f977f128ad2bc8e9f9ad8213a909d19dcf60d0d63a3ddc9c0a3a4c files/digest-gtkmm-2.8.3 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFYaldAiZjviIA2XgRAoqGAJwOGvwBJU+DdQkY3d2KDbL+BpwS3wCfbTP0 -JGAXcWbuuruwrHsw/VWBjeU= -=IGwP ------END PGP SIGNATURE----- diff --git a/dev-cpp/gtkmm/files/digest-gtkmm-2.10.2-r1 b/dev-cpp/gtkmm/files/digest-gtkmm-2.10.2-r1 new file mode 100644 index 000000000000..72e29b80a7b5 --- /dev/null +++ b/dev-cpp/gtkmm/files/digest-gtkmm-2.10.2-r1 @@ -0,0 +1,3 @@ +MD5 b29ec706e544002d312cbefa0a65c446 gtkmm-2.10.2.tar.bz2 7056116 +RMD160 7c9dc8d9d45efc073c6036bd3a5e3c04518ccee2 gtkmm-2.10.2.tar.bz2 7056116 +SHA256 57e95e857dc37be8a2813e618f627f4986c073aa8b6f1ce9bcd07193545f358b gtkmm-2.10.2.tar.bz2 7056116 diff --git a/dev-cpp/gtkmm/files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch b/dev-cpp/gtkmm/files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch new file mode 100644 index 000000000000..689e182106a0 --- /dev/null +++ b/dev-cpp/gtkmm/files/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch @@ -0,0 +1,27 @@ +diff -Nru configure.in.old configure.in +--- configure.in 2006-09-21 21:48:20.000000000 +0200 ++++ configure.in 2006-11-19 00:15:40.000000000 +0100 +@@ -452,7 +452,11 @@ + atk/atkmm/Makefile + atk/atkmm/private/Makefile + ]) ++ GTKMM_PC_ATKMM_DEP="atkmm-1.6" ++else ++ GTKMM_PC_ATKMM_DEP="" + fi ++AC_SUBST(GTKMM_PC_ATKMM_DEP) + + #Allow us to test for atkmm support in Makefile.am files: + AM_CONDITIONAL(GTKMM_ATKMM_ENABLED, test "x$gtkmm_enable_api_atkmm" = "xyes") +diff -Nru gtk/gtkmm-2.4.pc.in.old gtk/gtkmm-2.4.pc.in +--- gtk/gtkmm-2.4.pc.in 2004-04-11 23:00:53.000000000 +0200 ++++ gtk/gtkmm-2.4.pc.in 2006-11-19 00:16:04.000000000 +0100 +@@ -5,7 +5,7 @@ + + Name: gtkmm + Description: C++ wrapper for GTK+ +-Requires: glibmm-2.4 gdkmm-2.4 pangomm-1.4 atkmm-1.6 gtk+-2.0 ++Requires: glibmm-2.4 gdkmm-2.4 pangomm-1.4 @GTKMM_PC_ATKMM_DEP@ gtk+-2.0 + Version: @VERSION@ + Libs: -L${libdir} -lgtkmm-2.4 + Cflags: -I${includedir}/gtkmm-2.4 -I${libdir}/gtkmm-2.4/include diff --git a/dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild b/dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild new file mode 100644 index 000000000000..61718a0bdd39 --- /dev/null +++ b/dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtkmm/gtkmm-2.10.2-r1.ebuild,v 1.1 2006/11/21 08:16:05 remi Exp $ + +inherit gnome2 autotools + +DESCRIPTION="C++ interface for GTK+2" +HOMEPAGE="http://gtkmm.sourceforge.net/" + +LICENSE="LGPL-2.1" +SLOT="2.4" +KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~sh ~sparc ~x86" +IUSE="accessibility doc examples" + +RDEPEND=">=dev-cpp/glibmm-2.12.1 + >=x11-libs/gtk+-2.10.0 + >=dev-cpp/cairomm-1.1.12 + >=dev-libs/libsigc++-2.0 + accessibility? ( >=dev-libs/atk-1.9.1 )" + +DEPEND="${RDEPEND} + dev-util/pkgconfig" + +DOCS="AUTHORS CHANGES ChangeLog PORTING NEWS README" + +gnome2_src_unpack() { + unpack ${A} + cd ${S} + + # fix bug #153294 + epatch ${FILESDIR}/gtkmm-2.10.2-remove_atk_from_gtk_pc_during_configure.patch + eautoconf + + # Prevent scrollkeeper access violations + gnome2_omf_fix +} + +pkg_setup() { + G2CONF="${G2CONF} \ + $(use_enable accessibility api-atkmm) \ + $(use_enable doc docs) \ + $(use_enable examples) + $(use_enable examples demos)" +} -- 2.26.2