diff --git a/geary-0.13-libunwind-opt-out.patch b/geary-0.13-libunwind-opt-out.patch deleted file mode 100644 index 1af7350..0000000 --- a/geary-0.13-libunwind-opt-out.patch +++ /dev/null @@ -1,152 +0,0 @@ -From 7037d0aa6215c70c8652d7b46178e46bbe275264 Mon Sep 17 00:00:00 2001 -From: Thomas Moschny -Date: Sun, 17 Feb 2019 17:56:46 +0100 -Subject: [PATCH] Allow to opt-out from using libunwind. - ---- - meson.build | 33 +++++++++++++------------ - meson_options.txt | 1 + - src/engine/meson.build | 11 ++++++++- - src/engine/util/util-error-context.vala | 4 +++ - 4 files changed, 32 insertions(+), 17 deletions(-) - -diff --git a/meson.build b/meson.build -index b2d0752f..c6da9f66 100644 ---- a/meson.build -+++ b/meson.build -@@ -1,7 +1,7 @@ - project('geary', [ 'vala', 'c' ], - version: '0.13.0', - license: 'LGPL2.1+', -- meson_version: '>= 0.43', -+ meson_version: '>= 0.47', - ) - - gnome = import('gnome') -@@ -70,8 +70,8 @@ libmath = cc.find_library('m') - libnotify = dependency('libnotify', version: '>= 0.7.5') - libsecret = dependency('libsecret-1', version: '>= 0.11') - libsoup = dependency('libsoup-2.4', version: '>= 2.48') --libunwind_dep = dependency('libunwind', version: '>= 1.1') --libunwind_generic_dep = dependency('libunwind-generic', version: '>= 1.1') -+libunwind_dep = dependency('libunwind', version: '>= 1.1', required: get_option('libunwind')) -+libunwind_generic_dep = dependency('libunwind-generic', version: '>= 1.1', required: get_option('libunwind')) - libxml = dependency('libxml-2.0', version: '>= 2.7.8') - posix = valac.find_library('posix') - webkit2gtk_web_extension = dependency('webkit2gtk-web-extension-4.0', version: '>=' + target_webkit) -@@ -81,19 +81,20 @@ if not enchant.found() - enchant = dependency('enchant', version: '>=1.6') - endif - -- --# Libunwind system dependencies above ensures appropriate versions, --# but this declared depencency is what we actually build against so we --# can include the custom VAPI correctly. We need to add unwind_lib to --# the search path for these so Flatpak builds can find the C lib. --unwind_lib = libunwind_dep.get_pkgconfig_variable('libdir') --libunwind = declare_dependency( -- dependencies: [ -- valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]), -- cc.find_library('libunwind', dirs: unwind_lib), -- cc.find_library('libunwind-generic', dirs: unwind_lib) -- ], -- ) -+if libunwind_dep.found() -+ # Libunwind system dependencies above ensures appropriate versions, -+ # but this declared depencency is what we actually build against so we -+ # can include the custom VAPI correctly. We need to add unwind_lib to -+ # the search path for these so Flatpak builds can find the C lib. -+ unwind_lib = libunwind_dep.get_pkgconfig_variable('libdir') -+ libunwind = declare_dependency( -+ dependencies: [ -+ valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]), -+ cc.find_library('libunwind', dirs: unwind_lib), -+ cc.find_library('libunwind-generic', dirs: unwind_lib) -+ ], -+ ) -+endif - - # Optional libraries - libunity = dependency('unity', version: '>= 5.12.0', required: false) -diff --git a/meson_options.txt b/meson_options.txt -index 234e979d..f29b0f0c 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -4,3 +4,4 @@ option('poodle', type: 'boolean', value: true, description: 'Whether to apply th - option('ref_tracking', type: 'boolean', value: false, description: 'Whether to use explicit reference tracking.') - option('iso_639_xml', type: 'string', value: '', description: 'Full path to the ISO 639 XML file.') - option('iso_3166_xml', type: 'string', value: '', description: 'Full path to the ISO 3166 XML file.') -+option('libunwind', type: 'feature', value: 'enabled', description: 'Whether to use libunwind.') -diff --git a/src/engine/meson.build b/src/engine/meson.build -index f9fb1626..3f5bfad9 100644 ---- a/src/engine/meson.build -+++ b/src/engine/meson.build -@@ -332,12 +332,15 @@ geary_engine_dependencies = [ - glib, - gmime, - javascriptcoregtk, -- libunwind, - libxml, - posix, - sqlite - ] - -+if libunwind_dep.found() -+ geary_engine_dependencies += libunwind -+endif -+ - build_dir = meson.current_build_dir() - - # Generate internal VAPI for unit testing. See Meson issue -@@ -349,6 +352,12 @@ geary_engine_vala_options += [ - '--internal-vapi=@0@/geary-engine-internal.vapi'.format(build_dir) - ] - -+if libunwind_dep.found() -+ geary_engine_vala_options += [ -+ '-D', 'HAVE_LIBUNWIND', -+ ] -+endif -+ - geary_engine_lib = static_library('geary-engine', - geary_engine_sources, - dependencies: geary_engine_dependencies, -diff --git a/src/engine/util/util-error-context.vala b/src/engine/util/util-error-context.vala -index 81cfcb8b..b4f3008f 100644 ---- a/src/engine/util/util-error-context.vala -+++ b/src/engine/util/util-error-context.vala -@@ -28,6 +28,7 @@ public class Geary.ErrorContext : BaseObject { - public string name = "unknown"; - - -+#if HAVE_LIBUNWIND - internal StackFrame(Unwind.Cursor frame) { - uint8 proc_name[256]; - int ret = -frame.get_proc_name(proc_name); -@@ -36,6 +37,7 @@ public class Geary.ErrorContext : BaseObject { - this.name = (string) proc_name; - } - } -+#endif - - public string to_string() { - return this.name; -@@ -56,6 +58,7 @@ public class Geary.ErrorContext : BaseObject { - public ErrorContext(GLib.Error thrown) { - this.thrown = thrown; - -+#if HAVE_LIBUNWIND - Unwind.Context trace = Unwind.Context(); - Unwind.Cursor cursor = Unwind.Cursor.local(trace); - -@@ -64,6 +67,7 @@ public class Geary.ErrorContext : BaseObject { - while (cursor.step() != 0) { - this.backtrace.add(new StackFrame(cursor)); - } -+#endif - } - - /** Returns a string representation of the error type, for debugging. */ --- -2.20.1 - diff --git a/geary.spec b/geary.spec index 723c608..841aa22 100644 --- a/geary.spec +++ b/geary.spec @@ -5,8 +5,8 @@ %endif Name: geary -Version: 0.13.0 -Release: 2%{?dist} +Version: 0.13.1 +Release: 1%{?dist} Summary: A lightweight email program designed around conversations # Geary is under LGPLv2+. # SQLite3-unicodesn code is in the Public Domain. @@ -16,7 +16,7 @@ Summary: A lightweight email program designed around conversations License: LGPLv2+ and BSD and CC-BY and CC-BY-SA and Public Domain URL: https://wiki.gnome.org/Apps/Geary Source0: https://download.gnome.org/sources/geary/0.13/%{name}-%{version}.tar.xz -Patch0: geary-0.13-libunwind-opt-out.patch + BuildRequires: meson >= 0.43 BuildRequires: vala >= 0.26.0 # primary deps @@ -76,8 +76,8 @@ all kinds of nifty features in a modular way. %build %meson \ - %{?with_libunwind:-Dlibunwind=enabled} \ - %{!?with_libunwind:-Dlibunwind=disabled} + %{?with_libunwind:-Dlibunwind_optional=false} \ + %{!?with_libunwind:-Dlibunwind_optional=true} %meson_build %install @@ -113,6 +113,9 @@ desktop-file-validate \ %changelog +* Thu Feb 21 2019 Kalev Lember - 0.13.1-1 +- Update to 0.13.1 + * Mon Feb 18 2019 Thomas Moschny - 0.13.0-2 - Add patch to make dependency on libunwind optional. diff --git a/sources b/sources index 852766b..bf1dd5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (geary-0.13.0.tar.xz) = e2be71c30795e924244e2479ff5f6291a907bf47f53061383d7039e574383f3b4fbd7c6670bdc1c45ad70dad9c8d165531791ad03deb87d442a0bff33986d038 +SHA512 (geary-0.13.1.tar.xz) = 725055c6dcabbe7f8cff1d1be4ac43bac28c1bce23aaf20115d44cefbd238143cf3cb1178a5d92650d05d10d798a5d2c6446ec28b691eff50b5c107eb531bc98