a7y18lte-pmos/pmos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

temp/gnome-control-center: enable printer panel (MR 2795)

Browse Source 
The bug that made the cups client in the panel crash is now
fixed and the panel is finally usable
This commit is contained in:
Pablo Correa Gómez 2021-12-28 11:44:41 +01:00 committed by Bart Ribbers
parent 3543294624
commit b5c970e13e
No known key found for this signature in database
GPG Key ID: 0BF4C1B5988C50D8
10 changed files with 36 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
temp/gnome-control-center/0001-Hide-and-disable-building-printer-panel.patch
View File

@ -1,61 +0,0 @@
From 4c467035e7f541cbe5d523497488caffecb61663 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Sun, 18 Jul 2021 20:53:01 +0200
Subject: [PATCH 1/8] Hide and disable building printer panel
The printer panel requires `libcups`, which is known to crash
in Alpine: https://gitlab.alpinelinux.org/alpine/aports/-/issues/11937
Opening the printer panel crashes g-c-c and prevents it from
opening again. Hide and do not build the panel until the upstream
issue is fixed
---
panels/meson.build | 1 -
shell/cc-panel-loader.c | 2 --
tests/meson.build | 1 -
3 files changed, 4 deletions(-)
diff --git a/panels/meson.build b/panels/meson.build
index f603db919..9df1ec2a3 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -19,7 +19,6 @@ panels = [
'notifications',
'online-accounts',
'power',
- 'printers',
'region',
'removable-media',
'search',
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 67f3f1b46..48c587066 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -51,7 +51,6 @@ extern GType cc_wifi_panel_get_type (void);
extern GType cc_notifications_panel_get_type (void);
extern GType cc_goa_panel_get_type (void);
extern GType cc_power_panel_get_type (void);
-extern GType cc_printers_panel_get_type (void);
extern GType cc_region_panel_get_type (void);
extern GType cc_removable_media_panel_get_type (void);
extern GType cc_search_panel_get_type (void);
@@ -122,7 +121,6 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("notifications", cc_notifications_panel_get_type, NULL),
PANEL_TYPE("online-accounts", cc_goa_panel_get_type, NULL),
PANEL_TYPE("power", cc_power_panel_get_type, NULL),
- PANEL_TYPE("printers", cc_printers_panel_get_type, NULL),
PANEL_TYPE("region", cc_region_panel_get_type, NULL),
PANEL_TYPE("removable-media", cc_removable_media_panel_get_type, NULL),
PANEL_TYPE("search", cc_search_panel_get_type, NULL),
diff --git a/tests/meson.build b/tests/meson.build
index d4fe361ef..01f7c923c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,5 +6,4 @@ endif
subdir('interactive-panels')
-subdir('printers')
subdir('info')
--
2.25.1

4
temp/gnome-control-center/0002-shell-Mirror-the-main-leaflet-s-folded-property.patch → temp/gnome-control-center/0001-shell-Mirror-the-main-leaflet-s-folded-property.patch
View File

@ -1,7 +1,7 @@
From ef5c92ca97770fe2e970985a499d8c1a4749be5a Mon Sep 17 00:00:00 2001
From 2f6f14c45ed891ee215f408ce428aab6508b9b3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 24 Aug 2021 18:23:51 +0200
Subject: [PATCH 2/8] shell: Mirror the main leaflet's 'folded' property
Subject: [PATCH 1/8] shell: Mirror the main leaflet's 'folded' property
This makes it simpler for panels to check whether g-c-c
is in folded state.

4
temp/gnome-control-center/0003-display-Use-ComboBox-when-folded.patch → temp/gnome-control-center/0002-display-Use-ComboBox-when-folded.patch
View File

@ -1,7 +1,7 @@
From c8cf47d9f6873aa996d29283055e110389250434 Mon Sep 17 00:00:00 2001
From 7611eb809fee7da48b255535695836f91b14e8e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Tue, 24 Aug 2021 18:25:05 +0200
Subject: [PATCH 3/8] display: Use ComboBox when folded
Subject: [PATCH 2/8] display: Use ComboBox when folded
On small window sizes the ButtonBox can overflow the panel. This is
especially true in single display mode when no other elemnts prevent

4
temp/gnome-control-center/0004-Wrap-long-labels-on-small-screens.patch → temp/gnome-control-center/0003-Wrap-long-labels-on-small-screens.patch
View File

@ -1,7 +1,7 @@
From 81bb6daebef02481f6bc467a64d1402c598627dd Mon Sep 17 00:00:00 2001
From 77cff5ed952d20a7d29ae844926a76d75b26e13d Mon Sep 17 00:00:00 2001
From: undef <gitlab@undef.tools>
Date: Tue, 21 Sep 2021 08:56:22 +0000
Subject: [PATCH 4/8] Wrap long labels on small screens
Subject: [PATCH 3/8] Wrap long labels on small screens
Both the keyboard and region panels contain long GtkLabels. These labels
cause gnome-control-center overflow the screen, especially on small

4
temp/gnome-control-center/0005-WiFi-Reduce-width-of-connection-row-for-mobile.patch → temp/gnome-control-center/0004-WiFi-Reduce-width-of-connection-row-for-mobile.patch
View File

@ -1,7 +1,7 @@
From 73c0b7f78f49f1503a6dc16517f3ecefddc59ee7 Mon Sep 17 00:00:00 2001
From 196a16e30948251efeec1905546c37a698526327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Sun, 3 Oct 2021 17:48:29 +0200
Subject: [PATCH 5/8] WiFi: Reduce width of connection row for mobile
Subject: [PATCH 4/8] WiFi: Reduce width of connection row for mobile
The current WiFi panel is not adaptive on small screens. This results in
the panel being partially off the screen, blocking users from (for

4
temp/gnome-control-center/0006-Add-new-connection-editor.patch → temp/gnome-control-center/0005-Add-new-connection-editor.patch
View File

@ -1,7 +1,7 @@
From 4c96a9b3869163c8c51c5e27589113fb4038e6e0 Mon Sep 17 00:00:00 2001
From f43b638fbbb1715f4901451aed3fd5b53ea326da Mon Sep 17 00:00:00 2001
From: Mohammed Sadiq <sadiq@sadiqpk.org>
Date: Fri, 18 Oct 2019 18:36:59 +0530
Subject: [PATCH 6/8] Add new connection editor
Subject: [PATCH 5/8] Add new connection editor
---
.../connection-editor/cc-connection-editor.c | 618 ++++++++++

4
temp/gnome-control-center/0007-Wifi-Use-Purism-connection-editor.patch → temp/gnome-control-center/0006-Wifi-Use-Purism-connection-editor.patch
View File

@ -1,7 +1,7 @@
From d1d39a439448cd070c0d85ad5eb39d021db6ac69 Mon Sep 17 00:00:00 2001
From 5f8efaf6961ed1e9c0bdd1d823aa2e4a05f2a676 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Sun, 3 Oct 2021 17:56:45 +0200
Subject: [PATCH 7/8] Wifi: Use Purism connection editor
Subject: [PATCH 6/8] Wifi: Use Purism connection editor
Build for adaptability.

4
temp/gnome-control-center/0008-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch → temp/gnome-control-center/0007-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch
View File

@ -1,7 +1,7 @@
From f9a3d824d401754805bb7102713facf82bcf39b3 Mon Sep 17 00:00:00 2001
From 5580d36bb63ecec8613c00972614a3c527709333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Sun, 3 Oct 2021 18:13:38 +0200
Subject: [PATCH 8/8] Users: Adapt panel to make it usable in small screens
Subject: [PATCH 7/8] Users: Adapt panel to make it usable in small screens
---
panels/common/cc-permission-infobar.ui | 6 ++++++

6
temp/gnome-control-center/0009-Added-some-more-reasonable-suspend-time-options-for-.patch → temp/gnome-control-center/0008-Added-some-more-reasonable-suspend-time-options-for-.patch
View File

@ -1,7 +1,7 @@
From 33e1f62891a5ccd907fabb0ef446da8341dc02b4 Mon Sep 17 00:00:00 2001
From 6756ee55e44754b68f13c0d4690eaed7641fa6f8 Mon Sep 17 00:00:00 2001
From: silver <silver@silvermag.net>
Date: Fri, 23 Oct 2020 21:56:44 +0000
Subject: [PATCH] Added some more reasonable suspend time options for
Subject: [PATCH 8/8] Added some more reasonable suspend time options for
mobile
---
@ -32,5 +32,5 @@ index 9880f6b7e..6eb6c379a 100644
<col id="0" translatable="yes" context="automatic_suspend" comments="Translators: Option for &quot;Delay&quot; in &quot;Automatic suspend&quot; dialog.">15 minutes</col>
<col id="1">900</col>
--
2.34.1
2.25.1

40
temp/gnome-control-center/APKBUILD
View File

@ -1,8 +1,8 @@
# Forked from Alpine to apply adaptability patches
pkgname=gnome-control-center
pkgver=9999_git20210917
pkgrel=1
_pkgver=41.1
pkgrel=2
_pkgver=41.2
pkgdesc="GNOME control center"
url="https://gitlab.gnome.org/GNOME/gnome-control-center"
# s390x, mips64 and riscv64 blocked by polkit
@ -52,15 +52,14 @@ _purism_commit="d2c36cb86195d75a6975bc3ad369ee7a0a8f1352"
_purism_patches="https://source.puri.sm/pureos/packages/gnome-control-center/-/raw/$_purism_commit/debian/patches"
source="https://download.gnome.org/sources/gnome-control-center/${_pkgver%.*}/gnome-control-center-$_pkgver.tar.xz
0001-Hide-and-disable-building-printer-panel.patch
0002-shell-Mirror-the-main-leaflet-s-folded-property.patch
0003-display-Use-ComboBox-when-folded.patch
0004-Wrap-long-labels-on-small-screens.patch
0005-WiFi-Reduce-width-of-connection-row-for-mobile.patch
0006-Add-new-connection-editor.patch
0007-Wifi-Use-Purism-connection-editor.patch
0008-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch
0009-Added-some-more-reasonable-suspend-time-options-for-.patch
0001-shell-Mirror-the-main-leaflet-s-folded-property.patch
0002-display-Use-ComboBox-when-folded.patch
0003-Wrap-long-labels-on-small-screens.patch
0004-WiFi-Reduce-width-of-connection-row-for-mobile.patch
0005-Add-new-connection-editor.patch
0006-Wifi-Use-Purism-connection-editor.patch
0007-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch
0008-Added-some-more-reasonable-suspend-time-options-for-.patch
$_assets_location/multitasking/active-screen-edges.svg
$_assets_location/multitasking/hot-corner.svg
$_assets_location/multitasking/workspaces-primary-display.svg
@ -110,16 +109,15 @@ package() {
}
sha512sums="
432cc9d90896f7d5ffc751cd6904e1694cf825e39807b00f673bf2a6b375ecb3d65de6602df49da0b3147c3a35c83f3177ab22ca68e7f66c530958afeab30bc5 gnome-control-center-41.1.tar.xz
b0e53a2a436acc7502dbe3c21df73ce7da042b4f1513b3e003d7f14bb23f308e67f32d1a5743e5b60800a3247c5f48e87479d7c1c8eeade25ae35fe43e088e6c 0001-Hide-and-disable-building-printer-panel.patch
7351f941110f369d3d9c837fcb52f91c8afaeb6e1a372de789584869bd9eb1d26c72ea65ea75fd1b14cecc8dc4baef060ec38b52d0c3bc46080732b38df26290 0002-shell-Mirror-the-main-leaflet-s-folded-property.patch
832da3134cdfb7a693088fe9b7579d5dc9788636163ec0fa8957803ff07bdc0c2b0a08fe7997fdf57a9d336cabd3cddc944074cca42154ed674bce6f01b5e163 0003-display-Use-ComboBox-when-folded.patch
a7d912c6e4a2aab0ba20e04240ee8e7a6729bee328249a1b7c123fa9bd2ee51685b29817538b81ec6bd5e1eee1966923893ca0fb9189eaa8dad401927a3746ed 0004-Wrap-long-labels-on-small-screens.patch
e8c0f1e03013ba95e80e65d790ea3eec3c47860a783bc6b0772a6607e90a37017da52a4308d78ec1755df740c798af744dac896fb74e690abf068a3e560a20d4 0005-WiFi-Reduce-width-of-connection-row-for-mobile.patch
8ed6b4c90a645e31b24e65a312b63f74d839a9a0f94509c7bf7206b355d326969203b20ddd3d1dc03a30f5294698899eaa42aa7301f166fab451ffc91bb59673 0006-Add-new-connection-editor.patch
9573434124562643299bcc7a2d2bf1f9b7a6f4efc30aa7605017553503c301efa062399409eefa07e5df4ea5be2d4396b7edfcf69828f2ca188d25fbae0dbcb9 0007-Wifi-Use-Purism-connection-editor.patch
ca8f9d85043682311c29352f21d4c1270b28d1a13135cb4189bb26d785bb255a37f70ba6a84d857d87febfc7a82344304ebb5e954411406f38126e8b0c1492fa 0008-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch
962147184f0f9fa051191ee04dad039dbba0011bbacc4d741b0581a9208dbb45052911a6a10853bbab490af1ecf2ac04a628fba01a04375079a9c184862739a8 0009-Added-some-more-reasonable-suspend-time-options-for-.patch
9ea19e4bd1bd708f78a62c746102467dd2e801b84a64589a043a4f849d297353edc54291a5c59db1f8dd3c2c24088aec0f1d98a6270b0373384a2e19e7dde332 gnome-control-center-41.2.tar.xz
429c9e084d859ab396ea390d047a2f0f22b6199af4ad3d55455af615331a7b5ac0264a7e1f38c7458478a41b8a38b429f3ed3e81e8d85d6d253085519c5ced49 0001-shell-Mirror-the-main-leaflet-s-folded-property.patch
59e27e52420c80ac4215833962169dcd8315c5cbe5270baef25cd2f24bbecd6298a8812e28dd9bab8c5992d62826bc288993f3cb6ccce39f22d09874ce6e7a2b 0002-display-Use-ComboBox-when-folded.patch
a6b4cea1d6efe4c211f0b2575a6a84ba4a4c825501f288b82bee2a0d1391f8dd4fca26849a89be2d7c4f8a423cea2c93b2b3c3dc19f028e4c7f9fb13c00c581b 0003-Wrap-long-labels-on-small-screens.patch
7d91a35c7e86035cdfffd6929a8701ffe4979b869fe7576f8f44d0a6bdb148d2d008b771decdb249b286373842711fc3698904224b6c8c94b29ba095e6aa38ec 0004-WiFi-Reduce-width-of-connection-row-for-mobile.patch
7584afa92f907a3dc55e8eb53b7b43feb7309b384890e9841b78d63c7873bea8c4c2712d0c445bf2fa88d207dbd37e6a2a33a1dc56623db7884ca567c5fdff0a 0005-Add-new-connection-editor.patch
f1368dcf7acbb64838dcc47922ee4fbf01cd9206f521d8002da53295ed7e30b40a1c0cd56bea217636e3f1c4b6e1f6e61d84bd42dd4396bd14b6056fa6930b25 0006-Wifi-Use-Purism-connection-editor.patch
e96594fecaa2334d035acd2076bffd4adedf6eb89757472e7a4e6ba9dfebef1c170005bf519e359c27e8f749c4fcdf7c432fca945dcca05eab287fe0c288117c 0007-Users-Adapt-panel-to-make-it-usable-in-small-screens.patch
240da7c2350ec1ed0058a614cd1766fae003cf1637473d035bea100585a57500d2002889de485f6f0395bc2a4b686d8ea963b06a5cf1e4b957242142fadb2166 0008-Added-some-more-reasonable-suspend-time-options-for-.patch
a14d99eb128b04d6c1744c5599cb88a78c26c6aaa5a02b00970095c1107dbac9002dd985c9d0ef313bea13db79ed6bd672f247f00d4fb3c31b7dc1e9565627da active-screen-edges.svg
4ccc3cbce817381e0780f518ab8e6877f8169ad0ffefb89ae331703be5c4630f5f533ef73a978b093f0f4a0005b488aaf0bd637db11f5efacd5e0fe8c703d863 hot-corner.svg
6d17793ceb312ec9b3bf32c5ace90c0515aa874ed654ab0a18fa822bfc3c5fdfbfc6e752eb3c6e43f2abfbfd61c1e8ee6eca61fa721e8503a19a061a748c69ae workspaces-primary-display.svg