r20832 - in /desktop/unstable/anjuta/debian: changelog patches/02_mips_language_c_defined.patch patches/series
pochu-guest at users.alioth.debian.org
pochu-guest at users.alioth.debian.org
Tue Aug 4 10:58:40 UTC 2009
Author: pochu-guest
Date: Tue Aug 4 10:58:39 2009
New Revision: 20832
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20832
Log:
debian/patches/02_mips_language_c_defined.patch: New patch, rename
LANGUAGE_* to ANJUTA_LANGUAGE_* because LANGUAGE_C is a built-in in
mips(el) and alpha, causing a FTBFS. Closes: #538285.
Added:
desktop/unstable/anjuta/debian/patches/02_mips_language_c_defined.patch
Modified:
desktop/unstable/anjuta/debian/changelog
desktop/unstable/anjuta/debian/patches/series
Modified: desktop/unstable/anjuta/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/changelog?rev=20832&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog [utf-8] (original)
+++ desktop/unstable/anjuta/debian/changelog [utf-8] Tue Aug 4 10:58:39 2009
@@ -1,3 +1,11 @@
+anjuta (2:2.26.2.2-2) UNRELEASED; urgency=low
+
+ * debian/patches/02_mips_language_c_defined.patch: New patch, rename
+ LANGUAGE_* to ANJUTA_LANGUAGE_* because LANGUAGE_C is a built-in in
+ mips(el) and alpha, causing a FTBFS. Closes: #538285.
+
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com> Tue, 04 Aug 2009 12:31:08 +0200
+
anjuta (2:2.26.2.2-1) unstable; urgency=low
[ Emilio Pozuelo Monfort ]
Added: desktop/unstable/anjuta/debian/patches/02_mips_language_c_defined.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/02_mips_language_c_defined.patch?rev=20832&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/02_mips_language_c_defined.patch (added)
+++ desktop/unstable/anjuta/debian/patches/02_mips_language_c_defined.patch [utf-8] Tue Aug 4 10:58:39 2009
@@ -1,0 +1,127 @@
+Description: LANGUAGE_C is a built-in on some arches, rename to avoid FTBFS
+Origin: Debian
+Bug: http://bugzilla.gnome.org/show_bug.cgi?id=590720
+Bug-Debian: http://bugs.debian.org/538285
+
+--- a/plugins/glade/plugin.c
++++ b/plugins/glade/plugin.c
+@@ -1413,10 +1413,10 @@
+
+ typedef enum
+ {
+- LANGUAGE_NONE,
+- LANGUAGE_C,
+- LANGUAGE_PYTHON,
+- LANGUAGE_VALA
++ ANJUTA_LANGUAGE_NONE,
++ ANJUTA_LANGUAGE_C,
++ ANJUTA_LANGUAGE_PYTHON,
++ ANJUTA_LANGUAGE_VALA
+ } LanguageId;
+
+ LanguageSyntax const *default_syntax_C = &_default_syntax_C;
+@@ -1903,14 +1903,14 @@
+ static LanguageId
+ language_name_to_id (const gchar *lang_name)
+ {
+- LanguageId lang_id = LANGUAGE_NONE;
++ LanguageId lang_id = ANJUTA_LANGUAGE_NONE;
+
+ if (g_str_equal (lang_name, "C") || g_str_equal (lang_name, "C++"))
+- lang_id = LANGUAGE_C;
++ lang_id = ANJUTA_LANGUAGE_C;
+ else if (g_str_equal (lang_name, "Python"))
+- lang_id = LANGUAGE_PYTHON;
++ lang_id = ANJUTA_LANGUAGE_PYTHON;
+ else if (g_str_equal (lang_name, "Vala"))
+- lang_id = LANGUAGE_VALA;
++ lang_id = ANJUTA_LANGUAGE_VALA;
+
+ return lang_id;
+ }
+@@ -1963,7 +1963,7 @@
+ lang_id = language_name_to_id (lang_name);
+ switch (lang_id)
+ {
+- case LANGUAGE_NONE:
++ case ANJUTA_LANGUAGE_NONE:
+ {
+ gchar *uri = get_uri_from_ianjuta_file (IANJUTA_FILE (editor));
+ g_set_error (error,
+@@ -1973,13 +1973,13 @@
+ g_free (uri);
+ return;
+ }
+- case LANGUAGE_C:
++ case ANJUTA_LANGUAGE_C:
+ syntax = default_syntax_C;
+ break;
+- case LANGUAGE_PYTHON:
++ case ANJUTA_LANGUAGE_PYTHON:
+ syntax = default_syntax_Python;
+ break;
+- case LANGUAGE_VALA:
++ case ANJUTA_LANGUAGE_VALA:
+ syntax = default_syntax_Vala;
+ break;
+ }
+@@ -1993,10 +1993,10 @@
+
+ switch (lang_id)
+ {
+- case LANGUAGE_NONE:
++ case ANJUTA_LANGUAGE_NONE:
+ g_assert_not_reached();
+ return;
+- case LANGUAGE_C:
++ case ANJUTA_LANGUAGE_C:
+ do_insert_handler_stub_C (docman, editor, position, position_type,
+ plugin->priv->last_object_type,
+ plugin->priv->last_object_name,
+@@ -2004,7 +2004,7 @@
+ plugin->priv->last_handler_name,
+ raise_editor, error);
+ break;
+- case LANGUAGE_PYTHON:
++ case ANJUTA_LANGUAGE_PYTHON:
+ do_insert_handler_stub_Python (docman, editor, position, position_type,
+ plugin->priv->last_object_type,
+ plugin->priv->last_object_name,
+@@ -2012,7 +2012,7 @@
+ plugin->priv->last_handler_name,
+ raise_editor, error);
+ break;
+- case LANGUAGE_VALA:
++ case ANJUTA_LANGUAGE_VALA:
+ do_insert_handler_stub_Vala (docman, editor, position, position_type,
+ plugin->priv->last_object_type,
+ plugin->priv->last_object_name,
+@@ -2083,8 +2083,8 @@
+
+ switch (language_name_to_id (lang_name))
+ {
+- case LANGUAGE_NONE:
+- case LANGUAGE_C:
++ case ANJUTA_LANGUAGE_NONE:
++ case ANJUTA_LANGUAGE_C:
+ do_insert_handler_stub_C (docman, editor, position, iptCurrent,
+ plugin->priv->last_object_type,
+ plugin->priv->last_object_name,
+@@ -2092,7 +2092,7 @@
+ plugin->priv->last_handler_name,
+ TRUE, &error);
+ break;
+- case LANGUAGE_PYTHON:
++ case ANJUTA_LANGUAGE_PYTHON:
+ do_insert_handler_stub_Python (docman, editor, position, iptCurrent,
+ plugin->priv->last_object_type,
+ plugin->priv->last_object_name,
+@@ -2100,7 +2100,7 @@
+ plugin->priv->last_handler_name,
+ TRUE, &error);
+ break;
+- case LANGUAGE_VALA:
++ case ANJUTA_LANGUAGE_VALA:
+ do_insert_handler_stub_Vala (docman, editor, position, iptCurrent,
+ plugin->priv->last_object_type,
+ plugin->priv->last_object_name,
Modified: desktop/unstable/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/series?rev=20832&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/series [utf-8] Tue Aug 4 10:58:39 2009
@@ -1,3 +1,3 @@
-# no patch in series
01_gda_optional.patch
+02_mips_language_c_defined.patch
90_relibtoolize.patch
More information about the pkg-gnome-commits
mailing list