pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

gnome-desktop: Rename wip/gnome-desktop40 to wip/gnome-desktop3



Module Name:	pkgsrc-wip
Committed By:	Dan CÃirnat <cirnatdan%NetBSD.org@localhost>
Pushed By:	cirnatdan
Date:		Tue Apr 6 11:11:13 2021 +0200
Changeset:	fca0ba311703a574e43743c2909373ec1dd7f183

Modified Files:
	gnome-shell/Makefile
	mutter/Makefile
Added Files:
	gnome-desktop3/DESCR
	gnome-desktop3/Makefile
	gnome-desktop3/PLIST
	gnome-desktop3/buildlink3.mk
	gnome-desktop3/distinfo
	gnome-desktop3/patches/patch-libgnome-desktop_gnome-languages.c
	gnome-desktop3/patches/patch-libgnome-desktop_gnome-wall-clock.c
	gnome-desktop3/patches/patch-tests_wall-clock.c
	gnome-desktop3/patches/patch-tests_wallclock-reftest.c
Removed Files:
	gnome-desktop40/DESCR
	gnome-desktop40/Makefile
	gnome-desktop40/PLIST
	gnome-desktop40/buildlink3.mk
	gnome-desktop40/distinfo
	gnome-desktop40/patches/patch-libgnome-desktop_gnome-languages.c
	gnome-desktop40/patches/patch-libgnome-desktop_gnome-wall-clock.c
	gnome-desktop40/patches/patch-tests_wall-clock.c
	gnome-desktop40/patches/patch-tests_wallclock-reftest.c

Log Message:
gnome-desktop: Rename wip/gnome-desktop40 to wip/gnome-desktop3

There's not a huge change from the 3.x release to 40.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=fca0ba311703a574e43743c2909373ec1dd7f183

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 gnome-desktop3/DESCR                               |   2 +
 gnome-desktop3/Makefile                            |  40 ++++++
 gnome-desktop3/PLIST                               | 137 +++++++++++++++++++++
 gnome-desktop3/buildlink3.mk                       |  19 +++
 gnome-desktop3/distinfo                            |  10 ++
 .../patch-libgnome-desktop_gnome-languages.c       | 120 ++++++++++++++++++
 .../patch-libgnome-desktop_gnome-wall-clock.c      |  37 ++++++
 gnome-desktop3/patches/patch-tests_wall-clock.c    | 111 +++++++++++++++++
 .../patches/patch-tests_wallclock-reftest.c        |  57 +++++++++
 gnome-desktop40/DESCR                              |   2 -
 gnome-desktop40/Makefile                           |  39 ------
 gnome-desktop40/PLIST                              | 137 ---------------------
 gnome-desktop40/buildlink3.mk                      |  19 ---
 gnome-desktop40/distinfo                           |  10 --
 .../patch-libgnome-desktop_gnome-languages.c       | 120 ------------------
 .../patch-libgnome-desktop_gnome-wall-clock.c      |  37 ------
 gnome-desktop40/patches/patch-tests_wall-clock.c   | 111 -----------------
 .../patches/patch-tests_wallclock-reftest.c        |  57 ---------
 gnome-shell/Makefile                               |   2 +-
 mutter/Makefile                                    |   2 +-
 20 files changed, 535 insertions(+), 534 deletions(-)

diffs:
diff --git a/gnome-desktop3/DESCR b/gnome-desktop3/DESCR
new file mode 100644
index 0000000000..a485f9737b
--- /dev/null
+++ b/gnome-desktop3/DESCR
@@ -0,0 +1,2 @@
+gnome-desktop contains the libgnome-desktop library, the gnome-about
+program as well as some desktop-wide documents for GNOME 3.
diff --git a/gnome-desktop3/Makefile b/gnome-desktop3/Makefile
new file mode 100644
index 0000000000..f1088ad09b
--- /dev/null
+++ b/gnome-desktop3/Makefile
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.44 2020/11/17 11:35:19 nia Exp $
+
+DISTNAME=	gnome-desktop-40.0
+PKGNAME=	${DISTNAME:S/desktop/desktop3/}
+CATEGORIES=	x11 gnome
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	prlw1%cam.ac.uk@localhost
+HOMEPAGE=	https://www.gnome.org/
+COMMENT=	GNOME3 desktop-wide documents and libgnome-desktop library
+LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1
+
+TOOL_DEPENDS+=		gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
+
+USE_TOOLS+=		pkg-config xgettext
+PKGCONFIG_OVERRIDE+=	libgnome-desktop/gnome-desktop-3.0.pc.in
+
+MESON_ARGS+=		-Dsystemd=disabled
+MESON_ARGS+=		-Dudev=disabled
+MESON_ARGS+=		-Ddistributor="The NetBSD Foundation"
+MESON_ARGS+=		-Ddate_in_gnome_version=false
+MESON_ARGS+=		-Ddesktop_docs=false
+MESON_ARGS+=		-Dgtk_doc=false
+MESON_ARGS+=		-Ddebug_tools=false
+MESON_ARGS+=		-Ddatadir=share
+
+BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.44.0
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.36.5
+.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
+.include "../../x11/xkeyboard-config/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/gnome-desktop3/PLIST b/gnome-desktop3/PLIST
new file mode 100644
index 0000000000..faef22f468
--- /dev/null
+++ b/gnome-desktop3/PLIST
@@ -0,0 +1,137 @@
+@comment $NetBSD$
+include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-crossfade.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-slide-show.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-bg.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-thumbnail.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-idle-monitor.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-languages.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-pnp-ids.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-config.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-rr.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-systemd.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
+include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
+lib/girepository-1.0/GnomeDesktop-3.0.typelib
+lib/libgnome-desktop-3.so
+lib/libgnome-desktop-3.so.19
+lib/libgnome-desktop-3.so.19.1.3
+lib/pkgconfig/gnome-desktop-3.0.pc
+share/gir-1.0/GnomeDesktop-3.0.gir
+share/gnome/gnome-version.xml
+share/locale/af/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/am/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/an/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ar/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/as/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ast/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/az/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/be/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/be@latin/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/bg/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/bn/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/br/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/bs/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ca/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ca@valencia/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ckb/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/crh/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/cs/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/csb/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/cy/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/da/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/de/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/dz/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/el/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/en/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/en@shaw/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/en_CA/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/en_GB/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/eo/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/es/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/et/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/eu/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fa/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fur/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/fy/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ga/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/gd/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/gl/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/gu/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ha/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/he/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/hi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/hr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/hu/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/hy/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/id/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ig/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/is/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/it/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ja/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ka/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/kg/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/kk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/km/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/kn/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ko/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ku/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ky/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/li/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/lo/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/lt/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/lv/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mai/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mg/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mjw/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ml/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mn/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/mr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ms/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nb/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nds/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ne/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nl/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nn/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/nso/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/oc/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/or/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/pa/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/pl/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ps/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/pt/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ro/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ru/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/rw/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/si/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sl/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sq/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/sv/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ta/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/te/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/tg/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/th/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/tk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/tr/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ug/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/uk/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/ur/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/uz/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/vi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/wa/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/xh/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/yi/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/yo/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/zh_HK/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-desktop-3.0.mo
+share/locale/zu/LC_MESSAGES/gnome-desktop-3.0.mo
diff --git a/gnome-desktop3/buildlink3.mk b/gnome-desktop3/buildlink3.mk
new file mode 100644
index 0000000000..27693d2759
--- /dev/null
+++ b/gnome-desktop3/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.33 2020/11/04 12:12:48 nia Exp $
+
+BUILDLINK_TREE+=	gnome-desktop3
+
+.if !defined(GNOME_DESKTOP3_BUILDLINK3_MK)
+GNOME_DESKTOP3_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.4.2
+BUILDLINK_ABI_DEPENDS.gnome-desktop3+=	gnome-desktop3>=3.36
+BUILDLINK_PKGSRCDIR.gnome-desktop3?=	../../wip/gnome-desktop33
+
+BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
+.include "../../wip/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/xkeyboard-config/buildlink3.mk"
+.include "../../textproc/iso-codes/buildlink3.mk"
+.endif
+
+BUILDLINK_TREE+=	-gnome-desktop3
diff --git a/gnome-desktop3/distinfo b/gnome-desktop3/distinfo
new file mode 100644
index 0000000000..67b3557e93
--- /dev/null
+++ b/gnome-desktop3/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.16 2020/11/04 12:12:48 nia Exp $
+
+SHA1 (gnome-desktop-40.0.tar.xz) = 95cb6b640618e5299ec90c0bdbf04f904c9a8bfc
+RMD160 (gnome-desktop-40.0.tar.xz) = b703e52c74f639c516a64e29274742a46d344321
+SHA512 (gnome-desktop-40.0.tar.xz) = faf6fd2a0c5db47a49319c03ca9a348d77092050cdd8d79a74979b2878d0e35ffa85bbe5e87449f9285ceb28a884439de6eb73d6b9fcaa02236eb48f4a7ac49c
+Size (gnome-desktop-40.0.tar.xz) = 721628 bytes
+SHA1 (patch-libgnome-desktop_gnome-languages.c) = 88878085009e36be056b90cce43019095e6d9ddf
+SHA1 (patch-libgnome-desktop_gnome-wall-clock.c) = fb8da1dcb408a78cbc427c69d510eaf2ca8a2fe7
+SHA1 (patch-tests_wall-clock.c) = c3f4cd354538ea4f549f87762b333cb00a92d18d
+SHA1 (patch-tests_wallclock-reftest.c) = 53cee07db779808b0d9b31f64529ee48c2252bda
diff --git a/gnome-desktop3/patches/patch-libgnome-desktop_gnome-languages.c b/gnome-desktop3/patches/patch-libgnome-desktop_gnome-languages.c
new file mode 100644
index 0000000000..a5c724d986
--- /dev/null
+++ b/gnome-desktop3/patches/patch-libgnome-desktop_gnome-languages.c
@@ -0,0 +1,120 @@
+$NetBSD: patch-libgnome-desktop_gnome-languages.c,v 1.1 2020/11/04 12:12:48 nia Exp $
+
+Replace usage of uselocale() - not available on NetBSD
+
+--- libgnome-desktop/gnome-languages.c.orig	2020-10-05 19:11:19.070822700 +0000
++++ libgnome-desktop/gnome-languages.c
+@@ -303,16 +303,13 @@ language_name_get_codeset_details (const
+                                    gboolean    *is_utf8)
+ {
+         locale_t locale;
+-        locale_t old_locale;
+         const char *codeset = NULL;
+ 
+         locale = newlocale (LC_CTYPE_MASK, language_name, (locale_t) 0);
+         if (locale == (locale_t) 0)
+                 return;
+ 
+-        old_locale = uselocale (locale);
+-
+-        codeset = nl_langinfo (CODESET);
++        codeset = nl_langinfo_l (CODESET, locale);
+ 
+         if (pcodeset != NULL) {
+                 *pcodeset = g_strdup (codeset);
+@@ -324,7 +321,6 @@ language_name_get_codeset_details (const
+                 *is_utf8 = strcmp (normalized_codeset, "UTF-8") == 0;
+         }
+ 
+-        uselocale (old_locale);
+         freelocale (locale);
+ }
+ 
+@@ -703,14 +699,11 @@ get_translated_language (const char *cod
+         name = NULL;
+         if (language != NULL) {
+                 const char *translated_name;
+-                locale_t loc = 0;
+-                locale_t old_locale = 0;
++                g_autofree char *old_locale = NULL;		
+ 
+                 if (locale != NULL) {
+-                        loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
+-                        if (loc == (locale_t) 0)
+-                                return NULL;
+-                        old_locale = uselocale (loc);
++                        old_locale = g_strdup (setlocale (LC_MESSAGES, NULL));
++			setlocale (LC_MESSAGES, locale);
+                 }
+ 
+                 if (is_fallback_language (code)) {
+@@ -723,8 +716,7 @@ get_translated_language (const char *cod
+                 }
+ 
+                 if (locale != NULL) {
+-                        uselocale (old_locale);
+-                        freelocale (loc);
++                        setlocale (LC_MESSAGES, locale);
+                 }
+         }
+ 
+@@ -761,15 +753,12 @@ get_translated_territory (const char *co
+         name = NULL;
+         if (territory != NULL) {
+                 const char *translated_territory;
+-                locale_t loc;
+-                locale_t old_locale = 0;
++                g_autofree char *old_locale = NULL;
+                 g_autofree char *tmp = NULL;
+ 
+                 if (locale != NULL) {
+-                        loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
+-                        if (loc == (locale_t) 0)
+-                                return NULL;
+-                        old_locale = uselocale (loc);
++                        old_locale = g_strdup (setlocale(LC_MESSAGES, NULL));
++                        setlocale(LC_MESSAGES, locale);
+                 }
+ 
+                 translated_territory = dgettext ("iso_3166", territory);
+@@ -777,8 +766,7 @@ get_translated_territory (const char *co
+                 name = capitalize_utf8_string (tmp);
+ 
+                 if (locale != NULL) {
+-                        uselocale (old_locale);
+-                        freelocale (loc);
++                        setlocale (LC_MESSAGES, old_locale);
+                 }
+         }
+ 
+@@ -1358,17 +1346,13 @@ gnome_get_translated_modifier (const cha
+ {
+         char *retval;
+         GHashTable *modifiers_map;
+-        locale_t loc;
+-        locale_t old_locale;
++	g_autofree char *old_locale = NULL;
+ 
+         g_return_val_if_fail (modifier != NULL, NULL);
+ 
+         if (translation != NULL) {
+-                loc = newlocale (LC_MESSAGES_MASK, translation, (locale_t) 0);
+-                if (loc == (locale_t) 0) {
+-                        return NULL;
+-                }
+-                old_locale = uselocale (loc);
++                old_locale = g_strdup (setlocale (LC_MESSAGES, NULL));
++		setlocale (LC_MESSAGES, translation);
+         }
+ 
+         /* Modifiers as listed in glibc's SUPPORTED file:
+@@ -1408,8 +1392,7 @@ gnome_get_translated_modifier (const cha
+         g_hash_table_destroy (modifiers_map);
+ 
+         if (translation != NULL) {
+-                uselocale (old_locale);
+-                freelocale (loc);
++                setlocale (LC_MESSAGES, old_locale);
+         }
+ 
+         return retval;
diff --git a/gnome-desktop3/patches/patch-libgnome-desktop_gnome-wall-clock.c b/gnome-desktop3/patches/patch-libgnome-desktop_gnome-wall-clock.c
new file mode 100644
index 0000000000..998b9ca391
--- /dev/null
+++ b/gnome-desktop3/patches/patch-libgnome-desktop_gnome-wall-clock.c
@@ -0,0 +1,37 @@
+$NetBSD: patch-libgnome-desktop_gnome-wall-clock.c,v 1.1 2020/11/04 12:12:48 nia Exp $
+
+Replace usage of uselocale() - not available on NetBSD
+
+--- libgnome-desktop/gnome-wall-clock.c.orig	2020-04-29 01:53:29.076934000 +0000
++++ libgnome-desktop/gnome-wall-clock.c
+@@ -279,22 +279,19 @@ translate_time_format_string (const char
+   const char *locale = g_getenv ("LC_TIME");
+   const char *res;
+   char *sep;
+-  locale_t old_loc;
+-  locale_t loc = (locale_t)0;
++  g_autofree char *old_locale = NULL;
+ 
+-  if (locale)
+-    loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t)0);
+-
+-  old_loc = uselocale (loc);
++  if (locale) {
++    old_locale = g_strdup (setlocale (LC_MESSAGES, NULL));
++    setlocale (LC_MESSAGES, locale);
++  }
+ 
+   sep = strchr (str, '\004');
+   res = g_dpgettext (GETTEXT_PACKAGE, str, sep ? sep - str + 1 : 0);
+ 
+-  uselocale (old_loc);
+-
+-  if (loc != (locale_t)0)
+-    freelocale (loc);
+-
++  if (locale)
++    setlocale (LC_MESSAGES, old_locale);
++  
+   return res;
+ }
+ 
diff --git a/gnome-desktop3/patches/patch-tests_wall-clock.c b/gnome-desktop3/patches/patch-tests_wall-clock.c
new file mode 100644
index 0000000000..43bacb2c9f
--- /dev/null
+++ b/gnome-desktop3/patches/patch-tests_wall-clock.c
@@ -0,0 +1,111 @@
+$NetBSD: patch-tests_wall-clock.c,v 1.1 2020/11/04 12:12:48 nia Exp $
+
+Disable tests that rely on uselocale()
+
+--- tests/wall-clock.c.orig	2020-10-05 19:11:19.000000000 +0000
++++ tests/wall-clock.c
+@@ -23,6 +23,9 @@
+ #include <libgnome-desktop/gnome-wall-clock.h>
+ #include <locale.h>
+ #include <string.h>
++#ifdef __APPLE__
++#include <xlocale.h>
++#endif
+ 
+ #define COLON ":"
+ #define RATIO "∶"
+@@ -36,8 +39,7 @@ test_utf8_character (const char *utf8_ch
+ {
+ 	GDateTime  *datetime;
+ 	GnomeWallClock *clock;
+-	locale_t locale;
+-	locale_t save_locale;
++	g_autofree char *save_locale;
+ 	const char *str;
+ 
+ 	/* When testing that UTF8 locales don't use double spaces
+@@ -47,9 +49,9 @@ test_utf8_character (const char *utf8_ch
+ 
+ 	/* In the C locale, make sure the time string is formatted with regular
+          * colons */
+-	locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
+-	g_assert_true (locale != (locale_t)0);
+-	save_locale = uselocale (locale);
++	save_locale = setlocale (LC_ALL_MASK, NULL);
++	g_assert_true (save_locale != NULL);
++	setlocale (LC_ALL_MASK, "C");
+ 	clock = gnome_wall_clock_new ();
+ 	str = gnome_wall_clock_string_for_datetime (clock,
+ 	                                            datetime,
+@@ -60,13 +62,7 @@ test_utf8_character (const char *utf8_ch
+ 	g_object_unref (clock);
+ 
+ 	/* In a UTF8 locale, we want ratio characters and no colons. */
+-	locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale);
+-	if (locale == (locale_t)0) {
+-		g_test_message ("en_US.utf8 locale not found");
+-		g_test_fail ();
+-		return;
+-	}
+-	uselocale (locale);
++	setlocale (LC_ALL_MASK, "en_US.utf8");
+ 	clock = gnome_wall_clock_new ();
+ 	str = gnome_wall_clock_string_for_datetime (clock,
+ 	                                            datetime,
+@@ -78,13 +74,7 @@ test_utf8_character (const char *utf8_ch
+ 
+ 	/* ... and same thing with an RTL locale: should be formatted with
+          * ratio characters */
+-	locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale);
+-	if (locale == (locale_t)0) {
+-		g_test_message ("he_IL.utf8 locale not found");
+-		g_test_fail ();
+-		return;
+-	}
+-	uselocale (locale);
++	setlocale (LC_ALL_MASK, "he_IL.utf8");
+ 	clock = gnome_wall_clock_new ();
+ 	str = gnome_wall_clock_string_for_datetime (clock,
+ 	                                            datetime,
+@@ -97,8 +87,7 @@ test_utf8_character (const char *utf8_ch
+ 	g_date_time_unref (datetime);
+ 
+ 	/* Restore previous locale */
+-	uselocale (save_locale);
+-	freelocale (locale);
++	setlocale (LC_ALL_MASK, save_locale);
+ }
+ 
+ static void
+@@ -197,6 +186,7 @@ test_notify_clock (void)
+ 	g_object_unref (settings);
+ }
+ 
++#if !defined(__NetBSD__)
+ static void
+ test_weekday_setting (void)
+ {
+@@ -248,6 +238,7 @@ test_weekday_setting (void)
+ 	uselocale (save_locale);
+ 	freelocale (locale);
+ }
++#endif
+ 
+ int
+ main (int   argc,
+@@ -257,11 +248,15 @@ main (int   argc,
+ 
+ 	g_test_init (&argc, &argv, NULL);
+ 
++#if !defined(__NetBSD__)
+ 	g_test_add_func ("/wall-clock/colon-vs-ratio", test_colon_vs_ratio);
+ 	g_test_add_func ("/wall-clock/space-vs-en-space", test_space_vs_en_space);
+ 	g_test_add_func ("/wall-clock/24h-clock-format", test_clock_format_setting);
++#endif
+ 	g_test_add_func ("/wall-clock/notify-clock", test_notify_clock);
++#if !defined(__NetBSD__)
+ 	g_test_add_func ("/wall-clock/weekday-setting", test_weekday_setting);
++#endif
+ 
+ 	return g_test_run ();
+ }
diff --git a/gnome-desktop3/patches/patch-tests_wallclock-reftest.c b/gnome-desktop3/patches/patch-tests_wallclock-reftest.c
new file mode 100644
index 0000000000..22ff2ba221
--- /dev/null
+++ b/gnome-desktop3/patches/patch-tests_wallclock-reftest.c
@@ -0,0 +1,57 @@
+$NetBSD: patch-tests_wallclock-reftest.c,v 1.1 2020/11/04 12:12:48 nia Exp $
+
+Disable tests that rely on uselocale()
+
+--- tests/wallclock-reftest.c.orig	2020-10-05 19:11:19.000000000 +0000
++++ tests/wallclock-reftest.c
+@@ -26,6 +26,9 @@
+ #include <gtk/gtk.h>
+ #define GNOME_DESKTOP_USE_UNSTABLE_API 1
+ #include <libgnome-desktop/gnome-wall-clock.h>
++#ifdef __APPLE__
++#include <xlocale.h>
++#endif
+ 
+ static const char *output_dir = NULL;
+ 
+@@ -439,21 +442,15 @@ test_ui_file (GFile         *file,
+   GnomeWallClock *clock;
+   GDateTime *datetime;
+   char *str;
+-  locale_t loc, previous_locale;
++  g_autofree char *previous_locale;
+ 
+   ui_file = g_file_get_path (file);
+ 
+   locale = get_locale_for_file (ui_file);
+   g_assert (locale);
+-  loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0);
+-  if (loc == (locale_t)0)
+-    {
+-      g_test_message ("locale '%s' not found", locale);
+-      g_test_fail();
+-      return;
+-    }
+-  previous_locale = uselocale (loc);
+-  g_assert_true (previous_locale != (locale_t) 0);
++  previous_locale = g_strdup (setlocale (LC_ALL_MASK, NULL));
++  g_assert_true (previous_locale != NULL);
++  setlocale (LC_ALL_MASK, locale);
+ 
+   clock = gnome_wall_clock_new ();
+   datetime = g_date_time_new_local (2014, 5, 28, 23, 59, 59);
+@@ -465,8 +462,7 @@ test_ui_file (GFile         *file,
+   g_date_time_unref (datetime);
+   g_object_unref (clock);
+ 
+-  uselocale (previous_locale);
+-  freelocale (loc);
++  setlocale (LC_ALL_MASK, previous_locale);
+ 
+   provider = add_extra_css (ui_file, ".css");
+ 
+@@ -616,3 +612,4 @@ main (int argc, char **argv)
+ 
+   return g_test_run ();
+ }
++
diff --git a/gnome-desktop40/DESCR b/gnome-desktop40/DESCR
deleted file mode 100644
index a485f9737b..0000000000
--- a/gnome-desktop40/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-gnome-desktop contains the libgnome-desktop library, the gnome-about
-program as well as some desktop-wide documents for GNOME 3.
diff --git a/gnome-desktop40/Makefile b/gnome-desktop40/Makefile
deleted file mode 100644
index 2a2a482f12..0000000000
--- a/gnome-desktop40/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# $NetBSD: Makefile,v 1.44 2020/11/17 11:35:19 nia Exp $
-
-DISTNAME=	gnome-desktop-40.0
-PKGNAME=	${DISTNAME:S/desktop/desktop40/}
-CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-desktop/${PKGVERSION_NOREV:R}/}
-EXTRACT_SUFX=	.tar.xz
-
-MAINTAINER=	prlw1%cam.ac.uk@localhost
-HOMEPAGE=	https://www.gnome.org/
-COMMENT=	GNOME3 desktop-wide documents and libgnome-desktop library
-LICENSE=	gnu-gpl-v2 AND gnu-lgpl-v2 AND gnu-fdl-v1.1
-
-TOOL_DEPENDS+=		gdbus-codegen-[0-9]*:../../devel/gdbus-codegen
-
-USE_TOOLS+=		pkg-config xgettext
-PKGCONFIG_OVERRIDE+=	libgnome-desktop/gnome-desktop-3.0.pc.in
-
-MESON_ARGS+=		-Dsystemd=disabled
-MESON_ARGS+=		-Dudev=disabled
-MESON_ARGS+=		-Ddistributor="The NetBSD Foundation"
-MESON_ARGS+=		-Ddate_in_gnome_version=false
-MESON_ARGS+=		-Ddesktop_docs=false
-MESON_ARGS+=		-Dgtk_doc=false
-MESON_ARGS+=		-Ddebug_tools=false
-
-BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.44.0
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/gobject-introspection/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gdk-pixbuf2+=	gdk-pixbuf2>=2.36.5
-.include "../../graphics/gdk-pixbuf2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
-.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../textproc/iso-codes/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../x11/xkeyboard-config/buildlink3.mk"
-.include "../../devel/meson/build.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/gnome-desktop40/PLIST b/gnome-desktop40/PLIST
deleted file mode 100644
index faef22f468..0000000000
--- a/gnome-desktop40/PLIST
+++ /dev/null
@@ -1,137 +0,0 @@
-@comment $NetBSD$
-include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-crossfade.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-bg-slide-show.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-bg.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-desktop-thumbnail.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-idle-monitor.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-languages.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-pnp-ids.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-rr-config.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-rr.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-systemd.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-wall-clock.h
-include/gnome-desktop-3.0/libgnome-desktop/gnome-xkb-info.h
-lib/girepository-1.0/GnomeDesktop-3.0.typelib
-lib/libgnome-desktop-3.so
-lib/libgnome-desktop-3.so.19
-lib/libgnome-desktop-3.so.19.1.3
-lib/pkgconfig/gnome-desktop-3.0.pc
-share/gir-1.0/GnomeDesktop-3.0.gir
-share/gnome/gnome-version.xml
-share/locale/af/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/am/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/an/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ar/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/as/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ast/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/az/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/be/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/be@latin/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/bg/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/bn/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/bn_IN/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/br/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/bs/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ca/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ca@valencia/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ckb/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/crh/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/cs/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/csb/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/cy/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/da/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/de/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/dz/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/el/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/en/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/en@shaw/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/en_CA/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/en_GB/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/eo/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/es/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/et/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/eu/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fa/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fur/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/fy/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ga/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/gd/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/gl/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/gu/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ha/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/he/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/hi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/hr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/hu/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/hy/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/id/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ig/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/is/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/it/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ja/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ka/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/kg/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/kk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/km/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/kn/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ko/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ku/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ky/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/li/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/lo/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/lt/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/lv/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mai/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mg/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mjw/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ml/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mn/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/mr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ms/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nb/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nds/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ne/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nl/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nn/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/nso/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/oc/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/or/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/pa/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/pl/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ps/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/pt/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/pt_BR/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ro/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ru/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/rw/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/si/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sl/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sq/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sr@latin/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/sv/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ta/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/te/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/tg/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/th/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/tk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/tr/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ug/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/uk/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/ur/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/uz/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/vi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/wa/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/xh/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/yi/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/yo/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/zh_CN/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/zh_HK/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/zh_TW/LC_MESSAGES/gnome-desktop-3.0.mo
-share/locale/zu/LC_MESSAGES/gnome-desktop-3.0.mo
diff --git a/gnome-desktop40/buildlink3.mk b/gnome-desktop40/buildlink3.mk
deleted file mode 100644
index 6b602dd1b2..0000000000
--- a/gnome-desktop40/buildlink3.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.33 2020/11/04 12:12:48 nia Exp $
-
-BUILDLINK_TREE+=	gnome-desktop40
-
-.if !defined(GNOME_DESKTOP40_BUILDLINK3_MK)
-GNOME_DESKTOP40_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.gnome-desktop40+=	gnome-desktop40>=3.4.2
-BUILDLINK_ABI_DEPENDS.gnome-desktop40+=	gnome-desktop40>=3.36
-BUILDLINK_PKGSRCDIR.gnome-desktop40?=	../../devel/gnome-desktop40
-
-BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=	gsettings-desktop-schemas>=3.27.0
-.include "../../wip/gsettings-desktop-schemas/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-.include "../../x11/xkeyboard-config/buildlink3.mk"
-.include "../../textproc/iso-codes/buildlink3.mk"
-.endif
-
-BUILDLINK_TREE+=	-gnome-desktop40
diff --git a/gnome-desktop40/distinfo b/gnome-desktop40/distinfo
deleted file mode 100644
index 67b3557e93..0000000000
--- a/gnome-desktop40/distinfo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: distinfo,v 1.16 2020/11/04 12:12:48 nia Exp $
-
-SHA1 (gnome-desktop-40.0.tar.xz) = 95cb6b640618e5299ec90c0bdbf04f904c9a8bfc
-RMD160 (gnome-desktop-40.0.tar.xz) = b703e52c74f639c516a64e29274742a46d344321
-SHA512 (gnome-desktop-40.0.tar.xz) = faf6fd2a0c5db47a49319c03ca9a348d77092050cdd8d79a74979b2878d0e35ffa85bbe5e87449f9285ceb28a884439de6eb73d6b9fcaa02236eb48f4a7ac49c
-Size (gnome-desktop-40.0.tar.xz) = 721628 bytes
-SHA1 (patch-libgnome-desktop_gnome-languages.c) = 88878085009e36be056b90cce43019095e6d9ddf
-SHA1 (patch-libgnome-desktop_gnome-wall-clock.c) = fb8da1dcb408a78cbc427c69d510eaf2ca8a2fe7
-SHA1 (patch-tests_wall-clock.c) = c3f4cd354538ea4f549f87762b333cb00a92d18d
-SHA1 (patch-tests_wallclock-reftest.c) = 53cee07db779808b0d9b31f64529ee48c2252bda
diff --git a/gnome-desktop40/patches/patch-libgnome-desktop_gnome-languages.c b/gnome-desktop40/patches/patch-libgnome-desktop_gnome-languages.c
deleted file mode 100644
index a5c724d986..0000000000
--- a/gnome-desktop40/patches/patch-libgnome-desktop_gnome-languages.c
+++ /dev/null
@@ -1,120 +0,0 @@
-$NetBSD: patch-libgnome-desktop_gnome-languages.c,v 1.1 2020/11/04 12:12:48 nia Exp $
-
-Replace usage of uselocale() - not available on NetBSD
-
---- libgnome-desktop/gnome-languages.c.orig	2020-10-05 19:11:19.070822700 +0000
-+++ libgnome-desktop/gnome-languages.c
-@@ -303,16 +303,13 @@ language_name_get_codeset_details (const
-                                    gboolean    *is_utf8)
- {
-         locale_t locale;
--        locale_t old_locale;
-         const char *codeset = NULL;
- 
-         locale = newlocale (LC_CTYPE_MASK, language_name, (locale_t) 0);
-         if (locale == (locale_t) 0)
-                 return;
- 
--        old_locale = uselocale (locale);
--
--        codeset = nl_langinfo (CODESET);
-+        codeset = nl_langinfo_l (CODESET, locale);
- 
-         if (pcodeset != NULL) {
-                 *pcodeset = g_strdup (codeset);
-@@ -324,7 +321,6 @@ language_name_get_codeset_details (const
-                 *is_utf8 = strcmp (normalized_codeset, "UTF-8") == 0;
-         }
- 
--        uselocale (old_locale);
-         freelocale (locale);
- }
- 
-@@ -703,14 +699,11 @@ get_translated_language (const char *cod
-         name = NULL;
-         if (language != NULL) {
-                 const char *translated_name;
--                locale_t loc = 0;
--                locale_t old_locale = 0;
-+                g_autofree char *old_locale = NULL;		
- 
-                 if (locale != NULL) {
--                        loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
--                        if (loc == (locale_t) 0)
--                                return NULL;
--                        old_locale = uselocale (loc);
-+                        old_locale = g_strdup (setlocale (LC_MESSAGES, NULL));
-+			setlocale (LC_MESSAGES, locale);
-                 }
- 
-                 if (is_fallback_language (code)) {
-@@ -723,8 +716,7 @@ get_translated_language (const char *cod
-                 }
- 
-                 if (locale != NULL) {
--                        uselocale (old_locale);
--                        freelocale (loc);
-+                        setlocale (LC_MESSAGES, locale);
-                 }
-         }
- 
-@@ -761,15 +753,12 @@ get_translated_territory (const char *co
-         name = NULL;
-         if (territory != NULL) {
-                 const char *translated_territory;
--                locale_t loc;
--                locale_t old_locale = 0;
-+                g_autofree char *old_locale = NULL;
-                 g_autofree char *tmp = NULL;
- 
-                 if (locale != NULL) {
--                        loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
--                        if (loc == (locale_t) 0)
--                                return NULL;
--                        old_locale = uselocale (loc);
-+                        old_locale = g_strdup (setlocale(LC_MESSAGES, NULL));
-+                        setlocale(LC_MESSAGES, locale);
-                 }
- 
-                 translated_territory = dgettext ("iso_3166", territory);
-@@ -777,8 +766,7 @@ get_translated_territory (const char *co
-                 name = capitalize_utf8_string (tmp);
- 
-                 if (locale != NULL) {
--                        uselocale (old_locale);
--                        freelocale (loc);
-+                        setlocale (LC_MESSAGES, old_locale);
-                 }
-         }
- 
-@@ -1358,17 +1346,13 @@ gnome_get_translated_modifier (const cha
- {
-         char *retval;
-         GHashTable *modifiers_map;
--        locale_t loc;
--        locale_t old_locale;
-+	g_autofree char *old_locale = NULL;
- 
-         g_return_val_if_fail (modifier != NULL, NULL);
- 
-         if (translation != NULL) {
--                loc = newlocale (LC_MESSAGES_MASK, translation, (locale_t) 0);
--                if (loc == (locale_t) 0) {
--                        return NULL;
--                }
--                old_locale = uselocale (loc);
-+                old_locale = g_strdup (setlocale (LC_MESSAGES, NULL));
-+		setlocale (LC_MESSAGES, translation);
-         }
- 
-         /* Modifiers as listed in glibc's SUPPORTED file:
-@@ -1408,8 +1392,7 @@ gnome_get_translated_modifier (const cha
-         g_hash_table_destroy (modifiers_map);
- 
-         if (translation != NULL) {
--                uselocale (old_locale);
--                freelocale (loc);
-+                setlocale (LC_MESSAGES, old_locale);
-         }
- 
-         return retval;
diff --git a/gnome-desktop40/patches/patch-libgnome-desktop_gnome-wall-clock.c b/gnome-desktop40/patches/patch-libgnome-desktop_gnome-wall-clock.c
deleted file mode 100644
index 998b9ca391..0000000000
--- a/gnome-desktop40/patches/patch-libgnome-desktop_gnome-wall-clock.c
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-libgnome-desktop_gnome-wall-clock.c,v 1.1 2020/11/04 12:12:48 nia Exp $
-
-Replace usage of uselocale() - not available on NetBSD
-
---- libgnome-desktop/gnome-wall-clock.c.orig	2020-04-29 01:53:29.076934000 +0000
-+++ libgnome-desktop/gnome-wall-clock.c
-@@ -279,22 +279,19 @@ translate_time_format_string (const char
-   const char *locale = g_getenv ("LC_TIME");
-   const char *res;
-   char *sep;
--  locale_t old_loc;
--  locale_t loc = (locale_t)0;
-+  g_autofree char *old_locale = NULL;
- 
--  if (locale)
--    loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t)0);
--
--  old_loc = uselocale (loc);
-+  if (locale) {
-+    old_locale = g_strdup (setlocale (LC_MESSAGES, NULL));
-+    setlocale (LC_MESSAGES, locale);
-+  }
- 
-   sep = strchr (str, '\004');
-   res = g_dpgettext (GETTEXT_PACKAGE, str, sep ? sep - str + 1 : 0);
- 
--  uselocale (old_loc);
--
--  if (loc != (locale_t)0)
--    freelocale (loc);
--
-+  if (locale)
-+    setlocale (LC_MESSAGES, old_locale);
-+  
-   return res;
- }
- 
diff --git a/gnome-desktop40/patches/patch-tests_wall-clock.c b/gnome-desktop40/patches/patch-tests_wall-clock.c
deleted file mode 100644
index 43bacb2c9f..0000000000
--- a/gnome-desktop40/patches/patch-tests_wall-clock.c
+++ /dev/null
@@ -1,111 +0,0 @@
-$NetBSD: patch-tests_wall-clock.c,v 1.1 2020/11/04 12:12:48 nia Exp $
-
-Disable tests that rely on uselocale()
-
---- tests/wall-clock.c.orig	2020-10-05 19:11:19.000000000 +0000
-+++ tests/wall-clock.c
-@@ -23,6 +23,9 @@
- #include <libgnome-desktop/gnome-wall-clock.h>
- #include <locale.h>
- #include <string.h>
-+#ifdef __APPLE__
-+#include <xlocale.h>
-+#endif
- 
- #define COLON ":"
- #define RATIO "∶"
-@@ -36,8 +39,7 @@ test_utf8_character (const char *utf8_ch
- {
- 	GDateTime  *datetime;
- 	GnomeWallClock *clock;
--	locale_t locale;
--	locale_t save_locale;
-+	g_autofree char *save_locale;
- 	const char *str;
- 
- 	/* When testing that UTF8 locales don't use double spaces
-@@ -47,9 +49,9 @@ test_utf8_character (const char *utf8_ch
- 
- 	/* In the C locale, make sure the time string is formatted with regular
-          * colons */
--	locale = newlocale (LC_ALL_MASK, "C", (locale_t) 0);
--	g_assert_true (locale != (locale_t)0);
--	save_locale = uselocale (locale);
-+	save_locale = setlocale (LC_ALL_MASK, NULL);
-+	g_assert_true (save_locale != NULL);
-+	setlocale (LC_ALL_MASK, "C");
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
- 	                                            datetime,
-@@ -60,13 +62,7 @@ test_utf8_character (const char *utf8_ch
- 	g_object_unref (clock);
- 
- 	/* In a UTF8 locale, we want ratio characters and no colons. */
--	locale = newlocale (LC_ALL_MASK, "en_US.utf8", locale);
--	if (locale == (locale_t)0) {
--		g_test_message ("en_US.utf8 locale not found");
--		g_test_fail ();
--		return;
--	}
--	uselocale (locale);
-+	setlocale (LC_ALL_MASK, "en_US.utf8");
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
- 	                                            datetime,
-@@ -78,13 +74,7 @@ test_utf8_character (const char *utf8_ch
- 
- 	/* ... and same thing with an RTL locale: should be formatted with
-          * ratio characters */
--	locale = newlocale (LC_ALL_MASK, "he_IL.utf8", locale);
--	if (locale == (locale_t)0) {
--		g_test_message ("he_IL.utf8 locale not found");
--		g_test_fail ();
--		return;
--	}
--	uselocale (locale);
-+	setlocale (LC_ALL_MASK, "he_IL.utf8");
- 	clock = gnome_wall_clock_new ();
- 	str = gnome_wall_clock_string_for_datetime (clock,
- 	                                            datetime,
-@@ -97,8 +87,7 @@ test_utf8_character (const char *utf8_ch
- 	g_date_time_unref (datetime);
- 
- 	/* Restore previous locale */
--	uselocale (save_locale);
--	freelocale (locale);
-+	setlocale (LC_ALL_MASK, save_locale);
- }
- 
- static void
-@@ -197,6 +186,7 @@ test_notify_clock (void)
- 	g_object_unref (settings);
- }
- 
-+#if !defined(__NetBSD__)
- static void
- test_weekday_setting (void)
- {
-@@ -248,6 +238,7 @@ test_weekday_setting (void)
- 	uselocale (save_locale);
- 	freelocale (locale);
- }
-+#endif
- 
- int
- main (int   argc,
-@@ -257,11 +248,15 @@ main (int   argc,
- 
- 	g_test_init (&argc, &argv, NULL);
- 
-+#if !defined(__NetBSD__)
- 	g_test_add_func ("/wall-clock/colon-vs-ratio", test_colon_vs_ratio);
- 	g_test_add_func ("/wall-clock/space-vs-en-space", test_space_vs_en_space);
- 	g_test_add_func ("/wall-clock/24h-clock-format", test_clock_format_setting);
-+#endif
- 	g_test_add_func ("/wall-clock/notify-clock", test_notify_clock);
-+#if !defined(__NetBSD__)
- 	g_test_add_func ("/wall-clock/weekday-setting", test_weekday_setting);
-+#endif
- 
- 	return g_test_run ();
- }
diff --git a/gnome-desktop40/patches/patch-tests_wallclock-reftest.c b/gnome-desktop40/patches/patch-tests_wallclock-reftest.c
deleted file mode 100644
index 22ff2ba221..0000000000
--- a/gnome-desktop40/patches/patch-tests_wallclock-reftest.c
+++ /dev/null
@@ -1,57 +0,0 @@
-$NetBSD: patch-tests_wallclock-reftest.c,v 1.1 2020/11/04 12:12:48 nia Exp $
-
-Disable tests that rely on uselocale()
-
---- tests/wallclock-reftest.c.orig	2020-10-05 19:11:19.000000000 +0000
-+++ tests/wallclock-reftest.c
-@@ -26,6 +26,9 @@
- #include <gtk/gtk.h>
- #define GNOME_DESKTOP_USE_UNSTABLE_API 1
- #include <libgnome-desktop/gnome-wall-clock.h>
-+#ifdef __APPLE__
-+#include <xlocale.h>
-+#endif
- 
- static const char *output_dir = NULL;
- 
-@@ -439,21 +442,15 @@ test_ui_file (GFile         *file,
-   GnomeWallClock *clock;
-   GDateTime *datetime;
-   char *str;
--  locale_t loc, previous_locale;
-+  g_autofree char *previous_locale;
- 
-   ui_file = g_file_get_path (file);
- 
-   locale = get_locale_for_file (ui_file);
-   g_assert (locale);
--  loc = newlocale (LC_ALL_MASK, locale, (locale_t) 0);
--  if (loc == (locale_t)0)
--    {
--      g_test_message ("locale '%s' not found", locale);
--      g_test_fail();
--      return;
--    }
--  previous_locale = uselocale (loc);
--  g_assert_true (previous_locale != (locale_t) 0);
-+  previous_locale = g_strdup (setlocale (LC_ALL_MASK, NULL));
-+  g_assert_true (previous_locale != NULL);
-+  setlocale (LC_ALL_MASK, locale);
- 
-   clock = gnome_wall_clock_new ();
-   datetime = g_date_time_new_local (2014, 5, 28, 23, 59, 59);
-@@ -465,8 +462,7 @@ test_ui_file (GFile         *file,
-   g_date_time_unref (datetime);
-   g_object_unref (clock);
- 
--  uselocale (previous_locale);
--  freelocale (loc);
-+  setlocale (LC_ALL_MASK, previous_locale);
- 
-   provider = add_extra_css (ui_file, ".css");
- 
-@@ -616,3 +612,4 @@ main (int argc, char **argv)
- 
-   return g_test_run ();
- }
-+
diff --git a/gnome-shell/Makefile b/gnome-shell/Makefile
index 90ad2d7939..995b8c7a94 100644
--- a/gnome-shell/Makefile
+++ b/gnome-shell/Makefile
@@ -62,6 +62,6 @@ post-extract:
 .include "../../security/polkit/buildlink3.mk"
 .include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
 .include "../../wip/mutter/buildlink3.mk"
-.include "../../wip/gnome-desktop40/buildlink3.mk"
+.include "../../wip/gnome-desktop3/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mutter/Makefile b/mutter/Makefile
index c2a263769b..daa6ac3662 100644
--- a/mutter/Makefile
+++ b/mutter/Makefile
@@ -79,6 +79,6 @@ BUILDLINK_API_DEPENDS.gsettings-desktop-schemas+=       gsettings-desktop-schema
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libxkbfile/buildlink3.mk"
-.include "../../wip/gnome-desktop40/buildlink3.mk"
+.include "../../wip/gnome-desktop3/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Home | Main Index | Thread Index | Old Index