Update to 3.25.90
- Switch to the meson build system
This commit is contained in:
Kalev Lember
parent
49f55000ba
commit
517dda4477
1
.gitignore
vendored
1
.gitignore
vendored
@ -24,3 +24,4 @@
|
||||
/gnome-font-viewer-3.22.0.tar.xz
|
||||
/gnome-font-viewer-3.23.91.tar.xz
|
||||
/gnome-font-viewer-3.24.0.tar.xz
|
||||
/gnome-font-viewer-3.25.90.tar.xz
|
||||
|
||||
@ -1,36 +0,0 @@
|
||||
From 0beb4d974d87eb4d5c6175143e6a6c3534feb38a Mon Sep 17 00:00:00 2001
|
||||
From: Cosimo Cecchi <cosimoc@gnome.org>
|
||||
Date: Wed, 17 May 2017 12:11:56 -0700
|
||||
Subject: font-view: ensure the window exists when opening a file
|
||||
|
||||
We refactored the initialization path, but forgot a case where the
|
||||
window needs to be created during startup.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=782738
|
||||
---
|
||||
src/font-view.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/font-view.c b/src/font-view.c
|
||||
index 21aebf4..4a216c2 100644
|
||||
--- a/src/font-view.c
|
||||
+++ b/src/font-view.c
|
||||
@@ -88,6 +88,7 @@ static const GOptionEntry goption_options[] =
|
||||
G_DEFINE_TYPE (FontViewApplication, font_view_application, GTK_TYPE_APPLICATION);
|
||||
|
||||
static void font_view_application_do_overview (FontViewApplication *self);
|
||||
+static void ensure_window (FontViewApplication *self);
|
||||
|
||||
#define VIEW_ITEM_WIDTH 140
|
||||
#define VIEW_ITEM_WRAP_WIDTH 128
|
||||
@@ -737,6 +738,7 @@ query_info_ready_cb (GObject *object,
|
||||
GFileInfo *info;
|
||||
GError *error = NULL;
|
||||
|
||||
+ ensure_window (self);
|
||||
g_application_release (G_APPLICATION (self));
|
||||
|
||||
info = g_file_query_info_finish (G_FILE (object), res, &error);
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,37 +0,0 @@
|
||||
From 51d9b31c07876857d105fa81d16c162b13aa8c3e Mon Sep 17 00:00:00 2001
|
||||
From: Cosimo Cecchi <cosimoc@gnome.org>
|
||||
Date: Wed, 17 May 2017 12:11:17 -0700
|
||||
Subject: font-view: make sure to hold the GApplication while doing async init
|
||||
|
||||
Otherwise the application will shutdown during the query_info call.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=782738
|
||||
---
|
||||
src/font-view.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/font-view.c b/src/font-view.c
|
||||
index 898e53b..21aebf4 100644
|
||||
--- a/src/font-view.c
|
||||
+++ b/src/font-view.c
|
||||
@@ -737,6 +737,8 @@ query_info_ready_cb (GObject *object,
|
||||
GFileInfo *info;
|
||||
GError *error = NULL;
|
||||
|
||||
+ g_application_release (G_APPLICATION (self));
|
||||
+
|
||||
info = g_file_query_info_finish (G_FILE (object), res, &error);
|
||||
if (error != NULL) {
|
||||
font_view_application_do_overview (self);
|
||||
@@ -756,6 +758,8 @@ font_view_application_open (GApplication *application,
|
||||
const gchar *hint)
|
||||
{
|
||||
FontViewApplication *self = FONT_VIEW_APPLICATION (application);
|
||||
+
|
||||
+ g_application_hold (application);
|
||||
g_file_query_info_async (files[0], G_FILE_ATTRIBUTE_STANDARD_NAME,
|
||||
G_FILE_QUERY_INFO_NONE,
|
||||
G_PRIORITY_DEFAULT, NULL,
|
||||
--
|
||||
cgit v0.12
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
%global release_version %(echo %{version} | awk -F. '{print $1"."$2}')
|
||||
|
||||
Name: gnome-font-viewer
|
||||
Version: 3.24.0
|
||||
Release: 4%{?dist}
|
||||
Version: 3.25.90
|
||||
Release: 1%{?dist}
|
||||
Summary: Utility for previewing fonts for GNOME
|
||||
|
||||
License: GPLv2+
|
||||
@ -10,14 +10,12 @@ License: GPLv2+
|
||||
URL: http://www.gnome.org/gnome-3/
|
||||
Source0: http://ftp.gnome.org/pub/GNOME/sources/gnome-font-viewer/%{release_version}/%{name}-%{version}.tar.xz
|
||||
|
||||
Patch0: font-view-hold-application.patch
|
||||
Patch1: font-view-ensure-window-exists.patch
|
||||
|
||||
BuildRequires: gnome-desktop3-devel
|
||||
BuildRequires: gtk3-devel
|
||||
BuildRequires: intltool
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libappstream-glib
|
||||
BuildRequires: meson
|
||||
|
||||
%description
|
||||
Use gnome-font-viewer, the Font Viewer, to preview fonts and display
|
||||
@ -28,12 +26,11 @@ name, style, type, size, version and copyright of the font.
|
||||
%autosetup -p1
|
||||
|
||||
%build
|
||||
%configure --disable-silent-rules
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%make_install
|
||||
%meson_install
|
||||
|
||||
%find_lang %{name} --with-gnome
|
||||
|
||||
@ -49,16 +46,18 @@ update-desktop-database &> /dev/null || :
|
||||
%files -f %{name}.lang
|
||||
%license COPYING
|
||||
%doc NEWS
|
||||
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/gnome-thumbnail-font
|
||||
%{_datadir}/appdata/org.gnome.font-viewer.appdata.xml
|
||||
%{_datadir}/applications/org.gnome.font-viewer.desktop
|
||||
%{_datadir}/dbus-1/services/org.gnome.font-viewer.service
|
||||
%{_datadir}/metainfo/org.gnome.font-viewer.appdata.xml
|
||||
%{_datadir}/thumbnailers/%{name}.thumbnailer
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 15 2017 Kalev Lember <klember@redhat.com> - 3.25.90-1
|
||||
- Update to 3.25.90
|
||||
- Switch to the meson build system
|
||||
|
||||
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.24.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (gnome-font-viewer-3.24.0.tar.xz) = b951e98161dde808aaea0666c0266a3381c82a264dc7280fcd4e4debcf07bd44c940e738a2dd5134276625e404f87323f57930764ed2faeedad831ba6a8bb591
|
||||
SHA512 (gnome-font-viewer-3.25.90.tar.xz) = ebe3cd71440aba8cbdfd0d0a102d693e80f3b8b234105c4f2d1138cc970855d12f25dd44110a573aab3a31731179c8789532c561b2bf75ba1ee1bc8bcab446ca
|
||||
|
||||
Loading…
Reference in New Issue
Block a user