r26098 - in /desktop/unstable/anjuta/debian: changelog patches/08_launcher_kill.patch patches/09_libxml_crash.patch patches/90_autotools.patch patches/series
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Thu Dec 30 13:22:57 UTC 2010
Author: joss
Date: Thu Dec 30 13:22:56 2010
New Revision: 26098
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26098
Log:
* Pick more patches in the upstream repository.
+ 08_launcher_kill.patch: avoid anjuta petit-suiciding by killing
itself.
+ 09_libxml_crash.patch: fix a crash when using pulseaudio, caused
by a misuse of libxml.
* 90_autotools.patch: regenerated accordingly.
Added:
desktop/unstable/anjuta/debian/patches/08_launcher_kill.patch
desktop/unstable/anjuta/debian/patches/09_libxml_crash.patch
Modified:
desktop/unstable/anjuta/debian/changelog
desktop/unstable/anjuta/debian/patches/90_autotools.patch
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=26098&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/changelog [utf-8] (original)
+++ desktop/unstable/anjuta/debian/changelog [utf-8] Thu Dec 30 13:22:56 2010
@@ -1,3 +1,14 @@
+anjuta (2:2.32.0.0-5) unstable; urgency=low
+
+ * Pick more patches in the upstream repository.
+ + 08_launcher_kill.patch: avoid anjuta petit-suiciding by killing
+ itself.
+ + 09_libxml_crash.patch: fix a crash when using pulseaudio, caused
+ by a misuse of libxml.
+ * 90_autotools.patch: regenerated accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Thu, 30 Dec 2010 14:22:26 +0100
+
anjuta (2:2.32.0.0-4) unstable; urgency=low
* Pick some patches in the upstream git repository.
Added: desktop/unstable/anjuta/debian/patches/08_launcher_kill.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/08_launcher_kill.patch?rev=26098&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/08_launcher_kill.patch (added)
+++ desktop/unstable/anjuta/debian/patches/08_launcher_kill.patch [utf-8] Thu Dec 30 13:22:56 2010
@@ -1,0 +1,33 @@
+From f93a497e29de639d27c4ee88824bf7af545ff494 Mon Sep 17 00:00:00 2001
+From: Johannes Schmid <jhs at gnome.org>
+Date: Fri, 26 Nov 2010 15:40:24 +0000
+Subject: libanjuta: Make sure that anjuta-launcher never kills us
+
+launcher->priv->child_pid might be 0 is which case we would kill the anjuta process
+---
+diff --git a/libanjuta/anjuta-launcher.c b/libanjuta/anjuta-launcher.c
+index 4496765..60e3883 100644
+--- a/libanjuta/anjuta-launcher.c
++++ b/libanjuta/anjuta-launcher.c
+@@ -461,7 +461,8 @@ anjuta_launcher_send_ptyin (AnjutaLauncher *launcher, const gchar * input_str)
+ void
+ anjuta_launcher_reset (AnjutaLauncher *launcher)
+ {
+- if (anjuta_launcher_is_busy (launcher))
++ if (anjuta_launcher_is_busy (launcher) &&
++ launcher->priv->child_pid)
+ kill (launcher->priv->child_pid, SIGTERM);
+ }
+
+@@ -475,7 +476,8 @@ anjuta_launcher_reset (AnjutaLauncher *launcher)
+ void
+ anjuta_launcher_signal (AnjutaLauncher *launcher, int sig)
+ {
+- kill (launcher->priv->child_pid, sig);
++ if (launcher->priv->child_pid)
++ kill (launcher->priv->child_pid, sig);
+ }
+
+ /**
+--
+cgit v0.8.3.1
Added: desktop/unstable/anjuta/debian/patches/09_libxml_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/09_libxml_crash.patch?rev=26098&op=file
==============================================================================
--- desktop/unstable/anjuta/debian/patches/09_libxml_crash.patch (added)
+++ desktop/unstable/anjuta/debian/patches/09_libxml_crash.patch [utf-8] Thu Dec 30 13:22:56 2010
@@ -1,0 +1,85 @@
+From ab086784fdad29d9346ecf337b24975385e405d2 Mon Sep 17 00:00:00 2001
+From: Johannes Schmid <jhs at gnome.org>
+Date: Wed, 29 Dec 2010 17:41:05 +0000
+Subject: bgo #633018 crash in Anjuta IDE: miuse of xmlCleanupParser
+
+---
+Index: anjuta-2.32.0.0/libanjuta/anjuta-profile-manager.c
+===================================================================
+--- anjuta-2.32.0.0.orig/libanjuta/anjuta-profile-manager.c 2010-04-11 15:20:49.000000000 +0200
++++ anjuta-2.32.0.0/libanjuta/anjuta-profile-manager.c 2010-12-30 14:10:24.645061791 +0100
+@@ -35,8 +35,6 @@
+ */
+
+ #include <string.h>
+-#include <libxml/parser.h>
+-#include <libxml/tree.h>
+
+ #include <libanjuta/anjuta-debug.h>
+ #include <libanjuta/anjuta-marshal.h>
+Index: anjuta-2.32.0.0/plugins/document-manager/anjuta-bookmarks.c
+===================================================================
+--- anjuta-2.32.0.0.orig/plugins/document-manager/anjuta-bookmarks.c 2010-07-10 00:19:43.000000000 +0200
++++ anjuta-2.32.0.0/plugins/document-manager/anjuta-bookmarks.c 2010-12-30 14:10:24.649063837 +0100
+@@ -774,7 +774,6 @@ anjuta_bookmarks_session_load (AnjutaBoo
+ read_bookmarks (bookmarks, cur->children);
+
+ xmlFreeDoc (doc);
+- xmlCleanupParser();
+ }
+
+ static gint
+Index: anjuta-2.32.0.0/plugins/language-manager/plugin.c
+===================================================================
+--- anjuta-2.32.0.0.orig/plugins/language-manager/plugin.c 2010-06-02 18:29:16.000000000 +0200
++++ anjuta-2.32.0.0/plugins/language-manager/plugin.c 2010-12-30 14:10:24.649063837 +0100
+@@ -130,7 +130,6 @@ load_languages (LanguageManager* languag
+ g_free (strings);
+ }
+ xmlFreeDoc(doc);
+- xmlCleanupParser();
+ }
+
+ static gboolean
+Index: anjuta-2.32.0.0/src/Makefile.am
+===================================================================
+--- anjuta-2.32.0.0.orig/src/Makefile.am 2010-06-02 18:29:16.000000000 +0200
++++ anjuta-2.32.0.0/src/Makefile.am 2010-12-30 14:18:38.965561154 +0100
+@@ -19,6 +19,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)\
+ -I.. -I. \
+ $(LIBANJUTA_CFLAGS) \
++ $(XML_CFLAGS) \
+ -DPACKAGE_BIN_DIR=\"$(bindir)\" \
+ -DPACKAGE_DATA_DIR="\"$(datadir)/$(PACKAGE)\"" \
+ -DPACKAGE_DOC_DIR=\"$(docdir)\" \
+@@ -46,6 +47,7 @@ anjuta_LDADD = \
+ $(GDL_LIBS) \
+ $(GLADE_LIBS)\
+ $(GLIB_LIBS) \
++ $(XML_LIBS) \
+ $(top_builddir)/libanjuta/libanjuta.la
+
+ anjuta_LDFLAGS = $(ANJUTA_LDFLAGS)
+Index: anjuta-2.32.0.0/src/main.c
+===================================================================
+--- anjuta-2.32.0.0.orig/src/main.c 2010-07-10 00:19:43.000000000 +0200
++++ anjuta-2.32.0.0/src/main.c 2010-12-30 14:10:24.649063837 +0100
+@@ -34,6 +34,7 @@
+ #include <libanjuta/resources.h>
+ #include <libanjuta/anjuta-debug.h>
+ #include <libanjuta/interfaces/ianjuta-file-loader.h>
++#include <libxml/parser.h>
+
+ #include "anjuta.h"
+
+@@ -264,5 +265,9 @@ main (int argc, char *argv[])
+ gtk_widget_show (GTK_WIDGET (app));
+ gtk_main();
+
++ /* xmlCleanupParser must be called only one time in the application */
++ if (proper_shutdown)
++ xmlCleanupParser ();
++
+ return 0;
+ }
Modified: desktop/unstable/anjuta/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/90_autotools.patch?rev=26098&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/90_autotools.patch [utf-8] Thu Dec 30 13:22:56 2010
@@ -3,8 +3,8 @@
Index: anjuta-2.32.0.0/aclocal.m4
===================================================================
---- anjuta-2.32.0.0.orig/aclocal.m4 2010-10-03 11:11:00.971564865 +0200
-+++ anjuta-2.32.0.0/aclocal.m4 2010-10-03 11:29:43.523567643 +0200
+--- anjuta-2.32.0.0.orig/aclocal.m4 2010-12-30 14:17:06.205058880 +0100
++++ anjuta-2.32.0.0/aclocal.m4 2010-12-30 14:19:48.829565485 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -190,10 +190,28 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -9166,7 +9183,7 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+
+-_PKG_TEXT])dnl
++_PKG_TEXT])[]dnl
+ ])
+ elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+@@ -9177,7 +9194,7 @@ path to pkg-config.
+
+ _PKG_TEXT
+
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
+ else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
Index: anjuta-2.32.0.0/configure
===================================================================
---- anjuta-2.32.0.0.orig/configure 2010-10-03 11:11:00.955565974 +0200
-+++ anjuta-2.32.0.0/configure 2010-10-03 11:29:43.543563202 +0200
+--- anjuta-2.32.0.0.orig/configure 2010-12-30 14:17:06.193058122 +0100
++++ anjuta-2.32.0.0/configure 2010-12-30 14:19:48.849561041 +0100
@@ -1,13 +1,13 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
@@ -2280,8 +2298,8 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
Index: anjuta-2.32.0.0/libanjuta/Makefile.in
===================================================================
---- anjuta-2.32.0.0.orig/libanjuta/Makefile.in 2010-10-03 11:11:00.943568639 +0200
-+++ anjuta-2.32.0.0/libanjuta/Makefile.in 2010-10-03 11:29:43.543563202 +0200
+--- anjuta-2.32.0.0.orig/libanjuta/Makefile.in 2010-12-30 14:17:06.169061495 +0100
++++ anjuta-2.32.0.0/libanjuta/Makefile.in 2010-12-30 14:19:48.849561041 +0100
@@ -88,7 +88,7 @@ am_libanjuta_la_OBJECTS = anjuta-enum-ty
anjuta-launcher.lo anjuta-utils.lo anjuta-session.lo \
anjuta-save-prompt.lo anjuta-serializer.lo resources.lo \
@@ -2318,8 +2336,8 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/anjuta-marshal.Plo at am__quote@
Index: anjuta-2.32.0.0/plugins/language-support-python/Makefile.in
===================================================================
---- anjuta-2.32.0.0.orig/plugins/language-support-python/Makefile.in 2010-10-03 11:30:35.451566100 +0200
-+++ anjuta-2.32.0.0/plugins/language-support-python/Makefile.in 2010-10-03 11:30:18.491562039 +0200
+--- anjuta-2.32.0.0.orig/plugins/language-support-python/Makefile.in 2010-12-30 14:17:06.141063311 +0100
++++ anjuta-2.32.0.0/plugins/language-support-python/Makefile.in 2010-12-30 14:19:48.849561041 +0100
@@ -86,6 +86,10 @@ libpython_plugin_la_OBJECTS = $(am_libpy
AM_V_lt = $(am__v_lt_$(V))
am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -2348,3 +2366,23 @@
install-scriptsSCRIPTS: $(scripts_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(scriptsdir)" || $(MKDIR_P) "$(DESTDIR)$(scriptsdir)"
+Index: anjuta-2.32.0.0/src/Makefile.in
+===================================================================
+--- anjuta-2.32.0.0.orig/src/Makefile.in 2010-12-30 14:17:06.109062102 +0100
++++ anjuta-2.32.0.0/src/Makefile.in 2010-12-30 14:20:20.569057029 +0100
+@@ -370,6 +370,7 @@ AM_CPPFLAGS = \
+ -I$(top_srcdir)\
+ -I.. -I. \
+ $(LIBANJUTA_CFLAGS) \
++ $(XML_CFLAGS) \
+ -DPACKAGE_BIN_DIR=\"$(bindir)\" \
+ -DPACKAGE_DATA_DIR="\"$(datadir)/$(PACKAGE)\"" \
+ -DPACKAGE_DOC_DIR=\"$(docdir)\" \
+@@ -395,6 +396,7 @@ anjuta_LDADD = \
+ $(GDL_LIBS) \
+ $(GLADE_LIBS)\
+ $(GLIB_LIBS) \
++ $(XML_LIBS) \
+ $(top_builddir)/libanjuta/libanjuta.la
+
+ anjuta_LDFLAGS = $(ANJUTA_LDFLAGS)
Modified: desktop/unstable/anjuta/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/anjuta/debian/patches/series?rev=26098&op=diff
==============================================================================
--- desktop/unstable/anjuta/debian/patches/series [utf-8] (original)
+++ desktop/unstable/anjuta/debian/patches/series [utf-8] Thu Dec 30 13:22:56 2010
@@ -5,6 +5,8 @@
05_autocompletion_duplicates.patch
06_autocompletion_brace.patch
07_filewizard_csharp.patch
+08_launcher_kill.patch
+09_libxml_crash.patch
21_glib_2.24.patch
22_no_gdbus.patch
23_libgda_4.0.patch
More information about the pkg-gnome-commits
mailing list