From 54107dded7fcaf878413f7d1451b65703d0201fb Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 9 Oct 2007 14:37:38 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/anjuta?expand=0&rev=7 --- abuild.patch | 36 ---------- anjuta-1.2.4a.tar.bz2 | 3 - anjuta-1.2.4a_array-index.patch | 11 --- anjuta-1.2.4a_literal-comparsion.patch | 11 --- anjuta-2.2.1.tar.bz2 | 3 + anjuta-64bit.patch | 92 -------------------------- anjuta.changes | 19 ++++++ anjuta.spec | 55 ++++++++------- update_global_tags.patch | 16 ----- 9 files changed, 54 insertions(+), 192 deletions(-) delete mode 100644 abuild.patch delete mode 100644 anjuta-1.2.4a.tar.bz2 delete mode 100644 anjuta-1.2.4a_array-index.patch delete mode 100644 anjuta-1.2.4a_literal-comparsion.patch create mode 100644 anjuta-2.2.1.tar.bz2 delete mode 100644 anjuta-64bit.patch delete mode 100644 update_global_tags.patch diff --git a/abuild.patch b/abuild.patch deleted file mode 100644 index 0971327..0000000 --- a/abuild.patch +++ /dev/null @@ -1,36 +0,0 @@ -I: Program is using uninitialized variables. - Note the difference between "is used" and "may be used" -W: anjuta uninitialized-variable breakpoints.c: 668 -W: anjuta uninitialized-variable project_dbase_gui.c: 1313 - -Index: anjuta-1.2.4a/src/breakpoints.c -=================================================================== ---- anjuta-1.2.4a.orig/src/breakpoints.c -+++ anjuta-1.2.4a/src/breakpoints.c -@@ -665,7 +665,6 @@ on_bk_properties_clicked (GtkWidget *but - valid = gtk_tree_selection_get_selected (selection, &model, &iter); - if (!valid) - { -- g_object_unref (gxml); - return; - } - gtk_tree_model_get (model, &iter, DATA_COLUMN, &bid, -1); -Index: anjuta-1.2.4a/src/project_dbase_gui.c -=================================================================== ---- anjuta-1.2.4a.orig/src/project_dbase_gui.c -+++ anjuta-1.2.4a/src/project_dbase_gui.c -@@ -1304,9 +1304,13 @@ static void - on_prj_import_confirm_yes (GtkButton * button, const gchar* filename, - gpointer user_data) - { -- PrjModule selMod ; -+ /* the second argument to project_dbase_import_file_real is ignored, -+ so zeroing this out silence warnings is safe. */ -+ PrjModule selMod; - ProjectDBase *p = user_data; - -+ memset (&selMod, 0, sizeof (selMod)); -+ - gtk_widget_hide (p->fileselection_add_file); - if (!filename) - return; diff --git a/anjuta-1.2.4a.tar.bz2 b/anjuta-1.2.4a.tar.bz2 deleted file mode 100644 index 014d26d..0000000 --- a/anjuta-1.2.4a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:958747af7b02c43972aa44477c2536a0fb7dd1939f0f9a1fedb697d07946ed00 -size 6315488 diff --git a/anjuta-1.2.4a_array-index.patch b/anjuta-1.2.4a_array-index.patch deleted file mode 100644 index f6e9005..0000000 --- a/anjuta-1.2.4a_array-index.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/anjuta-tools.c -+++ src/anjuta-tools.c -@@ -1871,7 +1871,7 @@ - { - len = strlen(s[2]); - if (len > 20) -- s[20] = '\0'; -+ s[2][20] = '\0'; - } - else - s[2] = g_strdup("Undefined"); diff --git a/anjuta-1.2.4a_literal-comparsion.patch b/anjuta-1.2.4a_literal-comparsion.patch deleted file mode 100644 index 191481c..0000000 --- a/anjuta-1.2.4a_literal-comparsion.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/aneditor.cxx -+++ src/aneditor.cxx -@@ -1807,7 +1807,7 @@ - } - } - SString mode = GetMode(language); -- if (mode.c_str() != "") -+ if (mode.c_str()[0] != '\0') - { - SString comment ; - comment += start_stream.c_str() ; diff --git a/anjuta-2.2.1.tar.bz2 b/anjuta-2.2.1.tar.bz2 new file mode 100644 index 0000000..ffef41f --- /dev/null +++ b/anjuta-2.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e569dd0089bdbc333a2fd0342ead82154f44ad4d456165c801cde485756499aa +size 5533408 diff --git a/anjuta-64bit.patch b/anjuta-64bit.patch deleted file mode 100644 index d679a1c..0000000 --- a/anjuta-64bit.patch +++ /dev/null @@ -1,92 +0,0 @@ ---- configure.in -+++ configure.in -@@ -268,7 +268,7 @@ - ]) ]) - - dnl Checks for header files. --AC_CHECK_HEADERS(dirent.h fcntl.h fnmatch.h stat.h stdlib.h string.h) -+AC_CHECK_HEADERS(dirent.h fcntl.h fnmatch.h stat.h stdlib.h string.h stdint.h) - AC_CHECK_HEADERS(time.h types.h unistd.h) - AC_CHECK_HEADERS(sys/dir.h sys/stat.h sys/times.h sys/types.h) - ---- scintilla/include/Scintilla.h -+++ scintilla/include/Scintilla.h -@@ -24,6 +24,11 @@ - #if _MSC_VER >= 1300 - #include - #endif -+#ifdef HAVE_STDINT_H -+#include -+typedef uintptr_t uptr_t; -+typedef intptr_t sptr_t; -+#else - #ifdef MAXULONG_PTR - typedef ULONG_PTR uptr_t; - typedef LONG_PTR sptr_t; -@@ -31,6 +36,7 @@ - typedef unsigned long uptr_t; - typedef long sptr_t; - #endif -+#endif - - typedef sptr_t (*SciFnDirect)(sptr_t ptr, unsigned int iMessage, uptr_t wParam, sptr_t lParam); - ---- src/anjuta.c -+++ src/anjuta.c -@@ -583,9 +583,9 @@ - TextEditor *te; - guint *explorer_height; - -- g_return_val_if_fail (fname, NULL); -+ g_return_val_if_fail (fname, 0); - fn = anjuta_get_full_filename (fname); -- g_return_val_if_fail (fname != NULL, NULL); -+ g_return_val_if_fail (fname != NULL, 0); - - te = app->explorer_view; - if (te) -@@ -615,12 +615,12 @@ - scintilla_send_message (SCINTILLA (te->widgets.editor), - SCI_SETSELECTIONEND, selpos, 0); - -- explorer_height = scintilla_send_message (SCINTILLA (te->widgets.editor), -+ explorer_height = (guint *) scintilla_send_message (SCINTILLA (te->widgets.editor), - SCI_TEXTHEIGHT, 0, 0); - /* This ensures that we have arround 1 lines visible upon the mark, - and locat to to top of the explorer view */ - scintilla_send_message (SCINTILLA (te->widgets.editor), SCI_GOTOLINE, -- linenum_text_editor_to_scintilla (lineno)+ explorer_height - 1, 0); -+ (uptr_t) (linenum_text_editor_to_scintilla (lineno)+ explorer_height - 1), 0); - scintilla_send_message (SCINTILLA (te->widgets.editor), SCI_GOTOLINE, - linenum_text_editor_to_scintilla (lineno), 0); - /* Since we cannot save this window we make it read-only */ -@@ -2058,7 +2058,7 @@ - if (pid < 1) - return; - app->registered_child_processes = -- g_list_append (app->registered_child_processes, (int *) pid); -+ g_list_append (app->registered_child_processes, GINT_TO_POINTER (pid)); - app->registered_child_processes_cb = - g_list_append (app->registered_child_processes_cb, - ch_terminated); -@@ -2072,9 +2072,9 @@ - gint idx; - GList *ptr; - -- idx = g_list_index (app->registered_child_processes, (int *) pid); -+ idx = g_list_index (app->registered_child_processes, GINT_TO_POINTER (pid)); - app->registered_child_processes = -- g_list_remove (app->registered_child_processes, (int *) pid); -+ g_list_remove (app->registered_child_processes, GINT_TO_POINTER (pid)); - - ptr = g_list_nth (app->registered_child_processes_cb, idx); - // g_assert (ptr != NULL); -@@ -2106,7 +2106,7 @@ - - if (pid < 1) - return; -- idx = g_list_index (app->registered_child_processes, (int *) pid); -+ idx = g_list_index (app->registered_child_processes, GINT_TO_POINTER (pid)); - if (idx < 0) - return; - callback = diff --git a/anjuta.changes b/anjuta.changes index c7a0c5c..9301ee4 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Mon Oct 8 20:43:21 CEST 2007 - mauro@suse.de + +- Update to version 2.2.1: + * Fixed lots of memory leaks (thanks valgrind) + * Fixed crasher on shutdown + * Avoid an endless loop if clearing all breakpoints while the programm + is running + * Fixed help activation (bug #451557). + * Fixed compiler warnings. + * Fixed #423467 (View->Tasks menu items are not checked on startup) + * Fixed anjuta-plugin template plugin by moving the "\" out of the [IF] block + * Fixes bug #433552: crash in Anjuta IDE: add file test.h in project on + generic Makefile. + * Disables 'Add to project' in wizards for projects that can not add sources. + * Fixed bug #450217: Refreshing tree brings to random crashes + * Fixed bug 453931 - crash in Anjuta IDE: Trying some c++ exampled + * Fixed bug 457093 - crash in Anjuta IDE: just typed in some text + ------------------------------------------------------------------- Fri Aug 10 16:36:41 CEST 2007 - coolo@suse.de diff --git a/anjuta.spec b/anjuta.spec index 494063e..ad43d5e 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,5 +1,5 @@ # -# spec file for package anjuta (Version 1.2.4a) +# spec file for package anjuta (Version 2.2.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,24 +11,24 @@ # norootforbuild Name: anjuta -BuildRequires: fdupes gcc-c++ gnome-common gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel pcre-devel perl-XML-Parser scrollkeeper shared-mime-info update-desktop-files vte-devel +BuildRequires: fdupes gcc-c++ gnome-common gnome-doc-utils-devel gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel mDNSResponder-devel pcre-devel perl-XML-Parser scrollkeeper shared-mime-info update-desktop-files vte-devel License: GPL v2 or later Group: Development/Tools/IDE -Autoreqprov: on -Requires: automake autoconf libtool gettext alsa alsa-devel audiofile devhelp esound esound-devel gconf2 gconf2-devel gconf2-doc gnome-terminal gnome-vfs2 gnome-vfs2-devel gnome-vfs2-doc libart_lgpl libart_lgpl-devel libbonobo libbonobo-devel libbonobo-doc libbonoboui libbonoboui-devel libbonoboui-doc libglade2 libglade2-devel libglade2-doc libgnome libgnome-devel libgnome-doc libgnomecanvas libgnomecanvas-devel libgnomecanvas-doc libgnomeui libgnomeui-devel libgnomeui-doc libwnck libwnck-devel libxml2 libxml2-devel openssl openssl-devel orbit2 orbit2-devel popt popt-devel libgnomeprint libgnomeprint-devel libgnomeprint-doc libgnomeprintui libgnomeprintui-devel libgnomeprintui-doc yelp -Version: 1.2.4a -Release: 115 +AutoReqProv: on +Requires: automake autoconf libtool gettext alsa alsa-devel audiofile devhelp esound esound-devel gconf2 gconf2-devel gconf2-doc gnome-terminal gnome-vfs2 gnome-vfs2-devel gnome-vfs2-doc libart_lgpl libart_lgpl-devel libbonobo libbonobo-devel libbonobo-doc libbonoboui libbonoboui-devel libbonoboui-doc libglade2 libglade2-devel libglade2-doc libgnome libgnome-devel libgnome-doc libgnomecanvas libgnomecanvas-devel libgnomecanvas-doc libgnomeui libgnomeui-devel libgnomeui-doc libwnck libwnck-devel libxml2 libxml2-devel openssl openssl-devel orbit2 orbit2-devel popt popt-devel libgnomeprint libgnomeprint-devel libgnomeprint-doc libgnomeprintui libgnomeprintui-devel libgnomeprintui-doc yelp gnome-doc-utils +Version: 2.2.1 +Release: 1 Requires: %{name}-lang = %{version} Summary: GNOME IDE for C and C++ Source: anjuta-%{version}.tar.bz2 Source1: README.SuSE -Patch: update_global_tags.patch +#Patch: update_global_tags.patch Patch1: configure.patch -Patch2: anjuta-64bit.patch -Patch3: anjuta-1.2.4a_array-index.patch -Patch4: anjuta-1.2.4a_literal-comparsion.patch -Patch5: abuild.patch -URL: http://anjuta.sourceforge.net/ +#Patch2: anjuta-64bit.patch +#Patch3: anjuta-1.2.4a_array-index.patch +#Patch4: anjuta-1.2.4a_literal-comparsion.patch +#Patch5: abuild.patch +Url: http://anjuta.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,22 +53,17 @@ Authors: %lang_package %prep %setup -q -cp -a global-tags/create_global_tags.sh anjuta_update_global_tags -sed s:/@lib@:/%_lib: <%{P:0} | patch if [ "%_lib" != "lib" ] ; then %patch1 fi -%patch2 -%patch3 -%patch4 -%patch5 -p1 +#%patch2 +#%patch3 +#%patch4 +#%patch5 -p1 cp -a %{S:1} . -rm po/no.* sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in %build -cp /usr/share/gettext/config.rpath . -autoreconf -f -i # needed for anjuta-1.2.4a: export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" @@ -95,7 +90,6 @@ DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime %suse_update_desktop_file -C "" -D anjuta/anjuta-manual.xml -G "Integrated Development Environment" anjuta Development IDE GNOME %find_lang anjuta rm -r $RPM_BUILD_ROOT%{_datadir}/mime-info $RPM_BUILD_ROOT%{_libdir}/anjuta/*.*a - %fdupes %clean @@ -130,8 +124,23 @@ fi %doc %{_mandir}/man?/*.* %files lang -f %name.lang - %changelog +* Mon Oct 08 2007 - mauro@suse.de +- Update to version 2.2.1: + * Fixed lots of memory leaks (thanks valgrind) + * Fixed crasher on shutdown + * Avoid an endless loop if clearing all breakpoints while the programm + is running + * Fixed help activation (bug #451557). + * Fixed compiler warnings. + * Fixed #423467 (View->Tasks menu items are not checked on startup) + * Fixed anjuta-plugin template plugin by moving the "\" out of the [IF] block + * Fixes bug #433552: crash in Anjuta IDE: add file test.h in project on + generic Makefile. + * Disables 'Add to project' in wizards for projects that can not add sources. + * Fixed bug #450217: Refreshing tree brings to random crashes + * Fixed bug 453931 - crash in Anjuta IDE: Trying some c++ exampled + * Fixed bug 457093 - crash in Anjuta IDE: just typed in some text * Fri Aug 10 2007 - coolo@suse.de - put the Version before the use of %%version * Mon Aug 06 2007 - maw@suse.de diff --git a/update_global_tags.patch b/update_global_tags.patch deleted file mode 100644 index 7d45383..0000000 --- a/update_global_tags.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- anjuta_update_global_tags 2003-12-08 07:55:22.000000000 +0100 -+++ anjuta_update_global_tags 2004-02-12 14:16:25.000000000 +0100 -@@ -1,8 +1,9 @@ --## FILES="\"/usr/include/*.h\" \"/usr/local/include/*.h\"" --FILES="" -+#! /bin/sh -+ -+FILES="\"/usr/include/*.h\" \"/usr/include/sys/*.h\" \"/usr/local/include/*.h\"" - BASEDIR=`pwd` --PROGDIR=. # `dirname $0` --GLOBAL_TAGS_FILE=$BASEDIR/system.tags -+PROGDIR=/usr/@lib@/anjuta -+GLOBAL_TAGS_FILE=/var/lib/anjuta/system.tags - CFLAGS="" - - # WxWindows libraries