diff options
Diffstat (limited to 'pkgs/desktops')
10 files changed, 291 insertions, 119 deletions
diff --git a/pkgs/desktops/cinnamon/xviewer/default.nix b/pkgs/desktops/cinnamon/xviewer/default.nix index 7b89ab2d5ab..e8fb0f1f5c9 100644 --- a/pkgs/desktops/cinnamon/xviewer/default.nix +++ b/pkgs/desktops/cinnamon/xviewer/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "xviewer"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-9SUpJ76s3gf1852xnJh3Sz6SeuKhcGHtv+woiXztCS4="; + sha256 = "sha256-FFRms4yh7TQ/O3ee7igeIslimSWLhue3BE1xCrJ3NQ4="; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome/core/evince/default.nix b/pkgs/desktops/gnome/core/evince/default.nix index eb85c97f9f2..74987c07a5b 100644 --- a/pkgs/desktops/gnome/core/evince/default.nix +++ b/pkgs/desktops/gnome/core/evince/default.nix @@ -1,5 +1,7 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl +, fetchpatch , meson , ninja , pkg-config @@ -57,9 +59,12 @@ stdenv.mkDerivation rec { patches = lib.optionals withPantheon [ # Make this respect dark mode settings from Pantheon - # https://github.com/elementary/evince - # The patch currently differs from upstream (updated for evince 41). - ./pantheon-dark-style.patch + # https://github.com/elementary/evince/pull/21 + # https://github.com/elementary/evince/pull/31 + (fetchpatch { + url = "https://raw.githubusercontent.com/elementary/evince/c8364019ee2c2dffd2a1bccf79b8f4e526aa22af/dark-style.patch"; + sha256 = "sha256-nKELRXnM6gMRTGmWdO1Qqlo9ciy+4HOK5z2CYOoi2Lo="; + }) ]; postPatch = '' diff --git a/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch b/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch deleted file mode 100644 index 5e1ef67b08c..00000000000 --- a/pkgs/desktops/gnome/core/evince/pantheon-dark-style.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/meson.build b/meson.build -index bcb69cf7..4a18c08c 100644 ---- a/meson.build -+++ b/meson.build -@@ -162,6 +162,7 @@ gmodule_dep = dependency('gmodule-2.0') - gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_version) - gtk_dep = dependency('gtk+-3.0', version: gtk_req_version) - gthread_dep = dependency('gthread-2.0', version: glib_req_version) -+granite_dep = dependency('granite') - # Keep the version here synchronised with subprojects/libhandy.wrap - hdy_dep = dependency('libhandy-1', version: hdy_req_version, fallback: ['libhandy', 'libhandy_dep']) - -diff --git a/shell/ev-application.c b/shell/ev-application.c -index e704bda2..d705328c 100644 ---- a/shell/ev-application.c -+++ b/shell/ev-application.c -@@ -30,6 +30,7 @@ - #include <glib/gi18n.h> - #include <glib/gstdio.h> - #include <gtk/gtk.h> -+#include <granite.h> - #include <handy.h> - #ifdef GDK_WINDOWING_X11 - #include <gdk/gdkx.h> -@@ -176,7 +177,7 @@ ev_spawn (const char *uri, - - g_string_append_printf (cmd, " %s", path); - g_free (path); -- -+ - /* Page label */ - if (dest) { - switch (ev_link_dest_get_dest_type (dest)) { -@@ -940,6 +941,20 @@ ev_application_migrate_config_dir (EvApplication *application) - g_free (old_accels); - } - -+static void -+ev_application_set_prefers_color_scheme () -+{ -+ GtkSettings* gtk_settings = gtk_settings_get_default (); -+ GraniteSettings* granite_settings = granite_settings_get_default (); -+ -+ g_object_set ( -+ gtk_settings, -+ "gtk-application-prefer-dark-theme", -+ granite_settings_get_prefers_color_scheme (granite_settings) == GRANITE_SETTINGS_COLOR_SCHEME_DARK, -+ NULL -+ ); -+} -+ - static void - ev_application_startup (GApplication *gapplication) - { -@@ -992,6 +1007,7 @@ ev_application_startup (GApplication *gapplication) - - EvApplication *application = EV_APPLICATION (gapplication); - const gchar **it; -+ GraniteSettings* granite_settings = granite_settings_get_default (); - - g_application_set_resource_base_path (gapplication, "/org/gnome/evince"); - -@@ -999,6 +1015,11 @@ ev_application_startup (GApplication *gapplication) - - hdy_init (); - -+ ev_application_set_prefers_color_scheme (); -+ -+ g_signal_connect (granite_settings, "notify::prefers-color-scheme", -+ G_CALLBACK(ev_application_set_prefers_color_scheme), NULL); -+ - for (it = action_accels; it[0]; it += g_strv_length ((gchar **)it) + 1) - gtk_application_set_accels_for_action (GTK_APPLICATION (application), it[0], &it[1]); - } -diff --git a/shell/meson.build b/shell/meson.build -index 7cbc48f2..a3089b13 100644 ---- a/shell/meson.build -+++ b/shell/meson.build -@@ -52,6 +52,7 @@ sources += gnome.compile_resources( - deps = [ - gdk_pixbuf_dep, - gnome_desktop_dep, -+ granite_dep, - hdy_dep, - libevmisc_dep, - libevproperties_dep, diff --git a/pkgs/desktops/gnome/misc/gpaste/default.nix b/pkgs/desktops/gnome/misc/gpaste/default.nix index 98670c99311..83928c04827 100644 --- a/pkgs/desktops/gnome/misc/gpaste/default.nix +++ b/pkgs/desktops/gnome/misc/gpaste/default.nix @@ -17,14 +17,14 @@ }: stdenv.mkDerivation rec { - version = "3.42.1"; + version = "3.42.2"; pname = "gpaste"; src = fetchFromGitHub { owner = "Keruspe"; repo = "GPaste"; rev = "v${version}"; - sha256 = "sha256-yoJ/k9cXXF5ELKF0JXGtxsUjfQ/S1sccLRQOQG7YMXo="; + sha256 = "sha256-VWtq1jPwUHHIDpVaSYQ0FiihlfulRofFmacMyv/buMw="; }; patches = [ diff --git a/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch b/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch new file mode 100644 index 00000000000..bd519c292c2 --- /dev/null +++ b/pkgs/desktops/pantheon/apps/appcenter/add-packagekit-backend-option.patch @@ -0,0 +1,240 @@ +From b5d7cb20713eff3b3729e5c5fdd2f15680a29385 Mon Sep 17 00:00:00 2001 +From: Bobby Rong <rjl931189261@126.com> +Date: Sun, 31 Oct 2021 23:12:46 +0800 +Subject: [PATCH] build: add packagekit_backend option + +--- + .github/workflows/main.yml | 7 +++++++ + meson_options.txt | 1 + + src/Application.vala | 4 ++++ + src/Core/BackendAggregator.vala | 2 ++ + src/Core/Package.vala | 21 +++++++++++++-------- + src/Core/UpdateManager.vala | 6 ++++++ + src/Views/Homepage.vala | 4 ++++ + src/meson.build | 10 ++++++++-- + 8 files changed, 45 insertions(+), 10 deletions(-) + +diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml +index daf13654..5dc5a2fb 100644 +--- a/.github/workflows/main.yml ++++ b/.github/workflows/main.yml +@@ -42,6 +42,13 @@ jobs: + meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build + ninja -C build install + ++ - name: Build (NixOS) ++ env: ++ DESTDIR: out ++ run: | ++ meson configure -Dcurated=false -Dpayments=false -Dpackagekit_backend=false build ++ ninja -C build install ++ + lint: + + runs-on: ubuntu-latest +diff --git a/meson_options.txt b/meson_options.txt +index 0ae93d07..37a6cd8a 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -4,3 +4,4 @@ option('name', type : 'string', value : 'AppCenter', description : 'The name of + option('payments', type : 'boolean', value : true, description : 'Enable payment features and display paid apps') + option('sharing', type : 'boolean', value : true, description : 'Display sharing features, i.e. copyable URLs to appcenter.elementary.io') + option('hide_upstream_distro_apps', type : 'boolean', value : true, description : 'Used for hiding Ubuntu repo apps on elementary OS') ++option('packagekit_backend', type : 'boolean', value : true, description : 'Enable PackageKit backend') +diff --git a/src/Application.vala b/src/Application.vala +index 65fae5aa..7c075076 100644 +--- a/src/Application.vala ++++ b/src/Application.vala +@@ -167,9 +167,11 @@ public class AppCenter.App : Gtk.Application { + + var client = AppCenterCore.Client.get_default (); + ++#if PACKAGEKIT_BACKEND + if (fake_update_packages != null) { + AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages; + } ++#endif + + if (silent) { + NetworkMonitor.get_default ().network_changed.connect ((available) => { +@@ -183,6 +185,7 @@ public class AppCenter.App : Gtk.Application { + return; + } + ++#if PACKAGEKIT_BACKEND + if (local_path != null) { + var file = File.new_for_commandline_arg (local_path); + +@@ -192,6 +195,7 @@ public class AppCenter.App : Gtk.Application { + warning ("Failed to load local AppStream XML file: %s", e.message); + } + } ++#endif + + if (main_window == null) { + main_window = new MainWindow (this); +diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala +index 539dba98..feb1eaa9 100644 +--- a/src/Core/BackendAggregator.vala ++++ b/src/Core/BackendAggregator.vala +@@ -26,8 +26,10 @@ public class AppCenterCore.BackendAggregator : Backend, Object { + + construct { + backends = new Gee.ArrayList<unowned Backend> (); ++#if PACKAGEKIT_BACKEND + backends.add (PackageKitBackend.get_default ()); + backends.add (UbuntuDriversBackend.get_default ()); ++#endif + backends.add (FlatpakBackend.get_default ()); + + unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default (); +diff --git a/src/Core/Package.vala b/src/Core/Package.vala +index d6f12f15..8dbd7a22 100644 +--- a/src/Core/Package.vala ++++ b/src/Core/Package.vala +@@ -328,7 +328,14 @@ public class AppCenterCore.Package : Object { + public string origin_description { + owned get { + unowned string origin = component.get_origin (); +- if (backend is PackageKitBackend) { ++ if (backend is FlatpakBackend) { ++ var fp_package = this as FlatpakPackage; ++ if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { ++ return _("%s (system-wide)").printf (origin); ++ } ++ return origin; ++#if PACKAGEKIT_BACKEND ++ } else if (backend is PackageKitBackend) { + if (origin == APPCENTER_PACKAGE_ORIGIN) { + return _("AppCenter"); + } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) { +@@ -336,15 +343,9 @@ public class AppCenterCore.Package : Object { + } else if (origin.has_prefix ("ubuntu-")) { + return _("Ubuntu (non-curated)"); + } +- } else if (backend is FlatpakBackend) { +- var fp_package = this as FlatpakPackage; +- if (fp_package != null && fp_package.installation == FlatpakBackend.system_installation) { +- return _("%s (system-wide)").printf (origin); +- } +- +- return origin; + } else if (backend is UbuntuDriversBackend) { + return _("Ubuntu Drivers"); ++#endif + } + + return _("Unknown Origin (non-curated)"); +@@ -434,11 +435,15 @@ public class AppCenterCore.Package : Object { + _author_title = null; + backend_details = null; + ++#if PACKAGEKIT_BACKEND + // The version on a PackageKit package comes from the package not AppStream, so only reset the version + // on other backends + if (!(backend is PackageKitBackend)) { + _latest_version = null; + } ++#else ++ _latest_version = null; ++#endif + + this.component = component; + } +diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala +index 9deceaf5..c92c0d37 100644 +--- a/src/Core/UpdateManager.vala ++++ b/src/Core/UpdateManager.vala +@@ -52,6 +52,7 @@ public class AppCenterCore.UpdateManager : Object { + installed_package.update_state (); + } + ++#if PACKAGEKIT_BACKEND + Pk.Results pk_updates; + unowned PackageKitBackend client = PackageKitBackend.get_default (); + try { +@@ -60,10 +61,12 @@ public class AppCenterCore.UpdateManager : Object { + warning ("Unable to get updates from PackageKit backend: %s", e.message); + return 0; + } ++#endif + + uint os_count = 0; + string os_desc = ""; + ++#if PACKAGEKIT_BACKEND + var package_array = pk_updates.get_package_array (); + debug ("PackageKit backend reports %d updates", package_array.length); + +@@ -87,6 +90,7 @@ public class AppCenterCore.UpdateManager : Object { + ); + } + }); ++#endif + + os_updates.component.set_pkgnames ({}); + os_updates.change_information.clear_update_info (); +@@ -159,6 +163,7 @@ public class AppCenterCore.UpdateManager : Object { + count += 1; + } + ++#if PACKAGEKIT_BACKEND + pk_updates.get_details_array ().foreach ((pk_detail) => { + var pk_package = new Pk.Package (); + try { +@@ -181,6 +186,7 @@ public class AppCenterCore.UpdateManager : Object { + critical (e.message); + } + }); ++#endif + + os_updates.update_state (); + return count; +diff --git a/src/Views/Homepage.vala b/src/Views/Homepage.vala +index 3673903f..2e128e77 100644 +--- a/src/Views/Homepage.vala ++++ b/src/Views/Homepage.vala +@@ -107,9 +107,13 @@ public class AppCenter.Homepage : AbstractView { + column_spacing = 24, + orientation = Gtk.Orientation.VERTICAL + }; ++#if PACKAGEKIT_BACKEND + grid.add (banner_revealer); + grid.add (recently_updated_revealer); + grid.add (categories_label); ++#else ++ category_flow.margin_top = 12; ++#endif + grid.add (category_flow); + + scrolled_window = new Gtk.ScrolledWindow (null, null) { +diff --git a/src/meson.build b/src/meson.build +index 7b319fc6..d1d77931 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -12,10 +12,8 @@ appcenter_files = files( + 'Core/FlatpakBackend.vala', + 'Core/Job.vala', + 'Core/Package.vala', +- 'Core/PackageKitBackend.vala', + 'Core/ScreenshotCache.vala', + 'Core/Task.vala', +- 'Core/UbuntuDriversBackend.vala', + 'Core/UpdateManager.vala', + 'Dialogs/InstallFailDialog.vala', + 'Dialogs/NonCuratedWarningDialog.vala', +@@ -76,6 +74,14 @@ if get_option('hide_upstream_distro_apps') + args += '--define=HIDE_UPSTREAM_DISTRO_APPS' + endif + ++if get_option('packagekit_backend') ++ args += '--define=PACKAGEKIT_BACKEND' ++ appcenter_files += files( ++ 'Core/PackageKitBackend.vala', ++ 'Core/UbuntuDriversBackend.vala', ++ ) ++endif ++ + executable( + meson.project_name(), + appcenter_files, diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index 6492c933294..bdc2fbca591 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -30,20 +30,21 @@ stdenv.mkDerivation rec { pname = "appcenter"; - version = "3.9.0"; + version = "3.9.1"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-+r19n42FPoBArZNDF4ZAdUBZqsSxpLwpeBoyaRJBCrg="; + sha256 = "sha256-xktIHQHmz5gh72NEz9UQ9fMvBlj1BihWxHgxsHmTIB0="; }; - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; - }; + patches = [ + # Introduces a packagekit_backend meson flag. + # Makes appcenter actually work by using only the flatpak backend. + # https://github.com/elementary/appcenter/pull/1739 + ./add-packagekit-backend-option.patch + ]; nativeBuildInputs = [ appstream-glib @@ -78,6 +79,8 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dpayments=false" "-Dcurated=false" + # This option is introduced in add-packagekit-backend-option.patch + "-Dpackagekit_backend=false" ]; postPatch = '' @@ -85,6 +88,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { homepage = "https://github.com/elementary/appcenter"; description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index d74907db911..badfec690eb 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -26,15 +26,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-applications-menu"; - version = "2.10.1"; - - repoName = "applications-menu"; + version = "2.10.2"; src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "applications-menu"; rev = version; - sha256 = "sha256-e9InWx5b2DAFK7m7z/oCW7Mw/ymBNz1Sc7vT65kkZ9o="; + sha256 = "sha256-xBuMJzIFOueSvNwvXc85AI9NHuMW3bOblNsyuDkIzyk="; }; patches = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index 708e2b6eb0c..1164e0592bf 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , nix-update-script , substituteAll , pkg-config @@ -24,13 +23,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-datetime"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-/kbwZVzOlC3ATCuXVMdf2RIskoGQKG1evaDYO3yFerg="; + sha256 = "sha256-GxlnzLDrZmDDAGlUMoM4k4SkbCqra3Th6ugRAj3Wse4="; }; patches = [ @@ -38,12 +37,6 @@ stdenv.mkDerivation rec { src = ./fix-paths.patch; elementary_calendar = elementary-calendar; }) - # Fix incorrect month shown on re-opening indicator if previously changed month - # https://github.com/elementary/wingpanel-indicator-datetime/pull/284 - (fetchpatch { - url = "https://github.com/elementary/wingpanel-indicator-datetime/commit/9b0bed98e09dfdad62f43a95d956d2f53d824e65.patch"; - sha256 = "sha256-MQfz4Uzo59SmmfQNi58OA7CIHHkm2TODQz2fmmIall4="; - }) ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch index bec5f43e0d7..51c49536202 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/fix-paths.patch @@ -1,8 +1,21 @@ +diff --git a/src/Indicator.vala b/src/Indicator.vala +index 4aba03c..6385bc9 100644 +--- a/src/Indicator.vala ++++ b/src/Indicator.vala +@@ -55,7 +55,7 @@ public class DateTime.Indicator : Wingpanel.Indicator { + + panel_label.button_press_event.connect ((e) => { + if (e.button == Gdk.BUTTON_MIDDLE) { +- var command = "io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F")); ++ var command = "@elementary_calendar@/bin/io.elementary.calendar --show-day %s".printf (new GLib.DateTime.now_local ().format ("%F")); + try { + var appinfo = AppInfo.create_from_commandline (command, null, AppInfoCreateFlags.NONE); + appinfo.launch_uris (null, null); diff --git a/src/Widgets/calendar/CalendarView.vala b/src/Widgets/calendar/CalendarView.vala -index 6e0d530a..2f90f96c 100644 +index cb54253..7477d1a 100644 --- a/src/Widgets/calendar/CalendarView.vala +++ b/src/Widgets/calendar/CalendarView.vala -@@ -222,7 +222,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { +@@ -242,7 +242,7 @@ public class DateTime.Widgets.CalendarView : Gtk.Grid { // TODO: As far as maya supports it use the Dbus Activation feature to run the calendar-app. public void show_date_in_maya (GLib.DateTime date) { diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index a0a687985f9..3ebc3813879 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "wingpanel-indicator-notifications"; - version = "6.0.2"; + version = "6.0.3"; src = fetchFromGitHub { owner = "elementary"; repo = pname; rev = version; - sha256 = "sha256-ZuOZlfxtRq8ZcrXGe9wlFGwn2isdvMoXQveKKnEPFdo="; + sha256 = "sha256-iHhZJwaomQgH1Sal8uejl4QlavOQ75UKZ9xchTi1X3U="; }; nativeBuildInputs = [ |