From a90255422693df7af6914218f06a65f40f7e286a Mon Sep 17 00:00:00 2001 From: David King Date: Fri, 3 Mar 2023 07:04:41 +0000 Subject: [PATCH] Update to 0.1.1 (#2175053) --- .gitignore | 1 + libdex-0.1.0-doc-dir.patch | 31 ---------- libdex-0.1.0-soversion.patch | 112 ----------------------------------- libdex.spec | 9 +-- sources | 2 +- 5 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 libdex-0.1.0-doc-dir.patch delete mode 100644 libdex-0.1.0-soversion.patch diff --git a/.gitignore b/.gitignore index cb4e0bb..ab340bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /libdex-0.1.0.tar.xz +/libdex-0.1.1.tar.xz diff --git a/libdex-0.1.0-doc-dir.patch b/libdex-0.1.0-doc-dir.patch deleted file mode 100644 index cfcc9f7..0000000 --- a/libdex-0.1.0-doc-dir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f810f6175c0171f29e9c23ab4454c5a437b0bef8 Mon Sep 17 00:00:00 2001 -From: Christian Hergert -Date: Mon, 23 Jan 2023 15:15:35 -0800 -Subject: [PATCH] build: place docs in docdir/libdex-1 - ---- - docs/meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/docs/meson.build b/docs/meson.build -index 5d2104a..1999e68 100644 ---- a/docs/meson.build -+++ b/docs/meson.build -@@ -23,12 +23,12 @@ source_toml = configure_file( - output: 'Dex.toml', - configuration: toml_conf, - install: true, -- install_dir: docs_dir / 'dex', -+ install_dir: docs_dir / 'libdex-@0@'.format(api_version), - ) - - custom_target('dex-doc', - input: [ source_toml, libdex_gir[0] ], -- output: 'dex', -+ output: 'libdex-@0@'.format(api_version), - command: [ - gidocgen, - 'generate', --- -GitLab - diff --git a/libdex-0.1.0-soversion.patch b/libdex-0.1.0-soversion.patch deleted file mode 100644 index dd10bd0..0000000 --- a/libdex-0.1.0-soversion.patch +++ /dev/null @@ -1,112 +0,0 @@ -From bb93ebb64f2d468819c7bb3732f25f40dbcdb4af Mon Sep 17 00:00:00 2001 -From: Christian Hergert -Date: Tue, 21 Feb 2023 11:54:03 -0800 -Subject: [PATCH] build: fix library versioning - -This also undoes some of the build cleanups that were done previously -because they were too difficult for me to unwrap and see exactly how -settings are getting inherited. - -Fixes #3 ---- - meson.build | 3 --- - src/meson.build | 41 ++++++++++++++++++++--------------------- - 2 files changed, 20 insertions(+), 24 deletions(-) - -diff --git a/meson.build b/meson.build -index 94e60b9..3b83b00 100644 ---- a/meson.build -+++ b/meson.build -@@ -126,7 +126,6 @@ endforeach - add_project_arguments(project_c_args, language: 'c') - - # Detect and set symbol visibility --hidden_visibility_args = [] - if get_option('default_library') != 'static' - if host_machine.system() == 'windows' - config_h.set('DLL_EXPORT', true) -@@ -134,11 +133,9 @@ if get_option('default_library') != 'static' - config_h.set('_DEX_EXTERN', '__declspec(dllexport) extern') - elif cc.has_argument('-fvisibility=hidden') - config_h.set('_DEX_EXTERN', '__attribute__((visibility("default"))) __declspec(dllexport) extern') -- hidden_visibility_args = ['-fvisibility=hidden'] - endif - elif cc.has_argument('-fvisibility=hidden') - config_h.set('_DEX_EXTERN', '__attribute__((visibility("default"))) extern') -- hidden_visibility_args = ['-fvisibility=hidden'] - endif - endif - -diff --git a/src/meson.build b/src/meson.build -index 3f0fd8a..04f6e29 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -117,26 +117,31 @@ endif - - libdex_c_args = [ - deprecated_c_args, -- hidden_visibility_args, -+ release_args, - '-DG_LOG_DOMAIN="Dex"', - '-DDEX_COMPILATION', - ] - --libdex = library('dex-@0@'.format(api_version), libdex_sources, -- dependencies: libdex_deps, -- c_args: libdex_c_args, -- install: true, -+libdex_static = static_library('dex-@0@'.format(api_version), libdex_sources, -+ dependencies: libdex_deps, -+ gnu_symbol_visibility: 'hidden', -+ c_args: libdex_c_args, - ) - --if get_option('default_library') == 'shared' -- libdex_static = static_library('dex-@0@'.format(api_version), -- objects: libdex.extract_all_objects(recursive: true), -- ) --elif get_option('default_library') == 'static' -- libdex_static = libdex --elif get_option('default_library') == 'both' -- libdex_static = libdex.get_static_lib() --endif -+libdex_static_dep = declare_dependency( -+ link_whole: libdex_static, -+ include_directories: include_directories('.'), -+ dependencies: libdex_deps, -+) -+ -+libdex = shared_library('dex-@0@'.format(api_version), -+ dependencies: libdex_deps + [libdex_static_dep], -+ c_args: libdex_c_args, -+ install: true, -+ gnu_symbol_visibility: 'hidden', -+ version: '@0@.0.0'.format(api_version), -+ darwin_versions: '1.0', -+) - - libdex_dep_sources = [] - -@@ -152,7 +157,7 @@ pkg.generate( - ) - - if get_option('introspection').enabled() -- libdex_gir = gnome.generate_gir(libdex, -+ libdex_gir = gnome.generate_gir(libdex_static, - sources: [libdex_sources, libdex_headers], - nsversion: api_version, - namespace: 'Dex', -@@ -185,10 +190,4 @@ libdex_dep = declare_dependency( - sources: [libdex_dep_sources], - ) - --libdex_static_dep = declare_dependency( -- link_whole: libdex_static, -- include_directories: include_directories('.'), -- dependencies: libdex_deps, --) -- - meson.override_dependency('libdex-' + api_version, libdex_dep) --- -GitLab - diff --git a/libdex.spec b/libdex.spec index 73ac053..ebd8de5 100644 --- a/libdex.spec +++ b/libdex.spec @@ -1,14 +1,11 @@ Name: libdex -Version: 0.1.0 +Version: 0.1.1 Release: %autorelease Summary: a library supporting "Deferred Execution" for GNOME and GTK License: LGPL-2.1-or-later -URL: https://gitlab.gnome.org/chergert/libdex -Source0: https://gitlab.gnome.org/chergert/libdex/uploads/8894d387768d3b8375b5d1121988c35a/%{name}-%{version}.tar.xz -Patch0: libdex-0.1.0-doc-dir.patch -# https://gitlab.gnome.org/chergert/libdex/-/issues/3 -Patch1: libdex-0.1.0-soversion.patch +URL: https://gitlab.gnome.org/GNOME/libdex +Source0: https://download.gnome.org/sources/libdex/0.1/%{name}-%{version}.tar.xz BuildRequires: /usr/bin/vapigen BuildRequires: gcc diff --git a/sources b/sources index 2e915c8..38bc87f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libdex-0.1.0.tar.xz) = 22c983a01eb838de6ee137a46a1aea54758a069e818a17ae097f58367c5184066cabc5a5a9392c61945ef4484a6bde5753425627b8a03a401e3e656d7dd7c95d +SHA512 (libdex-0.1.1.tar.xz) = 9deb48ce635c5b179db37f063184adf56cccdd10fece8c1c8c9fe7125034f2f48ebce54eb7b58c52884991eabe9ed0121a11839254ec9bcc492c842f2f68741c