Skip to content

Commit

Permalink
sysutils/gnome-control-center: Revert erroneous commit
Browse files Browse the repository at this point in the history
This reverts commit ec5d7c6.
  • Loading branch information
neelchauhan committed Mar 23, 2022
1 parent ec5d7c6 commit 91e8d73
Show file tree
Hide file tree
Showing 15 changed files with 52 additions and 371 deletions.
22 changes: 0 additions & 22 deletions sysutils/gnome-control-center/files/patch-meson.build

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -0,0 +1,11 @@
--- panels/keyboard/meson.build.orig 2020-07-03 05:10:57 UTC
+++ panels/keyboard/meson.build
@@ -30,7 +30,7 @@ configure_file(
input: pc + '.in',
output: pc,
install: true,
- install_dir: join_paths(control_center_datadir, 'pkgconfig'),
+ install_dir: join_paths(control_center_prefix, 'libdata/pkgconfig'),
configuration: pc_conf
)

33 changes: 2 additions & 31 deletions sysutils/gnome-control-center/files/patch-panels_meson.build
@@ -1,39 +1,10 @@
No GUdev on OpenBSD (XXX add HAVE_GUDEV to meson_options.txt)
No colord (needs GUdev) on OpenBSD (XXX add HAVE_COLORD to meson_options.txt)
wwan needs network-manager

Index: panels/meson.build
--- panels/meson.build.orig
--- panels/meson.build.orig 2021-09-23 00:43:37 UTC
+++ panels/meson.build
@@ -4,7 +4,6 @@ panels = [
'applications',
'background',
'camera',
- 'color',
'datetime',
'default-apps',
'diagnostics',
@@ -14,7 +13,6 @@ panels = [
'location',
'lock',
'microphone',
- 'mouse',
'multitasking',
'notifications',
'online-accounts',
@@ -28,11 +26,13 @@ panels = [
@@ -28,7 +28,6 @@ panels = [
'universal-access',
'usage',
'user-accounts',
- 'wwan',
]

if host_is_linux
- panels += ['network']
+ panels += [
+ 'network',
+ 'wwan'
+ ]
endif

if host_is_linux_not_s390
@@ -1,18 +1,12 @@
login1 -> ConsoleKit

Index: panels/power/cc-power-panel.c
--- panels/power/cc-power-panel.c.orig
--- panels/power/cc-power-panel.c.orig 2021-10-22 02:27:08 UTC
+++ panels/power/cc-power-panel.c
@@ -903,9 +903,9 @@ can_suspend_or_hibernate (CcPowerPanel *self,
}
@@ -1641,9 +1641,6 @@ cc_power_panel_init (CcPowerPanel *self)
setup_power_profiles (self);

setup_power_saving (self);
- g_settings_bind (self->gsd_settings, "power-saver-profile-on-low-battery",
- self->power_saver_low_battery_switch, "active",
- G_SETTINGS_BIND_DEFAULT);

setup_general_section (self);

variant = g_dbus_connection_call_sync (connection,
- "org.freedesktop.login1",
- "/org/freedesktop/login1",
- "org.freedesktop.login1.Manager",
+ "org.freedesktop.ConsoleKit",
+ "/org/freedesktop/ConsoleKit/Manager",
+ "org.freedesktop.ConsoleKit.Manager",
method_name,
NULL,
NULL,

This file was deleted.

@@ -1,7 +1,6 @@
Fix for Heimdal (versus MIT).
http://git.pld-linux.org/gitweb.cgi?p=packages/gnome-control-center.git;a=blob;f=krb5.patch;h=260e9aac087453b798dc58b23bbc79705e6172d9;hb=49c1b881b47743e0c76eaf9158a37fd6532c111f

Index: panels/user-accounts/cc-realm-manager.c
--- panels/user-accounts/cc-realm-manager.c.orig
--- panels/user-accounts/cc-realm-manager.c.orig 2021-09-17 20:48:56 UTC
+++ panels/user-accounts/cc-realm-manager.c
@@ -22,7 +22,7 @@

Expand Down
@@ -0,0 +1,12 @@
--- panels/user-accounts/meson.build.orig 2021-09-17 20:48:56 UTC
+++ panels/user-accounts/meson.build
@@ -170,7 +170,8 @@ sources += gnome.mkenums_simple(
sources: files(enum_headers))

# Kerberos support
-krb_dep = dependency('krb5', required: false)
+#krb_dep = dependency('krb5', required: false)
+krb_dep = cc.find_library('krb5')
assert(krb_dep.found(), 'kerberos libraries not found in your path')

deps = common_deps + [

This file was deleted.

0 comments on commit 91e8d73

Please sign in to comment.