temp/gnome-control-center: upgrade to 9999_git20210203 (MR 2212)
This is actually g-c-c 3.38.1 or something like that.
This commit is contained in:
Newbyte
Dylan Van Assche
parent
6340875eb2
commit
f48b6f19bd
4 changed files with 118 additions and 62 deletions
|
|
@ -0,0 +1,83 @@
|
|||
From ff3c623cf1fbd681bc123417da4a4c23390ceb7b 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] 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
|
||||
---
|
||||
debian/patches/pureos/shell-Hide-some-panels-on-phones.patch | 3 +--
|
||||
panels/meson.build | 1 -
|
||||
shell/cc-panel-loader.c | 2 --
|
||||
tests/meson.build | 1 -
|
||||
4 files changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/debian/patches/pureos/shell-Hide-some-panels-on-phones.patch b/debian/patches/pureos/shell-Hide-some-panels-on-phones.patch
|
||||
index 3fd0eac5c..3a17401fb 100644
|
||||
--- a/debian/patches/pureos/shell-Hide-some-panels-on-phones.patch
|
||||
+++ b/debian/patches/pureos/shell-Hide-some-panels-on-phones.patch
|
||||
@@ -33,7 +33,7 @@ new file mode 100644
|
||||
index 0000000..e8a446c
|
||||
--- /dev/null
|
||||
+++ b/shell/phone-panels.h
|
||||
-@@ -0,0 +1,52 @@
|
||||
+@@ -0,0 +1,51 @@
|
||||
+static CcPanelLoaderVtable phone_panels[] =
|
||||
+ {
|
||||
+ /* PANEL_TYPE("applications", cc_applications_panel_get_type, NULL), */
|
||||
@@ -60,7 +60,6 @@ index 0000000..e8a446c
|
||||
+ 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/panels/meson.build b/panels/meson.build
|
||||
index 2f4fdc5e3..7113a9867 100644
|
||||
--- a/panels/meson.build
|
||||
+++ b/panels/meson.build
|
||||
@@ -18,7 +18,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 f20384394..9c329a477 100644
|
||||
--- a/shell/cc-panel-loader.c
|
||||
+++ b/shell/cc-panel-loader.c
|
||||
@@ -50,7 +50,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);
|
||||
@@ -114,7 +113,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.17.1
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
From 7437108a3c522710ed2da3c018d938878e51084a Mon Sep 17 00:00:00 2001
|
||||
From: Dylan Van Assche <me@dylanvanassche.be>
|
||||
Date: Thu, 3 Dec 2020 07:52:00 +0100
|
||||
Subject: [PATCH] panels/info-overview: Use GNOME logo instead of Purism
|
||||
|
||||
pmOS should not ship this with a Purism logo since pmOS uses upstream as much as possible.
|
||||
---
|
||||
panels/info-overview/cc-info-overview-panel.ui | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/info-overview/cc-info-overview-panel.ui
|
||||
index 4af20ccba..bd43be8c9 100644
|
||||
--- a/panels/info-overview/cc-info-overview-panel.ui
|
||||
+++ b/panels/info-overview/cc-info-overview-panel.ui
|
||||
@@ -30,7 +30,7 @@
|
||||
<object class="GtkImage">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
- <property name="resource">/org/gnome/control-center/info-overview/purism-logo.svg</property>
|
||||
+ <property name="resource">/org/gnome/control-center/info-overview/GnomeLogoVerticalMedium.svg</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
@ -1,8 +1,8 @@
|
|||
# Forked from Alpine to apply Purism's mobile patches
|
||||
pkgname=gnome-control-center
|
||||
pkgver=9999_git20201203
|
||||
pkgver=9999_git20210710
|
||||
pkgrel=0
|
||||
_commit="d748dfeff8ca3c4a5c3a85bf81089246ce5b70cb"
|
||||
_commit="30480740e4e5c0ab2920dc21859c34cbd41df278"
|
||||
pkgdesc="GNOME control center"
|
||||
url="https://gitlab.gnome.org/GNOME/gnome-control-center"
|
||||
# limited by gnome-online-accounts
|
||||
|
|
@ -39,46 +39,58 @@ makedepends="
|
|||
gsound-dev
|
||||
libgudev-dev
|
||||
polkit-dev
|
||||
libhandy-dev
|
||||
libhandy1-dev
|
||||
cheese-dev
|
||||
ibus-dev"
|
||||
options="!check" # needs unpackaged py-dbusmock
|
||||
install="$pkgname.pre-install $pkgname.pre-upgrade"
|
||||
subpackages="$pkgname-dev $pkgname-lang $pkgname-dbg $pkgname-doc $pkgname-bash-completion"
|
||||
source="https://source.puri.sm/Librem5/gnome-control-center/-/archive/$_commit/gnome-control-center-$_commit.tar.gz
|
||||
source="https://source.puri.sm/pureos/packages/gnome-control-center/-/archive/$_commit/gnome-control-center-$_commit.tar.gz
|
||||
0001-Hide-and-disable-building-printer-panel.patch
|
||||
README.alpine
|
||||
build-fix.patch
|
||||
0001-panels-info-overview-Use-GNOME-logo.patch
|
||||
"
|
||||
builddir="$srcdir/$pkgname-$_commit"
|
||||
|
||||
prepare() {
|
||||
default_prepare
|
||||
|
||||
patch_dir="$builddir"/debian/patches
|
||||
rm "$patch_dir"/distro-logo.patch
|
||||
sed -i 's/^distro-logo.patch$//' "$patch_dir"/series
|
||||
|
||||
grep "\.patch$" debian/patches/series \
|
||||
| xargs -I {} -t -r -n1 patch -p1 -i debian/patches/{}
|
||||
}
|
||||
|
||||
build() {
|
||||
meson \
|
||||
--prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--mandir=/usr/share/man \
|
||||
--localstatedir=/var \
|
||||
--buildtype=plain \
|
||||
-Dcheese=true \
|
||||
-Dibus=true \
|
||||
. output
|
||||
ninja -C output
|
||||
abuild-meson \
|
||||
-Dcheese=true \
|
||||
-Dibus=true \
|
||||
. output
|
||||
|
||||
# Bad dep file -> blows up when compiling with multiple build jobs otherwise
|
||||
ninja -C output panels/network/cc-network-resources.c
|
||||
ninja -C output panels/network/cc-network-resources.h
|
||||
|
||||
meson compile ${JOBS:+-j ${JOBS}} -C output
|
||||
}
|
||||
|
||||
check() {
|
||||
ninja -C output test
|
||||
meson test --no-rebuild -v -C output
|
||||
}
|
||||
|
||||
package() {
|
||||
DESTDIR="$pkgdir" ninja -C output install
|
||||
DESTDIR="$pkgdir" meson install --no-rebuild -C output
|
||||
|
||||
mkdir -p "$pkgdir"/usr/lib
|
||||
mv "$pkgdir"/usr/share/pkgconfig "$pkgdir"/usr/lib
|
||||
mkdir -p "$pkgdir"/usr/lib/pkgconfig
|
||||
mv "$pkgdir"/usr/share/pkgconfig/* "$pkgdir"/usr/lib/pkgconfig
|
||||
rmdir "$pkgdir"/usr/share/pkgconfig
|
||||
|
||||
install -Dm0644 "$srcdir"/README.alpine -t "$pkgdir"/usr/share/doc/"$pkgname"
|
||||
}
|
||||
|
||||
sha512sums="2e16e8e9a497224db249838c4767ac5feae78b7f68b77fd6f54d03cb7b1e6ed91cae4979afaa8a7b5316a7cd309373b531c30d669e1a89778f3e160da0327bcc gnome-control-center-d748dfeff8ca3c4a5c3a85bf81089246ce5b70cb.tar.gz
|
||||
sha512sums="
|
||||
02a1fc03c1c4aaba74e49e0d59ef8ff4307ebd70e605164deed55cb6ba2c2d2c795dfdf6d4dcd8cc9da5e9dbbafac4ecf951faff43843b753c0bc7fc289ecd95 gnome-control-center-30480740e4e5c0ab2920dc21859c34cbd41df278.tar.gz
|
||||
b8954191d454e92386c42c9adacfdbb5126e347f5cb7014a2000112662f3af6a9b78219b575121f165377aef76be72389cdf5c5bb8b209878c16a18bddcc6732 0001-Hide-and-disable-building-printer-panel.patch
|
||||
350aa443149c71851ad4de0976c7fc5cb626ba0c57a8d41e6ef80da1c65ed84a4dfa2483ae92630a3b611c4bfa9360ded82b55e8cd0e3907294c025e4f6b1671 README.alpine
|
||||
78a87bfddb1a660873ec1380a5f8f0f3ad5ef04dd3414d9a7f25ec55a8d4b653769f8e49f519d45c8b17bb3c6549d855e472a33a61c8cca1f9e18f16a05d1cb8 build-fix.patch
|
||||
718c057c2213d39bc30b0975ecd063caa216d11683ca6d6d9ecdee223fa6952daa7db7ea5df56712ca29e209fe231c86edcdecf0c2530f1a4bcfea8ddaef9b45 0001-panels-info-overview-Use-GNOME-logo.patch"
|
||||
"
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/panels/background/cc-background-item.c b/panels/background/cc-background-item.c
|
||||
index dc8850b66..50851e17d 100644
|
||||
--- a/panels/background/cc-background-item.c
|
||||
+++ b/panels/background/cc-background-item.c
|
||||
@@ -156,7 +156,7 @@ render_at_size (GnomeBG *bg,
|
||||
GdkPixbuf *pixbuf;
|
||||
|
||||
pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
|
||||
- gnome_bg_draw (bg, pixbuf, gdk_screen_get_default (), FALSE);
|
||||
+ gnome_bg_draw (bg, pixbuf);
|
||||
|
||||
return pixbuf;
|
||||
}
|
||||
Loading…
Reference in a new issue