From 81e4d4b60ab95a6ed3bea37ea3f757048138f587 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Thu, 26 Jan 2023 11:27:26 -0500 Subject: [PATCH] Add build and test suite fix for single core VMs Related: #2062786 --- ...access-to-resources-in-corelib-build.patch | 147 ++++++++++++++++++ ...ew-fix-decrement-of-negative-numbers.patch | 4 +- gtksourceview4.spec | 11 +- 3 files changed, 158 insertions(+), 4 deletions(-) create mode 100644 0001-build-ensure-access-to-resources-in-corelib-build.patch diff --git a/0001-build-ensure-access-to-resources-in-corelib-build.patch b/0001-build-ensure-access-to-resources-in-corelib-build.patch new file mode 100644 index 0000000..48cebe1 --- /dev/null +++ b/0001-build-ensure-access-to-resources-in-corelib-build.patch @@ -0,0 +1,147 @@ +From fa324fc228691cd2b1aa86dbbde43f37a5dd7758 Mon Sep 17 00:00:00 2001 +From: Christian Hergert +Date: Sun, 7 Mar 2021 08:54:15 -0800 +Subject: [PATCH 1/1] build: ensure access to resources in corelib build + +This should help with some transient build failures in dependent projects. +--- + gtksourceview/meson.build | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/gtksourceview/meson.build b/gtksourceview/meson.build +index fd080a9c..b6192604 100644 +--- a/gtksourceview/meson.build ++++ b/gtksourceview/meson.build +@@ -145,122 +145,123 @@ core_enums_header = ''' + + #if !defined (GTK_SOURCE_H_INSIDE) && !defined (GTK_SOURCE_COMPILATION) + # error "Only can be included directly." + #endif + + #include + ''' + + core_enums = gnome.mkenums_simple('gtksource-enumtypes', + sources: core_public_h, + identifier_prefix: 'GtkSource', + symbol_prefix: 'gtk_source', + header_prefix: core_enums_header, + decorator: 'GTK_SOURCE_ENUM_EXTERN', + install_header: true, + install_dir: join_paths(pkgincludedir, 'gtksourceview'), + ) + + version_h = configuration_data() + version_h.set('GTK_SOURCE_MAJOR_VERSION', version_major) + version_h.set('GTK_SOURCE_MINOR_VERSION', version_minor) + version_h.set('GTK_SOURCE_MICRO_VERSION', version_micro) + + gtksourceversion_h = configure_file( + input: 'gtksourceversion.h.in', + output: 'gtksourceversion.h', + configuration: version_h, + install_dir: join_paths(pkgincludedir, 'gtksourceview'), + ) + ++gtksource_res = gnome.compile_resources( ++ 'gtksourceview-gresources', ++ 'gtksourceview.gresource.xml' ++) ++ + core_sources = [ + core_public_c, + core_private_c, + core_enums, + gtksourceversion_h, + core_marshallers, ++ gtksource_res, + ] + + install_headers( + core_public_h, + install_dir: join_paths(pkgincludedir, 'gtksourceview'), + ) + + core_enums_h = core_enums.get(1) + + # Unfortunately, Visual Studio builds must build the core + # sources twice, once for the GtkSourceView DLL, and once for + # the tests (static core lib), so that we can ensure that + # all the items from the core sources are properly linked into + # the final GtkSourceView DLL and exported from it. + core_lib = static_library(package_string + 'core', core_sources, + include_directories: gtksourceview_include_dirs, + dependencies: core_deps, + c_args: core_c_args, + install: false + ) + + core_dep = declare_dependency( + link_with: core_lib, + include_directories: rootdir, + dependencies: core_deps, + sources: [core_enums_h] + ) + + gtksource_deps = [ + core_dep, + ] + + gtksource_libs = [core_lib] + + extra_public_sources = [] + + subdir('completion-providers') + +-gtksource_res = gnome.compile_resources( +- 'gtksourceview-gresources', +- 'gtksourceview.gresource.xml' +-) +- + + # We can't use the static libs on Visual Studio builds + # to form our DLL here directly, so we must use + # extract_all_objects() to extract all the core and word + # completion provider objects that we previously built + # into static .lib's and link them into the main DLL + # instead + gtksource_objs = [] + foreach int_lib : gtksource_libs + gtksource_objs += int_lib.extract_all_objects() + endforeach + +-gtksource_lib = shared_library(package_string, gtksource_res, ++gtksource_lib = shared_library(package_string, + version: lib_version, + darwin_versions: lib_osx_version, + include_directories: gtksourceview_include_dirs, + dependencies: cc.get_id() == 'msvc' ? core_deps : gtksource_deps, + objects: cc.get_id() == 'msvc' ? gtksource_objs : [], + link_whole: cc.get_id() == 'msvc' ? [] : gtksource_libs, + c_args: core_c_args, + link_args: release_link_args, + install: true, + gnu_symbol_visibility: 'hidden', + ) + + gtksource_dep_sources = [ + core_enums_h, + ] + + if generate_gir + gtksource_gir_sources = [ + core_public_c, + core_public_h, + core_enums_h, + extra_public_sources, + ] + + gtksource_gir = gnome.generate_gir(gtksource_lib, + sources: gtksource_gir_sources, + nsversion: api_version, + namespace: 'GtkSource', + symbol_prefix: 'gtk_source', + identifier_prefix: 'GtkSource', +-- +2.39.1 + diff --git a/0001-view-fix-decrement-of-negative-numbers.patch b/0001-view-fix-decrement-of-negative-numbers.patch index 666e98d..f306436 100644 --- a/0001-view-fix-decrement-of-negative-numbers.patch +++ b/0001-view-fix-decrement-of-negative-numbers.patch @@ -1,7 +1,7 @@ From d33ed342af50b66c7c49c2843d7495febfd663e9 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Wed, 28 Jul 2021 17:49:40 -0700 -Subject: [PATCH] view: fix decrement of negative numbers +Subject: [PATCH 1/1] view: fix decrement of negative numbers Fixes #117 --- @@ -86,5 +86,5 @@ index e10584aa..377cdd8d 100644 newstr = g_strdup_printf ("%"G_GINT64_FORMAT, (n + count)); -- -2.35.1 +2.39.1 diff --git a/gtksourceview4.spec b/gtksourceview4.spec index 41128ec..d4e87ec 100644 --- a/gtksourceview4.spec +++ b/gtksourceview4.spec @@ -3,7 +3,7 @@ Name: gtksourceview4 Version: 4.8.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Source code editing widget License: LGPLv2+ @@ -28,7 +28,10 @@ BuildRequires: vala Requires: glib2%{?_isa} >= %{glib_version} Requires: gtk3%{?_isa} >= %{gtk_version} -Patch10001: 0001-view-fix-decrement-of-negative-numbers.patch +# Fixes build and test suite on single cpu VMs +Patch10001: 0001-build-ensure-access-to-resources-in-corelib-build.patch + +Patch20001: 0001-view-fix-decrement-of-negative-numbers.patch %description GtkSourceView is a GNOME library that extends GtkTextView, the standard GTK+ @@ -98,6 +101,10 @@ the functionality of the installed %{name} package. %{_datadir}/installed-tests/gtksourceview-4/ %changelog +* Thu Jan 26 2023 Ray Strode - 4.8.1-5 +- Add build and test suite fix for single core VMs + Related: #2062786 + * Wed Jan 25 2023 Ray Strode