isa/citadel
1
0
Fork 0
forked from brl/citadel
Code Pull Requests Activity

Update gnome-control-center for 3.28

Browse Source
This commit is contained in:
Bruce Leidl 2018-03-24 13:46:40 -04:00
parent 86e611b564
commit cfb4eefe12
10 changed files with 354 additions and 445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center.inc
View File

@ -1,25 +0,0 @@
SUMMARY = "GNOME desktop configuration UI"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
inherit gettext gnome
SRC_URI += "\
file://0001-Remove-grilo-miner-from-background-panel.patch \
file://0002-remove-unwanted-panels.patch \
file://0003-disable-running-tests.patch \
file://0004-remove-unwanted-panel-dependencies.patch \
file://0005-fix-gdesktop-prefix.patch \
"
DEPENDS = "pulseaudio colord-gtk networkmanager ibus colord gnome-desktop gnome-settings-daemon polkit libcanberra gdk-pixbuf fontconfig gtk+3 glib-2.0 intltool-native upower libpwquality cairo libxml2 libgudev libsoup-2.4 libxi libwacom libx11 libgtop gnome-common-native autoconf-archive-native wayland accountsservice modemmanager network-manager-applet gnome-bluetooth clutter-1.0 clutter-gtk gsettings-desktop-schemas glib-2.0-native libxml2-native"
FILES_${PN} += "\
${datadir}/bash-completion \
${datadir}/gettext \
${datadir}/dbus-1 \
${datadir}/gnome-shell/search-providers \
"
EXTRA_OECONF = "--disable-documentation --without-cheese"

310
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Make-goa-cups-and-user-accounts-optional.patch Normal file
View File

@ -0,0 +1,310 @@
From e771fb2af8b8e12640f01390d0695f9338142ee5 Mon Sep 17 00:00:00 2001
From: Bruce Leidl <bruce@subgraph.com>
Date: Thu, 22 Mar 2018 19:50:28 -0400
Subject: [PATCH] Make goa cups and user accounts optional
There is also a path leak fix
---
meson.build | 13 +++++++++++++
meson_options.txt | 4 ++++
panels/background/bg-pictures-source.c | 20 ++++++++++++++++++++
panels/background/meson.build | 15 +++++++++++----
panels/meson.build | 15 ++++++++++++---
shell/cc-panel-loader.c | 6 ++++++
6 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/meson.build b/meson.build
index 2d0d45e..a61de4a 100644
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,13 @@ libgd = subproject(
)
libgd_dep = libgd.get_variable('libgd_dep')
+enable_goa = get_option('online_accounts')
+enable_cups = get_option('cups')
+enable_user_accounts = get_option('user_accounts')
+config_h.set('WITH_GOA', enable_goa, description: 'Define to enable support for Gnome Online Accounts')
+config_h.set('WITH_CUPS', enable_goa, description: 'Define to enable support for CUPS')
+config_h.set('WITH_USER_ACCOUNTS', enable_user_accounts, description: 'Define to enable user accounts panel')
+
goa_req_version = '>= 3.25.3'
pulse_req_version = '>= 2.0'
@@ -108,7 +115,9 @@ gio_dep = dependency('gio-2.0')
glib_dep = dependency('glib-2.0', version: '>= 2.53.0')
gnome_desktop_dep = dependency('gnome-desktop-3.0', version: '>= 3.27.90')
gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 3.25.90')
+if enable_goa
goa_dep = dependency('goa-1.0', version: goa_req_version)
+endif
gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 3.27.2')
libxml_dep = dependency('libxml-2.0')
polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103')
@@ -129,6 +138,8 @@ common_deps = [
dependency('gtk+-3.0', version: '>= 3.22.20')
]
+if enable_cups
+
# Check for CUPS 1.4 or newer
cups_dep = dependency('cups', version : '>= 1.4', required: false)
assert(cups_dep.found(), 'CUPS 1.4 or newer not found')
@@ -149,6 +160,8 @@ foreach header: check_headers
assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1])
endforeach
+endif
+
# Optional dependency for the user accounts panel
enable_cheese = get_option('cheese')
if enable_cheese
diff --git a/meson_options.txt b/meson_options.txt
index 7498af4..d5e2548 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -3,3 +3,7 @@ option('documentation', type: 'boolean', value: false, description: 'build docum
option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir')
option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
+option('staging_dir', type: 'string', description: 'set staging directory for cross-compile')
+option('online_accounts', type: 'boolean', value: false, description: 'build with support for gnome-online-accounts')
+option('cups', type: 'boolean', value: false, description: 'build with support for CUPS')
+option('user_accounts', type: 'boolean', value: false, description: 'build with support for user accounts panel')
diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
index a37682d..e17b0e1 100644
--- a/panels/background/bg-pictures-source.c
+++ b/panels/background/bg-pictures-source.c
@@ -23,13 +23,17 @@
#include "bg-pictures-source.h"
+#ifdef WITH_GOA
#include "cc-background-grilo-miner.h"
+#endif
#include "cc-background-item.h"
#include <string.h>
#include <cairo-gobject.h>
#include <gio/gio.h>
+#ifdef WITH_GOA
#include <grilo.h>
+#endif
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
#include <gdesktop-enums.h>
@@ -43,7 +47,9 @@ struct _BgPicturesSource
GCancellable *cancellable;
+#ifdef WITH_GOA
CcBackgroundGriloMiner *grl_miner;
+#endif
GnomeDesktopThumbnailFactory *thumb_factory;
@@ -85,7 +91,9 @@ bg_pictures_source_dispose (GObject *object)
g_clear_object (&source->cancellable);
}
+#ifdef WITH_GOA
g_clear_object (&source->grl_miner);
+#endif
g_clear_object (&source->thumb_factory);
G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
@@ -460,7 +468,9 @@ add_single_file (BgPicturesSource *bg_source,
gboolean retval = FALSE;
g_autoptr(GFile) pictures_dir = NULL;
g_autoptr(GFile) cache_dir = NULL;
+#ifdef WITH_GOA
GrlMedia *media;
+#endif
/* find png and jpeg files */
if (!content_type)
@@ -516,13 +526,16 @@ add_single_file (BgPicturesSource *bg_source,
read_file:
+#ifdef WITH_GOA
media = g_object_get_data (G_OBJECT (file), "grl-media");
if (media == NULL)
{
+#endif
g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
g_file_read_async (file, G_PRIORITY_DEFAULT,
bg_source->cancellable,
picture_opened_for_read, bg_source);
+#ifdef WITH_GOA
}
else
{
@@ -560,6 +573,7 @@ add_single_file (BgPicturesSource *bg_source,
picture_copied_for_read,
bg_source);
}
+#endif
retval = TRUE;
@@ -590,6 +604,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
}
+#ifdef WITH_GOA
static gboolean
add_single_file_from_media (BgPicturesSource *bg_source,
GFile *file,
@@ -614,6 +629,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
}
+#endif
gboolean
bg_pictures_source_add (BgPicturesSource *bg_source,
@@ -930,6 +946,7 @@ monitor_path (BgPicturesSource *self,
return monitor;
}
+#ifdef WITH_GOA
static void
media_found_cb (BgPicturesSource *self, GrlMedia *media)
{
@@ -941,6 +958,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
add_single_file_from_media (self, file, media);
}
+#endif
static void
bg_pictures_source_init (BgPicturesSource *self)
@@ -964,9 +982,11 @@ bg_pictures_source_init (BgPicturesSource *self)
cache_path = bg_pictures_source_get_cache_path ();
self->cache_dir_monitor = monitor_path (self, cache_path);
+#ifdef WITH_GOA
self->grl_miner = cc_background_grilo_miner_new ();
g_signal_connect_swapped (self->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
cc_background_grilo_miner_start (self->grl_miner);
+#endif
self->thumb_factory =
gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
diff --git a/panels/background/meson.build b/panels/background/meson.build
index bb34b69..0db3dae 100644
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -34,9 +34,11 @@ install_data(
common_sources = []
+staging = get_option('staging_dir')
+
enums = 'gdesktop-enums-types'
enums_header = files(
- gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
+ staging + gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
'cc-background-item.h'
)
@@ -75,20 +77,25 @@ sources = common_sources + files(
'bg-source.c',
'bg-wallpapers-source.c',
'cc-background-chooser-dialog.c',
- 'cc-background-grilo-miner.c',
'cc-background-item.c',
'cc-background-xml.c'
)
+if enable_goa
+sources += files('cc-background-grilo-miner.c')
+endif
+
deps = common_deps + [
gdk_pixbuf_dep,
gnome_desktop_dep,
- goa_dep,
libxml_dep,
dependency('cairo-gobject'),
- dependency('grilo-0.3', version: '>= 0.3.0')
]
+if enable_goa
+deps += [ goa_dep, dependency('grilo-0.3', version: '>= 0.3.0') ]
+endif
+
cflags += [
'-DGNOMELOCALEDIR="@0@"'.format(control_center_localedir),
'-DDATADIR="@0@"'.format(control_center_datadir),
diff --git a/panels/meson.build b/panels/meson.build
index d671c47..a823bc8 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -9,16 +9,13 @@ panels = [
'keyboard',
'mouse',
'notifications',
- 'online-accounts',
'power',
- 'printers',
'privacy',
'region',
'search',
'sharing',
'sound',
'universal-access',
- 'user-accounts'
]
if host_is_linux
@@ -32,6 +29,18 @@ if host_is_linux_not_s390
]
endif
+if enable_goa
+ panels += ['online-accounts']
+endif
+
+if enable_cups
+ panels += ['printers']
+endif
+
+if enable_user_accounts
+ panels += ['user-accounts']
+endif
+
panels_list = []
panels_libs = []
foreach cappletname: panels
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 675833c..da96263 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -91,16 +91,22 @@ static struct {
PANEL_TYPE("wifi", cc_wifi_panel_get_type ),
#endif
PANEL_TYPE("notifications", cc_notifications_panel_get_type),
+#ifdef WITH_GOA
PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
+#endif
PANEL_TYPE("power", cc_power_panel_get_type ),
+#ifdef WITH_CUPS
PANEL_TYPE("printers", cc_printers_panel_get_type ),
+#endif
PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
PANEL_TYPE("region", cc_region_panel_get_type ),
PANEL_TYPE("search", cc_search_panel_get_type ),
PANEL_TYPE("sharing", cc_sharing_panel_get_type ),
PANEL_TYPE("sound", cc_sound_panel_get_type ),
PANEL_TYPE("universal-access", cc_ua_panel_get_type ),
+#ifdef WITH_USER_ACCOUNTS
PANEL_TYPE("user-accounts", cc_user_panel_get_type ),
+#endif
#ifdef BUILD_WACOM
PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
#endif
--
2.16.2

136
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Remove-grilo-miner-from-background-panel.patch
View File

@ -1,136 +0,0 @@
From 618a2b52c41161d63f7ab4b5f72de7012fdc2f58 Mon Sep 17 00:00:00 2001
From: brl <bruce@subgraph.com>
Date: Tue, 19 Dec 2017 14:04:28 -0500
Subject: [PATCH 1/5] Remove grilo miner from background panel
---
panels/background/Makefile.am | 2 --
panels/background/bg-pictures-source.c | 20 ++++++++++++++------
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/panels/background/Makefile.am b/panels/background/Makefile.am
index ccb8017..c49837f 100644
--- a/panels/background/Makefile.am
+++ b/panels/background/Makefile.am
@@ -27,8 +27,6 @@ libbackground_chooser_la_SOURCES = \
$(BUILT_SOURCES) \
cc-background-chooser-dialog.c \
cc-background-chooser-dialog.h \
- cc-background-grilo-miner.c \
- cc-background-grilo-miner.h \
cc-background-item.c \
cc-background-item.h \
cc-background-xml.c \
diff --git a/panels/background/bg-pictures-source.c b/panels/background/bg-pictures-source.c
index a3b35f3..9e5d23d 100644
--- a/panels/background/bg-pictures-source.c
+++ b/panels/background/bg-pictures-source.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <cairo-gobject.h>
#include <gio/gio.h>
-#include <grilo.h>
+// #include <grilo.h>
#include <libgnome-desktop/gnome-desktop-thumbnail.h>
#include <gdesktop-enums.h>
@@ -46,7 +46,7 @@ struct _BgPicturesSourcePrivate
{
GCancellable *cancellable;
- CcBackgroundGriloMiner *grl_miner;
+// CcBackgroundGriloMiner *grl_miner;
GnomeDesktopThumbnailFactory *thumb_factory;
@@ -86,7 +86,7 @@ bg_pictures_source_dispose (GObject *object)
g_clear_object (&priv->cancellable);
}
- g_clear_object (&priv->grl_miner);
+// g_clear_object (&priv->grl_miner);
g_clear_object (&priv->thumb_factory);
G_OBJECT_CLASS (bg_pictures_source_parent_class)->dispose (object);
@@ -479,7 +479,7 @@ add_single_file (BgPicturesSource *bg_source,
gboolean needs_download;
gboolean retval = FALSE;
GFile *pictures_dir, *cache_dir;
- GrlMedia *media;
+// GrlMedia *media;
/* find png and jpeg files */
if (!content_type)
@@ -538,14 +538,15 @@ add_single_file (BgPicturesSource *bg_source,
read_file:
- media = g_object_get_data (G_OBJECT (file), "grl-media");
- if (media == NULL)
+// media = g_object_get_data (G_OBJECT (file), "grl-media");
+// if (media == NULL)
{
g_object_set_data_full (G_OBJECT (file), "item", g_object_ref (item), g_object_unref);
g_file_read_async (file, G_PRIORITY_DEFAULT,
bg_source->priv->cancellable,
picture_opened_for_read, bg_source);
}
+#if 0
else
{
GFile *native_file;
@@ -587,6 +588,7 @@ add_single_file (BgPicturesSource *bg_source,
g_free (native_dir);
g_free (native_path);
}
+#endif
retval = TRUE;
@@ -621,6 +623,7 @@ add_single_file_from_info (BgPicturesSource *bg_source,
return add_single_file (bg_source, file, content_type, mtime, ret_row_ref);
}
+#if 0
static gboolean
add_single_file_from_media (BgPicturesSource *bg_source,
GFile *file,
@@ -645,6 +648,7 @@ add_single_file_from_media (BgPicturesSource *bg_source,
return add_single_file (bg_source, file, content_type, (guint64) mtime_unix, NULL);
}
+#endif
gboolean
bg_pictures_source_add (BgPicturesSource *bg_source,
@@ -988,6 +992,7 @@ monitor_path (BgPicturesSource *self,
return monitor;
}
+#if 0
static void
media_found_cb (BgPicturesSource *self, GrlMedia *media)
{
@@ -999,6 +1004,7 @@ media_found_cb (BgPicturesSource *self, GrlMedia *media)
g_object_set_data_full (G_OBJECT (file), "grl-media", g_object_ref (media), g_object_unref);
add_single_file_from_media (self, file, media);
}
+#endif
static void
bg_pictures_source_init (BgPicturesSource *self)
@@ -1026,9 +1032,11 @@ bg_pictures_source_init (BgPicturesSource *self)
priv->cache_dir_monitor = monitor_path (self, cache_path);
g_free (cache_path);
+#if 0
priv->grl_miner = cc_background_grilo_miner_new ();
g_signal_connect_swapped (priv->grl_miner, "media-found", G_CALLBACK (media_found_cb), self);
cc_background_grilo_miner_start (priv->grl_miner);
+#endif
priv->thumb_factory =
gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
--
2.14.3

84
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0002-remove-unwanted-panels.patch
View File

@ -1,84 +0,0 @@
From 685f0fc6ae8fe70d1d3b6f12cc2aea8614632215 Mon Sep 17 00:00:00 2001
From: brl <bruce@subgraph.com>
Date: Tue, 19 Dec 2017 14:06:06 -0500
Subject: [PATCH 2/5] remove unwanted panels
---
panels/Makefile.am | 5 +----
shell/Makefile.am | 5 +----
shell/cc-panel-loader.c | 6 +++---
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/panels/Makefile.am b/panels/Makefile.am
index 507cd2f..1d36f3d 100644
--- a/panels/Makefile.am
+++ b/panels/Makefile.am
@@ -6,18 +6,15 @@ SUBDIRS= \
display \
mouse \
notifications \
- online-accounts \
region \
info \
sound \
keyboard \
universal-access \
- user-accounts \
datetime \
search \
privacy \
- sharing \
- printers
+ sharing
if BUILD_WACOM
SUBDIRS += wacom
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 8099330..de3e53d 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -87,16 +87,13 @@ gnome_control_center_LDADD = \
$(top_builddir)/panels/keyboard/libkeyboard.la \
$(top_builddir)/panels/mouse/libmouse-properties.la \
$(top_builddir)/panels/notifications/libnotifications.la \
- $(top_builddir)/panels/online-accounts/libonline-accounts.la \
$(top_builddir)/panels/power/libpower.la \
$(top_builddir)/panels/privacy/libprivacy.la \
$(top_builddir)/panels/region/libregion.la \
$(top_builddir)/panels/search/libsearch.la \
$(top_builddir)/panels/sharing/libsharing.la \
$(top_builddir)/panels/sound/libsound.la \
- $(top_builddir)/panels/universal-access/libuniversal-access.la \
- $(top_builddir)/panels/user-accounts/libuser-accounts.la \
- $(top_builddir)/panels/printers/libprinters.la
+ $(top_builddir)/panels/universal-access/libuniversal-access.la
if BUILD_WACOM
gnome_control_center_LDADD += $(top_builddir)/panels/wacom/libwacom-properties.la
diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c
index 8be3bb9..b244593 100644
--- a/shell/cc-panel-loader.c
+++ b/shell/cc-panel-loader.c
@@ -93,16 +93,16 @@ static struct {
PANEL_TYPE("wifi", cc_wifi_panel_get_type ),
#endif
PANEL_TYPE("notifications", cc_notifications_panel_get_type),
- PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
+// PANEL_TYPE("online-accounts", cc_goa_panel_get_type ),
PANEL_TYPE("power", cc_power_panel_get_type ),
- PANEL_TYPE("printers", cc_printers_panel_get_type ),
+// PANEL_TYPE("printers", cc_printers_panel_get_type ),
PANEL_TYPE("privacy", cc_privacy_panel_get_type ),
PANEL_TYPE("region", cc_region_panel_get_type ),
PANEL_TYPE("search", cc_search_panel_get_type ),
PANEL_TYPE("sharing", cc_sharing_panel_get_type ),
PANEL_TYPE("sound", cc_sound_panel_get_type ),
PANEL_TYPE("universal-access", cc_ua_panel_get_type ),
- PANEL_TYPE("user-accounts", cc_user_panel_get_type ),
+// PANEL_TYPE("user-accounts", cc_user_panel_get_type ),
#ifdef BUILD_WACOM
PANEL_TYPE("wacom", cc_wacom_panel_get_type ),
#endif
--
2.14.3

31
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0003-disable-running-tests.patch
View File

@ -1,31 +0,0 @@
From 39d14e08905e1ee6aed5f9659c13e9c9bb02a1dd Mon Sep 17 00:00:00 2001
From: brl <bruce@subgraph.com>
Date: Tue, 19 Dec 2017 14:11:16 -0500
Subject: [PATCH 3/5] disable running tests
---
shell/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/shell/Makefile.am b/shell/Makefile.am
index de3e53d..54fbdf8 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -163,10 +163,10 @@ EXTRA_DIST = \
CLEANFILES = $(BUILT_SOURCES) $(completion_DATA) $(servicefile_DATA)
DISTCLEANFILES = gnome-control-center.desktop gnome-control-center.desktop.in
-TEST_PROGS += test-hostname
-noinst_PROGRAMS += test-hostname
-test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
-test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
+#TEST_PROGS += test-hostname
+#noinst_PROGRAMS += test-hostname
+#test_hostname_SOURCES = hostname-helper.c hostname-helper.h test-hostname.c
+#test_hostname_LDADD = $(PANEL_LIBS) $(INFO_PANEL_LIBS)
EXTRA_DIST += hostnames-test.txt ssids-test.txt
--
2.14.3

138
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0004-remove-unwanted-panel-dependencies.patch
View File

@ -1,138 +0,0 @@
From 3f4c934ca6c1bdfc2c49158da254771cd78586cd Mon Sep 17 00:00:00 2001
From: brl <bruce@subgraph.com>
Date: Tue, 19 Dec 2017 14:14:37 -0500
Subject: [PATCH 4/5] remove unwanted panel dependencies
---
configure.ac | 80 ++++++++++++++++++++++++++++--------------------------------
1 file changed, 37 insertions(+), 43 deletions(-)
diff --git a/configure.ac b/configure.ac
index 42ddc62..8f53b86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -121,9 +121,7 @@ PKG_CHECK_MODULES(LIBLANGUAGE, $COMMON_MODULES gnome-desktop-3.0 fontconfig)
PKG_CHECK_MODULES(LIBSHORTCUTS, $COMMON_MODULES x11)
PKG_CHECK_MODULES(SHELL, $COMMON_MODULES x11 polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(BACKGROUND_PANEL, $COMMON_MODULES cairo-gobject libxml-2.0 gnome-desktop-3.0
- gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION
- goa-1.0 >= $GOA_REQUIRED_VERSION
- grilo-0.3 >= $GRILO_REQUIRED_VERSION)
+ gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED_VERSION)
PKG_CHECK_MODULES(DATETIME_PANEL, $COMMON_MODULES
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -141,15 +139,11 @@ PKG_CHECK_MODULES(MOUSE_PANEL, $COMMON_MODULES xi >= 1.2
PKG_CHECK_MODULES(NETWORK_PANEL, $COMMON_MODULES gmodule-2.0
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
PKG_CHECK_MODULES(NOTIFICATIONS_PANEL, $COMMON_MODULES)
-PKG_CHECK_MODULES(ONLINE_ACCOUNTS_PANEL, $COMMON_MODULES goa-1.0 goa-backend-1.0 >= $GOA_REQUIRED_VERSION)
PKG_CHECK_MODULES(COLOR_PANEL, $COMMON_MODULES
colord >= $COLORD_REQUIRED_VERSION
colord-gtk >= $COLORD_GTK_REQUIRED_VERSION
libsoup-2.4
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-PKG_CHECK_MODULES(PRINTERS_PANEL, $COMMON_MODULES
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
- smbclient)
PKG_CHECK_MODULES(PRIVACY_PANEL, $COMMON_MODULES)
PKG_CHECK_MODULES(REGION_PANEL, $COMMON_MODULES
polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
@@ -269,36 +263,36 @@ fi
# Check for CUPS 1.4 or newer
AC_PROG_SED
-AC_PATH_PROG(CUPS_CONFIG, cups-config)
+#AC_PATH_PROG(CUPS_CONFIG, cups-config)
-if test x$CUPS_CONFIG = x; then
- AC_MSG_ERROR([cups-config not found])
-fi
+#if test x$CUPS_CONFIG = x; then
+# AC_MSG_ERROR([cups-config not found])
+#fi
-CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
-CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
-CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
+#CUPS_API_VERSION=`$CUPS_CONFIG --api-version`
+#CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 1`
+#CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | cut -d . -f 2`
-AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
- AC_MSG_ERROR([CUPS headers not found]))
+#AC_CHECK_HEADERS([cups/cups.h cups/http.h cups/ipp.h cups/ppd.h],,
+# AC_MSG_ERROR([CUPS headers not found]))
-if ! test $CUPS_API_MAJOR -gt 1 -o \
- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
- AC_MSG_ERROR([CUPS 1.4 or newer not found])
-fi
+#if ! test $CUPS_API_MAJOR -gt 1 -o \
+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 4 ; then
+# AC_MSG_ERROR([CUPS 1.4 or newer not found])
+#fi
# https://bugzilla.gnome.org/show_bug.cgi?id=696766
-CUPS_CPPFLAGS=""
-if test $CUPS_API_MAJOR -gt 1 -o \
- $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
- CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
-fi
-
-CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
-CUPS_LIBS=`$CUPS_CONFIG --libs`
-AC_SUBST(CUPS_CPPFLAGS)
-AC_SUBST(CUPS_CFLAGS)
-AC_SUBST(CUPS_LIBS)
+#CUPS_CPPFLAGS=""
+#if test $CUPS_API_MAJOR -gt 1 -o \
+# $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6 ; then
+# CUPS_CPPFLAGS=-D_PPD_DEPRECATED=""
+#fi
+
+#CUPS_CFLAGS=`$CUPS_CONFIG --cflags | $SED -e 's/-O\w*//g' -e 's/-m\w*//g'`
+#CUPS_LIBS=`$CUPS_CONFIG --libs`
+#AC_SUBST(CUPS_CPPFLAGS)
+#AC_SUBST(CUPS_CFLAGS)
+#AC_SUBST(CUPS_LIBS)
# Optional dependency for the user accounts panel
AC_ARG_WITH([cheese],
@@ -336,21 +330,21 @@ fi
AM_CONDITIONAL(BUILD_WACOM, [test x${have_wacom} = xyes])
# Kerberos kerberos support
-AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
-if test "$KRB5_CONFIG" = "no"; then
- AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
-fi
+#AC_PATH_PROG(KRB5_CONFIG, krb5-config, no)
+#if test "$KRB5_CONFIG" = "no"; then
+# AC_MSG_ERROR([krb5-config executable not found in your path - should be installed with the kerberos libraries])
+#fi
-AC_MSG_CHECKING(for krb5 libraries and flags)
-KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
-KRB5_LIBS="`$KRB5_CONFIG --libs`"
-AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
+#AC_MSG_CHECKING(for krb5 libraries and flags)
+#KRB5_CFLAGS="`$KRB5_CONFIG --cflags`"
+#KRB5_LIBS="`$KRB5_CONFIG --libs`"
+#AC_MSG_RESULT($KRB5_CFLAGS $KRB5_LIBS)
-AC_SUBST(KRB5_CFLAGS)
-AC_SUBST(KRB5_LIBS)
+#AC_SUBST(KRB5_CFLAGS)
+#AC_SUBST(KRB5_LIBS)
-USER_ACCOUNTS_PANEL_CFLAGS="$USER_ACCOUNTS_PANEL_CFLAGS $KRB5_CFLAGS"
-USER_ACCOUNTS_PANEL_LIBS="$USER_ACCOUNTS_PANEL_LIBS $KRB5_LIBS"
+#USER_ACCOUNTS_PANEL_CFLAGS="$USER_ACCOUNTS_PANEL_CFLAGS $KRB5_CFLAGS"
+#USER_ACCOUNTS_PANEL_LIBS="$USER_ACCOUNTS_PANEL_LIBS $KRB5_LIBS"
dnl Check for info panel
AC_ARG_WITH([gnome-session-libexecdir],
--
2.14.3

25
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0005-fix-gdesktop-prefix.patch
View File

@ -1,25 +0,0 @@
From 78929b37ba1ee7408170299c9580840c9ca23663 Mon Sep 17 00:00:00 2001
From: brl <bruce@subgraph.com>
Date: Tue, 19 Dec 2017 14:15:45 -0500
Subject: [PATCH 5/5] fix gdesktop prefix
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 8f53b86..3f654fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -169,7 +169,7 @@ PKG_CHECK_MODULES(REMOTE_LOGIN_HELPER, glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.
PKG_CHECK_MODULES(GVC, gobject-2.0 libpulse libpulse-mainloop-glib)
AM_CONDITIONAL(HAVE_INTROSPECTION, false)
-GDESKTOP_PREFIX=`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
+GDESKTOP_PREFIX=${PKG_CONFIG_SYSROOT_DIR}`$PKG_CONFIG --variable prefix gsettings-desktop-schemas`
AC_SUBST(GDESKTOP_PREFIX)
PKG_CHECK_MODULES(DEVICES, $COMMON_MODULES)
--
2.14.3

3
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.26.1.bb
View File

@ -1,3 +0,0 @@
require gnome-control-center.inc
SRC_URI[archive.md5sum] = "61a55cddc794f4020f93df1290792f0e"
SRC_URI[archive.sha256sum] = "5e5dbb0cd6b882d02662a94c15613f29be3b9152aa38847b17f8d5bea2cfc290"

3
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.26.2.bb
View File

@ -1,3 +0,0 @@
require gnome-control-center.inc
SRC_URI[archive.md5sum] = "4f19c72a6cfe1956cc2172caae5494c1"
SRC_URI[archive.sha256sum] = "07aed27d6317f2cad137daa6d94a37ad02c32b958dcd30c8f07d0319abfb04c5"

44
meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.28.0.bb Normal file
View File

@ -0,0 +1,44 @@
SUMMARY = "GNOME desktop configuration UI"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
SRC_URI[archive.md5sum] = "a717df964cf2cd6798358032932986bc"
SRC_URI[archive.sha256sum] = "03768b7b543caf9c534118287f9f55c375cb9886c0b3961311c0cf2ca82ddd5b"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gettext
DEPENDS = "pulseaudio colord-gtk networkmanager ibus colord gnome-desktop gnome-settings-daemon polkit libcanberra gdk-pixbuf fontconfig gtk+3 glib-2.0 intltool-native upower libpwquality cairo libxml2 libgudev libsoup-2.4 libxi libwacom libx11 libgtop gnome-common-native autoconf-archive-native wayland accountsservice modemmanager network-manager-applet gnome-bluetooth clutter-1.0 clutter-gtk gsettings-desktop-schemas glib-2.0-native libxml2-native"
#
# Extra options have been added to meson_options.txt to make some components of the control
# center optional. One reason is that these components drag in heavy dependencies, and some
# of these dependencies have not been packaged and tested yet.
#
# Gnome Online Accounts support
#
# EXTRA_OEMESON += "-Donline_accounts=true"
# DEPENDS += "grilo gnome-online-accounts webkitgtk rest"
#
# Printer Panel
#
# EXTRA_OEMESON += "-Dcups=true"
# DEPENDS += "cups samba" (only smbclient needed from samba)
#
# User Accounts Panel
#
# EXTRA_OEMESON += "-Duser_accounts=true"
# DEPENDS += "accountsservice krb5"
#
SRC_URI += "file://0001-Make-goa-cups-and-user-accounts-optional.patch"
FILES_${PN} += "\
${datadir}/bash-completion \
${datadir}/gettext \
${datadir}/dbus-1 \
${datadir}/gnome-shell/search-providers \
${datadir}/metainfo \
"
EXTRA_OEMESON = "--buildtype=release -Dcheese=false -Ddocumentation=false -Dstaging_dir=${STAGING_DIR_TARGET}"