-----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
AUX 2.0/gentoo.lang 3910 RMD160 43b51212ec2787b9d95e9d4f512342b920d6c355 SHA1 22ce79797f654f1f7b6894de8cb12bbdcdf70bee SHA256 fcb5133892038174826d9ee1a720ec7204f3842c7bd3e9aabf0532b408e663d1
AUX gentoo.lang 2607 RMD160 a6532326c5ee395500726e434a36e1270c0e411a SHA1 6f859400d569c3d39fe02e6dc426d0b4caf6fe75 SHA256 3a51831952ae3661232de4ace1eae5182039d82a6d45c97ccbe9cab73519c707
+AUX gtksourceview-2.10.5-G_CONST_RETURN.patch 6799 RMD160 5a8605d7a689ec7e0c65eed85e7bffaa2d87b37f SHA1 ceb9868fa4d894646993253a465b29b06fed7b3d SHA256 3462673c6856a8435dbe970d4fef3716f8743ad56ad0150ee08fa694c0380040
DIST gtksourceview-2.10.5.tar.bz2 1253321 RMD160 081679debc8ca021749136e952329bb3ea0aa4f2 SHA1 5081dc7a081954d0af73852c22e874a746bda30e SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e
DIST gtksourceview-3.2.3.tar.xz 1215836 RMD160 f814af3e3d54794175706a7cbb05d6adca9446de SHA1 22e9e3c38a10e3ffdec7d5e1179571364e4d3653 SHA256 73d9c6702ccecd06846132cfb50191092cb50a4bcb3ff810a5605868f0855947
EBUILD gtksourceview-2.10.5-r1.ebuild 1774 RMD160 2981c056e504c9f819893a92e352e5480996bb3f SHA1 37e6576f0e32129fd41d9797e9b2e73ff862800d SHA256 a83a3020eec85f261831ad50d7f4e77585d5f876f943b2dd46272760f763180b
+EBUILD gtksourceview-2.10.5-r2.ebuild 1876 RMD160 a9e407d41f63a66e02e86dca2c4d95f440f08020 SHA1 fd4db73e777efd98d97bd95821089c3f7bf65d2e SHA256 ec5e3423838129c3b9dcdf2ee85bd2f72efc4c4c1a516c753aad64774ac25b0a
EBUILD gtksourceview-3.2.3.ebuild 1602 RMD160 a04474a4d22d098b7d1254e3d132714a28f980e1 SHA1 d2d17ae68bb96f1bed75e4a84678dc4798fecdf9 SHA256 ec95e48d0f41388ad6db7c9f6318b6b382be04d0dab8d99c3f6e86745fcaac5d
-MISC ChangeLog 28722 RMD160 471a5eca656fdc10c73a6b159f97231ed126d165 SHA1 ac98c46d63f4a24368c5afa0387c63d3018846ba SHA256 fbbd6754aa1ad4faf97d3c1091e062f9688b075d617332e22043c2bfcd12496d
+MISC ChangeLog 29039 RMD160 4e4e8a46d1ea733dec3fbd87d3a510f8acafb8ea SHA1 779b1e4cd82bbc06381ec0db71a4c4d0b32e43a9 SHA256 e95ffc5f6c901ed84cb561fd505523d5242d91ea55aeab0c0b1d487198a77c90
MISC metadata.xml 331 RMD160 08926ed65e29552e8c76b80d909ee6811365a06d SHA1 b3c2f924c66a46ddae95523e41833b768cc8c94c SHA256 579046b73f8ef7347b584cd716724289934c347aa1498fd47c3dba227623c279
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
-iEYEARECAAYFAk7K6bsACgkQCaWpQKGI+9TumACfeLnVQWqvgFKQz16q5MQEVQiO
-2wUAmwTaUWum552JTj7hqJQ4wwB8L/83
-=36Do
+iF4EAREIAAYFAk7r9pAACgkQdjK8w9WeBnBK2wD/RXdvFZanGFUWUPabu8brAH+H
+eO/XMM6hP4yzScaFriAA/3A8WHs8Cc1IyXJkzmE2eXAYZDXyNbIgfGkpbY7DTvOe
+=6Zob
-----END PGP SIGNATURE-----
--- /dev/null
+From d27fec22c3f50bcd3c384256b8ad75d662033c7f Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq@gnome.org>
+Date: Sun, 13 Mar 2011 11:01:37 +0100
+Subject: [PATCH] Do not use G_CONST_RETURN anymore. This macro is going to be
+ deprecated.
+
+---
+ gtksourceview/gtksourcelanguagemanager.c | 4 ++--
+ gtksourceview/gtksourcelanguagemanager.h | 6 ++----
+ gtksourceview/gtksourcestylescheme.c | 4 ++--
+ gtksourceview/gtksourcestylescheme.h | 3 +--
+ gtksourceview/gtksourcestyleschememanager.c | 4 ++--
+ gtksourceview/gtksourcestyleschememanager.h | 6 ++----
+ 6 files changed, 11 insertions(+), 16 deletions(-)
+
+diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c
+index b431e1f..31deba7 100644
+--- a/gtksourceview/gtksourcelanguagemanager.c
++++ b/gtksourceview/gtksourcelanguagemanager.c
+@@ -275,7 +275,7 @@ gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm,
+ * containg a list of language files directories.
+ * The array is owned by @lm and must not be modified.
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+@@ -394,7 +394,7 @@ ensure_languages (GtkSourceLanguageManager *lm)
+ * no language is available.
+ * The array is owned by @lm and must not be modified.
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h
+index ce234f5..de7a3aa 100644
+--- a/gtksourceview/gtksourcelanguagemanager.h
++++ b/gtksourceview/gtksourcelanguagemanager.h
+@@ -63,14 +63,12 @@ GtkSourceLanguageManager *gtk_source_language_manager_new (void);
+
+ GtkSourceLanguageManager *gtk_source_language_manager_get_default (void);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm);
++const gchar * const * gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm);
+
+ void gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm,
+ gchar **dirs);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm);
++const gchar * const * gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm);
+
+ GtkSourceLanguage *gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm,
+ const gchar *id);
+diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c
+index 6b470e8..d9d41a3 100644
+--- a/gtksourceview/gtksourcestylescheme.c
++++ b/gtksourceview/gtksourcestylescheme.c
+@@ -318,7 +318,7 @@ gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme)
+ *
+ * Since: 2.0
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+@@ -326,7 +326,7 @@ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
+ if (scheme->priv->authors == NULL)
+ return NULL;
+
+- return (G_CONST_RETURN gchar* G_CONST_RETURN *)scheme->priv->authors->pdata;
++ return (const gchar * const *)scheme->priv->authors->pdata;
+ }
+
+ /**
+diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
+index 501163c..fe74bd2 100644
+--- a/gtksourceview/gtksourcestylescheme.h
++++ b/gtksourceview/gtksourcestylescheme.h
+@@ -62,8 +62,7 @@ const gchar *gtk_source_style_scheme_get_id (GtkSourceStyleS
+ const gchar *gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme);
+ const gchar *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme);
++const gchar * const * gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme);
+
+ const gchar *gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme);
+
+diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c
+index cba042f..eec5d45 100644
+--- a/gtksourceview/gtksourcestyleschememanager.c
++++ b/gtksourceview/gtksourcestyleschememanager.c
+@@ -516,7 +516,7 @@ gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager
+ * of string containing the search path.
+ * The array is owned by the @manager and must not be modified.
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+@@ -555,7 +555,7 @@ gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manag
+ * of string containing the ids of the available style schemes or %NULL if no
+ * style scheme is available. The array is owned by the @manager and must not be modified.
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h
+index 6effc1c..456e8bf 100644
+--- a/gtksourceview/gtksourcestyleschememanager.h
++++ b/gtksourceview/gtksourcestyleschememanager.h
+@@ -74,13 +74,11 @@ void gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSc
+ void gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager *manager,
+ const gchar *path);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager);
++const gchar * const * gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager);
+
+ void gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manager);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager);
++const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager);
+
+ GtkSourceStyleScheme *gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager,
+ const gchar *scheme_id);
+--
+1.7.8
+
--- /dev/null
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild,v 1.1 2011/12/17 01:55:23 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc glade"
+
+# FIXME: We could avoid the glade conditional and dep completely if upstream
+# would have a --with-glade-catalogdir that would allow to pass the system
+# glade catalog dir, instead of needing gladeui-1.0.pc installed from dev-util/glade
+RDEPEND=">=x11-libs/gtk+-2.12:2
+ >=dev-libs/libxml2-2.5:2
+ >=dev-libs/glib-2.14:2
+ glade? ( >=dev-util/glade-3.2:3 )
+ kernel_Darwin? ( x11-libs/ige-mac-integration )"
+DEPEND="${RDEPEND}
+ >=sys-devel/gettext-0.17
+ >=dev-util/intltool-0.40
+ >=dev-util/pkgconfig-0.9
+ doc? ( >=dev-util/gtk-doc-1.11 )"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
+ G2CONF="${G2CONF}
+ $(use_enable glade glade-catalog)"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Skip broken test until upstream bug #621383 is solved
+ sed -i -e "/guess-language/d" tests/test-languagemanager.c || die
+
+ # The same for another broken test, upstream bug #631214
+ sed -i -e "/get-language/d" tests/test-languagemanager.c || die
+
+ # Patch from 3.x for bug #394925
+ epatch "${FILESDIR}/${P}-G_CONST_RETURN.patch"
+}
+
+src_test() {
+ Xemake check || die "Test phase failed"
+}
+
+src_install() {
+ gnome2_src_install
+
+ insinto /usr/share/${PN}-2.0/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+}
projects / gentoo.git / commitdiff