Accepting request 523022 from GNOME:Factory

(forwarded request 522926 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/523022
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/anjuta?expand=0&rev=108
This commit is contained in:
Dominique Leuenberger 2017-09-13 19:47:07 +00:00 committed by Git OBS Bridge
commit dba936bc21
6 changed files with 99 additions and 193 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4face1c063a5a6687a6cfc6f1f700ba15f13664633c05caa2fbf50317608dd03
size 6363016

3
anjuta-3.26.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:fb895464c1a3c915bb2bb3ea5d236fd17202caa7205f6792f70a75affc343d70
size 6369404

View File

@ -1,122 +0,0 @@
From ae460ed1c2512875032a641dbe157b7a7144c09b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
Date: Sat, 3 Jun 2017 13:43:48 +0200
Subject: Avoid errors with recent version of gcc
---
plugins/build-basic-autotools/Makefile.am | 3 +++
plugins/cvs-plugin/Makefile.am | 3 +++
plugins/debug-manager/Makefile.am | 3 +++
plugins/file-manager/Makefile.am | 3 +++
plugins/git/Makefile.am | 3 +++
5 files changed, 15 insertions(+)
diff --git a/plugins/build-basic-autotools/Makefile.am b/plugins/build-basic-autotools/Makefile.am
index b91dda2..0858303 100644
--- a/plugins/build-basic-autotools/Makefile.am
+++ b/plugins/build-basic-autotools/Makefile.am
@@ -32,6 +32,9 @@ AM_CPPFLAGS = \
$(DEPRECATED_FLAGS) \
$(LIBANJUTA_CFLAGS)
+AM_CFLAGS += \
+ -Wno-error=format-nonliteral
+
# Where to install the plugin
plugindir = $(anjuta_plugin_dir)
diff --git a/plugins/cvs-plugin/Makefile.am b/plugins/cvs-plugin/Makefile.am
index b6d4f0e..dd83f4e 100644
--- a/plugins/cvs-plugin/Makefile.am
+++ b/plugins/cvs-plugin/Makefile.am
@@ -2,6 +2,9 @@
cvs_plugin_gladedir = $(anjuta_glade_dir)
dist_cvs_plugin_glade_DATA = anjuta-cvs-plugin.ui
+AM_CFLAGS += \
+ -Wno-error=format-nonliteral
+
cvs_plugin_pixmapsdir = $(anjuta_image_dir)
dist_cvs_plugin_pixmaps_DATA = \
anjuta-cvs-plugin.svg \
diff --git a/plugins/debug-manager/Makefile.am b/plugins/debug-manager/Makefile.am
index 751d63a..abe048f 100644
--- a/plugins/debug-manager/Makefile.am
+++ b/plugins/debug-manager/Makefile.am
@@ -21,6 +21,9 @@ AM_CPPFLAGS= \
$(GIO_CFLAGS) \
$(LIBANJUTA_CFLAGS)
+AM_CFLAGS += \
+ -Wno-error=format-nonliteral
+
plugindir = $(anjuta_plugin_dir)
plugin_LTLIBRARIES = libanjuta-debug-manager.la
diff --git a/plugins/file-manager/Makefile.am b/plugins/file-manager/Makefile.am
index 1d86aeb..eecb6f5 100644
--- a/plugins/file-manager/Makefile.am
+++ b/plugins/file-manager/Makefile.am
@@ -33,6 +33,9 @@ AM_CPPFLAGS = \
$(GDL_CFLAGS) \
$(GIO_CFLAGS)
+AM_CFLAGS += \
+ -Wno-error=format-y2k
+
# Where to install the plugin
plugindir = $(anjuta_plugin_dir)
diff --git a/plugins/git/Makefile.am b/plugins/git/Makefile.am
index 21889d0..45ab84c 100644
--- a/plugins/git/Makefile.am
+++ b/plugins/git/Makefile.am
@@ -29,6 +29,9 @@ AM_CPPFLAGS = \
$(DEPRECATED_FLAGS) \
$(LIBANJUTA_CFLAGS)
+AM_CFLAGS += \
+ -Wno-error=format-nonliteral
+
# Where to install the plugin
plugindir = $(anjuta_plugin_dir)
--
cgit v0.12
From a10b1b33ee89de8c86dc56f5b7a88c452ea246ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= <seb.sfo@free.fr>
Date: Sat, 3 Jun 2017 13:52:24 +0200
Subject: gdb: bgo #783380 Unable to debug executable compiled with -pie option
---
plugins/gdb/anjuta-gdb.plugin.in | 2 +-
plugins/gdb/plugin.c | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/plugins/gdb/anjuta-gdb.plugin.in b/plugins/gdb/anjuta-gdb.plugin.in
index fb90b69..782c202 100644
--- a/plugins/gdb/anjuta-gdb.plugin.in
+++ b/plugins/gdb/anjuta-gdb.plugin.in
@@ -7,4 +7,4 @@ UserActivatable=yes
Interfaces=IAnjutaDebugger
[File Loader]
-SupportedMimeTypes=application/x-executable,application/octet-stream,application/x-core,application/x-shellscript
+SupportedMimeTypes=application/x-executable,application/octet-stream,application/x-core,application/x-shellscript,application/x-sharedlib
diff --git a/plugins/gdb/plugin.c b/plugins/gdb/plugin.c
index 526ec40..396000c 100644
--- a/plugins/gdb/plugin.c
+++ b/plugins/gdb/plugin.c
@@ -429,6 +429,7 @@ idebugger_load (IAnjutaDebugger *plugin, const gchar *file, const gchar* mime_ty
/* Hope that the target is supported */
}
else if ((strcmp (mime_type, "application/x-executable") == 0) ||
+ (strcmp (mime_type, "application/x-sharedlib") == 0) ||
(strcmp (mime_type, "application/octet-stream") == 0))
{
/* Supported target */
--
cgit v0.12

View File

@ -1,13 +0,0 @@
Index: anjuta-3.20.0/configure.ac
===================================================================
--- anjuta-3.20.0.orig/configure.ac
+++ anjuta-3.20.0/configure.ac
@@ -329,7 +329,7 @@ if test "$user_disabled_vala" = 1; then
else
AC_MSG_RESULT(no)
AC_MSG_CHECKING(if libvala is available)
- m4_foreach([VERSION], [[0.18], [0.20], [0.22], [0.24], [0.26], [0.28], [0.30], [0.32]],
+ m4_foreach([VERSION], [[0.18], [0.20], [0.22], [0.24], [0.26], [0.28], [0.30], [0.32], [0.34], [0.36]],
[PKG_CHECK_EXISTS([ libvala-VERSION ],
[ valaver="-VERSION" ])
])

View File

@ -1,3 +1,68 @@
-------------------------------------------------------------------
Sun Sep 10 21:30:24 UTC 2017 - zaitor@opensuse.org
- Update to version 3.26.0:
+ Remove some untracked files from git status (bgo#787473).
+ Language-support-vala fails to build with vala 0.38
(bgo#786973).
+ Updated translations.
- Stop passing --disable-vala to configure, bug fixed upstream.
-------------------------------------------------------------------
Fri Sep 8 22:15:22 UTC 2017 - jengelh@inai.de
- Trim descriptions in secondary packages, and update summaries.
Do not run fdupes across hardlink boundaries.
-------------------------------------------------------------------
Wed Aug 30 09:37:07 UTC 2017 - dimstar@opensuse.org
- Pass --disable-vala to configure until bgo#786973 is resolved.
-------------------------------------------------------------------
Sun Aug 20 19:07:28 UTC 2017 - zaitor@opensuse.org
- Update to version 3.25.91:
+ bgo#782633: Scintilla editor occupies 100% of a core after
switching tabs.
+ bgo#782452: Using #!/usr/bin/perl in scripts is not portable.
+ Avoid errors with recent version of gcc.
+ gdb: bgo#783380: Unable to debug executable compiled with -pie
option.
+ bgo#770822: "Search for example code" points to discontinued
webpage
+ bgo#763115: Anjuta builds are not reproducible.
+ Fix some compiler warnings.
+ Fix warning misleading-indentation.
+ Remove obsolete CSS properties.
+ Remove deprecated flags.
+ Fix some run time critical warnings.
+ Avoid an endless loop when updating a project.
+ Fix another crash when updating project files.
+ bgo#786309: segfault when shm support is missing.
+ gtksourceview: Ignore changes that happen during a save.
+ symbol-db: add support for libgda-6.0.
+ Support reproducible builds.
+ manuals: Remove extra - symbols before =.
+ Allow building with vala 0.36 and 0.38.
+ bgo#771625: needs support for vala 0.34.
+ Fix callback generation when user_data is set on glade.
+ Fix translator comments.
+ Updated translations.
- Conditionally apply translations-update-upstream BuildRequires
and macro for non-openSUSE only.
- Drop anjuta-vala-0.34.patch and anjuta-fix-gcc7-build.patch:
Fixed upstream, following this, drop gnome-common BuildRequires:
and autogen.sh call, no longer needed.
-------------------------------------------------------------------
Thu Jul 20 18:50:52 UTC 2017 - zaitor@opensuse.org
- Build with vala 0.38:
+ Replace pkgconfig(libvala-0.36) BuildRequires with
pkgconfig(libvala-0.38).
+ Extend anjuta-vala-0.34.patch: add support for vala 0.38.
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jun 3 19:31:17 UTC 2017 - zaitor@opensuse.org Sat Jun 3 19:31:17 UTC 2017 - zaitor@opensuse.org
@ -6,8 +71,8 @@ Sat Jun 3 19:31:17 UTC 2017 - zaitor@opensuse.org
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 25 08:22:17 UTC 2016 - dimstar@opensuse.org Fri Nov 25 08:22:17 UTC 2016 - dimstar@opensuse.org
- Build wit vala 0.36: - Build with vala 0.36:
+ place pkgconfig(libvala-0.34) BuildRequires with + Replace pkgconfig(libvala-0.34) BuildRequires with
pkgconfig(libvala-0.36). pkgconfig(libvala-0.36).
+ Extend anjuta-vala-0.34.patch: add support for vala 0.36. + Extend anjuta-vala-0.34.patch: add support for vala 0.36.

View File

@ -17,41 +17,33 @@
Name: anjuta Name: anjuta
Version: 3.22.0 Version: 3.26.0
Release: 0 Release: 0
Summary: Versatile Integrated Development Environment for GNOME Summary: Versatile Integrated Development Environment for GNOME
License: GPL-2.0+ License: GPL-2.0+
Group: Development/Tools/IDE Group: Development/Tools/IDE
Url: https://wiki.gnome.org/Apps/Anjuta Url: https://wiki.gnome.org/Apps/Anjuta
Source0: http://download.gnome.org/sources/anjuta/3.22/%{name}-%{version}.tar.xz Source0: http://download.gnome.org/sources/anjuta/3.26/%{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc Source99: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM anjuta-vala-0.34.patch dimstar@opensuse.org -- Enable building with vala 0.34 and 0.36
Patch0: anjuta-vala-0.34.patch
# PATCH-FIX-UPSTREAM anjuta-fix-gcc7-build.patch zaitor@opensuse.org -- Fix build with gcc7
Patch1: anjuta-fix-gcc7-build.patch
BuildRequires: autogen BuildRequires: autogen
BuildRequires: binutils-devel BuildRequires: binutils-devel
BuildRequires: bison BuildRequires: bison
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: flex BuildRequires: flex
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: gnome-common
BuildRequires: gobject-introspection-devel BuildRequires: gobject-introspection-devel
BuildRequires: intltool BuildRequires: intltool
BuildRequires: libapr-util1-devel BuildRequires: libapr-util1-devel
BuildRequires: libapr1-devel BuildRequires: libapr1-devel
BuildRequires: libxslt-devel BuildRequires: libxslt-devel
BuildRequires: perl-gettext BuildRequires: perl-gettext
BuildRequires: pkgconfig
BuildRequires: shared-mime-info BuildRequires: shared-mime-info
BuildRequires: sqlite3-devel BuildRequires: sqlite3-devel
BuildRequires: subversion-devel BuildRequires: subversion-devel
BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: vala BuildRequires: vala
BuildRequires: yelp-tools BuildRequires: yelp-tools
%ifnarch ia64 s390 s390x aarch64 ppc64le
BuildRequires: valgrind-devel
%endif
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.0.0 BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.0.0
BuildRequires: pkgconfig(gdl-3.0) >= 3.5.5 BuildRequires: pkgconfig(gdl-3.0) >= 3.5.5
BuildRequires: pkgconfig(gladeui-2.0) >= 3.12.0 BuildRequires: pkgconfig(gladeui-2.0) >= 3.12.0
@ -61,7 +53,7 @@ BuildRequires: pkgconfig(gtksourceview-3.0) >= 3.0.0
BuildRequires: pkgconfig(libdevhelp-3.0) >= 3.7.5 BuildRequires: pkgconfig(libdevhelp-3.0) >= 3.7.5
BuildRequires: pkgconfig(libgda-5.0) >= 5.0.0 BuildRequires: pkgconfig(libgda-5.0) >= 5.0.0
BuildRequires: pkgconfig(libgvc) BuildRequires: pkgconfig(libgvc)
BuildRequires: pkgconfig(libvala-0.36) BuildRequires: pkgconfig(libvala-0.38)
BuildRequires: pkgconfig(libxml-2.0) >= 2.4.23 BuildRequires: pkgconfig(libxml-2.0) >= 2.4.23
BuildRequires: pkgconfig(serf-1) BuildRequires: pkgconfig(serf-1)
BuildRequires: pkgconfig(vte-2.91) BuildRequires: pkgconfig(vte-2.91)
@ -70,12 +62,17 @@ Requires: autoconf
Requires: autogen Requires: autogen
Requires: automake Requires: automake
Requires: gettext Requires: gettext
Requires: libtool
# libgda-sqlite is needed by the symbol-db plugin. See bnc#624924. # libgda-sqlite is needed by the symbol-db plugin. See bnc#624924.
Requires: libgda-sqlite Requires: libgda-sqlite
Requires: libtool
Recommends: %{name}-lang Recommends: %{name}-lang
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%glib2_gsettings_schema_requires %glib2_gsettings_schema_requires
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
%ifnarch ia64 s390 s390x aarch64 ppc64le
BuildRequires: valgrind-devel
%endif
%description %description
Anjuta is a versatile Integrated Development Environment (IDE) for the Anjuta is a versatile Integrated Development Environment (IDE) for the
@ -87,36 +84,26 @@ profiler, a class generator, a powerful source editor, source browsing,
and more. and more.
%package -n libanjuta-3-0 %package -n libanjuta-3-0
Summary: Libraries for developing Anjuta plugins Summary: Library for developing Anjuta plugins
Group: System/Libraries Group: System/Libraries
%description -n libanjuta-3-0 %description -n libanjuta-3-0
Anjuta is a versatile Integrated Development Environment (IDE) for the Anjuta is a versatile Integrated Development Environment (IDE) for the
GNOME desktop. It features a number of advanced programming facilities GNOME desktop.
includes project management, application wizards, an interactive
debugger, an integrated Glade UI designer, integrated Devhelp API help,
an integrated Valgrind memory profiler, an integrated gprof performance
profiler, a class generator, a powerful source editor, source browsing,
and more.
%package -n typelib-1_0-Anjuta-3_0 %package -n typelib-1_0-Anjuta-3_0
Summary: Libraries for developing Anjuta plugins -- Introspection bindings Summary: Introspection bindings for the Anjuta plugin library
Group: System/Libraries Group: System/Libraries
%description -n typelib-1_0-Anjuta-3_0 %description -n typelib-1_0-Anjuta-3_0
Anjuta is a versatile Integrated Development Environment (IDE) for the Anjuta is a versatile Integrated Development Environment (IDE) for the
GNOME desktop. It features a number of advanced programming facilities GNOME desktop.
includes project management, application wizards, an interactive
debugger, an integrated Glade UI designer, integrated Devhelp API help,
an integrated Valgrind memory profiler, an integrated gprof performance
profiler, a class generator, a powerful source editor, source browsing,
and more.
This package provides the GObject Introspection bindings for the Anjuta This package provides the GObject Introspection bindings for the Anjuta
library to develop plugins. library to develop plugins.
%package -n glade-catalog-anjuta %package -n glade-catalog-anjuta
Summary: Versatile Integrated Development Environment for GNOME -- Catalog for Glade Summary: Glade catalog for Anjuta
Group: Development/Tools/GUI Builders Group: Development/Tools/GUI Builders
Requires: %{name} = %{version} Requires: %{name} = %{version}
Requires: glade Requires: glade
@ -124,19 +111,14 @@ Supplements: packageand(glade:%{name}-devel)
%description -n glade-catalog-anjuta %description -n glade-catalog-anjuta
Anjuta is a versatile Integrated Development Environment (IDE) for the Anjuta is a versatile Integrated Development Environment (IDE) for the
GNOME desktop. It features a number of advanced programming facilities GNOME desktop.
includes project management, application wizards, an interactive
debugger, an integrated Glade UI designer, integrated Devhelp API help,
an integrated Valgrind memory profiler, an integrated gprof performance
profiler, a class generator, a powerful source editor, source browsing,
and more.
This package provides a catalog for Glade, to allow the use the Anjuta This package provides a catalog for Glade, to allow the use the Anjuta
widgets in Glade. widgets in Glade.
%package devel %package devel
Summary: Libraries for developing Anjuta plugins -- Development Files Summary: Development files for Anjuta plugins
Group: Development/Tools/IDE Group: Development/Libraries/C and C++
Requires: libanjuta-3-0 = %{version} Requires: libanjuta-3-0 = %{version}
Requires: typelib-1_0-Anjuta-3_0 = %{version} Requires: typelib-1_0-Anjuta-3_0 = %{version}
Provides: %{name}-doc = %{version} Provides: %{name}-doc = %{version}
@ -144,25 +126,21 @@ Obsoletes: %{name}-doc < %{version}
%description devel %description devel
Anjuta is a versatile Integrated Development Environment (IDE) for the Anjuta is a versatile Integrated Development Environment (IDE) for the
GNOME desktop. It features a number of advanced programming facilities GNOME desktop.
includes project management, application wizards, an interactive
debugger, an integrated Glade UI designer, integrated Devhelp API help,
an integrated Valgrind memory profiler, an integrated gprof performance
profiler, a class generator, a powerful source editor, source browsing,
and more.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1 %if !0%{?is_opensuse}
%patch1 -p1
translation-update-upstream translation-update-upstream
%endif
%build %build
NOCONFIGURE=1 ./autogen.sh
%configure\ %configure\
--disable-static \ --disable-static \
--enable-glade-catalog --enable-glade-catalog \
%{nil}
make %{?_smp_mflags} V=1 make %{?_smp_mflags} V=1
%install %install
@ -178,7 +156,7 @@ rm -r %{buildroot}%{_datadir}/doc
#%%find_lang anjuta-faqs %{?no_lang_C} anjuta.lang #%%find_lang anjuta-faqs %{?no_lang_C} anjuta.lang
%find_lang anjuta-manual %{?no_lang_C} anjuta.lang %find_lang anjuta-manual %{?no_lang_C} anjuta.lang
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
%fdupes %{buildroot} %fdupes %{buildroot}/%{_prefix}
%post %post
%glib2_gsettings_schema_post %glib2_gsettings_schema_post
@ -194,11 +172,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
%icon_theme_cache_postun HighContrast %icon_theme_cache_postun HighContrast
%mime_database_postun %mime_database_postun
%post -n libanjuta-3-0 %post -n libanjuta-3-0 -p /sbin/ldconfig
/sbin/ldconfig
%postun -n libanjuta-3-0 %postun -n libanjuta-3-0 -p /sbin/ldconfig
/sbin/ldconfig
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -222,7 +198,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_datadir}/icons/hicolor/scalable/apps/*.svg %{_datadir}/icons/hicolor/scalable/apps/*.svg
%{_datadir}/icons/hicolor/scalable/mimetypes/*.svg %{_datadir}/icons/hicolor/scalable/mimetypes/*.svg
%{_datadir}/icons/hicolor/symbolic/apps/anjuta-symbolic.svg %{_datadir}/icons/hicolor/symbolic/apps/anjuta-symbolic.svg
%doc %{_mandir}/man?/*.* %{_mandir}/man?/*.*
%files -n libanjuta-3-0 %files -n libanjuta-3-0
%defattr(-, root, root) %defattr(-, root, root)