Update to 3.92.1
This commit is contained in:
parent
5d5c7419b3
commit
36a0dd29c0
|
@ -1 +1,2 @@
|
|||
/gtk+-3.91.2.tar.xz
|
||||
/gtk+-3.92.1.tar.xz
|
||||
|
|
|
@ -0,0 +1,40 @@
|
|||
From 46f475664d66e25f0cc4212786c441f929a91d05 Mon Sep 17 00:00:00 2001
|
||||
From: Emmanuele Bassi <ebassi@gnome.org>
|
||||
Date: Tue, 24 Oct 2017 16:58:06 +0100
|
||||
Subject: [PATCH] Add a return value
|
||||
|
||||
When building with G_DISABLE_ASSERT, the g_assert_not_reached()
|
||||
statement won't do anything, and we're going to fall through, and the
|
||||
compiler will emit a warning that we're not returning anything from a
|
||||
function with a return value.
|
||||
---
|
||||
gdk/wayland/gdkwindow-wayland.c | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c
|
||||
index bb15eb18201b..2d738a63ca5e 100644
|
||||
--- a/gdk/wayland/gdkwindow-wayland.c
|
||||
+++ b/gdk/wayland/gdkwindow-wayland.c
|
||||
@@ -1617,6 +1617,9 @@ rect_anchor_to_anchor (GdkGravity rect_anchor)
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
+
|
||||
+ return (ZXDG_POSITIONER_V6_ANCHOR_TOP |
|
||||
+ ZXDG_POSITIONER_V6_ANCHOR_LEFT);
|
||||
}
|
||||
|
||||
static enum zxdg_positioner_v6_gravity
|
||||
@@ -1650,6 +1653,9 @@ window_anchor_to_gravity (GdkGravity rect_anchor)
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
+
|
||||
+ return (ZXDG_POSITIONER_V6_GRAVITY_BOTTOM |
|
||||
+ ZXDG_POSITIONER_V6_GRAVITY_RIGHT);
|
||||
}
|
||||
|
||||
static GdkWindow *
|
||||
--
|
||||
2.14.2
|
||||
|
|
@ -0,0 +1,82 @@
|
|||
From 8549e62d8595bb6f94b51f2051f8542e357f236b Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Otte <otte@redhat.com>
|
||||
Date: Tue, 24 Oct 2017 18:13:45 +0200
|
||||
Subject: [PATCH] Add default return values to switch statements
|
||||
|
||||
We are using g_assert_not_reached() without doing anything, assuming it
|
||||
aborts the program. In release builds however, it is ignored.
|
||||
---
|
||||
gdk/x11/gdkdevicemanager-core-x11.c | 2 ++
|
||||
gdk/x11/gdkdevicemanager-xi2.c | 2 ++
|
||||
gtk/gtkcssselector.c | 1 +
|
||||
gtk/inspector/general.c | 2 +-
|
||||
4 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
|
||||
index 350a79b03f0e..dd8613e3fddc 100644
|
||||
--- a/gdk/x11/gdkdevicemanager-core-x11.c
|
||||
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
|
||||
@@ -265,6 +265,7 @@ translate_crossing_mode (int mode)
|
||||
return GDK_CROSSING_UNGRAB;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
+ return GDK_CROSSING_NORMAL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -285,6 +286,7 @@ translate_notify_type (int detail)
|
||||
return GDK_NOTIFY_NONLINEAR_VIRTUAL;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
+ return GDK_NOTIFY_UNKONWN;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
|
||||
index 8779c65a7245..758513e4dbd7 100644
|
||||
--- a/gdk/x11/gdkdevicemanager-xi2.c
|
||||
+++ b/gdk/x11/gdkdevicemanager-xi2.c
|
||||
@@ -1068,6 +1068,7 @@ translate_crossing_mode (gint mode)
|
||||
/* Fall through, unexpected in pointer crossing events */
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
+ return GDK_CROSSING_NORMAL;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1088,6 +1089,7 @@ translate_notify_type (gint detail)
|
||||
return GDK_NOTIFY_NONLINEAR_VIRTUAL;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
+ return GDK_NOTIFY_UNKONWN;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/gtk/gtkcssselector.c b/gtk/gtkcssselector.c
|
||||
index 241a69023039..961e78ea5c86 100644
|
||||
--- a/gtk/gtkcssselector.c
|
||||
+++ b/gtk/gtkcssselector.c
|
||||
@@ -876,6 +876,7 @@ change_pseudoclass_position (const GtkCssSelector *selector)
|
||||
return GTK_CSS_CHANGE_FIRST_CHILD | GTK_CSS_CHANGE_LAST_CHILD;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
+ return 0;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
|
||||
index 2e7e21207bec..62404a05c6aa 100644
|
||||
--- a/gtk/inspector/general.c
|
||||
+++ b/gtk/inspector/general.c
|
||||
@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
|
||||
case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
|
||||
case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
|
||||
case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
|
||||
- default: g_assert_not_reached ();
|
||||
+ default: g_assert_not_reached (); return "none;
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.14.2
|
||||
|
|
@ -0,0 +1,54 @@
|
|||
From 373b407bd26a940072173e0a509038185b63e936 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Otte <otte@redhat.com>
|
||||
Date: Tue, 24 Oct 2017 18:26:08 +0200
|
||||
Subject: [PATCH] Fix build
|
||||
|
||||
Don't do two things at once and forget to run ninja before pushing.
|
||||
---
|
||||
gdk/x11/gdkdevicemanager-core-x11.c | 2 +-
|
||||
gdk/x11/gdkdevicemanager-xi2.c | 2 +-
|
||||
gtk/inspector/general.c | 2 +-
|
||||
3 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c
|
||||
index dd8613e3fddc..c662d215ce90 100644
|
||||
--- a/gdk/x11/gdkdevicemanager-core-x11.c
|
||||
+++ b/gdk/x11/gdkdevicemanager-core-x11.c
|
||||
@@ -286,7 +286,7 @@ translate_notify_type (int detail)
|
||||
return GDK_NOTIFY_NONLINEAR_VIRTUAL;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
- return GDK_NOTIFY_UNKONWN;
|
||||
+ return GDK_NOTIFY_UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/gdk/x11/gdkdevicemanager-xi2.c b/gdk/x11/gdkdevicemanager-xi2.c
|
||||
index 758513e4dbd7..56fb2c8b25e5 100644
|
||||
--- a/gdk/x11/gdkdevicemanager-xi2.c
|
||||
+++ b/gdk/x11/gdkdevicemanager-xi2.c
|
||||
@@ -1089,7 +1089,7 @@ translate_notify_type (gint detail)
|
||||
return GDK_NOTIFY_NONLINEAR_VIRTUAL;
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
- return GDK_NOTIFY_UNKONWN;
|
||||
+ return GDK_NOTIFY_UNKNOWN;
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
|
||||
index 62404a05c6aa..45a386e56bd6 100644
|
||||
--- a/gtk/inspector/general.c
|
||||
+++ b/gtk/inspector/general.c
|
||||
@@ -501,7 +501,7 @@ translate_subpixel_layout (GdkSubpixelLayout subpixel)
|
||||
case GDK_SUBPIXEL_LAYOUT_HORIZONTAL_BGR: return "horizontal bgr";
|
||||
case GDK_SUBPIXEL_LAYOUT_VERTICAL_RGB: return "vertical rgb";
|
||||
case GDK_SUBPIXEL_LAYOUT_VERTICAL_BGR: return "vertical bgr";
|
||||
- default: g_assert_not_reached (); return "none;
|
||||
+ default: g_assert_not_reached (); return "none";
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.14.2
|
||||
|
|
@ -0,0 +1,86 @@
|
|||
From fda120ceece7b15daee81430a45ca795719eecca Mon Sep 17 00:00:00 2001
|
||||
From: Marek Kasik <mkasik@redhat.com>
|
||||
Date: Thu, 19 Oct 2017 13:59:58 +0200
|
||||
Subject: [PATCH] printing: Install printbackends
|
||||
|
||||
Add "install : true" for each printbackend so that they are installed.
|
||||
|
||||
https://bugzilla.gnome.org/show_bug.cgi?id=789185
|
||||
---
|
||||
modules/printbackends/cloudprint/meson.build | 3 ++-
|
||||
modules/printbackends/cups/meson.build | 3 ++-
|
||||
modules/printbackends/file/meson.build | 3 ++-
|
||||
modules/printbackends/lpr/meson.build | 3 ++-
|
||||
modules/printbackends/papi/meson.build | 3 ++-
|
||||
modules/printbackends/test/meson.build | 3 ++-
|
||||
6 files changed, 12 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/modules/printbackends/cloudprint/meson.build b/modules/printbackends/cloudprint/meson.build
|
||||
index c6193f4c0388..f5217cbc46ca 100644
|
||||
--- a/modules/printbackends/cloudprint/meson.build
|
||||
+++ b/modules/printbackends/cloudprint/meson.build
|
||||
@@ -7,4 +7,5 @@ shared_module('printbackend-cloudprint',
|
||||
'-DGTK_DISABLE_DEPRECATION_WARNINGS',
|
||||
],
|
||||
dependencies: [ libgtk_dep, rest_dep, json_glib_dep ],
|
||||
- install_dir: printbackends_install_dir)
|
||||
+ install_dir: printbackends_install_dir,
|
||||
+ install : true)
|
||||
diff --git a/modules/printbackends/cups/meson.build b/modules/printbackends/cups/meson.build
|
||||
index e69788d9f3c6..a6f83d51e7fa 100644
|
||||
--- a/modules/printbackends/cups/meson.build
|
||||
+++ b/modules/printbackends/cups/meson.build
|
||||
@@ -18,4 +18,5 @@ shared_module('printbackend-cups',
|
||||
'-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
|
||||
],
|
||||
dependencies: [libgtk_dep, libcups, colord_dep],
|
||||
- install_dir: printbackends_install_dir)
|
||||
+ install_dir: printbackends_install_dir,
|
||||
+ install : true)
|
||||
diff --git a/modules/printbackends/file/meson.build b/modules/printbackends/file/meson.build
|
||||
index 52ab3a34226b..b1604be0f653 100644
|
||||
--- a/modules/printbackends/file/meson.build
|
||||
+++ b/modules/printbackends/file/meson.build
|
||||
@@ -6,4 +6,5 @@ shared_module('printbackend-file',
|
||||
'-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
|
||||
],
|
||||
dependencies: libgtk_dep,
|
||||
- install_dir: printbackends_install_dir)
|
||||
+ install_dir: printbackends_install_dir,
|
||||
+ install : true)
|
||||
diff --git a/modules/printbackends/lpr/meson.build b/modules/printbackends/lpr/meson.build
|
||||
index 95a982df8da2..581ca77a4803 100644
|
||||
--- a/modules/printbackends/lpr/meson.build
|
||||
+++ b/modules/printbackends/lpr/meson.build
|
||||
@@ -6,4 +6,5 @@ shared_module('printbackend-lpr',
|
||||
'-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
|
||||
],
|
||||
dependencies: libgtk_dep,
|
||||
- install_dir: printbackends_install_dir)
|
||||
+ install_dir: printbackends_install_dir,
|
||||
+ install : true)
|
||||
diff --git a/modules/printbackends/papi/meson.build b/modules/printbackends/papi/meson.build
|
||||
index feef64068c38..647234ef4f34 100644
|
||||
--- a/modules/printbackends/papi/meson.build
|
||||
+++ b/modules/printbackends/papi/meson.build
|
||||
@@ -6,4 +6,5 @@ shared_module('printbackend-papi',
|
||||
'-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
|
||||
],
|
||||
dependencies: [libgtk_dep, libpapi],
|
||||
- install_dir: printbackends_install_dir)
|
||||
+ install_dir: printbackends_install_dir,
|
||||
+ install : true)
|
||||
diff --git a/modules/printbackends/test/meson.build b/modules/printbackends/test/meson.build
|
||||
index a8df4fe34208..29cf00b6ffae 100644
|
||||
--- a/modules/printbackends/test/meson.build
|
||||
+++ b/modules/printbackends/test/meson.build
|
||||
@@ -6,4 +6,5 @@ shared_module('printbackend-test',
|
||||
'-DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED',
|
||||
],
|
||||
dependencies: libgtk_dep,
|
||||
- install_dir: printbackends_install_dir)
|
||||
+ install_dir: printbackends_install_dir,
|
||||
+ install : true)
|
||||
--
|
||||
2.14.2
|
||||
|
61
gtk4.spec
61
gtk4.spec
|
@ -6,7 +6,7 @@
|
|||
# File conflicts between gtk3-tests and gtk4-tests
|
||||
%global build_installed_tests 0
|
||||
|
||||
%global glib2_version 2.53.0
|
||||
%global glib2_version 2.53.7
|
||||
%global pango_version 1.37.3
|
||||
%global atk_version 2.15.1
|
||||
%global cairo_version 1.14.0
|
||||
|
@ -21,18 +21,25 @@
|
|||
%global __provides_exclude_from ^%{_libdir}/gtk-4.0
|
||||
|
||||
Name: gtk4
|
||||
Version: 3.91.2
|
||||
Version: 3.92.1
|
||||
Release: 1%{?dist}
|
||||
Summary: GTK+ graphical user interface library
|
||||
|
||||
License: LGPLv2+
|
||||
URL: http://www.gtk.org
|
||||
Source0: http://download.gnome.org/sources/gtk+/3.91/gtk+-%{version}.tar.xz
|
||||
Source0: http://download.gnome.org/sources/gtk+/3.92/gtk+-%{version}.tar.xz
|
||||
# Build fixes backported from upstream
|
||||
Patch0: 0001-Add-default-return-values-to-switch-statements.patch
|
||||
Patch1: 0001-Fix-build.patch
|
||||
Patch2: 0001-Add-a-return-value.patch
|
||||
# Fix installing printbackends, backported from upstream
|
||||
Patch3: 0001-printing-Install-printbackends.patch
|
||||
|
||||
BuildRequires: cups-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: gettext
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig(atk) >= %{atk_version}
|
||||
BuildRequires: pkgconfig(atk-bridge-2.0)
|
||||
BuildRequires: pkgconfig(avahi-gobject)
|
||||
|
@ -148,37 +155,35 @@ the functionality of the installed %{name} package.
|
|||
|
||||
%prep
|
||||
%setup -q -n gtk+-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
||||
%build
|
||||
export CFLAGS='-fno-strict-aliasing %optflags'
|
||||
%configure \
|
||||
--enable-xkb \
|
||||
--enable-xinerama \
|
||||
--enable-xrandr \
|
||||
--enable-xfixes \
|
||||
--enable-xcomposite \
|
||||
--enable-xdamage \
|
||||
--enable-x11-backend \
|
||||
%meson \
|
||||
-Denable-xinerama=yes \
|
||||
-Denable-x11-backend=true \
|
||||
%if 0%{?with_wayland}
|
||||
--enable-wayland-backend \
|
||||
-Denable-wayland-backend=true \
|
||||
%endif
|
||||
%if 0%{?with_broadway}
|
||||
--enable-broadway-backend \
|
||||
-Denable-broadway-backend=true \
|
||||
%endif
|
||||
--enable-colord \
|
||||
-Denable-colord=yes \
|
||||
-Ddocumentation=true \
|
||||
-Dman-pages=true \
|
||||
%if 0%{?build_installed_tests}
|
||||
--enable-installed-tests
|
||||
-Denable-installed-tests=true
|
||||
%else
|
||||
--disable-installed-tests
|
||||
-Denable-installed-tests=false
|
||||
%endif
|
||||
|
||||
# fight unused direct deps
|
||||
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
|
||||
|
||||
make %{?_smp_mflags}
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%make_install RUN_QUERY_IMMODULES_TEST=false
|
||||
%meson_install
|
||||
|
||||
%find_lang gtk40
|
||||
%find_lang gtk40-properties
|
||||
|
@ -189,9 +194,6 @@ make %{?_smp_mflags}
|
|||
|
||||
echo ".so man1/gtk4-query-immodules.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtk4-query-immodules-%{__isa_bits}.1
|
||||
|
||||
# Remove unpackaged files
|
||||
find $RPM_BUILD_ROOT -name '*.la' -delete
|
||||
|
||||
%if !0%{?with_broadway}
|
||||
rm $RPM_BUILD_ROOT%{_mandir}/man1/gtk4-broadwayd.1*
|
||||
%endif
|
||||
|
@ -230,7 +232,7 @@ gtk-query-immodules-4.0-%{__isa_bits} --update-cache &>/dev/null || :
|
|||
|
||||
%files -f gtk40.lang
|
||||
%license COPYING
|
||||
%doc AUTHORS NEWS README
|
||||
%doc AUTHORS NEWS README.md
|
||||
%{_bindir}/gtk4-query-immodules*
|
||||
%{_bindir}/gtk4-launch
|
||||
%{_bindir}/gtk4-update-icon-cache
|
||||
|
@ -243,17 +245,15 @@ gtk-query-immodules-4.0-%{__isa_bits} --update-cache &>/dev/null || :
|
|||
%{_libdir}/gtk-4.0/%{bin_version}/printbackends
|
||||
%{_libdir}/gtk-4.0/modules
|
||||
%{_libdir}/gtk-4.0/immodules
|
||||
%{_datadir}/themes/Default
|
||||
%{_datadir}/themes/Emacs
|
||||
%{_libdir}/girepository-1.0
|
||||
%ghost %{_libdir}/gtk-4.0/%{bin_version}/immodules.cache
|
||||
%{_mandir}/man1/gtk4-query-immodules*
|
||||
%{_mandir}/man1/gtk4-launch.1*
|
||||
%{_mandir}/man1/gtk4-update-icon-cache.1*
|
||||
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.EmojiChooser.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
|
||||
%if 0%{?with_broadway}
|
||||
%{_bindir}/gtk4-broadwayd
|
||||
%{_mandir}/man1/gtk4-broadwayd.1*
|
||||
|
@ -318,6 +318,9 @@ gtk-query-immodules-4.0-%{__isa_bits} --update-cache &>/dev/null || :
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Thu Nov 02 2017 Kalev Lember <klember@redhat.com> - 3.92.1-1
|
||||
- Update to 3.92.1
|
||||
|
||||
* Tue Aug 08 2017 Kalev Lember <klember@redhat.com> - 3.91.2-1
|
||||
- Update to 3.91.2
|
||||
|
||||
|
|
2
sources
2
sources
|
@ -1 +1 @@
|
|||
SHA512 (gtk+-3.91.2.tar.xz) = e89bedd1c6652af7756a398582a94abc6640504b0d97a5084841d582a05ae4ec7c2b2f0121f109d7a72e270d4786de080c3d36d5086e51d0e359858ae8a74a4f
|
||||
SHA512 (gtk+-3.92.1.tar.xz) = 50fd775df09595536ceb8c156aaf3e13170438aa8918b8a638d5f661791e9ff11cf072fb9bde9b2b6b2a3a75fec69a633c0170533478a2e7af33251ae8064ae2
|
||||
|
|
Loading…
Reference in New Issue