From f3130fc7d9cbfe13b7deb637c6bd9b666d0f1330 Mon Sep 17 00:00:00 2001 From: Hendursaga Date: Sun, 4 Sep 2022 11:31:29 -0400 Subject: gnu: cmh: Update to 1.1.1. * gnu/packages/algebra.scm (cmh): Update to 1.1.1. * gnu/packages/patches/cmh-support-fplll.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. Signed-off-by: Andreas Enge --- gnu/local.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 19102113c9..02aa555541 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -975,7 +975,6 @@ dist_patch_DATA = \ %D%/packages/patches/cling-use-shared-library.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates.patch \ - %D%/packages/patches/cmh-support-fplll.patch \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/containerd-create-pid-file.patch \ -- cgit 1.4.1 From b48162d3c98625a87b77da67578bbaa1843f693d Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 4 Sep 2022 21:27:55 -0400 Subject: gnu: Add gobject-introspection-next. * gnu/packages/glib.scm (gobject-introspection-next): New variable. * gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch: New file. * gnu/packages/patches/gobject-introspection-cc-1.72.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. --- gnu/local.mk | 2 + gnu/packages/glib.scm | 20 +++ ...ct-introspection-absolute-shlib-path-1.72.patch | 173 +++++++++++++++++++++ .../patches/gobject-introspection-cc-1.72.patch | 15 ++ 4 files changed, 210 insertions(+) create mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch create mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 02aa555541..493e10698a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1225,7 +1225,9 @@ dist_patch_DATA = \ %D%/packages/patches/gnutls-cross.patch \ %D%/packages/patches/gnutls-guile-eintr-eagain.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ + %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \ %D%/packages/patches/gobject-introspection-cc.patch \ + %D%/packages/patches/gobject-introspection-cc-1.72.patch \ %D%/packages/patches/gobject-introspection-girepository.patch \ %D%/packages/patches/go-fix-script-tests.patch \ %D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \ diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 820a44cbde..32220ee69b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -546,6 +546,26 @@ provide bindings to call into the C library.") ;; For tools. license:gpl2+)))) +(define-public gobject-introspection-next + (package + (inherit gobject-introspection) + (name "gobject-introspection") + (version "1.73.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" + "gobject-introspection/" (version-major+minor version) + "/gobject-introspection-" version ".tar.xz")) + (sha256 + (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34")) + (patches (search-patches + "gobject-introspection-cc-1.72.patch" + "gobject-introspection-girepository.patch" + "gobject-introspection-absolute-shlib-path-1.72.patch")))) + (propagated-inputs + (modify-inputs (package-propagated-inputs gobject-introspection) + (replace "glib" glib-next))))) + (define intltool (package (name "intltool") diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch new file mode 100644 index 0000000000..8bb86467c0 --- /dev/null +++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch @@ -0,0 +1,173 @@ +Names of libraries included in typelib files are opened by dlopen. +Here we add the full path. + +This patch was provided by Luca Bruno , +for 'gobject-introspection' 1.40.0 in Nix. + +It has since been updated to work with newer versions of +gobject-introspection. + +diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py +index 1d39ab84..e12ed24e 100644 +--- a/giscanner/scannermain.py ++++ b/giscanner/scannermain.py +@@ -95,6 +95,39 @@ def get_windows_option_group(parser): + return group + + ++def _get_default_fallback_libpath(): ++ # Newer multiple-output-optimized stdenv has an environment variable ++ # $outputLib which in turn specifies another variable which then is used as ++ # the destination for the library contents (${!outputLib}/lib). ++ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None ++ if store_path is None: ++ outputs = os.environ.get("outputs", "out").split() ++ if "lib" in outputs: ++ # For multiple output derivations let's try whether there is a $lib ++ # environment variable and use that as the base store path. ++ store_path = os.environ.get("lib") ++ elif "out" in outputs: ++ # Otherwise we have a single output derivation, so the libraries ++ # most certainly will end up in "$out/lib". ++ store_path = os.environ.get("out") ++ ++ if store_path is not None: ++ # Even if we have a $lib as output, there still should be a $lib/lib ++ # directory. ++ return os.path.join(store_path, 'lib') ++ else: ++ # If we haven't found a possible scenario, let's return an empty string ++ # so that the shared library won't be prepended with a path. ++ # ++ # Note that this doesn't mean that all hope is lost, because after all ++ # we can still use --fallback-library-path to set one. ++ # ++ # Also, we're not returning None, because that would make it very ++ # difficult to disable adding fallback paths altogether using something ++ # like: --fallback-library-path="" ++ return "" ++ ++ + def _get_option_parser(): + parser = optparse.OptionParser('%prog [options] sources', + version='%prog ' + giscanner.__version__) +@@ -220,6 +253,10 @@ match the namespace prefix.""") + parser.add_option("", "--compiler", + action="store", dest="compiler", default=None, + help="the C compiler to use internally") ++ parser.add_option("", "--fallback-library-path", ++ action="store", dest="fallback_libpath", ++ default=_get_default_fallback_libpath(), ++ help="Path to prepend to unknown shared libraries") + + group = get_preprocessor_option_group(parser) + parser.add_option_group(group) +diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py +index 9f8ab5df..8aa37c99 100644 +--- a/giscanner/shlibs.py ++++ b/giscanner/shlibs.py +@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name): + $""" % re.escape(library_name), re.VERBOSE) + + ++def _ldd_library_guix_pattern(library_name): ++ store_dir = re.escape( ++ os.environ.get("NIX_STORE", default="/gnu/store") ++ ) ++ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)' ++ return re.compile(pattern % (store_dir, re.escape(library_name))) ++ ++ + # This is a what we do for non-la files. We assume that we are on an + # ELF-like system where ldd exists and the soname extracted with ldd is + # a filename that can be opened with dlopen(). +@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries): + output = output.decode("utf-8", "replace") + + shlibs = resolve_from_ldd_output(libraries, output) +- return list(map(sanitize_shlib_path, shlibs)) ++ fallback_libpath = options.fallback_libpath or ""; ++ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs))) + + + def sanitize_shlib_path(lib): +@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib): + # In case we get relative paths on macOS (like @rpath) then we fall + # back to the basename as well: + # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222 +- if sys.platform == "darwin": +- if not os.path.isabs(lib): +- return os.path.basename(lib) +- return lib +- else: ++ ++ # Always use absolute paths if available ++ if not os.path.isabs(lib): + return os.path.basename(lib) ++ return lib + + + def resolve_from_ldd_output(libraries, output): + patterns = {} + for library in libraries: + if not os.path.isfile(library): +- patterns[library] = _ldd_library_pattern(library) ++ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library)) + if len(patterns) == 0: + return [] + +@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output): + if line.endswith(':'): + continue + for word in line.split(): +- for library, pattern in patterns.items(): +- m = pattern.match(word) ++ for library, (pattern, guix_pattern) in patterns.items(): ++ store_dir = os.environ.get("NIX_STORE", default="/gnu/store") ++ if line.find(store_dir) != -1: ++ m = guix_pattern.match(word) ++ else: ++ m = pattern.match(word) + if m: + del patterns[library] + shlibs.append(m.group()) +diff --git a/giscanner/utils.py b/giscanner/utils.py +index 31c7ea48..630002a8 100644 +--- a/giscanner/utils.py ++++ b/giscanner/utils.py +@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file): + if dlname is None: + return None + +- # Darwin uses absolute paths where possible; since the libtool files never +- # contain absolute paths, use the libdir field +- if platform.system() == 'Darwin': +- dlbasename = os.path.basename(dlname) +- libdir = _extract_libdir_field(la_file) +- if libdir is None: +- return dlbasename +- return libdir + '/' + dlbasename +- # Older libtools had a path rather than the raw dlname +- return os.path.basename(dlname) ++ dlbasename = os.path.basename(dlname) ++ libdir = _extract_libdir_field(la_file) ++ if libdir is None: ++ return dlbasename ++ return libdir + '/' + dlbasename + + + # Returns arguments for invoking libtool, if applicable, otherwise None +diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py +index a8337c60..7f123103 100644 +--- a/tests/scanner/test_shlibs.py ++++ b/tests/scanner/test_shlibs.py +@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase): + + self.assertEqual( + sanitize_shlib_path('/foo/bar'), +- '/foo/bar' if sys.platform == 'darwin' else 'bar') ++ # Always use an absolute filename for Guix ++ '/foo/bar') + + def test_unresolved_library(self): + output = '' diff --git a/gnu/packages/patches/gobject-introspection-cc-1.72.patch b/gnu/packages/patches/gobject-introspection-cc-1.72.patch new file mode 100644 index 0000000000..d3b1df82af --- /dev/null +++ b/gnu/packages/patches/gobject-introspection-cc-1.72.patch @@ -0,0 +1,15 @@ +Use gcc as the default C compiler if CC is not set. + +diff --git a/giscanner/__init__.py b/giscanner/__init__.py +index 7c2f365a..607fe341 100644 +--- a/giscanner/__init__.py ++++ b/giscanner/__init__.py +@@ -21,6 +21,8 @@ import os + builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR') + if builddir is not None: + __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422 ++if not 'CC' in os.environ: ++ os.environ['CC'] = 'gcc' + try: + from ._version import __version__ + except ImportError: -- cgit 1.4.1 From 0884238e1518f68e7d35b78dc2815fb35a3e641e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 10 Sep 2022 18:02:31 +0200 Subject: gnu: gnome-shell: Update to 42.4. * gnu/packages/gnome.scm (gnome-shell): Update to 42.4. [source](patches): Remove. [arguments]: Adjust substitution to disable GTK icon cache. Filter disallowed references from GUIX_PYTHONPATH. While at it, also prevent MESON from ending up in the closure. [inputs]: Change from LIBGWEATHER to LIBGWEATHER4. * gnu/packages/patches/gnome-shell-polkit-autocleanup.patch: * gnu/local.mk (dist_patch_DATA): --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 24 +++++++---- .../patches/gnome-shell-polkit-autocleanup.patch | 50 ---------------------- 3 files changed, 16 insertions(+), 59 deletions(-) delete mode 100644 gnu/packages/patches/gnome-shell-polkit-autocleanup.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 493e10698a..3ee36b7b9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1215,7 +1215,6 @@ dist_patch_DATA = \ %D%/packages/patches/gnome-screenshot-meson-0.60.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-session-support-elogind.patch \ - %D%/packages/patches/gnome-shell-polkit-autocleanup.patch \ %D%/packages/patches/gnome-todo-libportal.patch \ %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnupg-CVE-2022-34903.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 72aee87514..c9f2d1fcbc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8853,21 +8853,21 @@ properties, screen resolution, and other GNOME parameters.") (define-public gnome-shell (package (name "gnome-shell") - (version "41.0") + (version "42.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" (version-major version) "/" name "-" version ".tar.xz")) - (patches (search-patches "gnome-shell-polkit-autocleanup.patch")) (sha256 (base32 - "0ragmcln210zvzhc2br33yprbkj9drjzd7inp5sdxra0a7l73yaj")))) + "0kn5fclciybp2fs38wd39hdz85y91pas0ckfa02pmyx91sbz4pw7")))) (build-system meson-build-system) (arguments (let ((disallowed-references (list (gexp-input glib "bin") (gexp-input libxslt) + (gexp-input meson) (gexp-input ruby-sass)))) (list #:glib-or-gtk? #t @@ -8880,7 +8880,8 @@ properties, screen resolution, and other GNOME parameters.") #:modules '((guix build meson-build-system) (guix build utils) (ice-9 match) - (srfi srfi-1)) + (srfi srfi-1) + (srfi srfi-26)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-keysdir @@ -8894,8 +8895,9 @@ properties, screen resolution, and other GNOME parameters.") (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "meson/postinstall.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-before 'configure 'record-absolute-file-names (lambda* (#:key inputs #:allow-other-keys) (let ((ibus-daemon (search-input-file inputs "bin/ibus-daemon")) @@ -8916,7 +8918,13 @@ properties, screen resolution, and other GNOME parameters.") (add-after 'install 'wrap-programs (lambda* (#:key inputs #:allow-other-keys) (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")) - (python-path (getenv "GUIX_PYTHONPATH"))) + (python-path + (string-join + (filter (lambda (item) + (not (any (cut string-prefix? <> item) + '#$disallowed-references))) + (string-split (getenv "GUIX_PYTHONPATH") #\:)) + ":"))) (for-each (lambda (prog) (wrap-program (string-append #$output "/bin/" prog) @@ -8996,7 +9004,7 @@ printf '~a is deprecated. Use the \"gnome-extensions\" CLI or \ libcanberra libcroco libgnomekbd ;for gkbd-keyboard-display - libgweather + libgweather4 libnma libsoup mesa-headers diff --git a/gnu/packages/patches/gnome-shell-polkit-autocleanup.patch b/gnu/packages/patches/gnome-shell-polkit-autocleanup.patch deleted file mode 100644 index 08968b83a1..0000000000 --- a/gnu/packages/patches/gnome-shell-polkit-autocleanup.patch +++ /dev/null @@ -1,50 +0,0 @@ -Don't redefine G_DEFINE_AUTOPTR_CLEANUP_FUNC when available in polkit. - -Taken from upstream: - - https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/1d0a08b5e25fea7b0e792ec9798e68a7c5606a75 - -diff --git a/config.h.meson b/config.h.meson -index b93fda8727..ff355d3062 100644 ---- a/config.h.meson -+++ b/config.h.meson -@@ -33,3 +33,6 @@ - - /* Define if fdwalk is available in libc */ - #mesondefine HAVE_FDWALK -+ -+/* Define if polkit defines autocleanup functions */ -+#mesondefine HAVE_POLKIT_AUTOCLEANUP -diff --git a/meson.build b/meson.build -index 42ec01c566..778a34c6ef 100644 ---- a/meson.build -+++ b/meson.build -@@ -169,6 +169,13 @@ cdata.set('HAVE_FDWALK', - cc.has_function('fdwalk') - ) - -+polkit_has_autocleanup = cc.compiles( -+ '#define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE -+ #include -+ void main(void) { g_autoptr(PolkitAgentListener) agent = NULL; }', -+ dependencies: polkit_dep) -+cdata.set('HAVE_POLKIT_AUTOCLEANUP', polkit_has_autocleanup) -+ - buildtype = get_option('buildtype') - if buildtype != 'plain' - all_warnings = [ -diff --git a/src/shell-polkit-authentication-agent.h b/src/shell-polkit-authentication-agent.h -index 55b46af110..4f14749563 100644 ---- a/src/shell-polkit-authentication-agent.h -+++ b/src/shell-polkit-authentication-agent.h -@@ -14,8 +14,10 @@ - - G_BEGIN_DECLS - -+#ifndef HAVE_POLKIT_AUTOCLEANUP - /* Polkit doesn't have g_autoptr support, thus we have to manually set the autoptr function here */ - G_DEFINE_AUTOPTR_CLEANUP_FUNC (PolkitAgentListener, g_object_unref) -+#endif - - #define SHELL_TYPE_POLKIT_AUTHENTICATION_AGENT (shell_polkit_authentication_agent_get_type()) - -- cgit 1.4.1 From 3c2a70604706363668d9a4b04fbfe5105ae70381 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 5 Sep 2022 02:30:14 -0400 Subject: gnu: eog: Update to 42.2. * gnu/packages/gnome.scm (eog): Update to 42.2. [source]: Delete patches. [configure-flags]: Use gexps. [phases]: Likewise. {skip-gtk-update-icon-cache}: New phase. {wrap-eog}: Use search-input-file. [native-inputs]: Replace intltool with gettext-minimal. [inputs]: Add libhandy and gtk. * gnu/packages/patches/eog-update-libportal-usage.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 112 ++++++++++----------- .../patches/eog-update-libportal-usage.patch | 40 -------- 3 files changed, 55 insertions(+), 98 deletions(-) delete mode 100644 gnu/packages/patches/eog-update-libportal-usage.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 3ee36b7b9b..3ba9c21be7 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1052,7 +1052,6 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-yasnippet-fix-tests.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ - %D%/packages/patches/eog-update-libportal-usage.patch \ %D%/packages/patches/erlang-man-path.patch \ %D%/packages/patches/esmtp-add-lesmtp.patch \ %D%/packages/patches/eudev-rules-directory.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ea6fe06c1..a93c4928b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6572,67 +6572,65 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") (license license:gpl2+))) (define-public eog - (package - (name "eog") - (version "40.3") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0ddjwcd77nw0rxb5x5bz5hd671m8gya9827p8rsnb58x103kpai8")) - ;; XXX: Remove when upgrading to 42.0 - (patches (search-patches "eog-update-libportal-usage.patch")))) - (build-system meson-build-system) - (arguments - `(#:glib-or-gtk? #t - #:meson ,meson-0.60 + (package + (name "eog") + (version "42.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0ph4b05cjlkzbn8vil4hjkwvfr1cp819yi2qifp418p15rm4lk8f")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t #:configure-flags ;; Otherwise, the RUNPATH will lack the final 'eog' path component. - (list (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib/eog")) + #~(list (string-append "-Dc_link_args=-Wl,-rpath=" + #$output "/lib/eog")) #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")))) - (add-after 'install 'wrap-eog - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program (string-append out "/bin/eog") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) - (propagated-inputs - (list dconf)) - (native-inputs - `(("intltool" ,intltool) - ("itstool" ,itstool) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("xmllint" ,libxml2))) - (inputs - `(("gnome-desktop" ,gnome-desktop) - ("shared-mime-info" ,shared-mime-info) - ("adwaita-icon-theme" ,adwaita-icon-theme) - ("exempi" ,exempi) - ("lcms" ,lcms) - ("libexif" ,libexif) - ("libpeas" ,libpeas) - ("libportal" ,libportal) - ("libjpeg" ,libjpeg-turbo) - ("librsvg" ,librsvg) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gtk+" ,gtk+))) - (home-page "https://wiki.gnome.org/Apps/EyeOfGnome") - (synopsis "GNOME image viewer") - (description "Eye of GNOME is the GNOME image viewer. It + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (add-after 'install 'wrap-eog + (lambda* (#:key outputs #:allow-other-keys) + (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (search-input-file outputs "bin/eog") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) + (propagated-inputs + (list dconf)) + (native-inputs + (list gettext-minimal + itstool + `(,glib "bin") + gobject-introspection + pkg-config + libxml2)) + (inputs + (list gnome-desktop + shared-mime-info + adwaita-icon-theme + exempi + lcms + libexif + libhandy + libpeas + libportal + libjpeg-turbo + librsvg + gtk)) + (home-page "https://wiki.gnome.org/Apps/EyeOfGnome") + (synopsis "GNOME image viewer") + (description "Eye of GNOME is the GNOME image viewer. It supports image conversion, rotation, and slideshows.") - (license license:gpl2+))) + (license license:gpl2+))) (define-public eog-plugins ;; Note: EOG looks for its plugins (via libpeas) in ~/.local as well as diff --git a/gnu/packages/patches/eog-update-libportal-usage.patch b/gnu/packages/patches/eog-update-libportal-usage.patch deleted file mode 100644 index 220a16ddc4..0000000000 --- a/gnu/packages/patches/eog-update-libportal-usage.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix eog to work with libportal-0.5 - -This patch is extracted from upstream, see here -https://gitlab.gnome.org/GNOME/eog/-/commit/a06e6325907e136678b0bbe7058c25d688034afd - -diff --git a/meson.build b/meson.build -index 9a32e4bb..9d49aa45 100644 ---- a/meson.build -+++ b/meson.build -@@ -165,10 +165,14 @@ config_h.set('HAVE_EXEMPI', enable_xmp) - # xdg-desktop-portal support with libportal (optional) - enable_libportal = get_option('libportal') - if enable_libportal -- libportal_dep = dependency('libportal', version: '>= 0.3', required: false) -+ libportal_dep = dependency('libportal', version: '>= 0.5', required: false) - assert(libportal_dep.found() and cc.has_header('libportal/portal.h', dependencies: libportal_dep), - 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') - -- common_deps += libportal_dep -+ libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: false) -+ assert(libportal_gtk3_dep.found() and cc.has_header('libportal-gtk3/portal-gtk3.h', dependencies: libportal_gtk3_dep), -+ 'xdg-desktop-portal support requested but library not found. Please use -Dlibportal=false') -+ -+ common_deps += [libportal_dep, libportal_gtk3_dep] - endif - config_h.set('HAVE_LIBPORTAL', enable_libportal) - -diff --git a/src/eog-util.c b/src/eog-util.c -index 90b9768e..56d23472 100644 ---- a/src/eog-util.c -+++ b/src/eog-util.c -@@ -45,7 +45,7 @@ - #include - #ifdef HAVE_LIBPORTAL - #include --#include -+#include - #endif - - void -- cgit 1.4.1 From cad5c7543ad73b608bdb973aa99a2f78d9709796 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 8 Sep 2022 11:41:26 -0400 Subject: gnu: gnome-boxes: Update to 42.3. * gnu/packages/gnome.scm (gnome-boxes): Update to 42.3. [source]: Delete patches field. [configure-flags]: Use gexps. [phases]: New argument. [native-inputs]: Replace intltool with gettext-minimal. Delete gtk+:bin. Sort. [inputs]: Sort. * gnu/packages/patches/gnome-boxes-add-guix-logo.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 44 +++++++++++----------- .../patches/gnome-boxes-add-guix-logo.patch | 32 ---------------- 3 files changed, 22 insertions(+), 55 deletions(-) delete mode 100644 gnu/packages/patches/gnome-boxes-add-guix-logo.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 3ba9c21be7..8e5a1970ab 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1207,7 +1207,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ - %D%/packages/patches/gnome-boxes-add-guix-logo.patch \ %D%/packages/patches/gnome-builder-update-libportal.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6fd4acc945..fec947b736 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11896,7 +11896,7 @@ integrate seamlessly with the GNOME desktop.") (define-public gnome-boxes (package (name "gnome-boxes") - (version "41.1") + (version "42.3") (source (origin (method url-fetch) @@ -11904,34 +11904,35 @@ integrate seamlessly with the GNOME desktop.") (version-major version) "/" "gnome-boxes-" version ".tar.xz")) (sha256 - (base32 "1wzhm8n485cqhbai4qshgrwl05ix881g8gjshilrj6vg8p1li79h")) - (patches - (search-patches "gnome-boxes-add-guix-logo.patch")))) + (base32 "1lv0bdh935qj6wkv3ixg2pcv8yrapj79z02gw4fal3rhz3xggvsn")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:meson ,meson-0.60 - #:configure-flags (list "-Drdp=false" - (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") - "/lib/gnome-boxes")))) + (list #:glib-or-gtk? #t + #:configure-flags #~(list "-Drdp=false" + (string-append "-Dc_link_args=-Wl,-rpath=" + #$output + "/lib/gnome-boxes")) + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-gtk-update-icon-cache + (lambda _ + (setenv "DESTDIR" "/")))))) (native-inputs - (list `(,glib "bin") ;for glib-compile-resources - `(,gtk+ "bin") ;for gtk-update-icon-cache - desktop-file-utils ;for update-desktop-database + (list desktop-file-utils ;for update-desktop-database + gettext-minimal + `(,glib "bin") ;for glib-compile-resources itstool - intltool - vala pkg-config - python)) + python + vala)) (inputs - (list libarchive - glib-networking ;for TLS support + (list glib-networking ;for TLS support gsettings-desktop-schemas gtk+ gtk-vnc gtksourceview json-glib + libarchive + libgudev libhandy libosinfo libsecret @@ -11940,12 +11941,11 @@ integrate seamlessly with the GNOME desktop.") libvirt libvirt-glib libxml2 - spice-gtk sparql-query - vte - webkitgtk-with-libsoup2 ;for webkit2gtk-4.0 + spice-gtk tracker - libgudev)) + vte + webkitgtk-with-libsoup2)) ;for webkit2gtk-4.0 (home-page "https://wiki.gnome.org/Apps/Boxes") (synopsis "View, access, and manage remote and virtual systems") (description "GNOME Boxes is a simple application to view, access, and diff --git a/gnu/packages/patches/gnome-boxes-add-guix-logo.patch b/gnu/packages/patches/gnome-boxes-add-guix-logo.patch deleted file mode 100644 index e570675083..0000000000 --- a/gnu/packages/patches/gnome-boxes-add-guix-logo.patch +++ /dev/null @@ -1,32 +0,0 @@ -Taken from upstream commit: 9091c6849652fa083297bc12645d8c57a962874a. - -diff --git a/data/osinfo/guix-1.3.xml b/data/osinfo/guix-1.3.xml -new file mode 100644 -index 00000000..d4e1c167 ---- /dev/null -+++ b/data/osinfo/guix-1.3.xml -@@ -0,0 +1,9 @@ -+ -+ -+ -+ -+ -+ https://gitlab.gnome.org/GNOME/gnome-boxes-logos/-/raw/master/logos/guix.svg -+ -+ -+ -diff --git a/data/osinfo/meson.build b/data/osinfo/meson.build -index 46ff1570..d5531e60 100644 ---- a/data/osinfo/meson.build -+++ b/data/osinfo/meson.build -@@ -7,6 +7,7 @@ osinfo_db = [ - ['freedos-1.2.xml', 'gnome-boxes/osinfo/os/freedos.org'], - ['gnome-nightly.xml', 'gnome-boxes/osinfo/os/gnome.org'], - ['gnome-3.38.xml', 'gnome-boxes/osinfo/os/gnome.org'], -+ ['guix-1.3.xml', 'gnome-boxes/osinfo/os/guix.gnu.org'], - ['manjaro-19.0.xml', 'gnome-boxes/osinfo/os/manjaro.org'], - ['nixos-20.03.xml', 'gnome-boxes/osinfo/os/nixos.org'], - ['opensuse-10.2.xml', 'gnome-boxes/osinfo/os/opensuse.org'], --- -2.34.0 - -- cgit 1.4.1 From dc1cf13ac58b7693cbabd3ebd82ad05088b4dbf4 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 8 Sep 2022 13:58:25 -0400 Subject: gnu: libgda: Update to 6.0.0. * gnu/packages/gnome.scm (libgda): Update to 6.0.0. [source]: Delete modules and snippet field. Apply new patches. [build-system]: Use meson-build-system. [native-inputs]: Remove autoconf, autoconf-archive, automake, libtool, which and xorg-server-for-tests. [inputs]: Add json-glib. * gnu/packages/patches/libgda-cve-2021-39359.patch: New file. * gnu/packages/patches/libgda-fix-build.patch: Likewise. * gnu/packages/patches/libgda-fix-missing-initialization.patch: Likewise. * gnu/packages/patches/libgda-skip-postgresql-tests.patch: Likewise. * gnu/local.mk (dist_patch_DATA): Register them. --- gnu/local.mk | 4 + gnu/packages/gnome.scm | 90 +++++--------- gnu/packages/patches/libgda-cve-2021-39359.patch | 33 ++++++ gnu/packages/patches/libgda-fix-build.patch | 131 +++++++++++++++++++++ .../libgda-fix-missing-initialization.patch | 26 ++++ .../patches/libgda-skip-postgresql-tests.patch | 91 ++++++++++++++ 6 files changed, 312 insertions(+), 63 deletions(-) create mode 100644 gnu/packages/patches/libgda-cve-2021-39359.patch create mode 100644 gnu/packages/patches/libgda-fix-build.patch create mode 100644 gnu/packages/patches/libgda-fix-missing-initialization.patch create mode 100644 gnu/packages/patches/libgda-skip-postgresql-tests.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 8e5a1970ab..376ce481b1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1405,6 +1405,10 @@ dist_patch_DATA = \ %D%/packages/patches/libcroco-CVE-2020-12825.patch \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ %D%/packages/patches/libexpected-nofetch.patch \ + %D%/packages/patches/libgda-cve-2021-39359.patch \ + %D%/packages/patches/libgda-fix-build.patch \ + %D%/packages/patches/libgda-fix-missing-initialization.patch \ + %D%/packages/patches/libgda-skip-postgresql-tests.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f7f12a6b12..7c78b194f6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12704,58 +12704,35 @@ developed with the aim of being used with the Librem 5 phone.") (define-public libgda (package (name "libgda") - (version "5.2.10") + (version "6.0.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.gnome.org/GNOME/libgda.git/") - (commit (string-append "LIBGDA_" (string-replace-substring - version "." "_"))))) - (file-name (git-file-name name version)) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) (sha256 - (base32 "18rg773gq9v3cdywpmrp12c5xyp97ir9yqjinccpi22sksb1kl8a")) - (modules '((guix build utils))) - (snippet - ;; Remove the bundled sqlite, but keep its header because code relies - ;; on this header variant. - '(delete-file "libgda/sqlite/sqlite-src/sqlite3.c")))) - (build-system gnu-build-system) - (arguments - `(#:configure-flags '("--enable-system-sqlite" "--enable-vala") - ;; There's a race between check_cnc_lock and check_threaded_cnc - ;; in tests/multi-threading. - #:parallel-tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-glade-install - (lambda _ - (substitute* "configure.ac" - (("`\\$PKG_CONFIG --variable=catalogdir gladeui-2\\.0`") - "${datadir}/glade/catalogs") - (("`\\$PKG_CONFIG --variable=pixmapdir gladeui-2\\.0`") - "${datadir}/glade/pixmaps")) - #t)) - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - ;; Tests require a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1") - #t)) - (add-after 'install 'symlink-glade-module - (lambda* (#:key outputs #:allow-other-keys) - (let* ((shlib "libgda-ui-5.0.so") - (out (assoc-ref outputs "out")) - (out/lib (string-append out "/lib")) - (moduledir (string-append out/lib "/glade/modules"))) - (mkdir-p moduledir) - (symlink (string-append out/lib "/" shlib) - (string-append moduledir "/" shlib)) - #t)))))) - (propagated-inputs - (list libxml2)) ; required by libgda-5.0.pc + (base32 "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr")) + (patches (search-patches "libgda-cve-2021-39359.patch" + "libgda-fix-build.patch" + "libgda-fix-missing-initialization.patch" + "libgda-skip-postgresql-tests.patch")))) + (build-system meson-build-system) + (native-inputs + (list intltool + iso-codes + `(,glib "bin") + gnome-common + gettext-minimal + gobject-introspection + gtk-doc/stable + pkg-config + python + vala + yelp-tools)) (inputs - (list glib + (list json-glib + glib glade3 gtk+ libsecret @@ -12763,21 +12740,8 @@ developed with the aim of being used with the Librem 5 phone.") openssl sqlite vala)) - (native-inputs - `(("autoconf" ,autoconf) - ("autoconf-archive" ,autoconf-archive) - ("automake" ,automake) - ("glib:bin" ,glib "bin") - ("gnome-common" ,gnome-common) - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("intltool" ,intltool) - ("libtool" ,libtool) - ("pkg-config" ,pkg-config) - ("vala" ,vala) - ("which" ,which) - ("xorg-server" ,xorg-server-for-tests) - ("yelp-tools" ,yelp-tools))) + (propagated-inputs + (list libxml2)) ; required by libgda-5.0.pc (home-page "https://gitlab.gnome.org/GNOME/libgda") (synopsis "Uniform data access") (description diff --git a/gnu/packages/patches/libgda-cve-2021-39359.patch b/gnu/packages/patches/libgda-cve-2021-39359.patch new file mode 100644 index 0000000000..5e14e79393 --- /dev/null +++ b/gnu/packages/patches/libgda-cve-2021-39359.patch @@ -0,0 +1,33 @@ +From bebdffb4de586fb43fd07ac549121f4b22f6812d Mon Sep 17 00:00:00 2001 +From: "Douglas R. Reno" +Date: Mon, 18 Oct 2021 13:18:01 -0500 +Subject: [PATCH] Fix CVE-2021-39359 by forcing TLS certificate validation + +This was done by adding "ssl-use-system-ca-file", TRUE to the options +for each soup_session_new_with_options() call that was made. + +Tested on Linux From Scratch 11.0 and Debian 11. + +Fixes #249 +--- + providers/web/gda-web-provider.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/providers/web/gda-web-provider.c b/providers/web/gda-web-provider.c +index cf8d14dc3..cc818895f 100644 +--- a/providers/web/gda-web-provider.c ++++ b/providers/web/gda-web-provider.c +@@ -355,8 +355,8 @@ gda_web_provider_open_connection (GdaServerProvider *provider, GdaConnection *cn + g_rec_mutex_init (& (cdata->mutex)); + cdata->server_id = NULL; + cdata->forced_closing = FALSE; +- cdata->worker_session = soup_session_new (); +- cdata->front_session = soup_session_new_with_options ("max-conns-per-host", 1, NULL); ++ cdata->worker_session = soup_session_new_with_options ("ssl-use-system-ca-file", TRUE, NULL); ++ cdata->front_session = soup_session_new_with_options ("max-conns-per-host", 1, "ssl-use-system-ca-file", TRUE, NULL); + if (use_ssl) { + server_url = g_string_new ("https://"); + g_print ("USING SSL\n"); +-- +GitLab + diff --git a/gnu/packages/patches/libgda-fix-build.patch b/gnu/packages/patches/libgda-fix-build.patch new file mode 100644 index 0000000000..35f5b9694b --- /dev/null +++ b/gnu/packages/patches/libgda-fix-build.patch @@ -0,0 +1,131 @@ +Taken from upstream. + +From 4c2369083c5941ffada100e4a7e4702e681585e3 Mon Sep 17 00:00:00 2001 +From: taozuhong +Date: Tue, 11 Jan 2022 15:03:28 +0800 +Subject: [PATCH] fixed compile error + +--- + libgda/Gda-6.0-custom.vala | 3 +++ + libgda/sql-parser/lemon.c | 39 +++++++++++++++++++------------------- + 2 files changed, 22 insertions(+), 20 deletions(-) + +diff --git a/libgda/Gda-6.0-custom.vala b/libgda/Gda-6.0-custom.vala +index d046c5c24..4d1408648 100644 +--- a/libgda/Gda-6.0-custom.vala ++++ b/libgda/Gda-6.0-custom.vala +@@ -92,7 +92,10 @@ namespace Gda { + [CCode (cheader_filename = "libgda.h", copy_function = "g_boxed_copy", free_function = "g_boxed_free", type_id = "gda_sql_statement_get_type ()")] + [Compact] + public class SqlStatement { ++ #if VALA_0_50 ++ #else + public static Gda.SqlStatementContentsInfo get_contents_infos (Gda.SqlStatementType type); ++ #endif + } + + } +diff --git a/libgda/sql-parser/lemon.c b/libgda/sql-parser/lemon.c +index a6fe75bb9..a3c727777 100644 +--- a/libgda/sql-parser/lemon.c ++++ b/libgda/sql-parser/lemon.c +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -40,7 +41,7 @@ static const char **made_files = NULL; + static int made_files_count = 0; + static int successful_exit = 0; + +-static char *msort(char*,char**,int(*)(const char*,const char*)); ++static uintptr_t msort(uintptr_t, uintptr_t*, int(*)(const uintptr_t, const uintptr_t)); + + /* + ** Compilers are getting increasingly pedantic about type conversions +@@ -396,8 +397,7 @@ static int actioncmp( + static struct action *Action_sort( + struct action *ap + ){ +- ap = (struct action *)msort((char *)ap,(char **)&ap->next, +- (int(*)(const char*,const char*))actioncmp); ++ ap = (struct action *)msort(ap, &ap->next, actioncmp); + return ap; + } + +@@ -1277,14 +1277,14 @@ void Configlist_closure(struct lemon *lemp) + + /* Sort the configuration list */ + void Configlist_sort(){ +- current = (struct config *)msort((char *)current,(char **)&(current->next),Configcmp); ++ current = (struct config *)msort(current, &(current->next), Configcmp); + currentend = 0; + return; + } + + /* Sort the basis configuration list */ + void Configlist_sortbasis(){ +- basis = (struct config *)msort((char *)current,(char **)&(current->bp),Configcmp); ++ basis = (struct config *)msort(current, &(current->bp), Configcmp); + basisend = 0; + return; + } +@@ -1577,7 +1577,7 @@ int main(G_GNUC_UNUSED int argc, char **argv) + /* + ** Return a pointer to the next structure in the linked list. + */ +-#define NEXT(A) (*(char**)(((unsigned long)A)+offset)) ++#define NEXT(A) (*(uintptr_t *)(((uintptr_t)A)+offset)) + + /* + ** Inputs: +@@ -1594,13 +1594,13 @@ int main(G_GNUC_UNUSED int argc, char **argv) + ** The "next" pointers for elements in the lists a and b are + ** changed. + */ +-static char *merge( +- char *a, +- char *b, +- int (*cmp)(const char*,const char*), +- int offset ++static uintptr_t merge( ++ uintptr_t a, ++ uintptr_t b, ++ int (*cmp)(const uintptr_t, const uintptr_t), ++ uintptr_t offset + ){ +- char *ptr, *head; ++ uintptr_t ptr, *head; + + if( a==0 ){ + head = b; +@@ -1646,16 +1646,15 @@ static char *merge( + ** The "next" pointers for elements in list are changed. + */ + #define LISTSIZE 30 +-static char *msort( +- char *list, +- char **next, +- int (*cmp)(const char*,const char*) ++static uintptr_t msort( ++ uintptr_t list, ++ uintptr_t *next, ++ int (*cmp)(const uintptr_t, const uintptr_t) + ){ +- unsigned long offset; +- char *ep; +- char *set[LISTSIZE]; ++ uintptr_t ep; ++ uintptr_t set[LISTSIZE]; + int i; +- offset = (unsigned long)next - (unsigned long)list; ++ uintptr_t offset = (uintptr_t)next - (uintptr_t)list; + for(i=0; i +Date: Sun, 19 Sep 2021 22:54:33 -0500 +Subject: [PATCH] Test: Fixing missing initialization + +--- + libgda/thread-wrapper/test-itsignaler.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libgda/thread-wrapper/test-itsignaler.c b/libgda/thread-wrapper/test-itsignaler.c +index d0c15ae17..7ac4e958a 100644 +--- a/libgda/thread-wrapper/test-itsignaler.c ++++ b/libgda/thread-wrapper/test-itsignaler.c +@@ -203,6 +203,7 @@ test2 (void) + CbData cbdata; + cbdata.counter = 0; + cbdata.loop = loop; ++ cbdata.its = its; + itsignaler_add (its, NULL, (ITSignalerFunc) source_callback, &cbdata, NULL); + itsignaler_unref (its); + g_mutex_unlock (&mutex); +-- +GitLab + diff --git a/gnu/packages/patches/libgda-skip-postgresql-tests.patch b/gnu/packages/patches/libgda-skip-postgresql-tests.patch new file mode 100644 index 0000000000..28fef585ac --- /dev/null +++ b/gnu/packages/patches/libgda-skip-postgresql-tests.patch @@ -0,0 +1,91 @@ +Taken from upstream. + +From b0cd77e588620465b78f7c017d3f240e13936aa3 Mon Sep 17 00:00:00 2001 +From: Pavlo Solntsev +Date: Sun, 19 Sep 2021 22:51:38 -0500 +Subject: [PATCH] Test: Skip test if no server available + +Two variables will be checked. If they set +and provide all needed information the test +will be executed. If they are not set, the test +will return TRUE and will terminate with +termination status EXIT_SUCCESS. +--- + tests/db/check-db-catalog-postgresql.c | 16 ++++++++++++++++ + tests/test-server-operation-postgresql.c | 16 ++++++++++++++++ + 2 files changed, 32 insertions(+) + +diff --git a/tests/db/check-db-catalog-postgresql.c b/tests/db/check-db-catalog-postgresql.c +index 5b8e9395c..bf9a8942c 100644 +--- a/tests/db/check-db-catalog-postgresql.c ++++ b/tests/db/check-db-catalog-postgresql.c +@@ -25,6 +25,9 @@ + #include + #include "../test-cnc-utils.h" + ++#define PROVIDER_DB_CREATE_PARAMS "POSTGRESQL_DBCREATE_PARAMS" ++#define PROVIDER_CNC_PARAMS "POSTGRESQL_CNC_PARAMS" ++ + typedef struct { + GdaDbCatalog *catalog; + GdaConnection *cnc; +@@ -359,6 +362,19 @@ main (gint argc, + { + setlocale (LC_ALL,""); + ++ const gchar *db_create_str; ++ const gchar *cnc_params; ++ ++ db_create_str = g_getenv (PROVIDER_DB_CREATE_PARAMS); ++ cnc_params = g_getenv (PROVIDER_CNC_PARAMS); ++ ++ if (!db_create_str || !cnc_params) { ++ g_print ("Please set POSTGRESQL_DBCREATE_PARAMS and POSTGRESQL_CNC_PARAMS variable" ++ "with dbname, host, user and port (usually 5432)\n"); ++ g_print ("Test will not be performed\n"); ++ return EXIT_SUCCESS; ++ } ++ + g_test_init (&argc,&argv,NULL); + + g_test_add ("/test-db-postgresql/meta-tables", +diff --git a/tests/test-server-operation-postgresql.c b/tests/test-server-operation-postgresql.c +index 37796c4be..860f41a18 100644 +--- a/tests/test-server-operation-postgresql.c ++++ b/tests/test-server-operation-postgresql.c +@@ -38,9 +38,12 @@ + #include + #include + #include ++/*#include */ + #include "test-cnc-utils.h" + + #define PROVIDER_NAME "PostgreSQL" ++#define PROVIDER_DB_CREATE_PARAMS "POSTGRESQL_DBCREATE_PARAMS" ++#define PROVIDER_CNC_PARAMS "POSTGRESQL_CNC_PARAMS" + + #define GDA_PGSQL_ERROR_HANDLE(e) (g_print("Error: %s: %s\n", G_STRLOC, e && e->message ? e->message : "No default")); + +@@ -1335,6 +1338,19 @@ main(gint argc, gchar *argv[]) + { + setlocale (LC_ALL,""); + ++ const gchar *db_create_str; ++ const gchar *cnc_params; ++ ++ db_create_str = g_getenv (PROVIDER_DB_CREATE_PARAMS); ++ cnc_params = g_getenv (PROVIDER_CNC_PARAMS); ++ ++ if (!db_create_str || !cnc_params) { ++ g_print ("Please set POSTGRESQL_DBCREATE_PARAMS and POSTGRESQL_CNC_PARAMS variable" ++ "with dbname, host, user and port (usually 5432)\n"); ++ g_print ("Test will not be performed\n"); ++ return EXIT_SUCCESS; ++ } ++ + g_test_init (&argc,&argv,NULL); + + g_test_add ("/test-server-operation-sqlite/old-so-module", +-- +GitLab + -- cgit 1.4.1 From 87c5dd8ea5535df93f3705177cff1c19800999c5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 10 Sep 2022 01:18:17 -0400 Subject: gnu: nautilus: Update to 42.2 and enable tests. * gnu/packages/gnome.scm (nautilus): Update to 42.2. [patches]: Replace nautilus-add-libportal-gtk3.patch with nautilus-disable-tracker-tests.patch. [tests?]: Delete argument. [phases]: Use gexps. {check}: Move after install. {pre-check}: New phase. [native-inputs]: Replace intltool with gettext-minimal. Add python-pygobject. [inputs]: Remove libsoup-minimal-2. * gnu/packages/patches/nautilus-add-libportal-gtk3.patch: Delete file. * gnu/packages/patches/nautilus-disable-tracker-tests.patch: New file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. --- gnu/local.mk | 2 +- gnu/packages/gnome.scm | 65 ++++++++++++---------- .../patches/nautilus-add-libportal-gtk3.patch | 61 -------------------- .../patches/nautilus-disable-tracker-tests.patch | 47 ++++++++++++++++ 4 files changed, 83 insertions(+), 92 deletions(-) delete mode 100644 gnu/packages/patches/nautilus-add-libportal-gtk3.patch create mode 100644 gnu/packages/patches/nautilus-disable-tracker-tests.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 376ce481b1..a733fc60de 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1539,7 +1539,7 @@ dist_patch_DATA = \ %D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/m4-gnulib-libio.patch \ - %D%/packages/patches/nautilus-add-libportal-gtk3.patch \ + %D%/packages/patches/nautilus-disable-tracker-tests.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/ncftp-reproducible.patch \ %D%/packages/patches/netcdf-date-time.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc43e191f8..65c6156966 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9420,7 +9420,7 @@ shared object databases, search tools and indexing.") (define-public nautilus (package (name "nautilus") - (version "41.1") + (version "42.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9428,28 +9428,27 @@ shared object databases, search tools and indexing.") name "-" version ".tar.xz")) (sha256 (base32 - "0bsqh241m43x3qb3z0mjakjic610ncl95zhjdgls649phnc30qry")) + "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr")) (patches - ;; This patch is already upstream and can be removed next - ;; release. - (search-patches "nautilus-add-libportal-gtk3.patch")))) + (search-patches "nautilus-disable-tracker-tests.patch")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'make-extensible - (lambda _ - (substitute* "src/nautilus-module.c" - (("static gboolean initialized = FALSE;" all) - (string-append all " + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'make-extensible + (lambda _ + (substitute* "src/nautilus-module.c" + (("static gboolean initialized = FALSE;" all) + (string-append all " const char *extension_path; char **extension_dirs, **d; ") - ) - (("load_module_dir \\(NAUTILUS_EXTENSIONDIR\\);" all) - (string-append all - " + ) + (("load_module_dir \\(NAUTILUS_EXTENSIONDIR\\);" all) + (string-append all + " extension_path = g_getenv (\"NAUTILUS_EXTENSION_PATH\"); if (extension_path) { @@ -9459,21 +9458,28 @@ if (extension_path) g_strfreev(extension_dirs); } "))))) - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "build-aux/meson/postinstall.py" - (("gtk-update-icon-cache") "true"))))) - ;; XXX: FAIL: check-nautilus - ;; Settings schema 'org.gnome.nautilus.preferences' is not installed - #:tests? #f)) + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "build-aux/meson/postinstall.py" + (("gtk-update-icon-cache") "true")))) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check)) + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" "/tmp") ;some tests require a writable HOME + (setenv "XDG_DATA_DIRS" + (string-append (getenv "XDG_DATA_DIRS") + ":" #$output "/share"))))))) (native-inputs - (list desktop-file-utils ; for update-desktop-database - `(,glib "bin") ; for glib-mkenums, etc. + (list desktop-file-utils ;for update-desktop-database + `(,glib "bin") ;for glib-mkenums, etc. + gettext-minimal gobject-introspection - intltool pkg-config - python)) + python + python-pygobject)) (inputs (list dconf gexiv2 @@ -9487,7 +9493,6 @@ if (extension_path) libportal libseccomp libselinux - libsoup-minimal-2 ; to satisfy tracker dependencies tracker tracker-miners ;; XXX: gtk+ is required by libnautilus-extension.pc diff --git a/gnu/packages/patches/nautilus-add-libportal-gtk3.patch b/gnu/packages/patches/nautilus-add-libportal-gtk3.patch deleted file mode 100644 index cefa47cc64..0000000000 --- a/gnu/packages/patches/nautilus-add-libportal-gtk3.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 55cfd66ccca391fc144f5863ff6bfc1f3b137e2d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= -Date: Tue, 21 Dec 2021 17:42:27 +0000 -Subject: [PATCH] general: Add libportal-gtk3 dependency - -The portal-gtk3.h header has been moved into a separate library which -binds gtk3 explicitly. - -https://github.com/flatpak/libportal/pull/53 ---- - build-aux/flatpak/org.gnome.Nautilus.json | 5 +++-- ;; Changes removed in Guix - build-aux/flatpak/org.gnome.Nautilus.yml | 3 ++- ;; Changes removed in Guix - meson.build | 4 +++- - src/meson.build | 1 + - src/nautilus-files-view.c | 2 +- - 5 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/meson.build b/meson.build -index 927216636..4626fa0bb 100644 ---- a/meson.build -+++ b/meson.build -@@ -122,8 +122,10 @@ gnome_desktop = dependency('gnome-desktop-3.0', version: '>= 3.0.0') - gtk = dependency('gtk+-3.0', version: '>= 3.22.27') - libhandy = dependency('libhandy-1', version: '>= 1.1.90') - libportal = [] -+libportal_gtk3 = [] - if get_option('libportal') -- libportal = dependency('libportal', version: '>= 0.3') -+ libportal = dependency('libportal', version: '>= 0.5') -+ libportal_gtk3 = dependency('libportal-gtk3', version: '>= 0.5') - endif - selinux = [] - if get_option('selinux') -diff --git a/src/meson.build b/src/meson.build -index 682d6f3a3..d7fb76d53 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -285,6 +285,7 @@ nautilus_deps = [ - libgd_dep, - libhandy, - libportal, -+ libportal_gtk3, - nautilus_extension, - selinux, - tracker_sparql, -diff --git a/src/nautilus-files-view.c b/src/nautilus-files-view.c -index dfb7fb26c..a24005a11 100644 ---- a/src/nautilus-files-view.c -+++ b/src/nautilus-files-view.c -@@ -93,7 +93,7 @@ - - #ifdef HAVE_LIBPORTAL - #include --#include -+#include - #endif - - /* Minimum starting update inverval */ --- -GitLab - diff --git a/gnu/packages/patches/nautilus-disable-tracker-tests.patch b/gnu/packages/patches/nautilus-disable-tracker-tests.patch new file mode 100644 index 0000000000..bcc7b38f33 --- /dev/null +++ b/gnu/packages/patches/nautilus-disable-tracker-tests.patch @@ -0,0 +1,47 @@ +The tracker test hangs in the build container (see: +https://gitlab.gnome.org/GNOME/nautilus/-/issues/2486). + +--- a/test/automated/displayless/meson.build 2022-09-10 00:52:50.348405729 -0400 ++++ b/test/automated/displayless/meson.build 2022-09-10 00:53:07.267907525 -0400 +@@ -34,41 +34,3 @@ + 'test-file-operations-trash-or-delete.c' + ]] + ] +- +-tracker_tests = [ +- ['test-nautilus-search-engine-tracker', [ +- 'test-nautilus-search-engine-tracker.c', +- ]], +-] +- +-foreach t: tests +- test( +- t[0], +- executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep), +- env: [ +- test_env, +- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), +- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) +- ], +- timeout: 480 +- ) +-endforeach +- +- +- +-# Tests that read and write from the Tracker index are run using 'tracker-sandbox' +-# script to use a temporary instance of tracker-miner-fs instead of the session one. +-foreach t: tracker_tests +- test_exe = executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep) +- test( +- t[0], +- tracker_sandbox, +- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe], +- env: [ +- test_env, +- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), +- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) +- ], +- timeout: 480 +- ) +-endforeach -- cgit 1.4.1 From db3d093546c3babab9b29c4d50130361f53196f8 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sat, 10 Sep 2022 02:27:49 -0400 Subject: gnu: gspell: Update to 1.11.1. * gnu/packages/gnome.scm (gspell): Update to 1.11.1. [source]: Delete patches. [phases]{disable-problematic-tests}: New phase. [native-inputs]: Remove labels. * gnu/packages/patches/gspell-dash-test.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 31 ++++++++++++++++++----------- gnu/packages/patches/gspell-dash-test.patch | 22 -------------------- 3 files changed, 19 insertions(+), 35 deletions(-) delete mode 100644 gnu/packages/patches/gspell-dash-test.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index a733fc60de..9eb984dc66 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1243,7 +1243,6 @@ dist_patch_DATA = \ %D%/packages/patches/groovy-add-exceptionutilsgenerator.patch \ %D%/packages/patches/grub-efi-fat-serial-number.patch \ %D%/packages/patches/grub-setup-root.patch \ - %D%/packages/patches/gspell-dash-test.patch \ %D%/packages/patches/gst-plugins-good-fix-test.patch \ %D%/packages/patches/guile-1.8-cpp-4.5.patch \ %D%/packages/patches/guile-2.2-skip-oom-test.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7184b50ab4..ed4305db90 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10838,7 +10838,7 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") (define-public gspell (package (name "gspell") - (version "1.8.2") + (version "1.11.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -10846,13 +10846,18 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") name "-" version ".tar.xz")) (sha256 (base32 - "1miybm1z5cl91i25l7mfqlxhv7j8yy8rcgi0s1bgbb2vm71rb4dv")) - (patches (search-patches "gspell-dash-test.patch")))) + "14h2w0yzqwaw5dykmhh21sy2c96g17waahg2lxc52xqiyzis8spg")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags (list "--enable-vala") #:phases (modify-phases %standard-phases + (add-after 'unpack 'disable-problematic-tests + (lambda _ + (substitute* "testsuite/test-checker.c" + ;; This test is known to fail with Aspell, as a comment + ;; mentions it. Disable it. + ((".*g_test_add_func.*test_dashes.*") "")))) (add-before 'check 'pre-check (lambda* (#:key inputs #:allow-other-keys) ;; Tests require a running X server. @@ -10869,18 +10874,20 @@ that support the Assistive Technology Service Provider Interface (AT-SPI).") (inputs (list iso-codes)) (native-inputs - `(("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection) - ("pkg-config" ,pkg-config) - ("vala" ,vala) ;for VAPI, needed by Geary - ("xmllint" ,libxml2) + (list `(,glib "bin") + gobject-introspection + pkg-config + vala ;for VAPI, needed by Geary + libxml2 - ;; For tests. - ("aspell-dict-en" ,aspell-dict-en) - ("xorg-server" ,xorg-server-for-tests))) + ;; For tests. + aspell-dict-en + xorg-server-for-tests)) (propagated-inputs ;; Referred by .pc file. - (list enchant glib gtk+)) + (list enchant + glib + gtk+)) (home-page "https://wiki.gnome.org/Projects/gspell") (synopsis "GNOME's alternative spell checker") (description diff --git a/gnu/packages/patches/gspell-dash-test.patch b/gnu/packages/patches/gspell-dash-test.patch deleted file mode 100644 index 1c9d77cfba..0000000000 --- a/gnu/packages/patches/gspell-dash-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -Somehow, Aspell 0.60.6.1 and aspell-dict-en-2016.11.20-0 don't consider -this a valid spelling. Skip it. - -TODO: Migrate to using hunspell. According to upstream, this bug won't be fixed. -See https://bugzilla.gnome.org/show_bug.cgi?id=772406. ---- a/testsuite/test-checker.c 2017-03-24 09:50:50.000000000 -0400 -+++ b/testsuite/test-checker.c 2017-06-15 21:47:07.116173895 -0400 -@@ -105,10 +105,11 @@ - * be considered deprecated, it is better to use hunspell, so WONTFIX. - * For more details, see: - * https://bugzilla.gnome.org/show_bug.cgi?id=772406 -+ * -+ * correctly_spelled = gspell_checker_check_word (checker, "spell-checking", -1, &error); -+ * g_assert_no_error (error); -+ * g_assert (correctly_spelled); - */ -- correctly_spelled = gspell_checker_check_word (checker, "spell-checking", -1, &error); -- g_assert_no_error (error); -- g_assert (correctly_spelled); - - correctly_spelled = gspell_checker_check_word (checker, "nrst-auie", -1, &error); - g_assert_no_error (error); -- cgit 1.4.1 From b060857c8e06375a13da36d13b14ea9d84d0d23c Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Sun, 11 Sep 2022 01:12:07 -0400 Subject: gnu: gnome-builder: Update to 42.1. * gnu/packages/gnome.scm (gnome-builder): Update to 42.1. [source]: Remove patches field. [configure-flags]: Remove -Dplugin_flatpak=false and -Dplugin_update_manager=false. [phases]{patch-meson}: Use search-input-file. {fix-ninja}: Delete phase. [inputs]: Ad flatpak, libhandy and libostree. [propagated-inputs]: Replace gtksourceview with gtksourceview-4. * gnu/packages/patches/gnome-builder-update-libportal.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 98 ++++++++++------------ .../patches/gnome-builder-update-libportal.patch | 93 -------------------- 3 files changed, 45 insertions(+), 147 deletions(-) delete mode 100644 gnu/packages/patches/gnome-builder-update-libportal.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 9eb984dc66..58742b1cc6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1207,7 +1207,6 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ - %D%/packages/patches/gnome-builder-update-libportal.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ %D%/packages/patches/gnome-screenshot-meson-0.60.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 841cbc043f..d559e17bd8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12708,7 +12708,7 @@ libraries. Applications do not need to be recompiled--or even restarted.") (define-public gnome-builder (package (name "gnome-builder") - (version "41.2") + (version "42.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -12716,20 +12716,12 @@ libraries. Applications do not need to be recompiled--or even restarted.") name "-" version ".tar.xz")) (sha256 (base32 - "04p031i999dccbnlbysmr6f93x7dji7b559j6yhdsqbqgxb7ncan")) - (patches - (search-patches "gnome-builder-update-libportal.patch")))) + "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax")))) (build-system meson-build-system) (arguments (list - #:glib-or-gtk? #t ;To wrap binaries and compile schemas - #:configure-flags - #~(list "-Dnetwork_tests=false" - ;; TODO: Enable all plugins... - ;; Flatpak plugin wants libsoup 2 - "-Dplugin_flatpak=false" - ;; ... except this one. - "-Dplugin_update_manager=false") + #:glib-or-gtk? #t ;To wrap binaries and compile schemas + #:configure-flags #~(list "-Dnetwork_tests=false") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-meson @@ -12738,47 +12730,47 @@ libraries. Applications do not need to be recompiled--or even restarted.") (("gtk-update-icon-cache") "true") (("update-desktop-database") "true")) (substitute* "src/libide/meson.build" - (("/usr/lib") (string-append (assoc-ref inputs - "python-pygobject") - "/lib"))))) - (add-after 'configure 'fix-ninja - (lambda _ - ;; #43296: meson(?) incorrectly assumes we want to link - ;; this PIE against a static libselinux. - (substitute* "build.ninja" - (("libselinux\\.a") "libselinux.so")))) + (("/usr/lib") + (string-append #$(this-package-input "python-pygobject") + "/lib"))))) (add-before 'check 'pre-check (lambda _ (system "Xvfb :1 &") (setenv "DISPLAY" ":1")))))) - (inputs (list cmark - clang - devhelp-with-libsoup2 - glade3 - gspell - gtk+ - json-glib - jsonrpc-glib - libdazzle - libgit2-glib - libpeas - libportal - libsoup-minimal-2 - llvm - python - python-pygobject - sysprof-3.44 - template-glib - vte - webkitgtk-with-libsoup2)) - (propagated-inputs (list gtksourceview)) ; needed for settings - (native-inputs (list desktop-file-utils ; for desktop-file-validate - `(,glib "bin") - gettext-minimal - pkg-config - python ; for meson scripts - vala - xorg-server-for-tests)) + (inputs + (list cmark + clang + devhelp-with-libsoup2 + flatpak + glade3 + gspell + gtk+ + json-glib + jsonrpc-glib + libdazzle + libgit2-glib + libhandy + libpeas + libportal + libsoup-minimal-2 + llvm + libostree + python + python-pygobject + sysprof-3.44 + template-glib + vte + webkitgtk-with-libsoup2)) + (propagated-inputs + (list gtksourceview-4)) ;needed for settings + (native-inputs + (list desktop-file-utils ;for desktop-file-validate + `(,glib "bin") + gettext-minimal + pkg-config + python ;for meson scripts + vala + xorg-server-for-tests)) (home-page "https://wiki.gnome.org/Apps/Builder") (synopsis "Toolsmith for GNOME-based applications") (description @@ -12819,10 +12811,10 @@ profiler via Sysprof, debugging support, and more.") (substitute* "meson_post_install.py" (("gtk-update-icon-cache") (which "true"))))) (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap - (lambda* (#:key outputs #:allow-other-keys) - (wrap-program (search-input-file outputs "bin/komikku") - `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/komikku") + `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))) (inputs (list bash-minimal gtk+ diff --git a/gnu/packages/patches/gnome-builder-update-libportal.patch b/gnu/packages/patches/gnome-builder-update-libportal.patch deleted file mode 100644 index 1cf7f32132..0000000000 --- a/gnu/packages/patches/gnome-builder-update-libportal.patch +++ /dev/null @@ -1,93 +0,0 @@ -From b3bfa0df53a3749c3b73cb6c4bad5cab3fa549a1 Mon Sep 17 00:00:00 2001 -From: Abderrahim Kitouni -Date: Sat, 25 Dec 2021 16:25:43 +0100 -Subject: [PATCH] build: use libportal 0.5 - -This partly reverts 2aea4bd7d0ced77a7d0778517b4505af5dea2dac ---- - build-aux/flatpak/org.gnome.Builder.json | 7 ++++--- - meson.build | 2 +- - src/gstyle/gstyle-color-panel.c | 2 +- - src/plugins/devhelp/gbp-devhelp-page.c | 2 +- - src/plugins/open-with-external/gbp-owe-workbench-addin.c | 2 +- - 5 files changed, 8 insertions(+), 7 deletions(-) - -diff --git a/build-aux/flatpak/org.gnome.Builder.json b/build-aux/flatpak/org.gnome.Builder.json -index 02ac31ede..a32d29b92 100644 ---- a/build-aux/flatpak/org.gnome.Builder.json -+++ b/build-aux/flatpak/org.gnome.Builder.json -@@ -601,15 +601,16 @@ - "name" : "libportal", - "config-opts" : [ - "--libdir=/app/lib", -- "--buildtype=debugoptimized" -+ "--buildtype=debugoptimized", -+ "-Dbackends=gtk3" - ], - "buildsystem" : "meson", - "builddir" : true, - "sources" : [ - { - "type" : "archive", -- "url" : "https://github.com/flatpak/libportal/releases/download/0.4/libportal-0.4.tar.xz", -- "sha256" : "3cd5f50907831cf236b40aa14c5a14ccbbf08828cecb3286efa82ce03cacef28" -+ "url" : "https://github.com/flatpak/libportal/releases/download/0.5/libportal-0.5.tar.xz", -+ "sha256" : "d8c8cb18a34e5eeb26a39c94044c955995b01de0e139caac5e18c076cf821b3b" - } - ] - }, -diff --git a/meson.build b/meson.build -index 01737034b..494e0d752 100644 ---- a/meson.build -+++ b/meson.build -@@ -284,7 +284,7 @@ libjsonrpc_glib_dep = dependency('jsonrpc-glib-1.0', version: '>= 3.41.0') - libm_dep = cc.find_library('m', required: false) - libpangoft2_dep = dependency('pangoft2', version: '>= 1.38.0') - libpeas_dep = dependency('libpeas-1.0', version: '>= 1.22.0') --libportal_dep = dependency('libportal', version: '>= 0.3', required: false) -+libportal_dep = dependency('libportal-gtk3', required: false) - libtemplate_glib_dep = dependency('template-glib-1.0', version: '>= 3.28.0') - libvte_dep = dependency('vte-2.91', version: '>= 0.65.0') - libwebkit_dep = dependency('webkit2gtk-4.0', version: '>= 2.26', required: false) -diff --git a/src/gstyle/gstyle-color-panel.c b/src/gstyle/gstyle-color-panel.c -index 15742a7be..a6295c168 100644 ---- a/src/gstyle/gstyle-color-panel.c -+++ b/src/gstyle/gstyle-color-panel.c -@@ -30,7 +30,7 @@ - #include "gstyle-color.h" - - #include --#include -+#include - - #define HSV_TO_SCALE_FACTOR (1.0 / 256.0) - #define CIELAB_L_TO_SCALE_FACTOR (100.0 / 256.0) -diff --git a/src/plugins/devhelp/gbp-devhelp-page.c b/src/plugins/devhelp/gbp-devhelp-page.c -index 5d5c52b0d..2ac788414 100644 ---- a/src/plugins/devhelp/gbp-devhelp-page.c -+++ b/src/plugins/devhelp/gbp-devhelp-page.c -@@ -25,7 +25,7 @@ - #include - - #include --#include -+#include - - #include "gbp-devhelp-page.h" - #include "gbp-devhelp-search.h" -diff --git a/src/plugins/open-with-external/gbp-owe-workbench-addin.c b/src/plugins/open-with-external/gbp-owe-workbench-addin.c -index 51d2da844..816fe643f 100644 ---- a/src/plugins/open-with-external/gbp-owe-workbench-addin.c -+++ b/src/plugins/open-with-external/gbp-owe-workbench-addin.c -@@ -23,7 +23,7 @@ - #include "gbp-owe-workbench-addin.h" - - #include --#include -+#include - - struct _GbpOweWorkbenchAddin - { --- -GitLab - -- cgit 1.4.1 From 1d7402c4ed8b44044252882af0670cfeef02a7a1 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 13 Sep 2022 02:00:42 -0400 Subject: gnu: gnome-screenshot: Remove meson patch. * gnu/packages/gnome.scm (gnome-screenshot) [source]: Delete patches field. * gnu/packages/patches/gnome-screenshot-meson-0.60.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 4 +-- .../patches/gnome-screenshot-meson-0.60.patch | 39 ---------------------- 3 files changed, 1 insertion(+), 43 deletions(-) delete mode 100644 gnu/packages/patches/gnome-screenshot-meson-0.60.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 58742b1cc6..c9a7cb7489 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1209,7 +1209,6 @@ dist_patch_DATA = \ %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ - %D%/packages/patches/gnome-screenshot-meson-0.60.patch \ %D%/packages/patches/gnome-settings-daemon-gc.patch \ %D%/packages/patches/gnome-session-support-elogind.patch \ %D%/packages/patches/gnome-todo-libportal.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a482880195..d6d22f8eb1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9685,9 +9685,7 @@ can add your own files to the collection.") name "-" version ".tar.xz")) (sha256 (base32 - "15wmikwk62cdi93gas77nqh4fbhlrxrncyfmcd1gfa34jbn7vnsa")) - (patches - (search-patches "gnome-screenshot-meson-0.60.patch")))) + "15wmikwk62cdi93gas77nqh4fbhlrxrncyfmcd1gfa34jbn7vnsa")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t diff --git a/gnu/packages/patches/gnome-screenshot-meson-0.60.patch b/gnu/packages/patches/gnome-screenshot-meson-0.60.patch deleted file mode 100644 index c80ce9d6a3..0000000000 --- a/gnu/packages/patches/gnome-screenshot-meson-0.60.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fixes build issue with Meson 0.60.0. Taken from upstream -https://gitlab.gnome.org/GNOME/gnome-screenshot/-/merge_requests/57 - -From b60dad3c2536c17bd201f74ad8e40eb74385ed9f Mon Sep 17 00:00:00 2001 -From: Jack Hill -Date: Thu, 18 Nov 2021 00:46:58 -0500 -Subject: [PATCH] meson: remove extraneous positional argument - -* data/meson.build (desktop_file) - (metainfo_file): Remove extraneous positional argument. - -Closes #186 ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index fd570b3..4e2e2e8 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -1,7 +1,6 @@ - gnome = import('gnome') - - desktop_file = i18n.merge_file( -- 'desktop', - type: 'desktop', - input: 'org.gnome.Screenshot.desktop.in', - output: 'org.gnome.Screenshot.desktop', -@@ -23,7 +22,6 @@ if desktop_file_validate.found() - endif - - metainfo_file = i18n.merge_file( -- 'appdata', - input: 'org.gnome.Screenshot.metainfo.xml.in', - output: 'org.gnome.Screenshot.metainfo.xml', - po_dir: join_paths(meson.current_source_dir(), '../po'), --- -2.33.1 - -- cgit 1.4.1 From d8d5e2a88fe3c7de1fe4d02c6cafd585a808dde5 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Tue, 13 Sep 2022 22:38:35 +0200 Subject: gnu: hedgewars: Update to 1.0.2. * gnu/packages/games.scm (hedgewars): Update to 1.0.2. * gnu/packages/patches/hedgewars-network-bsd.patch: Delete file. * gnu/local.mk: Apply removal. --- gnu/local.mk | 1 - gnu/packages/games.scm | 5 +- gnu/packages/patches/hedgewars-network-bsd.patch | 150 ----------------------- 3 files changed, 2 insertions(+), 154 deletions(-) delete mode 100644 gnu/packages/patches/hedgewars-network-bsd.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index c9a7cb7489..2f65e7ed01 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1286,7 +1286,6 @@ dist_patch_DATA = \ %D%/packages/patches/hdf-eos5-remove-gctp.patch \ %D%/packages/patches/hdf-eos5-fix-szip.patch \ %D%/packages/patches/hdf-eos5-fortrantests.patch \ - %D%/packages/patches/hedgewars-network-bsd.patch \ %D%/packages/patches/helm-fix-gcc-9-build.patch \ %D%/packages/patches/http-parser-CVE-2020-8287.patch \ %D%/packages/patches/htslib-for-stringtie.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6e176fee9e..23d51b1aa9 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9311,15 +9311,14 @@ play with up to four players simultaneously. It has network support.") (define-public hedgewars (package (name "hedgewars") - (version "1.0.0") + (version "1.0.2") (source (origin (method url-fetch) (uri (string-append "https://www.hedgewars.org/download/releases/" "hedgewars-src-" version ".tar.bz2")) - (patches (search-patches "hedgewars-network-bsd.patch")) (sha256 (base32 - "0nqm9w02m0xkndlsj6ys3wr0ik8zc14zgilq7k6fwjrf3zk385i1")))) + "04pjpkjhpy720n803gv35iygmjdvsrmw13mih4ympjnqbgjfa7r0")))) (build-system cmake-build-system) (arguments ;; XXX: Engine is built as Pascal source code, requiring Free Pascal diff --git a/gnu/packages/patches/hedgewars-network-bsd.patch b/gnu/packages/patches/hedgewars-network-bsd.patch deleted file mode 100644 index 311ce8bf09..0000000000 --- a/gnu/packages/patches/hedgewars-network-bsd.patch +++ /dev/null @@ -1,150 +0,0 @@ -From f813f3d5b63bb5be1b5e0b44930e77656c547aad Mon Sep 17 00:00:00 2001 -From: Jens Petersen -Date: Wed, 8 Jul 2020 17:02:45 +0300 -Subject: [PATCH] update server network - ---- - gameServer/Actions.hs | 2 +- - gameServer/CMakeLists.txt | 3 ++- - gameServer/ClientIO.hs | 4 ++-- - gameServer/CoreTypes.hs | 2 +- - gameServer/OfficialServer/checker.hs | 5 ++--- - gameServer/Utils.hs | 6 +----- - gameServer/hedgewars-server.cabal | 3 ++- - gameServer/hedgewars-server.hs | 5 +++-- - 8 files changed, 14 insertions(+), 16 deletions(-) - -diff --git a/gameServer/Actions.hs b/gameServer/Actions.hs -index 125d6ea832..c42d17b9a9 100644 ---- a/gameServer/Actions.hs -+++ b/gameServer/Actions.hs -@@ -709,7 +709,7 @@ processAction RestartServer = do - args <- gets (runArgs . serverInfo) - io $ do - noticeM "Core" "Closing listening socket" -- sClose sock -+ close sock - noticeM "Core" "Spawning new server" - _ <- createProcess (proc "./hedgewars-server" args) - return () -diff --git a/gameServer/CMakeLists.txt b/gameServer/CMakeLists.txt -index 5f2c882563..e71650c70c 100644 ---- a/gameServer/CMakeLists.txt -+++ b/gameServer/CMakeLists.txt -@@ -9,7 +9,8 @@ check_haskell_package_exists(base "Control.Exception" mask 1) - check_haskell_package_exists(containers "Data.Map" size 1) - check_haskell_package_exists(vector "Data.Vector" length 1) - check_haskell_package_exists(bytestring "Data.ByteString" pack 1) --check_haskell_package_exists(network "Network.BSD" getHostName 0) -+check_haskell_package_exists(network "Network.Socket" defaultHints 0) -+check_haskell_package_exists(network-bsd "Network.BSD" getHostName 0) - check_haskell_package_exists(time "Data.Time" getCurrentTime 0) - check_haskell_package_exists(mtl "Control.Monad.State" fix 1) - check_haskell_package_exists(sandi "Codec.Binary.Base64" encode 1) -diff --git a/gameServer/ClientIO.hs b/gameServer/ClientIO.hs -index 46dd40ed9f..0c97bde932 100644 ---- a/gameServer/ClientIO.hs -+++ b/gameServer/ClientIO.hs -@@ -23,7 +23,7 @@ import qualified Control.Exception as Exception - import Control.Monad.State - import Control.Concurrent.Chan - import Control.Concurrent --import Network -+import Network.Socket hiding (recv) - import Network.Socket.ByteString - import qualified Data.ByteString.Char8 as B - ---------------- -@@ -90,7 +90,7 @@ clientSendLoop s tId chan ci = do - sendAll s $ B.unlines answer `B.snoc` '\n' - - if isQuit answer then -- sClose s -+ close s - else - clientSendLoop s tId chan ci - -diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs -index f547df483a..72f35807e3 100644 ---- a/gameServer/CoreTypes.hs -+++ b/gameServer/CoreTypes.hs -@@ -23,7 +23,7 @@ import Control.Concurrent - import Data.Word - import qualified Data.Map as Map - import Data.Time --import Network -+import Network.Socket - import Data.Function - import Data.ByteString.Char8 as B - import Data.Unique -diff --git a/gameServer/OfficialServer/checker.hs b/gameServer/OfficialServer/checker.hs -index 37df3208b9..b4ecb8fc57 100644 ---- a/gameServer/OfficialServer/checker.hs -+++ b/gameServer/OfficialServer/checker.hs -@@ -28,8 +28,7 @@ import System.Directory - import Control.Monad.State - import Control.Concurrent.Chan - import Control.Concurrent --import Network --import Network.BSD -+import Network.BSD hiding (recv) - import Network.Socket hiding (recv, sClose) - import Network.Socket.ByteString - import qualified Data.ByteString.Char8 as B -@@ -207,7 +206,7 @@ main = withSocketsDo . forever $ do - - Exception.bracket - setupConnection -- (\s -> noticeM "Core" "Shutting down" >> sClose s) -+ (\s -> noticeM "Core" "Shutting down" >> close s) - (session login password (d ++ "/.hedgewars") exeFullname dataPrefix) - where - setupConnection = do -diff --git a/gameServer/Utils.hs b/gameServer/Utils.hs -index 3d81b7f7c6..9fd80c01ba 100644 ---- a/gameServer/Utils.hs -+++ b/gameServer/Utils.hs -@@ -41,11 +41,7 @@ import CoreTypes - - - sockAddr2String :: SockAddr -> IO B.ByteString --sockAddr2String (SockAddrInet _ hostAddr) = liftM B.pack $ inet_ntoa hostAddr --sockAddr2String (SockAddrInet6 _ _ (a, b, c, d) _) = -- return $ B.pack $ (foldr1 (.) -- $ List.intersperse (':':) -- $ concatMap (\n -> (\(a0, a1) -> [showHex a0, showHex a1]) $ divMod n 65536) [a, b, c, d]) [] -+sockAddr2String = liftM (B.pack . fromJust . fst) . getNameInfo [] True False - - maybeRead :: Read a => String -> Maybe a - maybeRead s = case reads s of -diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal -index 3c7f2418c9..9f764fd997 100644 ---- a/gameServer/hedgewars-server.cabal -+++ b/gameServer/hedgewars-server.cabal -@@ -57,7 +57,8 @@ Executable checker - containers, - vector, - bytestring, -- network >= 2.3 && < 3.0, -+ network >= 2.3, -+ network-bsd, - mtl >= 2, - sandi, - hslogger, -diff --git a/gameServer/hedgewars-server.hs b/gameServer/hedgewars-server.hs -index e47ae2891d..7e6ab8fa38 100644 ---- a/gameServer/hedgewars-server.hs -+++ b/gameServer/hedgewars-server.hs -@@ -50,10 +50,11 @@ server si = do - proto <- getProtocolNumber "tcp" - E.bracket - (socket AF_INET Stream proto) -- sClose -+ close - (\sock -> do - setSocketOption sock ReuseAddr 1 -- bindSocket sock (SockAddrInet (listenPort si) iNADDR_ANY) -+ iNADDR_ANY <- addrAddress . head <$> getAddrInfo Nothing (Just "0") (Just (show (listenPort si))) -+ bind sock iNADDR_ANY - listen sock maxListenQueue - startServer si{serverSocket = Just sock} - ) -- cgit 1.4.1 From 76454d9af373da8b0ca5d47b278d67dc051ec09f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Tue, 13 Sep 2022 22:57:06 -0400 Subject: gnu: cmake: Update to 3.24.2. * gnu/packages/cmake.scm (cmake): Update to 3.24.2. [source]: Adjust snippet to preserve "Utilities/cmelf". Override with new patch. [native-inputs]: Use modify-inputs and remove labels. * gnu/packages/patches/cmake-curl-certificates-3.24.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/cmake.scm | 30 +++++++++++++++++----- .../patches/cmake-curl-certificates-3.24.patch | 21 +++++++++++++++ 3 files changed, 45 insertions(+), 7 deletions(-) create mode 100644 gnu/packages/patches/cmake-curl-certificates-3.24.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index 2f65e7ed01..adaa709b3e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -975,6 +975,7 @@ dist_patch_DATA = \ %D%/packages/patches/cling-use-shared-library.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates.patch \ + %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/containerd-create-pid-file.patch \ diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index cf930c57fc..87fde01f63 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -8,7 +8,7 @@ ;;; Copyright © 2017, 2018, 2020, 2021 Marius Bakke ;;; Copyright © 2018 Arun Isaac ;;; Copyright © 2018, 2020 Tobias Geerinckx-Rice -;;; Copyright © 2019, 2020, 2021 Maxim Cournoyer +;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2019 Pierre-Moana Levesque ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Ricardo Wurmus @@ -333,6 +333,24 @@ and workspaces that can be used in the compiler environment of your choice.") (package (inherit cmake-minimal) (name "cmake") + (version "3.24.2") + (source (origin + (inherit (package-source cmake-minimal)) + (method url-fetch) + (uri (string-append "https://cmake.org/files/v" + (version-major+minor version) + "/cmake-" version ".tar.gz")) + (snippet (match (origin-snippet (package-source cmake-minimal)) + (('begin ('define 'preserved-files ('quote x)) + rest ...) + `(begin (define preserved-files + ',(cons "Utilities/cmelf" x)) + ,@rest)))) + (sha256 + (base32 + "1ny8y2dzc6fww9gzb1ml0vjpx4kclphjihkxagxigprxdzq2140d")) + (patches (search-patches "cmake-curl-certificates-3.24.patch")))) + (outputs '("out" "doc")) (arguments (substitute-keyword-arguments (package-arguments cmake-minimal) ;; Use cmake-minimal this time. @@ -368,14 +386,12 @@ and workspaces that can be used in the compiler environment of your choice.") (delete-file-recursively (string-append out html))))))))) (inputs (modify-inputs (package-inputs cmake-minimal) - (prepend ncurses ;required for ccmake - ))) + (prepend ncurses))) ;required for ccmake ;; Extra inputs required to build the documentation. (native-inputs - `(,@(package-native-inputs cmake-minimal) - ("python-sphinx" ,python-sphinx) - ("texinfo" ,texinfo))) - (outputs '("out" "doc")) + (modify-inputs (package-native-inputs cmake-minimal) + (append python-sphinx + texinfo))) (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) (define-public cmake-minimal-cross diff --git a/gnu/packages/patches/cmake-curl-certificates-3.24.patch b/gnu/packages/patches/cmake-curl-certificates-3.24.patch new file mode 100644 index 0000000000..ca29c9001e --- /dev/null +++ b/gnu/packages/patches/cmake-curl-certificates-3.24.patch @@ -0,0 +1,21 @@ +Submitted upstream at https://gitlab.kitware.com/cmake/cmake/-/merge_requests/7670. + +diff --git a/Source/cmCurl.cxx b/Source/cmCurl.cxx +index 28ee24dfe9..fc5405213a 100644 +--- a/Source/cmCurl.cxx ++++ b/Source/cmCurl.cxx +@@ -38,6 +38,14 @@ std::string cmCurlSetCAInfo(::CURL* curl, const std::string& cafile) + ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, cafile.c_str()); + check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); + } ++ /* Honor the user-configurable OpenSSL environment variables. */ ++ else if (cmSystemTools::GetEnv("SSL_CERT_FILE", e)) { ++ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAINFO, e.c_str()); ++ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); ++ } else if (cmSystemTools::GetEnv("SSL_CERT_DIR", e)) { ++ ::CURLcode res = ::curl_easy_setopt(curl, CURLOPT_CAPATH, e.c_str()); ++ check_curl_result(res, "Unable to set TLS/SSL Verify CAINFO: "); ++ } + #ifdef CMAKE_FIND_CAFILE + # define CMAKE_CAFILE_FEDORA "/etc/pki/tls/certs/ca-bundle.crt" + else if (cmSystemTools::FileExists(CMAKE_CAFILE_FEDORA, true)) { -- cgit 1.4.1 From 0336372296e676f97799d6a3a1e9cf209f14c6bc Mon Sep 17 00:00:00 2001 From: Andrew Tropin Date: Wed, 14 Sep 2022 09:21:32 +0300 Subject: gnu: emacs-kv: Fix build. Build fails with emacs-next cause of copypasted test defined two times. * gnu/packages/patches/emacs-kv-fix-tests.patch: New file. * gnu/packages/emacs-xyz.scm (emacs-kv): Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/packages/emacs-xyz.scm | 4 +++- gnu/packages/patches/emacs-kv-fix-tests.patch | 30 +++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/emacs-kv-fix-tests.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index adaa709b3e..bc4594146a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1051,6 +1051,7 @@ dist_patch_DATA = \ %D%/packages/patches/emacs-telega-test-env.patch \ %D%/packages/patches/emacs-wordnut-require-adaptive-wrap.patch \ %D%/packages/patches/emacs-yasnippet-fix-tests.patch \ + %D%/packages/patches/emacs-kv-fix-tests.patch \ %D%/packages/patches/enjarify-setup-py.patch \ %D%/packages/patches/enlightenment-fix-setuid-path.patch \ %D%/packages/patches/erlang-man-path.patch \ diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 53672377b1..3311e973e6 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -17951,7 +17951,9 @@ formatting rules for that language.") (file-name (git-file-name name version)) (sha256 (base32 - "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m")))) + "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m")) + (patches + (search-patches "emacs-kv-fix-tests.patch")))) (build-system emacs-build-system) (arguments `(#:tests? #t diff --git a/gnu/packages/patches/emacs-kv-fix-tests.patch b/gnu/packages/patches/emacs-kv-fix-tests.patch new file mode 100644 index 0000000000..35a6bf004c --- /dev/null +++ b/gnu/packages/patches/emacs-kv-fix-tests.patch @@ -0,0 +1,30 @@ +From 4702849bfe7462fb6c6303786dac1b670c8f0f8f Mon Sep 17 00:00:00 2001 +From: Andrew Tropin +Date: Wed, 14 Sep 2022 09:17:31 +0300 +Subject: [PATCH] remove copypasted kvaq test + +--- + kv-tests.el | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/kv-tests.el b/kv-tests.el +index 1713e5e..abd6a24 100644 +--- a/kv-tests.el ++++ b/kv-tests.el +@@ -105,13 +105,6 @@ + (should-not (equal "b" (kvaq "a" '((:a . :b)("a" . "b"))))) + (should-not (kvaq "b" '((:a . :b)("a" . "b"))))) + +-(ert-deftest kvaq () +- "Test the simple assq." +- (should (equal :b (kvaq :a '((:a . :b)("a" . "b"))))) +- (should (equal 2 (kvaq 1 '((1 . 2)("a" . "b"))))) +- (should-not (equal "b" (kvaq "a" '((:a . :b)("a" . "b"))))) +- (should-not (kvaq "b" '((:a . :b)("a" . "b"))))) +- + (ert-deftest kvaqc () + "Test the simple assq." + (should (equal :b (kvaqc :a '((:a . :b)("a" . "b"))))) +-- +2.37.3 + -- cgit 1.4.1 From 261bc8f02885d89faed0deb682405a83d6c9d535 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 14 Sep 2022 22:19:57 -0400 Subject: gnu: nautilus: Simplify how tracker tests are disabled. * gnu/packages/gnome.scm (nautilus)[source]: Remove patches field. [phases]{disable-tracker-tests}: New phase. * gnu/packages/patches/nautilus-disable-tracker-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 11 +++-- .../patches/nautilus-disable-tracker-tests.patch | 47 ---------------------- 3 files changed, 8 insertions(+), 51 deletions(-) delete mode 100644 gnu/packages/patches/nautilus-disable-tracker-tests.patch (limited to 'gnu/local.mk') diff --git a/gnu/local.mk b/gnu/local.mk index bc4594146a..cd41e6794d 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1537,7 +1537,6 @@ dist_patch_DATA = \ %D%/packages/patches/musl-cross-locale.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/m4-gnulib-libio.patch \ - %D%/packages/patches/nautilus-disable-tracker-tests.patch \ %D%/packages/patches/ncompress-fix-softlinks.patch \ %D%/packages/patches/ncftp-reproducible.patch \ %D%/packages/patches/netcdf-date-time.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cc8e2a0396..5a3ae2659d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9519,15 +9519,20 @@ shared object databases, search tools and indexing.") name "-" version ".tar.xz")) (sha256 (base32 - "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr")) - (patches - (search-patches "nautilus-disable-tracker-tests.patch")))) + "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-tracker-tests + ;; The tracker test hangs in the build container (see: + ;; https://gitlab.gnome.org/GNOME/nautilus/-/issues/2486). + (lambda _ + (substitute* "test/automated/displayless/meson.build" + (("^foreach t: tracker_tests" all) + (string-append "tracker_tests = []\n" all))))) (add-after 'unpack 'make-extensible (lambda _ (substitute* "src/nautilus-module.c" diff --git a/gnu/packages/patches/nautilus-disable-tracker-tests.patch b/gnu/packages/patches/nautilus-disable-tracker-tests.patch deleted file mode 100644 index bcc7b38f33..0000000000 --- a/gnu/packages/patches/nautilus-disable-tracker-tests.patch +++ /dev/null @@ -1,47 +0,0 @@ -The tracker test hangs in the build container (see: -https://gitlab.gnome.org/GNOME/nautilus/-/issues/2486). - ---- a/test/automated/displayless/meson.build 2022-09-10 00:52:50.348405729 -0400 -+++ b/test/automated/displayless/meson.build 2022-09-10 00:53:07.267907525 -0400 -@@ -34,41 +34,3 @@ - 'test-file-operations-trash-or-delete.c' - ]] - ] -- --tracker_tests = [ -- ['test-nautilus-search-engine-tracker', [ -- 'test-nautilus-search-engine-tracker.c', -- ]], --] -- --foreach t: tests -- test( -- t[0], -- executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep), -- env: [ -- test_env, -- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), -- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) -- ], -- timeout: 480 -- ) --endforeach -- -- -- --# Tests that read and write from the Tracker index are run using 'tracker-sandbox' --# script to use a temporary instance of tracker-miner-fs instead of the session one. --foreach t: tracker_tests -- test_exe = executable(t[0], t[1], files('test-utilities.c'), dependencies: libnautilus_dep) -- test( -- t[0], -- tracker_sandbox, -- args: ['--store-tmpdir', '--index-recursive-tmpdir', test_exe], -- env: [ -- test_env, -- 'G_TEST_BUILDDIR=@0@'.format(meson.current_build_dir()), -- 'G_TEST_SRCDIR=@0@'.format(meson.current_source_dir()) -- ], -- timeout: 480 -- ) --endforeach -- cgit 1.4.1