OBS User unknown 2008-02-08 16:46:03 +00:00 committed by Git OBS Bridge
parent e79ef6257b
commit 7238e5b7bf
5 changed files with 63 additions and 22 deletions

View File

@ -0,0 +1,22 @@
Index: plugins/glade/plugin.c
===================================================================
--- plugins/glade/plugin.c.orig
+++ plugins/glade/plugin.c
@@ -642,7 +642,7 @@ ifile_open (IAnjutaFile *ifile, const gc
gchar *filename;
IAnjutaDocumentManager* docman;
GList* docwids, *node;
- const GList *glade_obj_node;
+ GList *glade_obj_node;
g_return_if_fail (uri != NULL);
@@ -718,7 +718,7 @@ ifile_open (IAnjutaFile *ifile, const gc
glade_plugin_add_project (ANJUTA_PLUGIN_GLADE (ifile), project);
/* Select the first window in the project */
- for (glade_obj_node = glade_project_get_objects (project);
+ for (glade_obj_node = (GList *) glade_project_get_objects (project);
glade_obj_node != NULL;
glade_obj_node = g_list_next (glade_obj_node))
{

View File

@ -1,18 +1,11 @@
http://bugzilla.gnome.org/show_bug.cgi?id=489798
Expression compares a char* pointer with a string literal.
Usually a strcmp() was intended by the programmer
anjuta stringcompare vggeneralprefs.c: 371
vggeneralprefs.c: In function 'general_prefs_get_argv':
vggeneralprefs.c:371: warning: comparison with string literal results in unspecified behaviour
================================================================================
--- plugins/valgrind/vggeneralprefs.c
+++ plugins/valgrind/vggeneralprefs.c
@@ -368,7 +368,7 @@
continue;
}
- if (general_args[i].key == SUPPRESSIONS_KEY &&
+ if (!strcmp (general_args[i].key, SUPPRESSIONS_KEY) &&
(stat (str, &st) == -1 || !S_ISREG (st.st_mode))) {
general_args[i].buf = NULL;
g_free (str);
--- plugins/language-support-cpp-java/plugin.c.orig 2008-02-05 10:04:28.000000000 +0100
+++ plugins/language-support-cpp-java/plugin.c 2008-02-05 10:05:15.000000000 +0100
@@ -555,7 +555,7 @@ extract_mode_line (const gchar *comment_
/* Check for escape characters */
while (end_modeline)
{
- if ((end_modeline - 1) != "\\")
+ if (*(end_modeline - 1) != '\\')
break;
end_modeline++;
end_modeline = strstr (end_modeline, ":");

View File

@ -0,0 +1,13 @@
Index: plugins/symbol-browser/test-class.cpp
===================================================================
--- plugins/symbol-browser/test-class.cpp.orig
+++ plugins/symbol-browser/test-class.cpp
@@ -45,7 +45,7 @@ int main() {
First::Second::Second_1_class *sec_class;
sec_class->func_second_1_class_foo ();
- Third::Fourth::Fourth_1_class *fourth_class;
+ Third::Fourth::Fourth_1_class *fourth_class = new Third::Fourth::Fourth_1_class;
fourth_class->func_fourth_1_class_foo ();
// yklass->

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 6 13:35:24 CET 2008 - rodrigo@suse.de
- Added patches to fix build failures
-------------------------------------------------------------------
Mon Feb 4 18:27:40 CET 2008 - ro@suse.de

View File

@ -20,7 +20,7 @@ Group: Development/Tools/IDE
Requires: autogen
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.3.3
Release: 2
Release: 3
Requires: %{name}-lang = %{version}
Summary: GNOME IDE for C and C++
Source: anjuta-%{version}.tar.bz2
@ -29,10 +29,14 @@ Source1: README.SuSE
Patch0: abuild.patch
# PATCH-FIX-UPSTREAM no-bins-in-usershare.patch -- need a recent (more recent than 10.3) devel system to see if this is worth filing upstream
Patch1: no-bins-in-usrshare.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=489798
# PATCH-FIX-UPSTREAM anjuta-svn-no-svn-config.patch bgo489798
Patch2: anjuta-svn-no-svn-config.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=489798
# PATCH-FIX-UPSTREAM anjuta-invalid-comparison.patch bgo489798
Patch3: anjuta-invalid-comparison.patch
# PATCH-FIX-UPSTREAM anjuta-64bit-warning.patch bgo514732 rodrigo@novell.com
Patch4: anjuta-64bit-warning.patch
# PATCH-FIX-UPSTREAM anjuta-uninitalized-vars.patch bgo514733 rodrigo@novell.com
Patch5: anjuta-uninitalized-vars.patch
Url: http://anjuta.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%gconf_schemas_prereq
@ -110,7 +114,9 @@ Authors:
#%patch0 -p1
%patch1 -p1
#%patch2
#%patch3
%patch3
%patch4
%patch5
cp -a %{S:1} .
# FIXME: Ugly hack!
# libbfd has two instances:
@ -208,6 +214,8 @@ fi
%files lang -f %name.lang
%changelog
* Wed Feb 06 2008 rodrigo@suse.de
- Added patches to fix build failures
* Mon Feb 04 2008 ro@suse.de
- disable parallel make for the moment
* Mon Feb 04 2008 rodrigo@suse.de