diff --git a/.gitignore b/.gitignore index 12e8480..524e71d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /gtk+-3.91.2.tar.xz /gtk+-3.92.1.tar.xz +/gtk+-3.94.0.tar.xz diff --git a/0001-Add-a-return-value.patch b/0001-Add-a-return-value.patch deleted file mode 100644 index 1b07e9d..0000000 --- a/0001-Add-a-return-value.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 46f475664d66e25f0cc4212786c441f929a91d05 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi -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 - diff --git a/0001-Add-default-return-values-to-switch-statements.patch b/0001-Add-default-return-values-to-switch-statements.patch deleted file mode 100644 index 678d332..0000000 --- a/0001-Add-default-return-values-to-switch-statements.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 8549e62d8595bb6f94b51f2051f8542e357f236b Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -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 - diff --git a/0001-Fix-build.patch b/0001-Fix-build.patch deleted file mode 100644 index 5394c88..0000000 --- a/0001-Fix-build.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 373b407bd26a940072173e0a509038185b63e936 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -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 - diff --git a/0001-printing-Install-printbackends.patch b/0001-printing-Install-printbackends.patch deleted file mode 100644 index 3993204..0000000 --- a/0001-printing-Install-printbackends.patch +++ /dev/null @@ -1,86 +0,0 @@ -From fda120ceece7b15daee81430a45ca795719eecca Mon Sep 17 00:00:00 2001 -From: Marek Kasik -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 - diff --git a/gtk4.spec b/gtk4.spec index 470c109..2969d14 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -3,14 +3,14 @@ %global with_broadway 1 %endif -%global glib2_version 2.53.7 -%global pango_version 1.37.3 +%global glib2_version 2.55.0 +%global pango_version 1.41.0 %global atk_version 2.15.1 %global cairo_version 1.14.0 %global gdk_pixbuf_version 2.30.0 -%global wayland_version 1.9.91 -%global wayland_protocols_version 1.9 -%global epoxy_version 1.0 +%global wayland_protocols_version 1.12 +%global wayland_version 1.14.91 +%global epoxy_version 1.4 %global bin_version 4.0.0 @@ -18,26 +18,21 @@ %global __provides_exclude_from ^%{_libdir}/gtk-4.0 Name: gtk4 -Version: 3.92.1 -Release: 4%{?dist} +Version: 3.94.0 +Release: 1%{?dist} Summary: GTK+ graphical user interface library License: LGPLv2+ URL: http://www.gtk.org -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 +Source0: http://download.gnome.org/sources/gtk+/3.94/gtk+-%{version}.tar.xz -BuildRequires: meson >= 0.42.1 -BuildRequires: gcc BuildRequires: cups-devel BuildRequires: desktop-file-utils BuildRequires: gettext +BuildRequires: gcc +BuildRequires: gcc-c++ BuildRequires: gtk-doc +BuildRequires: meson BuildRequires: pkgconfig(atk) >= %{atk_version} BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(avahi-gobject) @@ -49,6 +44,7 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= %{gdk_pixbuf_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gobject-introspection-1.0) BuildRequires: pkgconfig(graphene-gobject-1.0) +BuildRequires: pkgconfig(gstreamer-player-1.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(pango) >= %{pango_version} BuildRequires: pkgconfig(rest-0.7) @@ -69,8 +65,6 @@ BuildRequires: pkgconfig(wayland-egl) >= %{wayland_version} BuildRequires: pkgconfig(wayland-protocols) >= %{wayland_protocols_version} BuildRequires: pkgconfig(xkbcommon) %endif -# For testing -BuildRequires: gcc-c++ # standard icons Requires: adwaita-icon-theme @@ -100,6 +94,10 @@ Recommends: dconf%{?_isa} Requires: dconf%{?_isa} %endif +# Removed in F29 +Obsoletes: gtk4-immodules < 3.94.0 +Obsoletes: gtk4-immodule-xim < 3.94.0 + %description GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for @@ -108,23 +106,6 @@ suites. This package contains version 4 of GTK+. -%package immodules -Summary: Input methods for GTK+ -Requires: gtk4%{?_isa} = %{version}-%{release} -# for im-cedilla.conf -Requires: gtk2-immodules%{?_isa} - -%description immodules -The gtk4-immodules package contains standalone input methods that -are shipped as part of GTK+ 4. - -%package immodule-xim -Summary: XIM support for GTK+ -Requires: gtk4%{?_isa} = %{version}-%{release} - -%description immodule-xim -The gtk4-immodule-xim package contains XIM support for GTK+ 4. - %package devel Summary: Development files for GTK+ Requires: gtk4%{?_isa} = %{version}-%{release} @@ -153,26 +134,22 @@ 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' %meson \ - -Denable-xinerama=yes \ - -Denable-x11-backend=true \ + -Dx11-backend=true \ %if 0%{?with_wayland} - -Denable-wayland-backend=true \ + -Dwayland-backend=true \ %endif %if 0%{?with_broadway} - -Denable-broadway-backend=true \ + -Dbroadway-backend=true \ %endif - -Denable-colord=yes \ + -Dxinerama=yes \ + -Dcolord=yes \ -Ddocumentation=true \ -Dman-pages=true \ - -Denable-installed-tests=true + -Dinstall-tests=true %meson_build @@ -182,21 +159,12 @@ export CFLAGS='-fno-strict-aliasing %optflags' %find_lang gtk40 %find_lang gtk40-properties -(cd $RPM_BUILD_ROOT%{_bindir} - mv gtk4-query-immodules gtk4-query-immodules-%{__isa_bits} -) - -echo ".so man1/gtk4-query-immodules.1" > $RPM_BUILD_ROOT%{_mandir}/man1/gtk4-query-immodules-%{__isa_bits}.1 - %if !0%{?with_broadway} rm $RPM_BUILD_ROOT%{_mandir}/man1/gtk4-broadwayd.1* %endif -touch $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/%{bin_version}/immodules.cache - mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gtk-4.0 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/modules -mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/immodules mkdir -p $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/%{bin_version}/theming-engines %check @@ -218,30 +186,19 @@ fi %posttrans devel gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%transfiletriggerin -- %{_libdir}/gtk-4.0/%{bin_version}/immodules -gtk4-query-immodules-%{__isa_bits} --update-cache &>/dev/null || : - -%transfiletriggerpostun -- %{_libdir}/gtk-4.0/%{bin_version}/immodules -gtk-query-immodules-4.0-%{__isa_bits} --update-cache &>/dev/null || : - %files -f gtk40.lang %license COPYING %doc AUTHORS NEWS README.md -%{_bindir}/gtk4-query-immodules* %{_bindir}/gtk4-launch %{_bindir}/gtk4-update-icon-cache %{_libdir}/libgtk-4.so.* %dir %{_libdir}/gtk-4.0 %dir %{_libdir}/gtk-4.0/%{bin_version} -%dir %{_datadir}/gtk-4.0 -%{_libdir}/gtk-4.0/%{bin_version}/theming-engines -%dir %{_libdir}/gtk-4.0/%{bin_version}/immodules -%{_libdir}/gtk-4.0/%{bin_version}/printbackends +%{_libdir}/gtk-4.0/%{bin_version}/media/ +%{_libdir}/gtk-4.0/%{bin_version}/printbackends/ +%{_libdir}/gtk-4.0/%{bin_version}/theming-engines/ %{_libdir}/gtk-4.0/modules -%{_libdir}/gtk-4.0/immodules %{_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.ColorChooser.gschema.xml @@ -253,25 +210,6 @@ gtk-query-immodules-4.0-%{__isa_bits} --update-cache &>/dev/null || : %{_mandir}/man1/gtk4-broadwayd.1* %endif -%files immodules -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-cedilla.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-am-et.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-cyrillic-translit.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-inuktitut.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-ipa.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-multipress.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-thai.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-ti-er.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-ti-et.so -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-viqr.so -%if 0%{?with_broadway} -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-broadway.so -%endif -%config(noreplace) %{_sysconfdir}/gtk-4.0/im-multipress.conf - -%files immodule-xim -%{_libdir}/gtk-4.0/%{bin_version}/immodules/im-xim.so - %files devel -f gtk40-properties.lang %{_libdir}/lib*.so %{_includedir}/* @@ -291,9 +229,12 @@ gtk-query-immodules-4.0-%{__isa_bits} --update-cache &>/dev/null || : %{_bindir}/gtk4-demo-application %{_bindir}/gtk4-widget-factory %{_datadir}/gettext/ +%dir %{_datadir}/gtk-4.0 %{_datadir}/gtk-4.0/gtkbuilder.rng %{_datadir}/gir-1.0 %{_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml +%{_datadir}/metainfo/org.gtk.Demo.appdata.xml +%{_datadir}/metainfo/org.gtk.WidgetFactory.appdata.xml %{_mandir}/man1/gtk4-builder-tool.1* %{_mandir}/man1/gtk4-demo.1* %{_mandir}/man1/gtk4-demo-application.1* @@ -308,8 +249,15 @@ gtk-query-immodules-4.0-%{__isa_bits} --update-cache &>/dev/null || : %files tests %dir %{_libexecdir}/installed-tests %{_libexecdir}/installed-tests/gtk-4.0/ +%dir %{_datadir}/installed-tests +%{_datadir}/installed-tests/gtk-4.0/ %changelog +* Mon Oct 01 2018 Kalev Lember - 3.94.0-1 +- Update to 3.94.0 +- Remove and obsolete immodules subpackages +- Build new gstreamer media backend + * Fri Jul 13 2018 Fedora Release Engineering - 3.92.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 7fdcf97..1ab2a8b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gtk+-3.92.1.tar.xz) = 50fd775df09595536ceb8c156aaf3e13170438aa8918b8a638d5f661791e9ff11cf072fb9bde9b2b6b2a3a75fec69a633c0170533478a2e7af33251ae8064ae2 +SHA512 (gtk+-3.94.0.tar.xz) = 4d7499e3161edfcc793065c1789292ccd11246f5107fa59187ba56c0df34c0c94f1d08521b9d927a2c03c7139d2228beadbc7270ff9a63e587878e7304b14980