cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnome-control-center-3.34.1.

Browse Source
This commit is contained in:
ajacoutot 2019-11-02 13:51:04 +00:00
parent dc134bbead
commit c2bc522460
13 changed files with 135 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
x11/gnome/control-center/Makefile
View File

@ -1,25 +1,24 @@
# $OpenBSD: Makefile,v 1.55 2019/07/07 11:20:51 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.56 2019/11/02 13:51:04 ajacoutot Exp $
# XXX change proxy settings without network-manager?
COMMENT= GNOME control center
COMMENT= GNOME settings
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 3.32.2
GNOME_VERSION= 3.34.1
CATEGORIES= x11
# GPLv2
PERMIT_PACKAGE= Yes
WANTLIB += X11 Xi accountsservice atk-1.0 c cairo cairo-gobject
WANTLIB += colord colord-gtk colordprivate cups fontconfig freetype
WANTLIB += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3
WANTLIB += goa-1.0 goa-backend-1.0 gobject-2.0 grilo-0.3 gsound
WANTLIB += gtk-3 gtop-2.0 handy-0.0 ibus-1.0 intl m pango-1.0
WANTLIB += pangocairo-1.0 polkit-gobject-1 pulse pulse-mainloop-glib
WANTLIB += pwquality secret-1 smbclient soup-2.4 upower-glib xml2
WANTLIB += z
WANTLIB += X11 accountsservice atk-1.0 c cairo colord colord-gtk
WANTLIB += colordprivate cups fontconfig gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gnome-desktop-3 goa-1.0 goa-backend-1.0
WANTLIB += gobject-2.0 gsound gtk-3 gtop-2.0 handy-0.0 ibus-1.0
WANTLIB += intl m pango-1.0 pangocairo-1.0 polkit-gobject-1 pulse
WANTLIB += pulse-mainloop-glib pwquality smbclient soup-2.4 upower-glib
WANTLIB += xml2
MODULES= devel/meson \
devel/dconf \
@ -36,13 +35,13 @@ LIB_DEPENDS= audio/gsound \
sysutils/accountsservice \
sysutils/upower \
x11/gnome/desktop \
x11/gnome/grilo \
x11/gnome/online-accounts \
x11/libhandy
BUILD_DEPENDS= x11/gnome/settings-daemon \
devel/iso-codes \
devel/gsettings-desktop-schemas
BUILD_DEPENDS= devel/iso-codes \
devel/gsettings-desktop-schemas \
x11/gnome/grilo \
x11/gnome/settings-daemon
RUN_DEPENDS= x11/gnome/settings-daemon \
devel/iso-codes \

4
x11/gnome/control-center/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (gnome/gnome-control-center-3.32.2.tar.xz) = +qUJLR6xLf6FxU/gJeD7KVIGVLshnMUIb3Mm6mAF1w4=
SIZE (gnome/gnome-control-center-3.32.2.tar.xz) = 5953072
SHA256 (gnome/gnome-control-center-3.34.1.tar.xz) = X4Ls1VVBNsRiJI7FNjuC2VNYs539Z4cAbYMHtFBOUV4=
SIZE (gnome/gnome-control-center-3.34.1.tar.xz) = 6185480

15
x11/gnome/control-center/patches/patch-meson_build Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-meson_build,v 1.1 2019/11/02 13:51:04 ajacoutot Exp $
No GUdev on OpenBSD (XXX add HAVE_GUDEV to meson_options.txt)
Index: meson.build
--- meson.build.orig
+++ meson.build
@@ -129,7 +129,6 @@ polkit_gobject_dep = dependency('polkit-gobject-1', ve
pulse_dep = dependency('libpulse', version: pulse_req_version)
pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_version)
upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8')
-gudev_dep = dependency('gudev-1.0')
x11_dep = dependency('x11')
xi_dep = dependency('xi', version: '>= 1.2')

27
x11/gnome/control-center/patches/patch-panels_common_meson_build Normal file
View File

@ -0,0 +1,27 @@
$OpenBSD: patch-panels_common_meson_build,v 1.1 2019/11/02 13:51:04 ajacoutot Exp $
No GUdev on OpenBSD (XXX add HAVE_GUDEV to meson_options.txt)
Index: panels/common/meson.build
--- panels/common/meson.build.orig
+++ panels/common/meson.build
@@ -75,18 +75,16 @@ liblanguage_dep = declare_dependency(
)
gsd_headers = [
- 'gsd-device-manager.h',
'gsd-input-helper.h'
]
gsd_sources = [
- 'gsd-device-manager.c',
'gsd-input-helper.c'
]
sources = common_sources + files(gsd_sources)
-deps = common_deps + [ gudev_dep ]
+deps = common_deps
libdevice = static_library(
'device',

15
x11/gnome/control-center/patches/patch-panels_meson_build Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-panels_meson_build,v 1.1 2019/11/02 13:51:04 ajacoutot Exp $
No GUdev on OpenBSD (XXX add HAVE_GUDEV to meson_options.txt)
Index: panels/meson.build
--- panels/meson.build.orig
+++ panels/meson.build
@@ -8,7 +8,6 @@ panels = [
'display',
'info',
'keyboard',
- 'mouse',
'notifications',
'online-accounts',
'power',

6
x11/gnome/control-center/patches/patch-panels_power_cc-power-panel_c
View File

@ -1,9 +1,11 @@
$OpenBSD: patch-panels_power_cc-power-panel_c,v 1.2 2019/05/08 15:45:47 ajacoutot Exp $
$OpenBSD: patch-panels_power_cc-power-panel_c,v 1.3 2019/11/02 13:51:04 ajacoutot Exp $
login1 -> ConsoleKit
Index: panels/power/cc-power-panel.c
--- panels/power/cc-power-panel.c.orig
+++ panels/power/cc-power-panel.c
@@ -2243,9 +2243,9 @@ can_suspend_or_hibernate (CcPowerPanel *self,
@@ -2212,9 +2212,9 @@ can_suspend_or_hibernate (CcPowerPanel *self,
}
variant = g_dbus_connection_call_sync (connection,

4
x11/gnome/control-center/patches/patch-panels_user-accounts_cc-realm-manager_c
View File

@ -1,4 +1,6 @@
$OpenBSD: patch-panels_user-accounts_cc-realm-manager_c,v 1.1 2019/05/08 15:45:47 ajacoutot Exp $
$OpenBSD: patch-panels_user-accounts_cc-realm-manager_c,v 1.2 2019/11/02 13:51:04 ajacoutot Exp $
Fix for Heimdal (versus MIT).
Index: panels/user-accounts/cc-realm-manager.c
--- panels/user-accounts/cc-realm-manager.c.orig

12
x11/gnome/control-center/patches/patch-panels_user-accounts_user-utils_c
View File

@ -1,11 +1,13 @@
$OpenBSD: patch-panels_user-accounts_user-utils_c,v 1.1 2019/05/08 15:45:47 ajacoutot Exp $
$OpenBSD: patch-panels_user-accounts_user-utils_c,v 1.2 2019/11/02 13:51:04 ajacoutot Exp $
No utmpx on OpenBSD
ld: error: undefined symbol: WEXITSTATUS
Index: panels/user-accounts/user-utils.c
--- panels/user-accounts/user-utils.c.orig
+++ panels/user-accounts/user-utils.c
@@ -25,7 +25,7 @@
@@ -25,9 +25,11 @@
#include <sys/types.h>
#include <limits.h>
#include <unistd.h>
@ -13,8 +15,12 @@ Index: panels/user-accounts/user-utils.c
+#include <utmp.h>
#include <pwd.h>
+#include <sys/wait.h> /* WEXITSTATUS */
+
#include <gio/gio.h>
@@ -343,7 +343,7 @@ clear_entry_validation_error (GtkEntry *entry)
#include <gio/gunixoutputstream.h>
#include <glib/gi18n.h>
@@ -343,7 +345,7 @@ clear_entry_validation_error (GtkEntry *entry)
gsize
get_username_max_length (void)
{

28
x11/gnome/control-center/patches/patch-shell_cc-panel-loader_c
View File

@ -1,4 +1,6 @@
$OpenBSD: patch-shell_cc-panel-loader_c,v 1.5 2019/05/08 15:45:47 ajacoutot Exp $
$OpenBSD: patch-shell_cc-panel-loader_c,v 1.6 2019/11/02 13:51:04 ajacoutot Exp $
No GUdev on OpenBSD (XXX add HAVE_GUDEV to meson_options.txt)
http://permalink.gmane.org/gmane.comp.gnome.desktop/51950
https://bugzilla.gnome.org/show_bug.cgi?id=770758#c3
@ -8,7 +10,17 @@ https://bugzilla.gnome.org/show_bug.cgi?id=772736 (systemd --user)
Index: shell/cc-panel-loader.c
--- shell/cc-panel-loader.c.orig
+++ shell/cc-panel-loader.c
@@ -55,7 +55,9 @@ extern GType cc_printers_panel_get_type (void);
@@ -43,7 +43,9 @@ extern GType cc_info_overview_panel_get_type (void);
extern GType cc_info_default_apps_panel_get_type (void);
extern GType cc_info_removable_media_panel_get_type (void);
extern GType cc_keyboard_panel_get_type (void);
+#ifdef NOTYET
extern GType cc_mouse_panel_get_type (void);
+#endif
#ifdef BUILD_NETWORK
extern GType cc_network_panel_get_type (void);
extern GType cc_wifi_panel_get_type (void);
@@ -55,7 +57,9 @@ extern GType cc_printers_panel_get_type (void);
extern GType cc_privacy_panel_get_type (void);
extern GType cc_region_panel_get_type (void);
extern GType cc_search_panel_get_type (void);
@ -18,7 +30,17 @@ Index: shell/cc-panel-loader.c
extern GType cc_sound_panel_get_type (void);
#ifdef BUILD_THUNDERBOLT
extern GType cc_bolt_panel_get_type (void);
@@ -108,7 +110,9 @@ static CcPanelLoaderVtable default_panels[] =
@@ -96,7 +100,9 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("default-apps", cc_info_default_apps_panel_get_type, NULL),
PANEL_TYPE("removable-media", cc_info_removable_media_panel_get_type, NULL),
PANEL_TYPE("keyboard", cc_keyboard_panel_get_type, NULL),
+#ifdef NOTYET
PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL),
+#endif
#ifdef BUILD_NETWORK
PANEL_TYPE("network", cc_network_panel_get_type, NULL),
PANEL_TYPE("wifi", cc_wifi_panel_get_type, cc_wifi_panel_static_init_func),
@@ -108,7 +114,9 @@ static CcPanelLoaderVtable default_panels[] =
PANEL_TYPE("privacy", cc_privacy_panel_get_type, NULL),
PANEL_TYPE("region", cc_region_panel_get_type, NULL),
PANEL_TYPE("search", cc_search_panel_get_type, NULL),

16
x11/gnome/control-center/patches/patch-shell_meson_build
View File

@ -1,17 +1,27 @@
$OpenBSD: patch-shell_meson_build,v 1.3 2019/05/08 15:45:47 ajacoutot Exp $
$OpenBSD: patch-shell_meson_build,v 1.4 2019/11/02 13:51:04 ajacoutot Exp $
No GUdev on OpenBSD (XXX add HAVE_GUDEV to meson_options.txt)
Find libkrb5.so
Index: shell/meson.build
--- shell/meson.build.orig
+++ shell/meson.build
@@ -126,7 +126,8 @@ executable(
@@ -108,7 +108,6 @@ libshell_dep = declare_dependency(
shell_sources = common_sources + files('main.c')
shell_deps = common_deps + [
- libdevice_dep,
liblanguage_dep,
libwidgets_dep,
x11_dep,
@@ -130,7 +129,8 @@ executable(
dependencies : shell_deps,
c_args : cflags,
link_with : panels_libs,
- install : true
+ install : true,
+ install_rpath : '${LOCALBASE}/heimdal/lib'
+ install_rpath : '${LOCALBASE}/heimdal/lib'
)

8
x11/gnome/control-center/patches/patch-tests_datetime_meson_build
View File

@ -1,15 +1,15 @@
$OpenBSD: patch-tests_datetime_meson_build,v 1.1 2019/05/08 15:45:47 ajacoutot Exp $
$OpenBSD: patch-tests_datetime_meson_build,v 1.2 2019/11/02 13:51:04 ajacoutot Exp $
https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/472
Index: tests/datetime/meson.build
--- tests/datetime/meson.build.orig
+++ tests/datetime/meson.build
@@ -21,6 +21,7 @@ cflags = [
@@ -20,6 +20,7 @@ cflags = [
foreach unit: test_units
exe = executable(
unit,
+ resources,
[unit + '.c'],
include_directories : includes,
dependencies : common_deps + [m_dep],
dependencies : common_deps + [m_dep, datetime_panel_lib_dep],
c_args : cflags

4
x11/gnome/control-center/pkg/DESCR
View File

@ -1,2 +1,2 @@
The control center is GNOME's main interface for configuration of
various aspects of your desktop.
GNOME Settings is GNOME's main interface for configuration of various aspects of
your desktop.

4
x11/gnome/control-center/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.16 2019/05/08 15:45:47 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.17 2019/11/02 13:51:04 ajacoutot Exp $
@conflict control-center-1*
@conflict control-center2-*
@conflict gnome-media-<2.91.2p3
@ -17,7 +17,6 @@ share/applications/gnome-default-apps-panel.desktop
share/applications/gnome-display-panel.desktop
share/applications/gnome-info-overview-panel.desktop
share/applications/gnome-keyboard-panel.desktop
share/applications/gnome-mouse-panel.desktop
share/applications/gnome-notifications-panel.desktop
share/applications/gnome-online-accounts-panel.desktop
share/applications/gnome-power-panel.desktop
@ -186,6 +185,7 @@ share/locale/lv/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mai/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/mai/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mg/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mjw/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/mk/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-control-center-2.0-timezones.mo