pool/anjuta
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/anjuta?expand=0&rev=9

Browse Source
This commit is contained in:
OBS User unknown 2007-10-19 02:26:19 +00:00 committed by Git OBS Bridge
parent bd5f4e1791
commit 6f99ff33ee
5 changed files with 177 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
abuild.patch Normal file
View File

@ -0,0 +1,68 @@
Index: anjuta-2.2.1/libegg/eggtreemodelfilter.c
===================================================================
--- anjuta-2.2.1.orig/libegg/eggtreemodelfilter.c
+++ anjuta-2.2.1/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.1/libegg/test-tree-utils.c
===================================================================
--- anjuta-2.2.1.orig/libegg/test-tree-utils.c
+++ anjuta-2.2.1/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),

11
anjuta.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Oct 17 21:02:10 CEST 2007 - maw@suse.de
- Add gdl-devel and libxslt-devel to the list of build requirements
- Remove configure.patch
- Don't attempt to install files that don't exist
- Split out a -devel subpackage
- Add abuild.patch
- Add no-bins-in-usrshare.patch
- Minor .spec cleanups.
-------------------------------------------------------------------
Thu Oct 11 16:39:37 CEST 2007 - sbrabec@suse.cz

122
anjuta.spec
View File

@ -11,23 +11,21 @@
# norootforbuild
Name: anjuta
BuildRequires: fdupes gcc-c++ gnome-common gnome-doc-utils-devel gnutls-devel intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel pcre-devel perl-XML-Parser scrollkeeper shared-mime-info update-desktop-files vte-devel
BuildRequires: autogen devhelp-devel fdupes gcc-c++ gdl-devel gnome-build-devel gnome-common gnome-doc-utils-devel gnome-icon-theme gnutls-devel gtk-doc intltool libglade2-devel libgnomeprintui-devel libgnomeui-devel libwnck-devel libxslt-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 gnome-doc-utils
Version: 2.2.1
Release: 2
Release: 3
Requires: %{name}-lang = %{version}
Summary: GNOME IDE for C and C++
Source: anjuta-%{version}.tar.bz2
Source1: README.SuSE
#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
# 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
Url: http://anjuta.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -41,6 +39,30 @@ and can be unfriendly to use.
Authors:
--------
Naba kumar <naba@gnome.org>
Stéphane Démurget <demurgets@free.fr>
Andy Piper <andy.piper@freeuk.com>
Hector Rivera Falu <misha@phreaker.net>
Luca Bellonda <lbell@tsc4.com>
Biswapesh Chattopadhyay <biswapesh_chatterjee@tcscal.co.in>
%package devel
Summary: GNOME IDE for C and C++
Group: Development/Tools/IDE
Requires: %{name} = %{version} libglade2-devel libgnomeui-devel
%description devel
Anjuta is a versatile integrated development environment (IDE) for C
and C++. It has been written for GTK and GNOME and features a number of
advanced programming facilities. It is basically a GUI interface for
the collection of command line programming utilities and tools
available for the GNU system. These are usually run via a text console
and can be unfriendly to use.
Authors:
--------
Naba kumar <naba@gnome.org>
@ -53,44 +75,34 @@ Authors:
%lang_package
%prep
%setup -q
if [ "%_lib" != "lib" ] ; then
%patch1
fi
#%patch2
#%patch3
#%patch4
#%patch5 -p1
%patch0 -p1
%patch1 -p1
cp -a %{S:1} .
sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in
%build
# needed for anjuta-1.2.4a:
# This _bindir monstrosity will go away when no-bins-in-user-share.patch does.
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.
# FIXME: WARNING: Program is using uninitialized variables.
%configure\
--disable-scrollkeeper
# does nor work for anjuta-1.2.4a:
#make %{?jobs:-j%jobs}
make
%configure \
--disable-scrollkeeper
make %{?jobs:-j%jobs}
%install
make install DESTDIR=$RPM_BUILD_ROOT
%makeinstall
# These should go to defaultdocdir.
rm -r $RPM_BUILD_ROOT%{_datadir}/doc
install anjuta_update_global_tags $RPM_BUILD_ROOT%{_bindir}
install global-tags/tm_global_tags $RPM_BUILD_ROOT%{_libdir}/anjuta
mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/anjuta
mv $RPM_BUILD_ROOT%{_datadir}/anjuta/system.tags $RPM_BUILD_ROOT%{_localstatedir}/lib/anjuta
ln -s %{_localstatedir}/lib/anjuta/system.tags $RPM_BUILD_ROOT%{_datadir}/anjuta
gzip -9nf $RPM_BUILD_ROOT%{_mandir}/man?/*.?
DESTDIR=$RPM_BUILD_ROOT mime-info-to-mime
rm -r $RPM_BUILD_ROOT/%{_libdir}/*.*a
# This works in conjunction with no-bins-in-usershare.patch. When that
# patch goes away, so too will the following:
mv $RPM_BUILD_ROOT/%{_datadir}/anjuta/scripts/anjuta-tags $RPM_BUILD_ROOT/%{_bindir}
%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
%fdupes $RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
@ -110,21 +122,57 @@ fi
%doc AUTHORS COPYING ChangeLog FUTURE NEWS README README.SuSE doc/ScintillaDoc.html TODO
%{_bindir}/*
%{_libdir}/anjuta
%{_libdir}/*.so.*
%{_datadir}/anjuta
%{_datadir}/applications/*.desktop
# FIXME: Probably move to KDE or remove:
%dir %{_datadir}/mimelnk
%dir %{_datadir}/mimelnk/application
%{_datadir}/mimelnk/application/*.desktop
%{_datadir}/mime/packages/*.xml
%{_datadir}/omf/anjuta
%{_datadir}/pixmaps/anjuta
%dir %{_localstatedir}/lib/anjuta
%verify(not size md5 mtime) %{_localstatedir}/lib/anjuta/system.tags
# Somehow I think that this is wrong.
%dir %{_datadir}/icons/gnome/48x48/mimetypes/
%{_datadir}/icons/gnome/48x48/mimetypes/*.png
%{_datadir}/icons/gnome/scalable/mimetypes/*.svg
%{_datadir}/icons/hicolor/48x48/apps/*.png
%{_datadir}/icons/hicolor/scalable/apps/*.svg
%dir %{_datadir}/omf/anjuta-manual
%{_datadir}/omf/anjuta-manual/*.omf
%doc %{_mandir}/man?/*.*
%dir %{_datadir}/gnome/help/anjuta-faqs
%dir %{_datadir}/gnome/help/anjuta-faqs/C
%{_datadir}/gnome/help/anjuta-faqs/C/*.xml
%dir %{_datadir}/gnome/help/anjuta-manual
%dir %{_datadir}/gnome/help/anjuta-manual/C/
%{_datadir}/gnome/help/anjuta-manual/C/*.xml
%dir %{_datadir}/gnome/help/anjuta-manual/C/figures
%{_datadir}/gnome/help/anjuta-manual/C/figures/*.png
%dir %{_datadir}/gtk-doc/html/libanjuta
%{_datadir}/gtk-doc/html/libanjuta/*.html
%{_datadir}/gtk-doc/html/libanjuta/*.sgml
%{_datadir}/gtk-doc/html/libanjuta/*.png
%{_datadir}/gtk-doc/html/libanjuta/*.devhelp
%{_datadir}/gtk-doc/html/libanjuta/*.devhelp2
%{_datadir}/gtk-doc/html/libanjuta/*.css
%files devel
%defattr(-, root, root)
%dir %{_includedir}/libanjuta-1.0/libanjuta
%dir %{_includedir}/libanjuta-1.0
%{_includedir}/libanjuta-1.0/libanjuta/*.h
%dir %{_includedir}/libanjuta-1.0/libanjuta/interfaces
%{_includedir}/libanjuta-1.0/libanjuta/interfaces/*.h
%{_includedir}/libanjuta-1.0/libanjuta/interfaces/*.idl
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%files lang -f %name.lang
%changelog
* Wed Oct 17 2007 - maw@suse.de
- Add gdl-devel and libxslt-devel to the list of build requirements
- Remove configure.patch
- Don't attempt to install files that don't exist
- Split out a -devel subpackage
- Add abuild.patch
- Add no-bins-in-usrshare.patch
- Minor .spec cleanups.
* Thu Oct 11 2007 - sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
* Mon Oct 08 2007 - mauro@suse.de

18
configure.patch
View File

@ -1,18 +0,0 @@
--- configure.in 2004/02/19 00:20:53 1.1
+++ configure.in 2004/02/19 00:21:29
@@ -470,13 +470,13 @@
dnl Set PACKAGE DATA & DOC DIR
packagedatadir=share/${PACKAGE}
packagedocdir=share/doc/${PACKAGE}
-packageplugindir=lib/${PACKAGE}/plugins/${VERSION}
+packageplugindir=lib64/${PACKAGE}/plugins/${VERSION}
dnl Set PACKAGE DIRs in config.h.
packagepixmapsdir=share/pixmaps/${PACKAGE}
packagehelpdir=share/gnome/help/${PACKAGE}
packagemenudir=share/gnome/apps
-packageplugindir=lib/${PACKAGE}
+packageplugindir=lib64/${PACKAGE}
dnl Subst PACKAGE_DATA_DIR.
NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"

13
no-bins-in-usrshare.patch Normal file
View File

@ -0,0 +1,13 @@
Index: anjuta-2.2.1/plugins/symbol-browser/an_symbol_prefs.c
===================================================================
--- anjuta-2.2.1.orig/plugins/symbol-browser/an_symbol_prefs.c
+++ anjuta-2.2.1/plugins/symbol-browser/an_symbol_prefs.c
@@ -485,7 +485,7 @@ on_create_tags_clicked (GtkButton *widge
/* Execute anjuta-tags to create tags for the given files */
if ((pid = fork()) == 0)
{
- execvp (g_build_filename (PACKAGE_DATA_DIR, "scripts",
+ execvp (g_build_filename ("/usr/bin", "/",
"anjuta-tags", NULL), argv);
perror ("Could not execute anjuta-tags");
}