From dcfa0acd7be3d6beaa87aae0ebe92104d7626a57 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:32 +1000 Subject: Correct email and license info for Brendan Tildesley. * gnu/packages/audio.scm: Correct email and license info. * gnu/packages/ebook.scm: Correct email and license info. * gnu/packages/fonts.scm: Correct email and license info. * gnu/packages/freedesktop.scm: Correct email and license info. * gnu/packages/gnome.scm: Correct email and license info. * gnu/packages/linux.scm: Correct email and license info. * gnu/packages/lxde.scm: Correct email and license info. * gnu/packages/python-web.scm: Correct email and license info. * gnu/packages/python-xyz.scm: Correct email and license info. * gnu/packages/python.scm: Correct email and license info. * gnu/packages/video.scm: Correct email and license info. * gnu/packages/web.scm: Correct email and license info. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8e3b7a406a..692a215e0d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -27,7 +27,7 @@ ;;; Copyright © 2017, 2018 nee ;;; Copyright © 2017 Chris Marusich ;;; Copyright © 2017 Mohammed Sadiq -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017 Brendan Tildesley ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Vasile Dumitrascu -- cgit v1.2.3 From 1df38cfcc78b750567f292a173e43a2633757cb0 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 May 2019 15:26:36 +0200 Subject: gnu: gnome-control-center: Patch file name of 'gkbd-keyboard-display'. Fixes . Reported by sirgazil . * gnu/packages/gnome.scm (gnome-control-center)[arguments]: In 'patch-paths' phase, patch "cc-region-panel.cc" and provide it with the absolute file name of 'gkbd-keyboard-display'. --- gnu/packages/gnome.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 692a215e0d..3e51e9cf9b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5837,13 +5837,18 @@ devices using the GNOME desktop.") (add-before 'configure 'patch-paths (lambda* (#:key inputs #:allow-other-keys) (let ((libc (assoc-ref inputs "libc")) - (tzdata (assoc-ref inputs "tzdata"))) + (tzdata (assoc-ref inputs "tzdata")) + (libgnomekbd (assoc-ref inputs "libgnomekbd"))) (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) (substitute* "panels/datetime/test-endianess.c" (("/usr/share/locale") (string-append libc "/share/locale"))) + (substitute* "panels/region/cc-region-panel.c" + (("\"gkbd-keyboard-display") + (string-append "\"" libgnomekbd + "/bin/gkbd-keyboard-display"))) #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. @@ -5867,6 +5872,7 @@ devices using the GNOME desktop.") ("grilo" ,grilo) ("ibus" ,ibus) ("libcanberra" ,libcanberra) + ("libgnomekbd" ,libgnomekbd) ("libgudev" ,libgudev) ("libgtop" ,libgtop) ("libpwquality" ,libpwquality) -- cgit v1.2.3 From 341225ac6ccf1e2fcf52a58fb4230586a53bae05 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 7 May 2019 15:41:35 +0200 Subject: gnu: gnome-control-center: Patch file name of 'nm-connection-editor'. * gnu/packages/gnome.scm (gnome-control-center)[argument]: In 'patch-paths' phase, provide absolute file name to 'nm-connection-editor' in panels/network/*.c --- gnu/packages/gnome.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3e51e9cf9b..7c40a39f01 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5838,7 +5838,8 @@ devices using the GNOME desktop.") (lambda* (#:key inputs #:allow-other-keys) (let ((libc (assoc-ref inputs "libc")) (tzdata (assoc-ref inputs "tzdata")) - (libgnomekbd (assoc-ref inputs "libgnomekbd"))) + (libgnomekbd (assoc-ref inputs "libgnomekbd")) + (nm-applet (assoc-ref inputs "network-manager-applet"))) (substitute* "panels/datetime/tz.h" (("/usr/share/zoneinfo/zone.tab") (string-append tzdata "/share/zoneinfo/zone.tab"))) @@ -5849,6 +5850,12 @@ devices using the GNOME desktop.") (("\"gkbd-keyboard-display") (string-append "\"" libgnomekbd "/bin/gkbd-keyboard-display"))) + (substitute* '("panels/network/net-device-wifi.c" + "panels/network/net-device.c" + "panels/network/connection-editor/net-connection-editor.c") + (("\"nm-connection-editor") + (string-append "\"" nm-applet + "/bin/nm-connection-editor"))) #t)))))) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-mkenums, etc. -- cgit v1.2.3 From d13f3a033e42b4a14d581390b8fa36cd1db7d023 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Thu, 6 Dec 2018 12:22:34 +0100 Subject: gnu: gnome-tweak-tool: Update to 3.28.1. Fixes . * gnu/packages/gnome.scm (gnome-tweak-tool): Deprecate and rename... (gnome-tweaks): ...to this. Update to 3.28.1. [build-system]: Use meson-build-system. [arguments]: Adjust configure flags; pass glib-or-gtk? flag; remove custom phases that are now provided by the meson-build-system; add phases "wrap" and "wrap-gi-typelib". [native-inputs]: Remove meson-for-build and ninja. [home-page]: Update. [description]: Use "Tweaks" instead of "Tweak Tool". * gnu/packages/patches/gnome-tweak-tool-search-paths.patch: Rename file... * gnu/packages/patches/gnome-tweaks-search-paths.patch: ...to this. * gnu/local.mk (dist_patch_DATA): Update patch file name. --- gnu/local.mk | 2 +- gnu/packages/gnome.scm | 66 ++++++++++------------ .../patches/gnome-tweak-tool-search-paths.patch | 52 ----------------- .../patches/gnome-tweaks-search-paths.patch | 52 +++++++++++++++++ 4 files changed, 83 insertions(+), 89 deletions(-) delete mode 100644 gnu/packages/patches/gnome-tweak-tool-search-paths.patch create mode 100644 gnu/packages/patches/gnome-tweaks-search-paths.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 3f97397c4a..133293aad3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -862,7 +862,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnome-shell-theme.patch \ - %D%/packages/patches/gnome-tweak-tool-search-paths.patch \ + %D%/packages/patches/gnome-tweaks-search-paths.patch \ %D%/packages/patches/gnucash-fix-test-transaction-failure.patch \ %D%/packages/patches/gnutls-skip-trust-store-test.patch \ %D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7c40a39f01..e1d2a65ccb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6777,51 +6777,41 @@ fit the GNOME desktop.") existing databases over the internet.") (license license:gpl3+))) -(define-public gnome-tweak-tool +(define-public gnome-tweaks (package - (name "gnome-tweak-tool") - (version "3.26.4") + (name "gnome-tweaks") + (version "3.28.1") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/gnome-tweak-tool/" + (uri (string-append "mirror://gnome/sources/gnome-tweaks/" (version-major+minor version) "/" - "gnome-tweak-tool-" version ".tar.xz")) - (patches (list - (search-patch "gnome-tweak-tool-search-paths.patch"))) + "gnome-tweaks-" version ".tar.xz")) + (patches + (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "1pq5a0kzh1sz7s7ax5c7p6212k9d51nk5bfvjfyqn99cs928187x")))) - (build-system glib-or-gtk-build-system) + "1p5xydr0haz4389h6dvvbna6i1mipdzvmlfksnv0jqfvfs9sy6fp")))) + (build-system meson-build-system) (arguments - `(#:configure-flags '("--localstatedir=/tmp" - "--sysconfdir=/tmp") + `(#:glib-or-gtk? #t + #:configure-flags '("-Dlocalstatedir=/tmp" + "-Dsysconfdir=/tmp") #:imported-modules ((guix build python-build-system) - ,@%glib-or-gtk-build-system-modules) - #:phases (modify-phases %standard-phases - (delete 'configure) - (replace 'build - (lambda* (#:key outputs #:allow-other-keys) - (invoke "meson" "build" - "--prefix" (assoc-ref outputs "out")))) - (replace 'check - (lambda _ (invoke "ninja" "-C" "build" "test"))) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (invoke "ninja" "-C" "build" "install"))) - (add-after 'install 'wrap-program - (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/gnome-tweak-tool") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) - #t)) - (add-after 'install 'wrap - (@@ (guix build python-build-system) wrap))))) + ,@%meson-build-system-modules) + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap + (@@ (guix build python-build-system) wrap)) + (add-after 'wrap 'wrap-gi-typelib + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append out "/bin/gnome-tweaks") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + #t))))) (native-inputs `(("gtk+:bin" ,gtk+ "bin") ; For gtk-update-icon-cache ("intltool" ,intltool) - ("meson" ,meson-for-build) - ("ninja" ,ninja) ("pkg-config" ,pkg-config))) (inputs `(("gnome-desktop" ,gnome-desktop) @@ -6834,14 +6824,18 @@ existing databases over the internet.") ("python" ,python) ("python-pygobject" ,python-pygobject))) (synopsis "Customize advanced GNOME 3 options") - (home-page "https://wiki.gnome.org/action/show/Apps/GnomeTweakTool") + (home-page "https://wiki.gnome.org/Apps/Tweaks") (description - "GNOME Tweak Tool allows adjusting advanced configuration settings in + "GNOME Tweaks allows adjusting advanced configuration settings in GNOME 3. This includes things like the fonts used in user interface elements, alternative user interface themes, changes in window management behavior, GNOME Shell appearance and extension, etc.") (license license:gpl3+))) +;; This package has been renamed by upstream. +(define-public gnome-tweak-tool + (deprecated-package "gnome-tweak-tool" gnome-tweaks)) + (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") diff --git a/gnu/packages/patches/gnome-tweak-tool-search-paths.patch b/gnu/packages/patches/gnome-tweak-tool-search-paths.patch deleted file mode 100644 index 027c61b3af..0000000000 --- a/gnu/packages/patches/gnome-tweak-tool-search-paths.patch +++ /dev/null @@ -1,52 +0,0 @@ -Gnome-tweak-tool does not look at GSETTINGS_SCHEMA_PATH or XDG_DATA_DIRS, it -assumes that schemas are installed in one global directory -(GSETTINGS_SCHEMA_DIR/gsettingsschemadir). - -Guix/GuixSD uses a different directory for every gir package and has -packages pick-up files using XDG_DATA_DIRS. - -Upstream ticket: https://bugzilla.gnome.org/show_bug.cgi?id=764537 -janneke@gnu.org - ---- gnome-tweak-tool-3.18.1.orig/gtweak/gsettings.py 2015-04-08 15:21:32.000000000 +0200 -+++ gnome-tweak-tool-3.18.1/gtweak/gsettings.py 2016-04-03 11:26:38.658482704 +0200 -@@ -16,7 +16,8 @@ - # along with gnome-tweak-tool. If not, see . - - import logging --import os.path -+import os -+import sys - import xml.dom.minidom - import gettext - -@@ -31,6 +32,13 @@ - class GSettingsMissingError(Exception): - pass - -+def file_from_path(path, file_name): -+ for dir in path: -+ f = os.path.join(dir, file_name) -+ if os.path.exists(f): -+ return f -+ return None -+ - class _GSettingsSchema: - def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): - if not schema_dir: -@@ -38,9 +46,14 @@ - if not schema_filename: - schema_filename = schema_name + ".gschema.xml" - -+ schema_prefix = os.path.join('glib-2.0', 'schemas') - schema_path = os.path.join(schema_dir, schema_filename) - if not os.path.exists(schema_path): -- logging.critical("Could not find schema %s" % schema_path) -+ schema_path = file_from_path(os.environ.get ('GSETTINGS_SCHEMA_PATH', '').split(os.path.pathsep), schema_filename) -+ if not (schema_path and os.path.exists(schema_path)): -+ schema_path = file_from_path(os.environ.get ('XDG_DATA_DIRS', '').split(os.path.pathsep), os.path.join(schema_prefix, schema_filename)) -+ if not (schema_path and os.path.exists(schema_path)): -+ logging.critical("Could not find schema %s" % schema_filename) - assert(False) - - self._schema_name = schema_name diff --git a/gnu/packages/patches/gnome-tweaks-search-paths.patch b/gnu/packages/patches/gnome-tweaks-search-paths.patch new file mode 100644 index 0000000000..e7524fa675 --- /dev/null +++ b/gnu/packages/patches/gnome-tweaks-search-paths.patch @@ -0,0 +1,52 @@ +Gnome-tweaks does not look at GSETTINGS_SCHEMA_PATH or XDG_DATA_DIRS, it +assumes that schemas are installed in one global directory +(GSETTINGS_SCHEMA_DIR/gsettingsschemadir). + +Guix/GuixSD uses a different directory for every gir package and has +packages pick-up files using XDG_DATA_DIRS. + +Upstream ticket: https://bugzilla.gnome.org/show_bug.cgi?id=764537 +janneke@gnu.org + +--- gnome-tweak-3.18.1.orig/gtweak/gsettings.py 2015-04-08 15:21:32.000000000 +0200 ++++ gnome-tweak-tool-3.18.1/gtweak/gsettings.py 2016-04-03 11:26:38.658482704 +0200 +@@ -16,7 +16,8 @@ + # along with gnome-tweak-tool. If not, see . + + import logging +-import os.path ++import os ++import sys + import xml.dom.minidom + import gettext + +@@ -31,6 +32,13 @@ + class GSettingsMissingError(Exception): + pass + ++def file_from_path(path, file_name): ++ for dir in path: ++ f = os.path.join(dir, file_name) ++ if os.path.exists(f): ++ return f ++ return None ++ + class _GSettingsSchema: + def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options): + if not schema_dir: +@@ -38,9 +46,14 @@ + if not schema_filename: + schema_filename = schema_name + ".gschema.xml" + ++ schema_prefix = os.path.join('glib-2.0', 'schemas') + schema_path = os.path.join(schema_dir, schema_filename) + if not os.path.exists(schema_path): +- logging.critical("Could not find schema %s" % schema_path) ++ schema_path = file_from_path(os.environ.get ('GSETTINGS_SCHEMA_PATH', '').split(os.path.pathsep), schema_filename) ++ if not (schema_path and os.path.exists(schema_path)): ++ schema_path = file_from_path(os.environ.get ('XDG_DATA_DIRS', '').split(os.path.pathsep), os.path.join(schema_prefix, schema_filename)) ++ if not (schema_path and os.path.exists(schema_path)): ++ logging.critical("Could not find schema %s" % schema_filename) + assert(False) + + self._schema_name = schema_name -- cgit v1.2.3 From 4088d809c075dd3f0ca4d153be10c11438357fa8 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 10 May 2019 00:56:33 +0200 Subject: gnu: upower: Update to 0.99.10. * gnu/packages/gnome.scm (upower): Update to 0.99.10. * gnu/packages/patches/upower-builddir.patch: Adapt. --- gnu/packages/gnome.scm | 6 +++--- gnu/packages/patches/upower-builddir.patch | 24 +----------------------- 2 files changed, 4 insertions(+), 26 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e1d2a65ccb..44ae693be0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3141,15 +3141,15 @@ faster results and to avoid unnecessary server load.") (define-public upower (package (name "upower") - (version "0.99.8") + (version "0.99.10") (source (origin (method url-fetch) (uri (string-append "https://gitlab.freedesktop.org/upower/upower/" - "uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/" + "uploads/c438511024b9bc5a904f8775cfc8e4c4/" "upower-" version ".tar.xz")) (sha256 (base32 - "00lzr0vyxz5lvmgya48gdb2cdgmfdim4b34jlfdyqakk1i9sl8xv")) + "17d2bclv5fgma2y3g8bsn9pdvspn1zrzismzdnzfivc0f2wm28k4")) (patches (search-patches "upower-builddir.patch")))) (build-system glib-or-gtk-build-system) (arguments diff --git a/gnu/packages/patches/upower-builddir.patch b/gnu/packages/patches/upower-builddir.patch index d59d4364b8..51295f2076 100644 --- a/gnu/packages/patches/upower-builddir.patch +++ b/gnu/packages/patches/upower-builddir.patch @@ -7,17 +7,10 @@ some things, so we patch the Makefile.in instead. Also fix to not try to create /var/lib/upower if /var isn't writable. Patch by Andy Wingo +Reduced to upower 0.99.10 by Tobias Geerinckx-Rice --- upower-0.99.2.orig/src/Makefile.in 2014-12-18 10:32:01.000000000 +0100 +++ upower-0.99.2/src/Makefile.in 2015-04-04 19:49:28.020843678 +0200 -@@ -780,6 +780,7 @@ - - @UP_BUILD_TESTS_TRUE@up_self_test_CFLAGS = $(AM_CFLAGS) $(WARNINGFLAGS_C) - @UP_BUILD_TESTS_TRUE@TESTS_ENVIRONMENT = $(DBUS_LAUNCH) -+@UP_BUILD_TESTS_TRUE@AM_TESTS_ENVIRONMENT = UPOWER_CONF_FILE_NAME=$(top_srcdir)/etc/UPower.conf - dbusservicedir = $(datadir)/dbus-1/system-services - dbusservice_in_files = org.freedesktop.UPower.service.in - dbusservice_DATA = $(dbusservice_in_files:.service.in=.service) @@ -1789,7 +1790,7 @@ @HAVE_SYSTEMDSYSTEMUNITDIR_TRUE@ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ @@ -27,18 +20,3 @@ Patch by Andy Wingo mkdir -p $(DESTDIR)$(historydir); \ fi ---- upower-0.99.2.orig/src/up-self-test.c 2014-07-17 09:46:15.000000000 +0200 -+++ upower-0.99.2/src/up-self-test.c 2015-04-04 18:43:04.952741927 +0200 -@@ -295,12 +295,6 @@ - #endif - g_test_init (&argc, &argv, NULL); - -- /* make check, vs. make distcheck */ -- if (g_file_test ("../etc/UPower.conf", G_FILE_TEST_EXISTS)) -- g_setenv ("UPOWER_CONF_FILE_NAME", "../etc/UPower.conf", TRUE); -- else -- g_setenv ("UPOWER_CONF_FILE_NAME", "../../../etc/UPower.conf", TRUE); -- - /* tests go here */ - g_test_add_func ("/power/backend", up_test_backend_func); - g_test_add_func ("/power/device", up_test_device_func); -- cgit v1.2.3 From a430a3501a6d3a565cb78e04a8dbb3ab846ec5fc Mon Sep 17 00:00:00 2001 From: Timothy Sample Date: Sun, 12 May 2019 09:36:38 -0400 Subject: gnu: gdm: Fix configuration file discovery. The configuration file loading code moved to a new file in version 2.28. * gnu/package/gnome.scm (gdm)[arguments]: Change the pre-configure phase to patch configuration file discovery into the 'gdm-settings.c' file. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 44ae693be0..09984717cc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5655,8 +5655,8 @@ libxml2.") "(self, \"" name "\"," "g_getenv (\"" name "\"));\n")) propagate))))) - ;; Look for custom GDM conf in /run/current-system. - (substitute* '("common/gdm-settings-desktop-backend.c") + ;; Find the configuration file using an environment variable. + (substitute* '("common/gdm-settings.c") (("GDM_CUSTOM_CONF") (string-append "(g_getenv(\"GDM_CUSTOM_CONF\") != NULL" " ? g_getenv(\"GDM_CUSTOM_CONF\")" -- cgit v1.2.3 From 3e9c80b27ae04e07e8a8cf2f2b1118b6dba926d4 Mon Sep 17 00:00:00 2001 From: Florian Pelz Date: Wed, 15 May 2019 23:41:44 +0200 Subject: gnu: network-manager-applet: Patch libnma for modem support. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (network-manager-applet): Patch libnma to load iso-codes and mobile-broadband-provider-info from the store and not require them in the profile. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 09984717cc..9070673cf6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -35,6 +35,7 @@ ;;; Copyright © 2018, 2019 Timothy Sample ;;; Copyright © 2019 Danny Milosavljevic ;;; Copyright © 2019 Marius Bakke +;;; Copyright © 2019 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -5502,7 +5503,24 @@ to virtual private networks (VPNs) via OpenVPN.") (base32 "1js0i2kwfklahsn77qgxzdscy33drrlym3mrj1qhlw0zf8ri56ya")))) (build-system glib-or-gtk-build-system) - (arguments '(#:configure-flags '("--disable-migration"))) + (arguments '(#:configure-flags '("--disable-migration") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (let ((mbpi (assoc-ref inputs + "mobile-broadband-provider-info")) + (iso-codes (assoc-ref inputs "iso-codes"))) + (substitute* "src/libnma/nma-mobile-providers.c" + (("(g_build_filename \\()dirs\\[i\\].*,\ + (MOBILE_BROADBAND_PROVIDER_INFO.*)" all start end) + (string-append start "\"" mbpi "/share\", " end))) + (substitute* "src/libnma/nma-mobile-providers.c" + (("(g_build_filename \\()dirs\\[i\\].*,\ + (ISO_3166_COUNTRY_CODES.*)" all start end) + (string-append start "\"" iso-codes + "/share\", " end))) + #t)))))) (native-inputs `(("intltool" ,intltool) ("gobject-introspection" ,gobject-introspection) @@ -5519,7 +5537,8 @@ to virtual private networks (VPNs) via OpenVPN.") ("libsecret" ,libsecret) ("libselinux" ,libselinux) ("jansson" ,jansson) ; for team support - ("modem-manager" ,modem-manager))) + ("modem-manager" ,modem-manager) + ("mobile-broadband-provider-info" ,mobile-broadband-provider-info))) (synopsis "Applet for managing network connections") (home-page "https://www.gnome.org/projects/NetworkManager/") (description -- cgit v1.2.3 From b1d81ba04368f17ba6d03d3e455c3d885590bb52 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sun, 19 May 2019 16:51:01 +0200 Subject: gnu: libsoup: Update to 2.66.2. * gnu/packages/gnome.scm (libsoup): Update to 2.66.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9070673cf6..9671c21a9d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2672,7 +2672,7 @@ libxml to ease remote use of the RESTful API.") (define-public libsoup (package (name "libsoup") - (version "2.66.1") + (version "2.66.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -2680,7 +2680,7 @@ libxml to ease remote use of the RESTful API.") name "-" version ".tar.xz")) (sha256 (base32 - "1zs3bhspwg7fggxd7x1rrggpkcf2j9ch6dhncq9syh252z0vcb2a")))) + "0amfw1yvy1kjrg41rfh2vvrw5gkwnyckqbw1fab50hm6xc1acbmx")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 7ef08efa21900e6e43415b9f9db0e51a04e17fa5 Mon Sep 17 00:00:00 2001 From: Uko Kokņevičs Date: Mon, 20 May 2019 02:23:30 +0300 Subject: gnu: libnotify: Propagate required inputs. libnotify doesn't propagate other needed libraries for linking against it resulting in pkg-config errors like > Package gdk-pixbuf-2.0 was not found in the pkg-config search path. > Perhaps you should add the directory containing `gdk-pixbuf-2.0.pc' > to the PKG_CONFIG_PATH environment variable * gnu/packages/gnome.scm (libnotify)[inputs]: Move GLIB and GDK-PIXBUF ... [propagated-inputs]: ... here. New field. Signed-off-by: Marius Bakke --- gnu/packages/gnome.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9671c21a9d..8f23935ff6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1108,10 +1108,12 @@ configuring CUPS.") (base32 "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w")))) (build-system gnu-build-system) + (propagated-inputs + `(;; In Requires of libnotify.pc. + ("gdk-pixbuf" ,gdk-pixbuf) + ("glib" ,glib))) (inputs - `(("gdk-pixbuf" ,gdk-pixbuf) - ("glib" ,glib) - ("gtk+" ,gtk+) + `(("gtk+" ,gtk+) ("libpng" ,libpng))) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From 6acf6cec7d74d2e288e275429e8362bfb04b0286 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 May 2019 17:24:26 +0200 Subject: gnu: libnotify: Don't build 'libnotify.a'. * gnu/packages/gnome.scm (libnotify)[arguments]: New field. --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8f23935ff6..03fcc453c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1108,6 +1108,8 @@ configuring CUPS.") (base32 "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--disable-static"))) (propagated-inputs `(;; In Requires of libnotify.pc. ("gdk-pixbuf" ,gdk-pixbuf) -- cgit v1.2.3 From 3ad75446648d8fc476098562627d38c2687afe44 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Wed, 22 May 2019 14:58:16 -0700 Subject: gnu: python2-rsvg: Fix typo "This package". * gnu/packages/gnome (python2-rsvg)[description]: Fix typo. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 03fcc453c6..6a2a683f58 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2594,7 +2594,7 @@ indicators etc).") (home-page "https://www.gnome.org") (synopsis "Python bindings to librsvg") (description - "This packages provides Python bindings to librsvg, the SVG rendering + "This package provides Python bindings to librsvg, the SVG rendering library.") ;; This is the license of the rsvg bindings. The license of each module -- cgit v1.2.3