Compare commits

...

21 Commits
f27 ... master

Author SHA1 Message Date
Kalev Lember
981addd1dd Update to 3.29.90.1 2018-08-12 21:00:51 +02:00
Fedora Release Engineering
437782e47d - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 02:51:52 +00:00
Kalev Lember
831bbd7505 Update to 3.28.2 2018-05-10 10:49:09 +02:00
Kalev Lember
faa7bd0310 Update to 3.28.1 2018-04-11 10:41:15 +02:00
Kalev Lember
d171456966 Update to 3.28.0 2018-03-12 16:58:01 +01:00
Kalev Lember
bba73087a1 Remove ldconfig scriptlets 2018-03-11 14:49:11 +01:00
Kalev Lember
3c54cb8785 Update to 3.27.92 2018-03-11 14:48:25 +01:00
Michael Catanzaro
314289569d Adjust the glob a bit 2018-02-19 06:45:14 -06:00
Michael Catanzaro
2015c45515 Tighten up files list wildcard
Build should fail if the first component of the soname changes, so that
fedora-devel can be notified.
2018-02-18 21:08:29 -06:00
Bastien Nocera
ef2883e28e Remove merged patch
Patch was merged in:
https://bugzilla.gnome.org/show_bug.cgi?id=787664
2018-02-10 14:58:30 +01:00
Bastien Nocera
d991ae3601 + gnome-desktop3-3.27.90-1
Update to 3.27.90
2018-02-10 14:33:58 +01:00
Fedora Release Engineering
ab1f912e6a - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-07 13:17:59 +00:00
Kalev Lember
d23a073623 Update to 3.26.2 2017-11-01 22:13:34 +01:00
Kalev Lember
86bb6de781 Update to 3.26.1 2017-10-06 22:57:44 +02:00
Kalev Lember
d12ea174b5 Update to 3.26.0 2017-09-11 17:53:32 +02:00
Kalev Lember
32f5eec777 Drop unused build deps 2017-09-07 09:26:19 +02:00
Kalev Lember
327248f578 Sort requires 2017-09-07 09:21:18 +02:00
Kalev Lember
729fb5aa98 Avoid build depending on git
We don't have a massive downstream patch collection that requires git to
manage patches. %autosetup -p1 works just as fine for most patches we
need to apply.
2017-09-07 09:17:03 +02:00
Kalev Lember
2025e00d31 Update to 3.25.92 2017-09-07 09:14:52 +02:00
Bastien Nocera
04c9b658d2 Remove upstreamed patches 2017-08-24 17:04:58 +02:00
Bastien Nocera
9b56247817 + gnome-desktop3-3.25.91.1-1
Update to 3.25.91.1
2017-08-24 16:52:42 +02:00
5 changed files with 62 additions and 199 deletions

11
.gitignore vendored
View File

@ -124,3 +124,14 @@ gnome-desktop-2.90.4.tar.bz2
/gnome-desktop-3.25.3.tar.xz
/gnome-desktop-3.25.4.tar.xz
/gnome-desktop-3.25.90.tar.xz
/gnome-desktop-3.25.91.1.tar.xz
/gnome-desktop-3.25.92.tar.xz
/gnome-desktop-3.26.0.tar.xz
/gnome-desktop-3.26.1.tar.xz
/gnome-desktop-3.26.2.tar.xz
/gnome-desktop-3.27.90.tar.xz
/gnome-desktop-3.27.92.tar.xz
/gnome-desktop-3.28.0.tar.xz
/gnome-desktop-3.28.1.tar.xz
/gnome-desktop-3.28.2.tar.xz
/gnome-desktop-3.29.90.1.tar.xz

View File

@ -1,26 +0,0 @@
From 5d478332677df7e428f82d4de0fe9ae4368d9554 Mon Sep 17 00:00:00 2001
From: Rui Matos <tiagomatos@gmail.com>
Date: Tue, 14 May 2013 13:24:09 +0200
Subject: [PATCH] default-input-sources: Switch ja_JP default to ibus-kkc
This should be the default ibus engine for Japanese in F19.
---
libgnome-desktop/default-input-sources.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libgnome-desktop/default-input-sources.h b/libgnome-desktop/default-input-sources.h
index c38e339..bb0b8b8 100644
--- a/libgnome-desktop/default-input-sources.h
+++ b/libgnome-desktop/default-input-sources.h
@@ -30,7 +30,7 @@ static DefaultInputSource default_input_sources[] =
{ "he_IL", "xkb", "il" },
{ "hi_IN", "ibus", "m17n:hi:inscript" },
{ "it_IT", "xkb", "it" },
- { "ja_JP", "ibus", "anthy" },
+ { "ja_JP", "ibus", "kkc" },
{ "kn_IN", "ibus", "m17n:kn:kgp" },
{ "ko_KR", "ibus", "hangul" },
{ "mai_IN", "ibus", "m17n:mai:inscript" },
--
1.8.1.4

View File

@ -1,155 +0,0 @@
From b5a674a757d4ad934eb505f4e3c50ee1180f3693 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 8 Aug 2017 19:12:51 +0200
Subject: [PATCH 1/3] thumbnail: Don't crash if the thumbnailer could not be
setup
script_exec_new() can fail in certain cases, and we should not crash
when trying to expand the script command later if the initial setup
failed.
https://bugzilla.gnome.org/show_bug.cgi?id=785963
---
libgnome-desktop/gnome-desktop-thumbnail-script.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
index 5a5f05f4..d9437d40 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
@@ -657,6 +657,9 @@ child_setup (gpointer user_data)
static void
script_exec_free (ScriptExec *exec)
{
+ if (exec == NULL)
+ return;
+
g_free (exec->infile);
if (exec->outfile)
{
@@ -757,6 +760,8 @@ gnome_desktop_thumbnail_script_exec (const char *cmd,
ScriptExec *exec;
exec = script_exec_new (uri);
+ if (!exec)
+ goto out;
expanded_script = expand_thumbnailing_cmd (cmd, exec, size, error);
if (expanded_script == NULL)
goto out;
--
2.13.4
From 99df9a83a36882d8a666176d9452283ae065d014 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 8 Aug 2017 19:14:09 +0200
Subject: [PATCH 2/3] thumbnail: Report errors when script_exec_new() fails
Makes it easier to debug.
https://bugzilla.gnome.org/show_bug.cgi?id=785963
---
libgnome-desktop/gnome-desktop-thumbnail-script.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/libgnome-desktop/gnome-desktop-thumbnail-script.c b/libgnome-desktop/gnome-desktop-thumbnail-script.c
index d9437d40..1012efa8 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail-script.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail-script.c
@@ -687,7 +687,8 @@ clear_fd (gpointer data)
}
static ScriptExec *
-script_exec_new (const char *uri)
+script_exec_new (const char *uri,
+ GError **error)
{
ScriptExec *exec;
g_autoptr(GFile) file = NULL;
@@ -705,7 +706,11 @@ script_exec_new (const char *uri)
exec->infile = g_file_get_path (file);
if (!exec->infile)
- goto bail;
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND,
+ "Could not get path for URI '%s'", uri);
+ goto bail;
+ }
#ifdef HAVE_BWRAP
if (exec->sandbox)
@@ -719,7 +724,11 @@ script_exec_new (const char *uri)
tmpl = g_strdup ("/tmp/gnome-desktop-thumbnailer-XXXXXX");
exec->outdir = g_mkdtemp (tmpl);
if (!exec->outdir)
- goto bail;
+ {
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Could not create temporary sandbox directory");
+ goto bail;
+ }
exec->outfile = g_build_filename (exec->outdir, "gnome-desktop-thumbnailer.png", NULL);
ext = get_extension (exec->infile);
@@ -732,7 +741,7 @@ script_exec_new (const char *uri)
int fd;
g_autofree char *tmpname = NULL;
- fd = g_file_open_tmp (".gnome_desktop_thumbnail.XXXXXX", &tmpname, NULL);
+ fd = g_file_open_tmp (".gnome_desktop_thumbnail.XXXXXX", &tmpname, error);
if (fd == -1)
goto bail;
close (fd);
@@ -759,7 +768,7 @@ gnome_desktop_thumbnail_script_exec (const char *cmd,
GBytes *image = NULL;
ScriptExec *exec;
- exec = script_exec_new (uri);
+ exec = script_exec_new (uri, error);
if (!exec)
goto out;
expanded_script = expand_thumbnailing_cmd (cmd, exec, size, error);
--
2.13.4
From f96041679f46ece036d742bde7d78afc67d73519 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@hadess.net>
Date: Tue, 8 Aug 2017 19:20:31 +0200
Subject: [PATCH 3/3] thumbnail: And print those errors in the debug
https://bugzilla.gnome.org/show_bug.cgi?id=785963
---
libgnome-desktop/gnome-desktop-thumbnail.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/libgnome-desktop/gnome-desktop-thumbnail.c b/libgnome-desktop/gnome-desktop-thumbnail.c
index 73751f69..866fc7d2 100644
--- a/libgnome-desktop/gnome-desktop-thumbnail.c
+++ b/libgnome-desktop/gnome-desktop-thumbnail.c
@@ -1066,13 +1066,20 @@ gnome_desktop_thumbnail_factory_generate_thumbnail (GnomeDesktopThumbnailFactory
if (script)
{
GBytes *data;
+ GError *error = NULL;
- data = gnome_desktop_thumbnail_script_exec (script, size, uri, NULL);
+ data = gnome_desktop_thumbnail_script_exec (script, size, uri, &error);
if (data)
{
pixbuf = pixbuf_new_from_bytes (data, NULL);
g_bytes_unref (data);
}
+ else
+ {
+ g_debug ("Thumbnail script ('%s') failed for '%s': %s",
+ script, uri, error ? error->message : "no details");
+ g_clear_error (&error);
+ }
}
g_free (script);
--
2.13.4

View File

@ -2,22 +2,18 @@
%global gtk3_version 3.3.6
%global glib2_version 2.53.0
%global gtk_doc_version 1.14
%global gsettings_desktop_schemas_version 3.5.91
%global gsettings_desktop_schemas_version 3.27.0
%global po_package gnome-desktop-3.0
Name: gnome-desktop3
Version: 3.25.90
Version: 3.29.90.1
Release: 1%{?dist}
Summary: Shared code among gnome-panel, gnome-session, nautilus, etc
License: GPLv2+ and LGPLv2+
URL: http://www.gnome.org
Source0: http://download.gnome.org/sources/gnome-desktop/3.25/gnome-desktop-%{version}.tar.xz
Patch0: 0001-default-input-sources-Switch-ja_JP-default-to-ibus-k.patch
# Post-release fixes
Patch1: gnome-desktop-3.25.90-thumbnailer-sandbox-fixes.patch
Source0: http://download.gnome.org/sources/gnome-desktop/3.29/gnome-desktop-%{version}.tar.xz
BuildRequires: gnome-common
BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf2_version}
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
@ -25,22 +21,21 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(iso-codes)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(xkeyboard-config)
BuildRequires: pkgconfig(libseccomp)
BuildRequires: gettext
BuildRequires: gtk-doc >= %{gtk_doc_version}
BuildRequires: automake autoconf libtool intltool
BuildRequires: intltool
BuildRequires: itstool
BuildRequires: git
Requires: bubblewrap
Requires: gdk-pixbuf2%{?_isa} >= %{gdk_pixbuf2_version}
Requires: glib2%{?_isa} >= %{glib2_version}
# Make sure that gnome-themes-standard gets pulled in for upgrades
Requires: gnome-themes-standard
# needed for GnomeWallClock
Requires: gsettings-desktop-schemas >= %{gsettings_desktop_schemas_version}
Requires: bubblewrap
# GnomeIdleMonitor API change breaks older gnome-shell versions
Conflicts: gnome-shell < 3.7.90
@ -75,7 +70,7 @@ The %{name}-tests package contains tests that can be used to verify
the functionality of the installed %{name} package.
%prep
%autosetup -p1 -S git -n gnome-desktop-%{version}
%autosetup -p1 -n gnome-desktop-%{version}
%build
%configure --enable-installed-tests
@ -89,17 +84,13 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%find_lang %{po_package} --all-name --with-gnome
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files -f %{po_package}.lang
%doc AUTHORS NEWS README
%license COPYING COPYING.LIB
%{_datadir}/gnome/gnome-version.xml
%{_libexecdir}/gnome-rr-debug
# LGPL
%{_libdir}/lib*.so.*
%{_libdir}/libgnome-desktop-3.so.17{,.*}
%{_libdir}/girepository-1.0/GnomeDesktop-3.0.typelib
%files devel
@ -116,6 +107,48 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%{_datadir}/installed-tests
%changelog
* Sun Aug 12 2018 Kalev Lember <klember@redhat.com> - 3.29.90.1-1
- Update to 3.29.90.1
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu May 10 2018 Kalev Lember <klember@redhat.com> - 3.28.2-1
- Update to 3.28.2
* Wed Apr 11 2018 Kalev Lember <klember@redhat.com> - 3.28.1-1
- Update to 3.28.1
* Mon Mar 12 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
- Update to 3.28.0
* Sun Mar 11 2018 Kalev Lember <klember@redhat.com> - 3.27.92-1
- Update to 3.27.92
- Remove ldconfig scriptlets
* Sat Feb 10 2018 Bastien Nocera <bnocera@redhat.com> - 3.27.90-1
+ gnome-desktop3-3.27.90-1
- Update to 3.27.90
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.26.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Nov 01 2017 Kalev Lember <klember@redhat.com> - 3.26.2-1
- Update to 3.26.2
* Fri Oct 06 2017 Kalev Lember <klember@redhat.com> - 3.26.1-1
- Update to 3.26.1
* Mon Sep 11 2017 Kalev Lember <klember@redhat.com> - 3.26.0-1
- Update to 3.26.0
* Thu Sep 07 2017 Kalev Lember <klember@redhat.com> - 3.25.92-1
- Update to 3.25.92
* Thu Aug 24 2017 Bastien Nocera <bnocera@redhat.com> - 3.25.91.1-1
+ gnome-desktop3-3.25.91.1-1
- Update to 3.25.91.1
* Wed Aug 09 2017 Bastien Nocera <bnocera@redhat.com> - 3.25.90-1
+ gnome-desktop3-3.25.90-1
- Update to 3.25.90

View File

@ -1 +1 @@
SHA512 (gnome-desktop-3.25.90.tar.xz) = f9ed616e7cd13c5eefcc367dca37ac72220a5a32c6a61ca05e1a407e41b20453e3741e04605b9243c6c2b499db18bf7142c32fb49e99a8e4af0ae25c488f9230
SHA512 (gnome-desktop-3.29.90.1.tar.xz) = a5d9920ea9d74dff6ea7fde8096b744f600ca4a91b5019948838fa189d8060e348072339b1ad7cd9c53a2b93d601c122f25923f56b1d00190271eec7046e7e4e