Skip to content
Commits on Source (64)
# You can override the included template(s) by including variable overrides
# SAST customization: https://docs.gitlab.com/ee/user/application_security/sast/#customizing-the-sast-settings
# Secret Detection customization: https://docs.gitlab.com/ee/user/application_security/secret_detection/#customizing-settings
# Dependency Scanning customization: https://docs.gitlab.com/ee/user/application_security/dependency_scanning/#customizing-the-dependency-scanning-settings
# Note that environment variables can be set in several places
# See https://docs.gitlab.com/ee/ci/variables/#cicd-variable-precedence
include:
- template: Security/SAST.gitlab-ci.yml
- template: Security/Secret-Detection.gitlab-ci.yml
image: fedora:34
variables:
LAST_ABI_BREAK: 9d01763ba2a3f71b7c0aade04d2ffa6a883e308d
DEPENDENCIES: gtk3-devel gsettings-desktop-schemas-devel gettext
gtk-doc libxkbcommon-devel xkeyboard-config-devel itstool
gobject-introspection-devel systemd-devel iso-codes-devel
libseccomp-devel gcc gcc-c++ glibc-devel
meson redhat-rpm-config
TEST_DEPENDENCIES: gnome-desktop-testing xorg-x11-server-Xvfb glibc-langpack-en glibc-langpack-he glibc-langpack-ja abattis-cantarell-fonts libabigail git
build_stable:
before_script:
# Undo delangification present in the Fedora Docker images
- rm -f /etc/rpm/macros.image-language-conf
- echo "reinstall glib2" >> translist.txt
# Work-around https://bugzilla.redhat.com/show_bug.cgi?id=1607172#c4
- echo "update dnf gdbm" >> translist.txt
- echo "remove python3-modulemd" >> translist.txt
- dnf shell -y --nogpgcheck translist.txt
- dnf update -y --nogpgcheck
- dnf install -y --nogpgcheck $DEPENDENCIES
- dnf install -y --nogpgcheck $TEST_DEPENDENCIES
script:
- meson --prefix=/usr -Dinstalled_tests=true build
- pushd build
- ninja
- ninja install
- ninja dist
- G_MESSAGES_DEBUG=all xvfb-run -a -s "-screen 0 1024x768x24" ninja test
- G_MESSAGES_DEBUG=all xvfb-run -a -s "-screen 0 1024x768x24"
gnome-desktop-testing-runner --report-directory=test-results gnome-desktop
- popd
- .ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
artifacts:
paths:
- build/meson-logs/
- build/test-results/
when: on_failure
paths:
- build/meson-dist/
when: on_success
do_gitlab_release:
stage: deploy
image: registry.gitlab.com/gitlab-org/release-cli:latest
rules:
- if: $CI_COMMIT_TAG
script:
- echo 'Running release_job'
release:
tag_name: '$CI_COMMIT_TAG'
description: 'See NEWS file'
============
Version 40.4
Version 41.1
============
- No changes
- gnome-languages: Avoid passing NULL to newlocale
- Avoid the use of `allow-none` for out parameters
- Translation updates
============
Version 40.3
Version 41.0
============
- Translation updates
============
Version 40.2
============
=============
Version 41.rc
=============
- Some improves in the CI
- Translation updates
===============
Version 41.beta
===============
- xkb: Clear cached layouts when necessary
- Translation updates
================
Version 41.alpha
================
- Fix crash loading keyboard settings panel (#190, Peter Hutterer)
- Stop mounting ld.so.cache on non-glibc systems
- Replace usage of non-portable `uselocale` with locale-dependent functions
- Fix starttime hour parsing in animated background
- xkbinfo: only insert new layouts, skip over duplicate ones
- Translation updates
============
......@@ -23,9 +42,9 @@ Version 40.0
- No changes
===============
=============
Version 40.rc
===============
=============
- bg-slide-show: Always parse date/time integers in base 10
- thumbnail: Fix thumbnailing of CBZ with UTF-8 filenames
......@@ -39,9 +58,9 @@ Version 40.beta
- xkbinfo: Update iso639Ids but not iso3166Ids correctly in evdev
- Translation updates
==============
================
Version 40.alpha
==============
================
- Add support for x-large and xx-large thumbnail sizes (!99, Bastien Nocera)
- Make it easier to profile thumbnailers (!94, Bastien Nocera)
......
......@@ -27,3 +27,9 @@
/* Define to include GNU extensions */
#mesondefine _GNU_SOURCE
/* define on systems that have the `uselocale` function */
#mesondefine HAVE_USELOCALE
/* define on system if OS has extended locale header */
#mesondefine HAVE_XLOCALE
gnome-desktop3 (41.1-1ubuntu1) jammy; urgency=medium
* Merge with Debian, remaining changes:
- Add 2 patches to adjust background color detection for Unity
+ tweak_color_computation.patch
+ 04_compute_average_color.patch
- Build-Depend on language-pack-gnome-he for build tests
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 19 Nov 2021 03:48:08 +0100
gnome-desktop3 (41.1-1) unstable; urgency=medium
* Team upload
* New upstream release
* d/rules: Fix spelling of desktop_docs Meson option.
This was accepted with a warning under Meson 0.59, but causes FTBFS
under Meson 0.60. (Closes: #998584)
-- Simon McVittie <smcv@debian.org> Fri, 05 Nov 2021 10:58:32 +0000
gnome-desktop3 (41.0-1) unstable; urgency=medium
* Build-depend on libgl-dev instead of transitional libgl1-mesa-dev
* New upstream release
* Add Lintian override for #970275
* d/upstream/metadata: Add
* Standards-Version: 4.6.0 (no changes required)
* Don't make all installed-tests files executable
* Make the library depend on iso-codes.
The iso-codes XML is read at runtime, as demonstrated by autopkgtest
failures if this dependency is not added.
* Recommend locales | locales-all, and depend on them for the tests
* d/p/languages-Look-at-LOCPATH-before-compile-time-LIBLOCALEDI.patch:
Add patch to make locale APIs follow $LOCPATH.
This is necessary to make the autopkgtest pass on a system with no
non-fallback locales configured, without having to pull in locales-all.
-- Simon McVittie <smcv@debian.org> Thu, 14 Oct 2021 00:48:12 +0100
gnome-desktop3 (40.4-2ubuntu1) impish; urgency=medium
* Merge with Debian, remaining changes:
......
# This file is autogenerated. DO NOT EDIT!
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
Source: gnome-desktop3
Section: gnome
Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
Uploaders: Gunnar Hjalmarsson <gunnarhj@debian.org>, Iain Lane <laney@debian.org>, Jeremy Bicha <jbicha@debian.org>, Laurent Bigonville <bigon@debian.org>, Sjoerd Simons <sjoerd@debian.org>, Tim Lunn <tim@feathertop.org>
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper-compat (= 13),
dh-sequence-gir,
dh-sequence-gnome (>= 0.22),
......@@ -20,7 +16,7 @@ Build-Depends: debhelper-compat (= 13),
language-pack-gnome-he <!nocheck>,
libgdk-pixbuf-2.0-dev (>= 2.36.5) | libgdk-pixbuf2.0-dev (>= 2.36.5),
libgirepository1.0-dev (>= 0.10.2-1~),
libgl1-mesa-dev,
libgl-dev,
libglib2.0-dev (>= 2.53.0),
libglib2.0-doc,
libgtk-3-dev (>= 3.3.6),
......@@ -40,7 +36,7 @@ XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-desktop.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-desktop
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-desktop.git -b ubuntu/master
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-desktop/tree/ubuntu/master
Standards-Version: 4.5.1
Standards-Version: 4.6.0
Package: gnome-desktop3-data
Architecture: all
......@@ -56,6 +52,7 @@ Package: gnome-desktop-3-tests
Architecture: any
Depends: libgnome-desktop-3-19 (= ${binary:Version}),
gnome-desktop3-data (= ${source:Version}),
locales | locales-all,
${misc:Depends},
${shlibs:Depends}
Breaks: libgnome-desktop-3-19 (<< 40),
......@@ -72,8 +69,10 @@ Depends: bubblewrap [linux-any],
gnome-desktop3-data (>= ${source:Version}),
gnome-desktop3-data (<< ${gnome:NextVersion}),
gsettings-desktop-schemas (>= 3.27.0),
iso-codes,
${misc:Depends},
${shlibs:Depends}
Recommends: locales | locales-all
Description: Utility library for loading .desktop files - runtime files
This library is used by GNOME to load the .desktop files.
......
......@@ -16,7 +16,7 @@ Build-Depends: debhelper-compat (= 13),
language-pack-gnome-he <!nocheck>,
libgdk-pixbuf-2.0-dev (>= 2.36.5) | libgdk-pixbuf2.0-dev (>= 2.36.5),
libgirepository1.0-dev (>= 0.10.2-1~),
libgl1-mesa-dev,
libgl-dev,
libglib2.0-dev (>= 2.53.0),
libglib2.0-doc,
libgtk-3-dev (>= 3.3.6),
......@@ -36,7 +36,7 @@ XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-desktop.git
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-desktop
Vcs-Git: https://salsa.debian.org/gnome-team/gnome-desktop.git -b ubuntu/master
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-desktop/tree/ubuntu/master
Standards-Version: 4.5.1
Standards-Version: 4.6.0
Package: gnome-desktop3-data
Architecture: all
......@@ -52,6 +52,7 @@ Package: gnome-desktop-3-tests
Architecture: any
Depends: libgnome-desktop-3-19 (= ${binary:Version}),
gnome-desktop3-data (= ${source:Version}),
locales | locales-all,
${misc:Depends},
${shlibs:Depends}
Breaks: libgnome-desktop-3-19 (<< 40),
......@@ -68,8 +69,10 @@ Depends: bubblewrap [linux-any],
gnome-desktop3-data (>= ${source:Version}),
gnome-desktop3-data (<< ${gnome:NextVersion}),
gsettings-desktop-schemas (>= 3.27.0),
iso-codes,
${misc:Depends},
${shlibs:Depends}
Recommends: locales | locales-all
Description: Utility library for loading .desktop files - runtime files
This library is used by GNOME to load the .desktop files.
......
# https://bugs.debian.org/970275
package-contains-documentation-outside-usr-share-doc usr/share/gtk-doc/html/*
From: Simon McVittie <smcv@debian.org>
Date: Thu, 14 Oct 2021 00:31:33 +0100
Subject: languages: Look at $LOCPATH before compile-time LIBLOCALEDIR
This allows unit testing on a minimal system with no locales set up, by
generating some locales in a directory and setting LOCPATH.
Signed-off-by: Simon McVittie <smcv@debian.org>
---
libgnome-desktop/gnome-languages.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/libgnome-desktop/gnome-languages.c b/libgnome-desktop/gnome-languages.c
index a9b1a19..b3d6d5a 100644
--- a/libgnome-desktop/gnome-languages.c
+++ b/libgnome-desktop/gnome-languages.c
@@ -463,8 +463,15 @@ add_locale (const char *language_name,
static int
select_dirs (const struct dirent *dirent)
{
+ const char *locpath;
int result = 0;
+ locpath = g_getenv ("LOCPATH");
+
+ if (locpath == NULL) {
+ locpath = LIBLOCALEDIR;
+ }
+
if (strcmp (dirent->d_name, ".") != 0 && strcmp (dirent->d_name, "..") != 0) {
mode_t mode = 0;
@@ -477,7 +484,7 @@ select_dirs (const struct dirent *dirent)
struct stat st;
g_autofree char *path = NULL;
- path = g_build_filename (LIBLOCALEDIR, dirent->d_name, NULL);
+ path = g_build_filename (locpath, dirent->d_name, NULL);
if (g_stat (path, &st) == 0) {
mode = st.st_mode;
}
@@ -496,8 +503,15 @@ collect_locales_from_directory (void)
struct dirent **dirents;
int ndirents;
int cnt;
+ const char *locpath;
+
+ locpath = g_getenv ("LOCPATH");
+
+ if (locpath == NULL) {
+ locpath = LIBLOCALEDIR;
+ }
- ndirents = scandir (LIBLOCALEDIR, &dirents, select_dirs, alphasort);
+ ndirents = scandir (locpath, &dirents, select_dirs, alphasort);
for (cnt = 0; cnt < ndirents; ++cnt) {
if (add_locale (dirents[cnt]->d_name, TRUE))
languages-Look-at-LOCPATH-before-compile-time-LIBLOCALEDI.patch
04_compute_average_color.patch
tweak_color_computation.patch
......@@ -2,6 +2,7 @@
include /usr/share/dpkg/default.mk
built_binaries := $(shell dh_listpackages)
LIB_PKG := $(filter-out %-dev %-bin,$(filter lib%,$(shell awk '/^Package: / { print $$2 }' debian/control)))
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
......@@ -21,7 +22,7 @@ override_dh_auto_configure:
-Ddate_in_gnome_version=false \
-Dgtk_doc=true \
-Dinstalled_tests=true \
-Ddesktop-docs=true
-Ddesktop_docs=true
override_dh_auto_test:
debian/tests/run-with-locales \
......@@ -34,6 +35,14 @@ override_dh_auto_test:
G_MESSAGES_DEBUG=all \
dh_auto_test -- --wrap="xvfb-run -a"
# debhelper >= 13.4 makes all of /usr/libexec executable, which is not
# quite right for installed-tests
override_dh_fixperms:
dh_fixperms -Xusr/libexec/installed-tests
ifneq ($(filter %-tests,$(built_binaries)),)
chmod --recursive --changes a+rX,u+w,og-w debian/*-tests/usr/libexec/installed-tests
endif
# Ubuntu-specific
override_dh_translations:
dh_translations --domain=gnome-desktop-3.0
---
Bug-Database: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/
Bug-Submit: https://gitlab.gnome.org/GNOME/gnome-desktop/issues/new
Repository: https://gitlab.gnome.org/GNOME/gnome-desktop.git
Repository-Browse: https://gitlab.gnome.org/GNOME/gnome-desktop
......@@ -11,6 +11,7 @@ ko
oc
pt_BR
sl
sr
sv
tr
uk
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -384,7 +384,7 @@ handle_text (GMarkupParseContext *context,
self->priv->start_tm.tm_mday = parse_int (text);
}
else if (stack_is (self, "hour", "starttime", "background", NULL)) {
self->priv->start_tm.tm_hour = parse_int (text) - 1;
self->priv->start_tm.tm_hour = parse_int (text);
}
else if (stack_is (self, "minute", "starttime", "background", NULL)) {
self->priv->start_tm.tm_min = parse_int (text);
......@@ -680,6 +680,9 @@ parse_file_contents (GnomeBGSlideShow *self,
if (!failed) {
guint queue_length;
/* Per the API of mktime, use a negative value on tm_isdst, in order to
* use the system databases to get the active timezone DST status. */
self->priv->start_tm.tm_isdst = -1;
t = mktime (&self->priv->start_tm);
self->priv->start_time = (double)t;
......
......@@ -557,7 +557,7 @@ add_bwrap (GPtrArray *array,
add_args (array,
"bwrap",
"--ro-bind", "/usr", "/usr",
"--ro-bind", "/etc/ld.so.cache", "/etc/ld.so.cache",
"--ro-bind-try", "/etc/ld.so.cache", "/etc/ld.so.cache",
NULL);
/* These directories might be symlinks into /usr/... */
......
/*-
* Copyright (c) 2021 Dan Cîrnaț <dan@alt.md>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License
* as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
*/
#include "config.h"
#include <locale.h>
#ifdef HAVE_XLOCALE
#include <xlocale.h>
#endif
#include <glib.h>
#include <glib/gi18n-lib.h>
#ifndef HAVE_USELOCALE
/**
* FIXME: This function does nothing if there's no thread-safe
* alternative to uselocale on some systems (NetBSD). Replace it
* when an implementation becomes available.
*/
locale_t
uselocale (locale_t newloc)
{
return (locale_t) 0;
}
#endif
char *
dgettext_l (locale_t locale,
const char *domain,
const char *msgid)
{
locale_t old_locale = uselocale (locale);
char *ret = dgettext (domain, msgid);
uselocale (old_locale);
return ret;
}
const gchar *
g_dgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgid)
{
locale_t old_locale = uselocale (locale);
const gchar *ret = g_dgettext (domain, msgid);
uselocale (old_locale);
return ret;
}
const gchar *
g_dpgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgctxtid,
gsize msgidoffset)
{
locale_t old_locale = uselocale (locale);
const gchar *ret = g_dpgettext (domain, msgctxtid, msgidoffset);
uselocale (old_locale);
return ret;
}
/*-
* Copyright (c) 2021 Dan Cîrnaț <dan@alt.md>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License
* as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*
*/
#include "config.h"
#include <locale.h>
#include <string.h>
#ifdef HAVE_XLOCALE
#include <xlocale.h>
#endif
const char *
dgettext_l (locale_t locale,
const char *domain,
const char *msgid);
const gchar *
g_dgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgid);
const gchar *
g_dpgettext_l (locale_t locale,
const gchar *domain,
const gchar *msgctxtid,
gsize msgidoffset);
#define _l(locale_t,String) ((char *) g_dgettext_l (locale_t, GETTEXT_PACKAGE, String))