From 7396d67859f152a9c4f79c25648f1f709cac0f7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Sat, 7 Nov 2015 22:03:20 +0000 Subject: [PATCH] Accepting request 342943 from home:badshah400:branches:GNOME:Factory UpdaTE TO VERSION 3.18.2 OBS-URL: https://build.opensuse.org/request/show/342943 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/anjuta?expand=0&rev=188 --- anjuta-3.18.0.tar.xz | 3 --- anjuta-3.18.2.tar.xz | 3 +++ anjuta-file-deleted-upon-save.patch | 37 ----------------------------- anjuta.changes | 9 +++++++ anjuta.spec | 7 ++---- 5 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 anjuta-3.18.0.tar.xz create mode 100644 anjuta-3.18.2.tar.xz delete mode 100644 anjuta-file-deleted-upon-save.patch diff --git a/anjuta-3.18.0.tar.xz b/anjuta-3.18.0.tar.xz deleted file mode 100644 index c2d254b..0000000 --- a/anjuta-3.18.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a3fec0963f04bc62a9dfb951e577a3276d39c3414083ef73163c3fea8e741ba -size 6359696 diff --git a/anjuta-3.18.2.tar.xz b/anjuta-3.18.2.tar.xz new file mode 100644 index 0000000..96cd401 --- /dev/null +++ b/anjuta-3.18.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:be864f2f1807e1b870697f646294e997d221d5984a135245543b719e501cef8e +size 6356972 diff --git a/anjuta-file-deleted-upon-save.patch b/anjuta-file-deleted-upon-save.patch deleted file mode 100644 index bbec11d..0000000 --- a/anjuta-file-deleted-upon-save.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e4b3dcce7086709c80cd159960f3a4433c054182 Mon Sep 17 00:00:00 2001 -From: Yannick Inizan -Date: Sun, 25 Oct 2015 14:45:32 +0100 -Subject: sourceview: bgo #756426 - Anjuta show "The file ... has been deleted - on the disk" everytime I save file - -SourceviewIO - Only emit "deleted" if monitored file isn't temporary. ---- - plugins/sourceview/sourceview-io.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/plugins/sourceview/sourceview-io.c b/plugins/sourceview/sourceview-io.c -index ec93bc1..323e5d7 100644 ---- a/plugins/sourceview/sourceview-io.c -+++ b/plugins/sourceview/sourceview-io.c -@@ -196,8 +196,18 @@ static void on_file_changed (GFileMonitor* monitor, - break; - } - case G_FILE_MONITOR_EVENT_DELETED: -- g_signal_emit_by_name (sio, "deleted"); -+ { -+ gchar* filename = NULL; -+ -+ if (G_IS_FILE (file)) -+ filename = g_file_get_basename (file); -+ /* Only emit "deleted" if monitored file isn't temporary */ -+ if (filename != NULL && !g_str_has_prefix (filename, ".goutputstream-")) -+ g_signal_emit_by_name (sio, "deleted"); -+ -+ g_free (filename); - break; -+ } - default: - break; - } --- -cgit v0.11.2 diff --git a/anjuta.changes b/anjuta.changes index a0e3720..661320f 100644 --- a/anjuta.changes +++ b/anjuta.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Nov 7 21:52:47 UTC 2015 - badshah400@gmail.com + +- Update to version 3.18.2: + + bgo#756426: Anjuta shows "The file ... has been deleted on the + disk" everytime upon file save. + + Updated translations. +- Drop anjuta-file-deleted-upon-save.patch: incorporated upstream. + ------------------------------------------------------------------- Sat Nov 7 11:31:31 UTC 2015 - badshah400@gmail.com diff --git a/anjuta.spec b/anjuta.spec index 17e4461..c00bec3 100644 --- a/anjuta.spec +++ b/anjuta.spec @@ -1,7 +1,7 @@ # # spec file for package anjuta # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: anjuta -Version: 3.18.0 +Version: 3.18.2 Release: 0 Summary: Versatile Integrated Development Environment for GNOME License: GPL-2.0+ @@ -25,8 +25,6 @@ Group: Development/Tools/IDE Url: https://wiki.gnome.org/Apps/Anjuta Source0: http://download.gnome.org/sources/anjuta/3.18/%{name}-%{version}.tar.xz Source99: %{name}-rpmlintrc -# PATCH-FIX-UPSTREAM anjuta-file-deleted-upon-save.patch bgo#756426 badshah400@gmail.com -- Prevent showing "The file ... has been deleted on the disk" everytime on file save -Patch0: anjuta-file-deleted-upon-save.patch BuildRequires: autogen BuildRequires: binutils-devel BuildRequires: bison @@ -151,7 +149,6 @@ and more. %lang_package %prep %setup -q -%patch0 -p1 # HACK to support vala 0.30 sed -i "s:-0.28:-0.30:g" configure translation-update-upstream