From c9a72aea0e242c2f487a592bc03a1bc104eeeec3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 7 Jun 2017 13:34:52 +0000 Subject: [PATCH] Accepting request 500881 from GNOME:Next Fix build with gcc7 OBS-URL: https://build.opensuse.org/request/show/500881 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=197 --- anjuta-fix-gcc7-build.patch | 122 ++++++++++++++++++++++++++++++++++++ anjuta.changes | 5 ++ anjuta.spec | 5 +- 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 anjuta-fix-gcc7-build.patch diff --git a/anjuta-fix-gcc7-build.patch b/anjuta-fix-gcc7-build.patch new file mode 100644 index 0000000..808c68a --- /dev/null +++ b/anjuta-fix-gcc7-build.patch @@ -0,0 +1,122 @@ +From ae460ed1c2512875032a641dbe157b7a7144c09b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?S=C3=A9bastien=20Granjoux?= +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?= +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 + diff --git a/anjuta.changes b/anjuta.changes index ebcf954..4a0b9f7 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Jun 3 19:31:17 UTC 2017 - zaitor@opensuse.org + +- Add anjuta-fix-gcc7-build.patch: Fix build with gcc7. + ------------------------------------------------------------------- Fri Nov 25 08:22:17 UTC 2016 - dimstar@opensuse.org diff --git a/anjuta.spec b/anjuta.spec index 1567ead..52a4a7f 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,7 +1,7 @@ # # spec file for package anjuta # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,6 +27,8 @@ Source0: http://download.gnome.org/sources/anjuta/3.22/%{name}-%{version} 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: binutils-devel BuildRequires: bison @@ -153,6 +155,7 @@ and more. %prep %setup -q %patch0 -p1 +%patch1 -p1 translation-update-upstream %build