Update to 3.25.90

This commit is contained in:
Florian Müllner 2017-08-10 20:33:42 +02:00
parent a5ac57d706
commit 04adf33870
4 changed files with 8 additions and 58 deletions

1
.gitignore vendored
View File

@ -133,3 +133,4 @@ gnome-shell-2.31.5.tar.bz2
/gnome-shell-3.25.2.tar.xz /gnome-shell-3.25.2.tar.xz
/gnome-shell-3.25.3.tar.xz /gnome-shell-3.25.3.tar.xz
/gnome-shell-3.25.4.tar.xz /gnome-shell-3.25.4.tar.xz
/gnome-shell-3.25.90.tar.xz

View File

@ -1,6 +1,6 @@
Name: gnome-shell Name: gnome-shell
Version: 3.25.4 Version: 3.25.90
Release: 3%{?dist} Release: 1%{?dist}
Summary: Window management and application launching for GNOME Summary: Window management and application launching for GNOME
Group: User Interface/Desktops Group: User Interface/Desktops
@ -12,12 +12,11 @@ Source0: http://download.gnome.org/sources/gnome-shell/3.25/%{name}-%{ver
# Replace Epiphany with Firefox in the default favourite apps list # Replace Epiphany with Firefox in the default favourite apps list
Patch1: gnome-shell-favourite-apps-firefox.patch Patch1: gnome-shell-favourite-apps-firefox.patch
Patch2: meson-fixes.patch
%define gnome_bluetooth_version 1:3.9.0 %define gnome_bluetooth_version 1:3.9.0
%define gobject_introspection_version 1.45.4 %define gobject_introspection_version 1.45.4
%define gjs_version 1.47.0 %define gjs_version 1.47.0
%define mutter_version 3.25.1 %define mutter_version 3.25.90
%define gtk3_version 3.15.0 %define gtk3_version 3.15.0
%define eds_version 3.13.90 %define eds_version 3.13.90
%define gnome_desktop_version 3.7.90 %define gnome_desktop_version 3.7.90
@ -116,7 +115,6 @@ easy to use experience.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .firefox %patch1 -p1 -b .firefox
%patch2 -p1 -b .meson-fixes
%build %build
%meson %meson
@ -182,6 +180,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null
%{_mandir}/man1/%{name}.1.gz %{_mandir}/man1/%{name}.1.gz
%changelog %changelog
* Thu Aug 10 2017 Florian Müllner <fmuellner@redhat.com> - 3.25.90-1
- Update to 3.25.90
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.4-3 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

View File

@ -1,52 +0,0 @@
From ae0eeb0dcadcf5543d3cf2e8d2d1fa429d0af82c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 20 Jul 2017 01:43:38 +0200
Subject: [PATCH] build: Fix portal installation with meson
Gah, this fell through the cracks ...
diff --git a/data/meson.build b/data/meson.build
index 0fa87fbfc..6bc5ae08a 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -72,6 +72,7 @@ configure_file(
)
+install_data('gnome-shell.portal', install_dir: portaldir)
install_data('50-gnome-shell-system.xml', install_dir: keysdir)
diff --git a/meson.build b/meson.build
index 00a541da4..5f4c74700 100644
--- a/meson.build
+++ b/meson.build
@@ -53,6 +53,7 @@ desktopdir = join_paths(datadir, 'applications')
ifacedir = join_paths(datadir, 'dbus-1', 'interfaces')
localedir = join_paths(datadir, 'locale')
mozplugindir = join_paths(libdir, 'mozilla', 'plugins')
+portaldir = join_paths(datadir, 'xdg-desktop-portal', 'portals')
schemadir = join_paths(datadir, 'glib-2.0', 'schemas')
servicedir = join_paths(datadir, 'dbus-1', 'services')
From 2aceeac7e0e5ddd1deddb35e6bc24265ccdc1465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
Date: Thu, 20 Jul 2017 01:28:35 +0200
Subject: [PATCH] build: Update gvc subproject
Submodule subprojects/gvc 01e1fde6e..3f71aac04:
diff --git a/subprojects/gvc/meson.build b/subprojects/gvc/meson.build
index 7433f6e..238f608 100644
--- a/subprojects/gvc/meson.build
+++ b/subprojects/gvc/meson.build
@@ -21,7 +21,7 @@ libpulse_glib = dependency('libpulse-mainloop-glib')
cdata = configuration_data()
cdata.set_quoted('GETTEXT_PACKAGE', get_option('package-name'))
cdata.set_quoted('PACKAGE_VERSION', get_option('package-version'))
-cdata.set10('HAVE_ALSA', alsa.found())
+cdata.set('HAVE_ALSA', alsa.found())
config = configure_file(
input: 'config.h.meson',

View File

@ -1 +1 @@
SHA512 (gnome-shell-3.25.4.tar.xz) = 8e6b5adaffa428a3af12caf43aea4bac446772fffc1c735a4430b36f80693adb36731599f25b34f4af0aceb344ff459727e3f7b68514a1269b875c2791d0b3f4 SHA512 (gnome-shell-3.25.90.tar.xz) = 16a0bfc87d73d486ee72f1c54c9693389ab780f19c750ccf7397ce87a4147703391deb795bd983765100fd4892f020851e881ecf68e24676d5838cc06e075b68