diff --git a/x11/gnome/initial-setup/Makefile b/x11/gnome/initial-setup/Makefile index 119433761d5..9a11de0e700 100644 --- a/x11/gnome/initial-setup/Makefile +++ b/x11/gnome/initial-setup/Makefile @@ -1,19 +1,18 @@ -# $OpenBSD: Makefile,v 1.48 2018/10/24 14:28:12 sthen Exp $ +# $OpenBSD: Makefile,v 1.49 2019/01/06 13:41:56 ajacoutot Exp $ COMMENT= initial-setup firstboot-like tool GNOME_PROJECT= gnome-initial-setup -GNOME_VERSION= 3.28.0 -REVISION= 1 +GNOME_VERSION= 3.30.0 # GPLv2+ PERMIT_PACKAGE_CDROM= Yes WANTLIB += ${COMPILER_LIBCXX} EGL GL GLESv2 ICE SM X11 X11-xcb WANTLIB += Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama -WANTLIB += Xrandr Xrender Xt Xxf86vm accountsservice atk-1.0 atk-bridge-2.0 -WANTLIB += atspi brotlicommon brotlidec c cairo cairo-gobject -WANTLIB += crack crypto dbus-1 drm enchant-2 epoxy expat ffi fontconfig +WANTLIB += Xrandr Xrender Xt Xxf86vm accountsservice aspell atk-1.0 +WANTLIB += atk-bridge-2.0 brotlicommon brotlidec c cairo cairo-gobject +WANTLIB += crack crypto drm enchant-2 epoxy expat ffi fontconfig WANTLIB += freetype fribidi gbm gcrypt gdk-3 gdk_pixbuf-2.0 gdm WANTLIB += geoclue-2 geocode-glib gio-2.0 glapi glib-2.0 gmodule-2.0 WANTLIB += gnome-desktop-3 goa-1.0 goa-backend-1.0 gobject-2.0 @@ -21,12 +20,14 @@ WANTLIB += gpg-error graphite2 gstallocators-1.0 gstapp-1.0 gstaudio-1.0 WANTLIB += gstbase-1.0 gstfft-1.0 gstgl-1.0 gstpbutils-1.0 gstreamer-1.0 WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3 gweather-3 WANTLIB += harfbuzz harfbuzz-icu hyphen ibus-1.0 iconv icudata -WANTLIB += icui18n icuuc intl javascriptcoregtk-4.0 jpeg json-glib-1.0 -WANTLIB += lzma m notify orc-0.4 pango-1.0 pangocairo-1.0 pangoft2-1.0 -WANTLIB += pcre pixman-1 png polkit-gobject-1 pwquality rest-0.7 -WANTLIB += secret-1 soup-2.4 soup-gnome-2.4 sqlite3 tasn1 webkit2gtk-4.0 -WANTLIB += webp webpdemux woff2common woff2dec xcb xcb-dri2 xcb-glx -WANTLIB += xcb-render xcb-shm xcb-xfixes xml2 xslt z aspell +WANTLIB += icui18n icuuc idn2 intl javascriptcoregtk-4.0 jpeg +WANTLIB += json-glib-1.0 lzma m notify orc-0.4 pango-1.0 pangocairo-1.0 +WANTLIB += pangoft2-1.0 pcre pixman-1 png16 polkit-gobject-1 psl +WANTLIB += pwquality rest-0.7 secret-1 soup-2.4 soup-gnome-2.4 +WANTLIB += sqlite3 tasn1 unistring webkit2gtk-4.0 webp webpdemux +WANTLIB += woff2common woff2dec xcb xcb-dri2 xcb-dri3 xcb-glx +WANTLIB += xcb-present xcb-render xcb-shm xcb-sync xcb-xfixes +WANTLIB += xml2 xshmfence xslt z WANTLIB += heimdal/lib/heimsqlite COMPILER = base-clang ports-gcc base-gcc diff --git a/x11/gnome/initial-setup/distinfo b/x11/gnome/initial-setup/distinfo index cb516424633..9837e308d94 100644 --- a/x11/gnome/initial-setup/distinfo +++ b/x11/gnome/initial-setup/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/gnome-initial-setup-3.28.0.tar.xz) = ud5qn7YYuIbi18NMsV85rTT7XLfEtFQcr4E+5wRi2Os= -SIZE (gnome/gnome-initial-setup-3.28.0.tar.xz) = 2999588 +SHA256 (gnome/gnome-initial-setup-3.30.0.tar.xz) = U8rYbOQIdm8NIpXP2vVaybmNfWbGb3vurEPi45VlaVE= +SIZE (gnome/gnome-initial-setup-3.30.0.tar.xz) = 3169008 diff --git a/x11/gnome/initial-setup/patches/patch-configure_ac b/x11/gnome/initial-setup/patches/patch-configure_ac index a4dab8060d1..739f131310b 100644 --- a/x11/gnome/initial-setup/patches/patch-configure_ac +++ b/x11/gnome/initial-setup/patches/patch-configure_ac @@ -1,11 +1,11 @@ -$OpenBSD: patch-configure_ac,v 1.7 2017/11/02 15:27:16 ajacoutot Exp $ +$OpenBSD: patch-configure_ac,v 1.8 2019/01/06 13:41:56 ajacoutot Exp $ Disable NetworkManager. Index: configure.ac --- configure.ac.orig +++ configure.ac -@@ -42,8 +42,6 @@ GEOCLUE_REQUIRED_VERSION=2.3.1 +@@ -40,8 +40,6 @@ GEOCLUE_REQUIRED_VERSION=2.3.1 PACKAGEKIT_REQUIRED_VERSION=1.1.4 PKG_CHECK_MODULES(INITIAL_SETUP, diff --git a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_Makefile_in b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_Makefile_in index 6c4156b6be4..984ce937398 100644 --- a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_Makefile_in +++ b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_Makefile_in @@ -1,4 +1,4 @@ -$OpenBSD: patch-gnome-initial-setup_Makefile_in,v 1.12 2017/11/02 15:27:16 ajacoutot Exp $ +$OpenBSD: patch-gnome-initial-setup_Makefile_in,v 1.13 2019/01/06 13:41:56 ajacoutot Exp $ Disable NetworkManager. @@ -7,7 +7,7 @@ XXX fix+push upstream Index: gnome-initial-setup/Makefile.in --- gnome-initial-setup/Makefile.in.orig +++ gnome-initial-setup/Makefile.in -@@ -113,7 +113,7 @@ gnome_initial_setup_OBJECTS = $(am_gnome_initial_setup +@@ -117,7 +117,7 @@ gnome_initial_setup_OBJECTS = $(am_gnome_initial_setup am__DEPENDENCIES_1 = gnome_initial_setup_DEPENDENCIES = pages/language/libgislanguage.la \ pages/region/libgisregion.la pages/keyboard/libgiskeyboard.la \ @@ -16,7 +16,7 @@ Index: gnome-initial-setup/Makefile.in pages/timezone/libgistimezone.la \ pages/privacy/libgisprivacy.la pages/goa/libgisgoa.la \ pages/account/libgisaccount.la \ -@@ -416,7 +416,7 @@ AM_CPPFLAGS = \ +@@ -406,7 +406,7 @@ AM_CPPFLAGS = \ -DVENDOR_CONF_FILE="\"$(VENDOR_CONF_FILE)\"" \ -DUIDIR="\"$(uidir)\"" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ @@ -25,7 +25,7 @@ Index: gnome-initial-setup/Makefile.in -DDATADIR=\""$(datadir)"\" resource_files = $(shell glib-compile-resources --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/gis-assistant.gresource.xml) -@@ -433,7 +433,6 @@ gnome_initial_setup_LDADD = \ +@@ -423,7 +423,6 @@ gnome_initial_setup_LDADD = \ pages/region/libgisregion.la \ pages/keyboard/libgiskeyboard.la \ pages/eulas/libgiseulas.la \ diff --git a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_gnome-initial-setup_c b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_gnome-initial-setup_c index 2563be5ac8e..631c6ba0799 100644 --- a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_gnome-initial-setup_c +++ b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_gnome-initial-setup_c @@ -1,11 +1,11 @@ -$OpenBSD: patch-gnome-initial-setup_gnome-initial-setup_c,v 1.7 2017/11/02 15:27:16 ajacoutot Exp $ +$OpenBSD: patch-gnome-initial-setup_gnome-initial-setup_c,v 1.8 2019/01/06 13:41:56 ajacoutot Exp $ Disable NetworkManager. Index: gnome-initial-setup/gnome-initial-setup.c --- gnome-initial-setup/gnome-initial-setup.c.orig +++ gnome-initial-setup/gnome-initial-setup.c -@@ -40,7 +40,6 @@ +@@ -36,7 +36,6 @@ #include "pages/region/gis-region-page.h" #include "pages/keyboard/gis-keyboard-page.h" #include "pages/eulas/gis-eula-pages.h" @@ -13,8 +13,8 @@ Index: gnome-initial-setup/gnome-initial-setup.c #include "pages/timezone/gis-timezone-page.h" #include "pages/privacy/gis-privacy-page.h" #include "pages/software/gis-software-page.h" -@@ -69,7 +68,6 @@ static PageData page_table[] = { - /* PAGE (region, FALSE), */ +@@ -71,7 +70,6 @@ static PageData page_table[] = { + #endif /* ENABLE_REGION_PAGE */ PAGE (keyboard, FALSE), PAGE (eula, FALSE), - PAGE (network, FALSE), diff --git a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_Makefile_in b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_Makefile_in index 71524a5d5d1..e686d379491 100644 --- a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_Makefile_in +++ b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_Makefile_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-gnome-initial-setup_pages_Makefile_in,v 1.10 2017/11/02 15:27:16 ajacoutot Exp $ +$OpenBSD: patch-gnome-initial-setup_pages_Makefile_in,v 1.11 2019/01/06 13:41:56 ajacoutot Exp $ Disable NetworkManager. Index: gnome-initial-setup/pages/Makefile.in --- gnome-initial-setup/pages/Makefile.in.orig +++ gnome-initial-setup/pages/Makefile.in -@@ -355,7 +355,6 @@ SUBDIRS = \ +@@ -345,7 +345,6 @@ SUBDIRS = \ region \ keyboard \ eulas \ diff --git a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_account_Makefile_in b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_account_Makefile_in index b03cc21039e..04de21abd68 100644 --- a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_account_Makefile_in +++ b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_account_Makefile_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-gnome-initial-setup_pages_account_Makefile_in,v 1.10 2017/11/02 15:27:16 ajacoutot Exp $ +$OpenBSD: patch-gnome-initial-setup_pages_account_Makefile_in,v 1.11 2019/01/06 13:41:56 ajacoutot Exp $ XXX push upstream: on OpenBSD, crypt() is part of libc, create a proper configure check Index: gnome-initial-setup/pages/account/Makefile.in --- gnome-initial-setup/pages/account/Makefile.in.orig +++ gnome-initial-setup/pages/account/Makefile.in -@@ -371,7 +371,7 @@ libgisaccount_la_SOURCES = \ +@@ -361,7 +361,7 @@ libgisaccount_la_SOURCES = \ $(NULL) libgisaccount_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.." diff --git a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page_c b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page_c index 0b3dca1921b..dfc7a5529ec 100644 --- a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page_c +++ b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page_c @@ -1,8 +1,9 @@ -$OpenBSD: patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page_c,v 1.4 2018/04/24 09:45:03 ajacoutot Exp $ +$OpenBSD: patch-gnome-initial-setup_pages_keyboard_gis-keyboard-page_c,v 1.5 2019/01/06 13:41:56 ajacoutot Exp $ ---- gnome-initial-setup/pages/keyboard/gis-keyboard-page.c.orig Wed Feb 25 12:14:08 2015 -+++ gnome-initial-setup/pages/keyboard/gis-keyboard-page.c Thu Feb 26 08:32:40 2015 -@@ -188,14 +188,16 @@ update_input (GisKeyboardPage *self) +Index: gnome-initial-setup/pages/keyboard/gis-keyboard-page.c +--- gnome-initial-setup/pages/keyboard/gis-keyboard-page.c.orig ++++ gnome-initial-setup/pages/keyboard/gis-keyboard-page.c +@@ -193,14 +193,16 @@ update_input (GisKeyboardPage *self) set_input_settings (self); diff --git a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_password_Makefile_in b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_password_Makefile_in index 77c104210b7..670108b4c7a 100644 --- a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_password_Makefile_in +++ b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_password_Makefile_in @@ -1,11 +1,11 @@ -$OpenBSD: patch-gnome-initial-setup_pages_password_Makefile_in,v 1.9 2017/11/02 15:27:16 ajacoutot Exp $ +$OpenBSD: patch-gnome-initial-setup_pages_password_Makefile_in,v 1.10 2019/01/06 13:41:56 ajacoutot Exp $ XXX push upstream: on OpenBSD, crypt() is part of libc, create a proper configure check Index: gnome-initial-setup/pages/password/Makefile.in --- gnome-initial-setup/pages/password/Makefile.in.orig +++ gnome-initial-setup/pages/password/Makefile.in -@@ -363,7 +363,7 @@ libgispassword_la_SOURCES = \ +@@ -353,7 +353,7 @@ libgispassword_la_SOURCES = \ $(NULL) libgispassword_la_CFLAGS = $(INITIAL_SETUP_CFLAGS) -I "$(srcdir)/../.." -I "$(srcdir)/../account" -I "../account" diff --git a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_region_cc-region-chooser_c b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_region_cc-region-chooser_c index 39652fa5d60..8fc04c08b55 100644 --- a/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_region_cc-region-chooser_c +++ b/x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_region_cc-region-chooser_c @@ -1,8 +1,9 @@ -$OpenBSD: patch-gnome-initial-setup_pages_region_cc-region-chooser_c,v 1.3 2018/04/24 09:45:03 ajacoutot Exp $ +$OpenBSD: patch-gnome-initial-setup_pages_region_cc-region-chooser_c,v 1.4 2019/01/06 13:41:56 ajacoutot Exp $ ---- gnome-initial-setup/pages/region/cc-region-chooser.c.orig Tue Sep 9 12:51:25 2014 -+++ gnome-initial-setup/pages/region/cc-region-chooser.c Mon Oct 6 11:55:35 2014 -@@ -240,7 +240,7 @@ add_one_region (CcRegionChooser *chooser, +Index: gnome-initial-setup/pages/region/cc-region-chooser.c +--- gnome-initial-setup/pages/region/cc-region-chooser.c.orig ++++ gnome-initial-setup/pages/region/cc-region-chooser.c +@@ -239,7 +239,7 @@ add_one_region (CcRegionChooser *chooser, gchar *region = NULL; gboolean is_extra; diff --git a/x11/gnome/initial-setup/pkg/PLIST b/x11/gnome/initial-setup/pkg/PLIST index d86e993f2b5..d90ddf992c1 100644 --- a/x11/gnome/initial-setup/pkg/PLIST +++ b/x11/gnome/initial-setup/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.13 2018/04/24 09:45:03 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.14 2019/01/06 13:41:56 ajacoutot Exp $ @newgroup _gnome-initial-setup:724 @newuser _gnome-initial-setup:724:_gnome-initial-setup:daemon:GNOME Initial Setup:/nonexistent:/sbin/nologin @bin libexec/gnome-initial-setup @@ -6,9 +6,7 @@ libexec/gnome-welcome-tour share/examples/gnome-initial-setup/ share/examples/gnome-initial-setup/xdg/ -@sample ${SYSCONFDIR}/xdg/ share/examples/gnome-initial-setup/xdg/autostart/ -@sample ${SYSCONFDIR}/xdg/autostart/ share/examples/gnome-initial-setup/xdg/autostart/gnome-initial-setup-copy-worker.desktop @sample ${SYSCONFDIR}/xdg/autostart/gnome-initial-setup-copy-worker.desktop share/examples/gnome-initial-setup/xdg/autostart/gnome-initial-setup-first-login.desktop