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

anjuta-invalid-comparison.patch

@@ -0,0 +1,18 @@
+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);

anjuta-svn-no-svn-config.patch

@@ -0,0 +1,19 @@
+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
+ 

anjuta.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 24 15:25:00 CEST 2007 - sbrabec@suse.cz
+
+- Build all optional plugins except GtkSourceView: subversion,
+  glade, class inheritance, performance profiler, Valgrind.
+
 -------------------------------------------------------------------
 Tue Oct 23 23:25:20 CEST 2007 - maw@suse.de
 

anjuta.spec

@@ -11,13 +11,15 @@
 # norootforbuild
 
 Name:           anjuta
-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
+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 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: gtksourceview-devel is too new for anjuta
+# FIXME: Introduced by other packages:
+BuildRequires:  sqlite-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.2
-Release:        1
+Release:        5
 Requires:       %{name}-lang = %{version}
 Summary:        GNOME IDE for C and C++
 Source:         anjuta-%{version}.tar.bz2
@@ -26,8 +28,13 @@ 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
+Patch2:         anjuta-svn-no-svn-config.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=489798
+Patch3:         anjuta-invalid-comparison.patch
 Url:            http://anjuta.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%gconf_schemas_prereq
 
 %description
 Anjuta is a versatile integrated development environment (IDE) for C
@@ -77,17 +84,28 @@ Authors:
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2
+%patch3
 cp -a %{S:1} .
-sed -i "s/\(ALL_LINGUAS.*\) no /\1 /" configure.in
+# FIXME: Ugly hack!
+# libbfd has two instances:
+# - static library, which is not compiled with PIC and is unusable for
+#   shared libanjuta library.
+# - dynamic library, which is binutils version specific.
+# We have to use dynamic library and make libanjuta dependent on
+# specific version of binutils.
+sed -i "s/-Wl,-Bstatic -lbfd -liberty -Wl,-Bdynamic/-l$(echo /usr/lib64/libbfd*.so | sed 's:.*/lib::;s/\.so//') -Wl,-Bstatic -liberty -Wl,-Bdynamic/" configure.in
 
 %build
+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"
+#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 \
+%configure\
 	--disable-scrollkeeper
 make %{?jobs:-j%jobs}
 
@@ -102,11 +120,14 @@ rm -r $RPM_BUILD_ROOT/%{_libdir}/*.*a
 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
+%find_gconf_schemas
 %fdupes $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre -f %{name}.schemas_pre
+
 %post
 if test -x usr/bin/update-mime-database ; then
   usr/bin/update-mime-database usr/share/mime >/dev/null
@@ -116,8 +137,11 @@ fi
 if test -x usr/bin/update-mime-database ; then
   usr/bin/update-mime-database usr/share/mime >/dev/null
 fi
+%posttrans -f %{name}.schemas_posttrans
 
-%files
+%preun -f %{name}.schemas_preun
+
+%files -f %{name}.schemas_list
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog FUTURE NEWS README README.SuSE doc/ScintillaDoc.html TODO
 %{_bindir}/*
@@ -165,6 +189,9 @@ fi
 
 %files lang -f %name.lang
 %changelog
+* Wed Oct 24 2007 - sbrabec@suse.cz
+- Build all optional plugins except GtkSourceView: subversion,
+  glade, class inheritance, performance profiler, Valgrind.
 * Tue Oct 23 2007 - maw@suse.de
 - Update to version 2.2.2:
   + Bugs (bugzilla.gnome.org) fixed: #477976, #427104, #479020,