Commit f7ddff0a authored by Mark Wagie's avatar Mark Wagie
Browse files

[pkg-upd] 41.2-4

- enable firmware updates
- update Pop!_OS patches
parent 738c7a4b
......@@ -3,7 +3,7 @@
pkgname=gnome-control-center-cosmic
_pkgname=${pkgname%-cosmic}
pkgver=41.2
pkgrel=3
pkgrel=4
pkgdesc="GNOME's main interface to configure various aspects of the desktop (with Pop!_OS COSMIC patches)"
url="https://gitlab.gnome.org/GNOME/gnome-control-center"
license=(GPL2)
......@@ -14,7 +14,7 @@ depends=(accountsservice cups-pk-helper gnome-bluetooth gnome-desktop
libgtop nm-connection-editor sound-theme-freedesktop upower libpwquality
gnome-color-manager smbclient libmm-glib libgnomekbd libibus libcheese
libgudev bolt udisks2 libhandy gsound colord-gtk
# libfirmware-manager
libfirmware-manager
pop-desktop-widget
pop-cosmic
# libs76-hidpi-widget
......@@ -27,15 +27,15 @@ optdepends=('system-config-printer: Printer settings'
'rygel: media sharing'
'openssh: remote login'
'power-profiles-daemon: Power profiles support')
provides=("$_pkgname")
provides=("$_pkgname" 'firmware-manager-virtual')
conflicts=("$_pkgname")
_commit=babeb0ce357d55406b0ba0a4597e0513a0419de8 # tags/41.2^0
_pop_commit=2dafb76ab69cf4c93e6dd8920c0e10b7cacf0d0f
_pop_commit=ba839eda1c673457b30fb65ccf8f19323331e692 # master_jammy
source=("git+https://gitlab.gnome.org/GNOME/gnome-control-center.git#commit=$_commit"
'git+https://gitlab.gnome.org/GNOME/libgnome-volume-control.git'
'git+https://gitlab.gnome.org/GNOME/libhandy.git'
"pop-gcc::git+https://github.com/pop-os/gnome-control-center.git#commit=$_pop_commit"
'pop-desktop-widget-41.patch'
"pop-gcc::git+https://github.com/pop-os/gnome-control-center.git#commit=$_pop_commit?signed"
'pop-desktop-widget.patch'
'distro-logo.patch'
'software-updates.diff'
)
......@@ -43,9 +43,10 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
'f14d5ab87075ff3f72a10c18c45cae40b08b0d37e45ae887016be9a24ebc07ed'
'a9557eb4dec262a7f7c5887f7f715d2955d89d2a62ae8653aeda19fcbb72e800'
'867048e26fb40e170c94c72d0b472de397af8b357d22aee995aed2a4a9e141f1'
'895c4599ba2cddcec75f144605e1b6256865528edbc3b376b8cd49be97ae4844')
validpgpkeys=('D3FB3AF9711C1CD12639C9F587F211AF2BE4C2FE') # Jeremy Soller (https://soller.dev) <jackpot51@gmail.com>
pkgver() {
cd $_pkgname
......@@ -69,18 +70,24 @@ prepare() {
git submodule set-url subprojects/libhandy "$srcdir/libhandy"
git submodule update
# patch -Np1 -i ../pop-gcc/debian/patches/pop/'0001-mouse-Add-Disable-While-Typing-toggle-for-touchpad.patch'
# patch -Np1 -i ../pop-gcc/debian/patches/pop/0001-shell-Fix-bug-when-multiple-panels-use-custom-sideba.patch
# Pop!_OS patches
# patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-mouse-accel.patch
# patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-hidpi.patch
# patch -Np1 -i ../pop-gcc/debian/patches/pop/system76-firmware.patch
patch -Np1 -i ../pop-gcc/debian/patches/pop/system76-firmware.patch
patch -Np1 -i ../pop-gcc/debian/patches/pop/'0001-mouse-Add-Disable-While-Typing-toggle-for-touchpad.patch'
# patch -Np1 -i ../pop-gcc/debian/patches/pop/0001-shell-Fix-bug-when-multiple-panels-use-custom-sideba.patch
# patch -Np1 -i ../pop-gcc/debian/patches/pop/pop-desktop-widget.patch
patch -Np1 -i ../pop-desktop-widget-41.patch
patch -Np1 -i "$srcdir/pop-desktop-widget.patch"
# patch -Np1 -i ../pop-gcc/debian/patches/pop/'0001-keyboard-Pop-_OS-changes-with-support-for-multiple-b.patch'
# Manjaro patches
patch -Np1 -i ../distro-logo.patch
patch --strip=1 panels/info-overview/cc-info-overview-panel.c < ../software-updates.diff
}
# meson: drop unused argument for i18n.merge_file()
# https://gitlab.gnome.org/GNOME/gnome-control-center/-/commit/37b29c32cbecfd89c9c5e0169e0f2876f00ef5eb
sed -i "/ desktop,/d" panels/firmware/meson.build
}
build() {
arch-meson $_pkgname build \
......
diff --unified --recursive --text --color a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
--- a/panels/background/cc-background-panel.c 2021-11-10 08:58:57.319396000 -0700
+++ b/panels/background/cc-background-panel.c 2021-11-10 09:10:10.945927765 -0700
diff --git a/panels/background/cc-background-panel.c b/panels/background/cc-background-panel.c
index 29dedf165..377410965 100644
--- a/panels/background/cc-background-panel.c
+++ b/panels/background/cc-background-panel.c
@@ -24,6 +24,7 @@
#include <glib.h>
#include <glib/gi18n-lib.h>
......@@ -9,7 +10,7 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
#include <gdesktop-enums.h>
@@ -49,6 +50,8 @@
@@ -51,6 +52,8 @@ struct _CcBackgroundPanel
GDBusConnection *connection;
......@@ -18,7 +19,7 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
GSettings *settings;
GSettings *lock_settings;
@@ -59,10 +62,51 @@
@@ -61,10 +64,52 @@ struct _CcBackgroundPanel
CcBackgroundChooser *background_chooser;
GtkButton *add_picture_button;
CcBackgroundPreview *desktop_preview;
......@@ -35,9 +36,10 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
+ gtk_widget_set_visible (GTK_WIDGET (self->add_picture_button), visible);
+}
+
+static void sidebar_row_selected_cb (CcBackgroundPanel *self, GtkListBoxRow *row, GtkListBox *box) {
+static void sidebar_row_activated_cb (CcBackgroundPanel *self, GtkListBoxRow *row, GtkListBox *box) {
+ GtkWidget *widget = g_object_get_data (G_OBJECT (row), "stack-child");
+ gtk_stack_set_visible_child (self->stack, widget);
+ g_signal_emit_by_name (self, "sidebar-activated");
+}
+
+static void for_each_stack_cb (GtkWidget *widget, gpointer user_data) {
......@@ -70,7 +72,7 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
static void
update_preview (CcBackgroundPanel *panel)
{
@@ -239,6 +283,7 @@
@@ -241,6 +286,7 @@ cc_background_panel_dispose (GObject *object)
g_clear_object (&panel->settings);
g_clear_object (&panel->lock_settings);
g_clear_object (&panel->thumb_factory);
......@@ -78,7 +80,7 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
G_OBJECT_CLASS (cc_background_panel_parent_class)->dispose (object);
}
@@ -264,6 +309,7 @@
@@ -266,6 +312,7 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass)
g_type_ensure (CC_TYPE_BACKGROUND_PREVIEW);
panel_class->get_help_uri = cc_background_panel_get_help_uri;
......@@ -86,7 +88,7 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
object_class->constructed = cc_background_panel_constructed;
object_class->dispose = cc_background_panel_dispose;
@@ -274,9 +320,14 @@
@@ -276,9 +323,14 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, add_picture_button);
gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, background_chooser);
gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, desktop_preview);
......@@ -96,12 +98,17 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
gtk_widget_class_bind_template_callback (widget_class, on_chooser_background_chosen_cb);
gtk_widget_class_bind_template_callback (widget_class, on_add_picture_button_clicked_cb);
+ gtk_widget_class_bind_template_callback (widget_class, sidebar_row_selected_cb);
+ gtk_widget_class_bind_template_callback (widget_class, sidebar_row_activated_cb);
+ gtk_widget_class_bind_template_callback (widget_class, visible_child_changed);
}
static void
@@ -303,6 +354,9 @@
@@ -301,10 +353,13 @@ cc_background_panel_init (CcBackgroundPanel *panel)
panel->settings = g_settings_new (WP_PATH_ID);
g_settings_delay (panel->settings);
-
+
panel->lock_settings = g_settings_new (WP_LOCK_PATH_ID);
g_settings_delay (panel->lock_settings);
......@@ -111,16 +118,17 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
/* Load the background */
reload_current_bg (panel);
update_preview (panel);
diff --unified --recursive --text --color a/panels/background/cc-background-panel.ui b/panels/background/cc-background-panel.ui
--- a/panels/background/cc-background-panel.ui 2021-11-10 08:58:57.319396000 -0700
+++ b/panels/background/cc-background-panel.ui 2021-11-10 09:16:56.922557538 -0700
diff --git a/panels/background/cc-background-panel.ui b/panels/background/cc-background-panel.ui
index 7b5c3d385..4edf29144 100644
--- a/panels/background/cc-background-panel.ui
+++ b/panels/background/cc-background-panel.ui
@@ -1,49 +1,65 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkListBox" id="stack_sidebar">
+ <property name="visible">True</property>
+ <signal name="row-selected" handler="sidebar_row_selected_cb" object="CcBackgroundPanel" swapped="yes" />
+ <signal name="row-activated" handler="sidebar_row_activated_cb" object="CcBackgroundPanel" swapped="yes" />
+ </object>
+
<template class="CcBackgroundPanel" parent="CcPanel">
......@@ -184,12 +192,13 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
- </object>
- </child>
<child>
- <child>
- <object class="CcBackgroundChooser" id="background_chooser">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="expand">True</property>
- <signal name="background-chosen" handler="on_chooser_background_chosen_cb" object="CcBackgroundPanel" swapped="yes" />
+ <child>
+ <object class="CcBackgroundChooser" id="background_chooser">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
......@@ -205,9 +214,10 @@ diff --unified --recursive --text --color a/panels/background/cc-background-pane
</child>
</object>
</child>
diff --unified --recursive --text --color a/panels/background/gnome-background-panel.desktop.in.in b/panels/background/gnome-background-panel.desktop.in.in
--- a/panels/background/gnome-background-panel.desktop.in.in 2021-11-10 08:58:57.319396000 -0700
+++ b/panels/background/gnome-background-panel.desktop.in.in 2021-11-10 09:18:23.048004483 -0700
diff --git a/panels/background/gnome-background-panel.desktop.in.in b/panels/background/gnome-background-panel.desktop.in.in
index 76534b028..0a074c1d3 100644
--- a/panels/background/gnome-background-panel.desktop.in.in
+++ b/panels/background/gnome-background-panel.desktop.in.in
@@ -1,6 +1,6 @@
[Desktop Entry]
-Name=Background
......@@ -217,25 +227,22 @@ diff --unified --recursive --text --color a/panels/background/gnome-background-p
Exec=gnome-control-center background
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=preferences-desktop-wallpaper
@@ -11,4 +11,5 @@
@@ -11,4 +11,5 @@ StartupNotify=true
Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
OnlyShowIn=GNOME;
# Translators: Search terms to find the Background panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=Wallpaper;Screen;Desktop;
+Keywords=Wallpaper;Screen;Desktop;Dark;Light;Theme;Night;Dock;Panel;Windows;Workspaces;
+X-GNOME-ControlCenter-HasSidebar=true
diff --unified --recursive --text --color a/panels/background/meson.build b/panels/background/meson.build
--- a/panels/background/meson.build 2021-11-10 08:58:57.319396000 -0700
+++ b/panels/background/meson.build 2021-11-10 09:19:51.976853554 -0700
@@ -91,6 +91,7 @@
gnome_desktop_dep,
diff --git a/panels/background/meson.build b/panels/background/meson.build
index e9fa398d4..0136a3bd7 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -94,7 +94,8 @@ deps = common_deps + [
goa_dep,
libxml_dep,
dependency('cairo-gobject'),
+ dependency('pop_desktop_widget'),
+ dependency('pop_desktop_widget')
]
cflags += [
<<<<<<< HEAD
=======
>>>>>>> 41
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment