This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
7238e5b7bf
commit
2ad20235f9
122
abuild.patch
122
abuild.patch
@ -1,122 +0,0 @@
|
||||
Index: anjuta-2.2.2/libegg/eggtreemodelfilter.c
|
||||
===================================================================
|
||||
--- anjuta-2.2.2.orig/libegg/eggtreemodelfilter.c
|
||||
+++ anjuta-2.2.2/libegg/eggtreemodelfilter.c
|
||||
@@ -668,6 +668,7 @@ egg_tree_model_filter_fetch_child (EggTr
|
||||
gint *index)
|
||||
{
|
||||
gint i = 0;
|
||||
+ gint i_t;
|
||||
gint start, middle, end;
|
||||
gint len;
|
||||
GtkTreePath *c_path = NULL;
|
||||
@@ -756,7 +757,8 @@ egg_tree_model_filter_fetch_child (EggTr
|
||||
g_array_insert_val (level->array, i, elt);
|
||||
*index = i;
|
||||
|
||||
- for (i = MAX (--i, 0); i < level->array->len; i++)
|
||||
+ i_t = i - 1;
|
||||
+ for (i = MAX (i_t, 0); i < level->array->len; i++)
|
||||
{
|
||||
FilterElt *e = &(g_array_index (level->array, FilterElt, i));
|
||||
if (e->children)
|
||||
@@ -830,9 +832,11 @@ egg_tree_model_filter_remove_node (EggTr
|
||||
|
||||
if (tmp)
|
||||
{
|
||||
+ gint i_t;
|
||||
g_array_remove_index (level->array, i);
|
||||
|
||||
- for (i = MAX (--i, 0); i < level->array->len; i++)
|
||||
+ i_t = i - 1;
|
||||
+ for (i = MAX (i_t, 0); i < level->array->len; i++)
|
||||
{
|
||||
/* NOTE: here we do *not* decrease offsets, because the node was
|
||||
* not removed from the child model
|
||||
@@ -1509,6 +1513,7 @@ egg_tree_model_filter_row_deleted (GtkTr
|
||||
else
|
||||
{
|
||||
FilterElt *tmp;
|
||||
+ gint i_t;
|
||||
|
||||
/* remove the row */
|
||||
tmp = bsearch_elt_with_offset (level->array, elt->offset, &i);
|
||||
@@ -1516,7 +1521,8 @@ egg_tree_model_filter_row_deleted (GtkTr
|
||||
offset = tmp->offset;
|
||||
g_array_remove_index (level->array, i);
|
||||
|
||||
- for (i = MAX (--i, 0); i < level->array->len; i++)
|
||||
+ i_t = i = 1;
|
||||
+ for (i = MAX (i_t, 0); i < level->array->len; i++)
|
||||
{
|
||||
elt = &g_array_index (level->array, FilterElt, i);
|
||||
if (elt->offset > offset)
|
||||
Index: anjuta-2.2.2/libegg/test-tree-utils.c
|
||||
===================================================================
|
||||
--- anjuta-2.2.2.orig/libegg/test-tree-utils.c
|
||||
+++ anjuta-2.2.2/libegg/test-tree-utils.c
|
||||
@@ -217,7 +217,9 @@ key_test (void)
|
||||
gtk_container_add (GTK_CONTAINER (sw), tv);
|
||||
column = gtk_tree_view_column_new ();
|
||||
rend = egg_cell_renderer_keys_new ();
|
||||
- g_object_set (G_OBJECT (rend), "accel_mode", EGG_CELL_RENDERER_KEYS_MODE_X);
|
||||
+ g_object_set (G_OBJECT (rend),
|
||||
+ "accel_mode", EGG_CELL_RENDERER_KEYS_MODE_X,
|
||||
+ NULL);
|
||||
g_signal_connect (G_OBJECT (rend),
|
||||
"keys_edited",
|
||||
G_CALLBACK (accel_edited_callback),
|
||||
Index: anjuta-2.2.2/plugins/profiler/gprof-call-graph-view.c
|
||||
===================================================================
|
||||
--- anjuta-2.2.2.orig/plugins/profiler/gprof-call-graph-view.c
|
||||
+++ anjuta-2.2.2/plugins/profiler/gprof-call-graph-view.c
|
||||
@@ -21,6 +21,13 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+# include <config.h>
|
||||
+#endif
|
||||
+
|
||||
+#include <glib.h>
|
||||
+#include <glib/gi18n.h>
|
||||
+
|
||||
#include "gprof-call-graph-view.h"
|
||||
|
||||
struct _GProfCallGraphViewPriv
|
||||
Index: anjuta-2.2.2/plugins/profiler/gprof-flat-profile-view.c
|
||||
===================================================================
|
||||
--- anjuta-2.2.2.orig/plugins/profiler/gprof-flat-profile-view.c
|
||||
+++ anjuta-2.2.2/plugins/profiler/gprof-flat-profile-view.c
|
||||
@@ -21,6 +21,13 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+# include <config.h>
|
||||
+#endif
|
||||
+
|
||||
+#include <glib.h>
|
||||
+#include <glib/gi18n.h>
|
||||
+
|
||||
#include "gprof-flat-profile-view.h"
|
||||
|
||||
struct _GProfFlatProfileViewPriv
|
||||
Index: anjuta-2.2.2/plugins/profiler/gprof-function-call-tree-view.c
|
||||
===================================================================
|
||||
--- anjuta-2.2.2.orig/plugins/profiler/gprof-function-call-tree-view.c
|
||||
+++ anjuta-2.2.2/plugins/profiler/gprof-function-call-tree-view.c
|
||||
@@ -21,6 +21,13 @@
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
+#ifdef HAVE_CONFIG_H
|
||||
+# include <config.h>
|
||||
+#endif
|
||||
+
|
||||
+#include <glib.h>
|
||||
+#include <glib/gi18n.h>
|
||||
+
|
||||
#include "gprof-function-call-tree-view.h"
|
||||
|
||||
struct _GProfFunctionCallTreeViewPriv
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7fb94ec16cd8e6be09c08d5754e61de438b8dd79727d07a5ebc3d8906686a339
|
||||
size 6082655
|
||||
3
anjuta-2.4.0.tar.bz2
Normal file
3
anjuta-2.4.0.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5bc67461e5d263c4f4b05f9fc3eb27c599a38ee0fb1393b0f941090774c35e95
|
||||
size 6257700
|
||||
@ -1,22 +0,0 @@
|
||||
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))
|
||||
{
|
||||
@ -1,19 +0,0 @@
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=489798
|
||||
Prevent creating of invalid alone "-L" if subversion development files are
|
||||
present, but svn-config does not exist.
|
||||
================================================================================
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -1020,7 +1020,11 @@
|
||||
|
||||
if test -n "$SVN_INCLUDE" ; then
|
||||
SVN_INCLUDE="-I$SVN_INCLUDE $APR_INCLUDE"
|
||||
- SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_subr-1"
|
||||
+ if test x != "x$SVN_LIB" ; then
|
||||
+ SVN_LIB="-L$SVN_LIB $APR_LIBS -lsvn_client-1 -lsvn_subr-1"
|
||||
+ else
|
||||
+ SVN_LIB="$APR_LIBS -lsvn_client-1 -lsvn_subr-1"
|
||||
+ fi
|
||||
SVN_CFLAGS="$APR_CFLAGS"
|
||||
fi
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
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->
|
||||
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Apr 2 14:41:43 CEST 2008 - vuntz@suse.de
|
||||
|
||||
- Remove -fno-strict-aliasing
|
||||
- Add gdl-devel to Requires for the devel package
|
||||
- Move *-doc from Requires to Recommends
|
||||
- Clean up Requires by removing libraries when the devel package of
|
||||
the libraries are already in Requires
|
||||
- Run ldconfig in %post(un)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 31 23:08:33 CEST 2008 - vuntz@suse.de
|
||||
|
||||
- Updated to version 2.4.0. Too many changes and bugfixes to list
|
||||
here.
|
||||
- Remove anjuta-64bit-warning.patch (fixed upstream),
|
||||
anjuta-svn-no-svn-config.patch (fixed upstream),
|
||||
anjuta-uninitalized-vars.patch (fixed upstream), abuild.patch
|
||||
(fixed upstream)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 6 13:35:24 CET 2008 - rodrigo@suse.de
|
||||
|
||||
|
||||
49
anjuta.spec
49
anjuta.spec
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package anjuta (Version 2.3.3)
|
||||
# spec file for package anjuta (Version 2.4.0)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -10,6 +10,7 @@
|
||||
|
||||
# norootforbuild
|
||||
|
||||
|
||||
Name: anjuta
|
||||
BuildRequires: autogen binutils-devel devhelp-devel fdupes gcc-c++ gdl-devel gnome-build-devel gnome-common gnome-doc-utils-devel gnome-icon-theme gnutls-devel graphviz-devel gtk-doc gtksourceview18-devel intltool libapr-util1-devel libapr1-devel libglade2-devel libgladeui-1_0-devel libgnomeprintui-devel libgnomeui-devel libneon-devel libwnck-devel libxslt-devel pcre-devel perl-XML-Parser scrollkeeper shared-mime-info subversion-devel update-desktop-files valgrind-devel vte-devel
|
||||
# FIXME: Introduced by other packages:
|
||||
@ -18,25 +19,18 @@ License: GPL v2 or later
|
||||
Group: Development/Tools/IDE
|
||||
# Directly required by anjuta:
|
||||
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: 3
|
||||
Requires: automake autoconf libtool gettext alsa-devel audiofile devhelp esound-devel gconf2-devel gnome-terminal gnome-vfs2-devel libart_lgpl-devel libbonobo-devel libbonoboui-devel libglade2-devel libgnome-devel libgnomecanvas-devel libgnomeui-devel libwnck-devel libxml2-devel openssl-devel orbit2-devel popt-devel libgnomeprint-devel libgnomeprintui-devel yelp gnome-doc-utils
|
||||
Recommends: gconf2-doc gnome-vfs2-doc libbonobo-doc libbonoboui-doc libglade2-doc libgnome-doc libgnomecanvas-doc libgnomeui-doc libgnomeprint-doc libgnomeprintui-doc
|
||||
Version: 2.4.0
|
||||
Release: 1
|
||||
Requires: %{name}-lang = %{version}
|
||||
Summary: GNOME IDE for C and C++
|
||||
Source: anjuta-%{version}.tar.bz2
|
||||
Source1: README.SuSE
|
||||
# PATCH-FIX-UPSTREAM abuild.patch bgo487683 -- we don't patch test-class.cpp because it's a test class
|
||||
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
|
||||
# PATCH-FIX-UPSTREAM anjuta-svn-no-svn-config.patch bgo489798
|
||||
Patch2: anjuta-svn-no-svn-config.patch
|
||||
# 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
|
||||
@ -61,9 +55,10 @@ Authors:
|
||||
Biswapesh Chattopadhyay <biswapesh_chatterjee@tcscal.co.in>
|
||||
|
||||
%package devel
|
||||
License: GPL v2 or later
|
||||
Summary: GNOME IDE for C and C++
|
||||
Group: Development/Tools/IDE
|
||||
Requires: %{name} = %{version} libglade2-devel libgnomeui-devel
|
||||
Requires: %{name} = %{version} gdl-devel libglade2-devel libgnomeui-devel
|
||||
|
||||
%description devel
|
||||
Anjuta is a versatile integrated development environment (IDE) for C
|
||||
@ -85,6 +80,7 @@ Authors:
|
||||
Biswapesh Chattopadhyay <biswapesh_chatterjee@tcscal.co.in>
|
||||
|
||||
%package doc
|
||||
License: GPL v2 or later
|
||||
Summary: GNOME IDE for C and C++
|
||||
Group: Development/Tools/IDE
|
||||
Requires: %{name} = %{version}
|
||||
@ -111,12 +107,8 @@ Authors:
|
||||
%lang_package
|
||||
%prep
|
||||
%setup -q
|
||||
#%patch0 -p1
|
||||
%patch1 -p1
|
||||
#%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
%patch5
|
||||
cp -a %{S:1} .
|
||||
# FIXME: Ugly hack!
|
||||
# libbfd has two instances:
|
||||
@ -131,9 +123,6 @@ sed -i "s/-Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic/-l$(echo /usr/%{_lib}/libbfd
|
||||
autoreconf -f -i
|
||||
# needed for anjuta-1.2.4a:
|
||||
# This _bindir monstrosity will go away when no-bins-in-user-share.patch does.
|
||||
# needed for anjuta-2.2.1:
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
#export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
# FIXME: Build as root modifies system!
|
||||
# anjuta-1.2.4a: --disable-scrollkeeper does not work properly.
|
||||
%configure\
|
||||
@ -162,11 +151,13 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%pre -f %{name}.schemas_pre
|
||||
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
if test -x usr/bin/update-mime-database ; then
|
||||
usr/bin/update-mime-database usr/share/mime >/dev/null
|
||||
fi
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
if test -x usr/bin/update-mime-database ; then
|
||||
usr/bin/update-mime-database usr/share/mime >/dev/null
|
||||
fi
|
||||
@ -214,6 +205,20 @@ fi
|
||||
%files lang -f %name.lang
|
||||
|
||||
%changelog
|
||||
* Wed Apr 02 2008 vuntz@suse.de
|
||||
- Remove -fno-strict-aliasing
|
||||
- Add gdl-devel to Requires for the devel package
|
||||
- Move *-doc from Requires to Recommends
|
||||
- Clean up Requires by removing libraries when the devel package of
|
||||
the libraries are already in Requires
|
||||
- Run ldconfig in %%post(un)
|
||||
* Tue Apr 01 2008 vuntz@suse.de
|
||||
- Updated to version 2.4.0. Too many changes and bugfixes to list
|
||||
here.
|
||||
- Remove anjuta-64bit-warning.patch (fixed upstream),
|
||||
anjuta-svn-no-svn-config.patch (fixed upstream),
|
||||
anjuta-uninitalized-vars.patch (fixed upstream), abuild.patch
|
||||
(fixed upstream)
|
||||
* Wed Feb 06 2008 rodrigo@suse.de
|
||||
- Added patches to fix build failures
|
||||
* Mon Feb 04 2008 ro@suse.de
|
||||
@ -269,7 +274,7 @@ fi
|
||||
* Mon Aug 06 2007 maw@suse.de
|
||||
- Split out a -lang subpackage
|
||||
- Use %%fupes.
|
||||
* Mon Jun 18 2007 maw@suse.de
|
||||
* Tue Jun 19 2007 maw@suse.de
|
||||
- Add abuild.patch (#241836).
|
||||
* Mon Apr 23 2007 pgajdos@suse.cz
|
||||
- fixed new gcc warnings
|
||||
@ -290,7 +295,7 @@ fi
|
||||
- converted neededforbuild to BuildRequires
|
||||
* Wed Jan 18 2006 sbrabec@suse.cz
|
||||
- Updated to version 1.2.4a.
|
||||
* Wed Nov 02 2005 dmueller@suse.de
|
||||
* Thu Nov 03 2005 dmueller@suse.de
|
||||
- don't build as root
|
||||
* Wed Oct 26 2005 sbrabec@suse.cz
|
||||
- Updated to version 1.2.4 (#118228).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user