diff options
author | Philip Walls <malverian@gentoo.org> | 2005-12-28 14:27:21 +0000 |
---|---|---|
committer | Philip Walls <malverian@gentoo.org> | 2005-12-28 14:27:21 +0000 |
commit | aba99930edc003fcc50e1e9fb94b7f59c49e38a5 (patch) | |
tree | 2c4e81c7e521cb41055e080aa0bbce5115bc3cb6 /dev-util | |
parent | making x86 & amd64 stable following testing. (diff) | |
download | gentoo-2-aba99930edc003fcc50e1e9fb94b7f59c49e38a5.tar.gz gentoo-2-aba99930edc003fcc50e1e9fb94b7f59c49e38a5.tar.bz2 gentoo-2-aba99930edc003fcc50e1e9fb94b7f59c49e38a5.zip |
Fix bug #108674 and #115680
(Portage version: 2.1_pre2)
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/anjuta/ChangeLog | 10 | ||||
-rw-r--r-- | dev-util/anjuta/Manifest | 11 | ||||
-rw-r--r-- | dev-util/anjuta/anjuta-1.2.2.ebuild | 58 | ||||
-rw-r--r-- | dev-util/anjuta/anjuta-1.2.4-r1.ebuild (renamed from dev-util/anjuta/anjuta-1.2.2-r1.ebuild) | 28 | ||||
-rw-r--r-- | dev-util/anjuta/anjuta-1.2.4.ebuild | 5 | ||||
-rw-r--r-- | dev-util/anjuta/files/anjuta-1.2.4-gtk-fix.patch | 40 | ||||
-rw-r--r-- | dev-util/anjuta/files/digest-anjuta-1.2.2 | 1 | ||||
-rw-r--r-- | dev-util/anjuta/files/digest-anjuta-1.2.2-r1 | 1 | ||||
-rw-r--r-- | dev-util/anjuta/files/digest-anjuta-1.2.4-r1 | 1 |
9 files changed, 80 insertions, 75 deletions
diff --git a/dev-util/anjuta/ChangeLog b/dev-util/anjuta/ChangeLog index c791cd411ab7..1d92d442e152 100644 --- a/dev-util/anjuta/ChangeLog +++ b/dev-util/anjuta/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-util/anjuta # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.51 2005/10/05 21:43:08 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/ChangeLog,v 1.52 2005/12/28 14:27:21 malverian Exp $ + +*anjuta-1.2.4-r1 (28 Dec 2005) + + 28 Dec 2005; <malverian@gentoo.org> +files/anjuta-1.2.4-gtk-fix.patch, + -anjuta-1.2.2.ebuild, -anjuta-1.2.2-r1.ebuild, anjuta-1.2.4.ebuild, + +anjuta-1.2.4-r1.ebuild: + Fix bug #108674 and #115680. anjuta-1.2.4-r1 has gtk+-2.8.9 fix. + Cleaned out old ebuilds. 05 Oct 2005; Simon Stelling <blubb@gentoo.org> anjuta-1.2.4.ebuild: make it adhere multilib-strict; bug 97271 diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest index 82b772b8fd87..27b398eaf22c 100644 --- a/dev-util/anjuta/Manifest +++ b/dev-util/anjuta/Manifest @@ -1,10 +1,9 @@ -MD5 577260a4be9d2ad148f8c8307bad354e ChangeLog 7067 -MD5 21ba3f1fe1fd406d17f9915bacef3612 anjuta-1.2.2-r1.ebuild 1475 -MD5 41ba5e22018256879cd26035cb94889e anjuta-1.2.2.ebuild 1423 -MD5 638beaf8456ca76eec2d55e92ca269d4 anjuta-1.2.4.ebuild 1763 +MD5 c9a61d69782a505aa5a0381222cc2ee6 ChangeLog 7364 +MD5 d2ca4f32e93cc3130df7dc37e5d1c841 anjuta-1.2.4-r1.ebuild 1857 +MD5 87adb038a289391ea802670b51433eea anjuta-1.2.4.ebuild 1799 MD5 8639474644eff77f61bc4e3d1aab336d files/anjuta-1.2.2-64bit.patch 2977 -MD5 59468c68592ef02f4549bf1347508779 files/digest-anjuta-1.2.2 65 -MD5 59468c68592ef02f4549bf1347508779 files/digest-anjuta-1.2.2-r1 65 +MD5 3b142ade06e51182f2034b9beb1b1ccb files/anjuta-1.2.4-gtk-fix.patch 1893 MD5 50b756284d7bb40f12f76cd64c24cab2 files/digest-anjuta-1.2.4 65 +MD5 50b756284d7bb40f12f76cd64c24cab2 files/digest-anjuta-1.2.4-r1 65 MD5 14e73ac6e0c7c2dd18f51c92bbea0f0d files/xim_patch.patch 5241 MD5 85b2ac065f0d779258b1483ff85d4335 metadata.xml 200 diff --git a/dev-util/anjuta/anjuta-1.2.2.ebuild b/dev-util/anjuta/anjuta-1.2.2.ebuild deleted file mode 100644 index 65f103cdddf2..000000000000 --- a/dev-util/anjuta/anjuta-1.2.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.2.ebuild,v 1.11 2004/08/24 19:25:07 lisa Exp $ - -inherit eutils gnome2 - -DESCRIPTION="A versatile IDE for GNOME" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" -HOMEPAGE="http://anjuta.sourceforge.net/" - -IUSE="" -SLOT="0" -LICENSE="GPL-2" -# Future versions will work with 64-bit archs, but 1.2.0 doesn't -KEYWORDS="x86 ~ppc sparc ~amd64" - -RDEPEND=">=dev-libs/glib-2.0.6 - >=x11-libs/gtk+-2.0.8 - >=gnome-base/orbit-2.10.3 - >=gnome-base/libglade-2 - >=gnome-base/libgnome-2.0.2 - >=gnome-base/libgnomeui-2.0.2 - >=gnome-base/libgnomeprint-2.0.1 - >=gnome-base/libgnomeprintui-2.0.1 - >=gnome-base/gnome-vfs-2.0.2 - >=gnome-base/libbonobo-2 - >=gnome-base/libbonoboui-2.0.1 - >=x11-libs/vte-0.9 - >=dev-libs/libxml2-2.4.23 - >=x11-libs/pango-1.1.1 - dev-libs/libpcre - app-text/scrollkeeper" - -DEPEND="${RDEPEND} - dev-util/pkgconfig" - -DOCS="AUTHORS COPYING ChangeLog FUTURE NEWS README THANKS TODO" - -MAKEOPTS="${MAKEOPTS} -j1" - -src_unpack() { - unpack ${A} - - cd ${S} - #epatch ${FILESDIR}/xim_patch.patch - - use amd64 && epatch ${FILESDIR}/${P}-64bit.patch -} - -pkg_postinst() { - - gnome2_pkg_postinst - - einfo "Some project templates may require additional development" - einfo "libraries to function correctly. It goes beyond the scope" - einfo "of this ebuild to provide them." - -} diff --git a/dev-util/anjuta/anjuta-1.2.2-r1.ebuild b/dev-util/anjuta/anjuta-1.2.4-r1.ebuild index 18503e6f7e8c..fb375b0fb422 100644 --- a/dev-util/anjuta/anjuta-1.2.2-r1.ebuild +++ b/dev-util/anjuta/anjuta-1.2.4-r1.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.2-r1.ebuild,v 1.9 2005/04/24 12:40:51 hansmi Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.4-r1.ebuild,v 1.1 2005/12/28 14:27:21 malverian Exp $ -inherit eutils gnome2 +inherit eutils gnome2 multilib DESCRIPTION="A versatile IDE for GNOME" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" @@ -11,8 +11,7 @@ HOMEPAGE="http://anjuta.sourceforge.net/" IUSE="doc" SLOT="0" LICENSE="GPL-2" -# Future versions will work with 64-bit archs, but 1.2.0 doesn't -KEYWORDS="x86 ppc sparc amd64" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" RDEPEND=">=dev-libs/glib-2.0.6 >=x11-libs/gtk+-2.0.8 @@ -40,10 +39,16 @@ MAKEOPTS="${MAKEOPTS} -j1" src_unpack() { unpack ${A} - cd ${S} - #epatch ${FILESDIR}/xim_patch.patch - epatch ${FILESDIR}/${P}-64bit.patch + + epatch ${FILESDIR}/anjuta-1.2.4-gtk-fix.patch + + sed -i -e "s:packageplugindir=lib:packageplugindir=$(get_libdir):" \ + configure.in + + autoreconf -f -i + + libtoolize --copy --force || die } pkg_postinst() { @@ -55,7 +60,16 @@ pkg_postinst() { dodoc ${S}/doc fi + einfo einfo "Some project templates may require additional development" einfo "libraries to function correctly. It goes beyond the scope" einfo "of this ebuild to provide them." + einfo + + ewarn "If code autocompletion is missing gtk+ and other pkg-config" + ewarn "managed package headers, resolve any errors produced by the" + ewarn "following command, and then re-emerge anjuta:" + ewarn + ewarn "# pkg-config --cflags \`pkg-config --list-all 2>/dev/null | awk '{printf(\"%s \",\$1);}'\`" + ewarn } diff --git a/dev-util/anjuta/anjuta-1.2.4.ebuild b/dev-util/anjuta/anjuta-1.2.4.ebuild index f3a75481123c..7f5219de4c9c 100644 --- a/dev-util/anjuta/anjuta-1.2.4.ebuild +++ b/dev-util/anjuta/anjuta-1.2.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.4.ebuild,v 1.5 2005/10/05 22:58:14 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/anjuta/anjuta-1.2.4.ebuild,v 1.6 2005/12/28 14:27:21 malverian Exp $ inherit eutils gnome2 multilib @@ -43,7 +43,10 @@ src_unpack() { sed -i -e "s:packageplugindir=lib:packageplugindir=$(get_libdir):" \ configure.in + autoreconf + + libtoolize --copy --force || die } pkg_postinst() { diff --git a/dev-util/anjuta/files/anjuta-1.2.4-gtk-fix.patch b/dev-util/anjuta/files/anjuta-1.2.4-gtk-fix.patch new file mode 100644 index 000000000000..e86b8c915634 --- /dev/null +++ b/dev-util/anjuta/files/anjuta-1.2.4-gtk-fix.patch @@ -0,0 +1,40 @@ +--- src/anjuta-encodings.c.orig 2005-12-15 18:50:55.000000000 +0100 ++++ src/anjuta-encodings.c 2005-12-15 18:51:38.000000000 +0100 +@@ -707,15 +707,15 @@ + gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview), + COLUMN_ENCODING_NAME); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (stock_treeview)); + g_return_if_fail (selection != NULL); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE); +- g_signal_connect (G_OBJECT (selection), "changed", +- G_CALLBACK (on_stock_selection_changed), NULL); + + model = create_encodings_treeview_model (); + gtk_tree_view_set_model (GTK_TREE_VIEW (stock_treeview), model); ++ g_signal_connect (G_OBJECT (selection), "changed", ++ G_CALLBACK (on_stock_selection_changed), NULL); + g_object_unref (model); + + /* Add the encoding column for supported treeview*/ + cell = gtk_cell_renderer_text_new (); + column = gtk_tree_view_column_new_with_attributes (_("Supported Encodings"), +@@ -726,17 +726,17 @@ + gtk_tree_view_set_search_column (GTK_TREE_VIEW (supported_treeview), + COLUMN_ENCODING_NAME); + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (supported_treeview)); + g_return_if_fail (selection != NULL); + gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); +- g_signal_connect (G_OBJECT (selection), "changed", +- G_CALLBACK (on_supported_selection_changed), NULL); + + /* create list store */ + model = GTK_TREE_MODEL (gtk_list_store_new (SUPPORTED_ENCODING_NUM_COLS, + G_TYPE_STRING, G_TYPE_POINTER)); + gtk_tree_view_set_model (GTK_TREE_VIEW (supported_treeview), model); ++ g_signal_connect (G_OBJECT (selection), "changed", ++ G_CALLBACK (on_supported_selection_changed), NULL); + g_object_unref (model); + + anjuta_preferences_register_property_custom (pref, supported_treeview, + SUPPORTED_ENCODINGS, + "ISO-8859-15", diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.2 b/dev-util/anjuta/files/digest-anjuta-1.2.2 deleted file mode 100644 index 1276bcb03e27..000000000000 --- a/dev-util/anjuta/files/digest-anjuta-1.2.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz 8556051 diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.2-r1 b/dev-util/anjuta/files/digest-anjuta-1.2.2-r1 deleted file mode 100644 index 1276bcb03e27..000000000000 --- a/dev-util/anjuta/files/digest-anjuta-1.2.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 a30858dba0b902064d0d702cedfdc84f anjuta-1.2.2.tar.gz 8556051 diff --git a/dev-util/anjuta/files/digest-anjuta-1.2.4-r1 b/dev-util/anjuta/files/digest-anjuta-1.2.4-r1 new file mode 100644 index 000000000000..8fa0db01999e --- /dev/null +++ b/dev-util/anjuta/files/digest-anjuta-1.2.4-r1 @@ -0,0 +1 @@ +MD5 5a709fbaedc816a88fd8b9ad5276a47b anjuta-1.2.4.tar.gz 7413573 |