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

Add a few fixes from upstream.

Browse Source
This commit is contained in:
ajacoutot 2017-11-09 15:11:34 +00:00
parent 5148d6acb7
commit 5fa23e472a
4 changed files with 89 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/initial-setup/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.43 2017/11/02 15:27:16 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.44 2017/11/09 15:11:34 ajacoutot Exp $
COMMENT= initial-setup firstboot-like tool
GNOME_PROJECT= gnome-initial-setup
GNOME_VERSION= 3.26.0
REVISION= 0
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes

15
x11/gnome/initial-setup/patches/patch-data_gnome-initial-setup-copy-worker_desktop_in_in Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-data_gnome-initial-setup-copy-worker_desktop_in_in,v 1.1 2017/11/09 15:11:34 ajacoutot Exp $
From a8551a4832ab32662723e3cc7abd591c01dbbd78 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <sam@endlessm.com>
Date: Thu, 17 Aug 2017 15:59:35 +0800
Subject: copy-worker: Don't start if gnome-initial-setup-done was touched
Index: data/gnome-initial-setup-copy-worker.desktop.in.in
--- data/gnome-initial-setup-copy-worker.desktop.in.in.orig
+++ data/gnome-initial-setup-copy-worker.desktop.in.in
@@ -6,3 +6,4 @@ OnlyShowIn=GNOME;
NoDisplay=true
X-GNOME-AutoRestart=false
X-GNOME-Autostart-Phase=EarlyInitialization
+AutostartCondition=unless-exists gnome-initial-setup-done

32
x11/gnome/initial-setup/patches/patch-gnome-initial-setup_gis-assistant_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-gnome-initial-setup_gis-assistant_c,v 1.1 2017/11/09 15:11:34 ajacoutot Exp $
From 1213a37e622836a3f82f8605b3b57a76ec64fccd Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <sam@endlessm.com>
Date: Thu, 31 Aug 2017 15:27:45 +0800
Subject: assistant: Also update titlebar when the title changes
Index: gnome-initial-setup/gis-assistant.c
--- gnome-initial-setup/gis-assistant.c.orig
+++ gnome-initial-setup/gis-assistant.c
@@ -270,11 +270,18 @@ page_notify (GisPage *page,
return;
if (strcmp (pspec->name, "title") == 0)
- g_object_notify_by_pspec (G_OBJECT (assistant), obj_props[PROP_TITLE]);
+ {
+ g_object_notify_by_pspec (G_OBJECT (assistant), obj_props[PROP_TITLE]);
+ update_titlebar (assistant);
+ }
else if (strcmp (pspec->name, "applying") == 0)
- update_applying_state (assistant);
+ {
+ update_applying_state (assistant);
+ }
else
- update_navigation_buttons (assistant);
+ {
+ update_navigation_buttons (assistant);
+ }
}
void

40
x11/gnome/initial-setup/patches/patch-gnome-initial-setup_pages_goa_gis-goa-page_c Normal file
View File

@ -0,0 +1,40 @@
$OpenBSD: patch-gnome-initial-setup_pages_goa_gis-goa-page_c,v 1.1 2017/11/09 15:11:35 ajacoutot Exp $
From db63ec68a61578c62b02c3a34b2a334b626b8b73 Mon Sep 17 00:00:00 2001
From: Cosimo Cecchi <cosimo@endlessm.com>
Date: Thu, 7 Sep 2017 13:24:39 -0700
Subject: goa: fix a memory leak
From 526b4fcaf51dde4ce3ccf64eb4642751080e8c7d Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Wed, 25 Oct 2017 18:13:04 +0200
Subject: goa: Fix a GIcon leak
Index: gnome-initial-setup/pages/goa/gis-goa-page.c
--- gnome-initial-setup/pages/goa/gis-goa-page.c.orig
+++ gnome-initial-setup/pages/goa/gis-goa-page.c
@@ -121,7 +121,7 @@ add_provider_to_list (GisGoaPage *page, const char *pr
GtkWidget *checkmark;
GtkWidget *account_label;
GIcon *icon;
- gchar *markup;
+ gchar *markup, *provider_name;
GoaProvider *provider;
ProviderWidget *provider_widget;
@@ -136,11 +136,14 @@ add_provider_to_list (GisGoaPage *page, const char *pr
icon = goa_provider_get_provider_icon (provider, NULL);
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_DIALOG);
+ g_object_unref (icon);
- markup = g_strdup_printf ("<b>%s</b>", goa_provider_get_provider_name (provider, NULL));
+ provider_name = goa_provider_get_provider_name (provider, NULL);
+ markup = g_strdup_printf ("<b>%s</b>", provider_name);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), markup);
g_free (markup);
+ g_free (provider_name);
checkmark = gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_MENU);