diff --git a/gtk+-3.92.1.tar.xz b/gtk+-3.92.1.tar.xz deleted file mode 100644 index 63aa363..0000000 --- a/gtk+-3.92.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:020d54d85b66af19de01c4db6dc0d320c58e68af9328e73bdd80bf77837b263c -size 13161384 diff --git a/gtk+-3.93.0.tar.xz b/gtk+-3.93.0.tar.xz new file mode 100644 index 0000000..9780796 --- /dev/null +++ b/gtk+-3.93.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4215d724c751b4999348d812d30261bcdfe52e41db1e20e8f3cefc7e80736251 +size 13180936 diff --git a/gtk4-return-nonvoid.patch b/gtk4-return-nonvoid.patch deleted file mode 100644 index 7d37774..0000000 --- a/gtk4-return-nonvoid.patch +++ /dev/null @@ -1,156 +0,0 @@ -commit 8549e62d8595bb6f94b51f2051f8542e357f236b -Author: Benjamin Otte -Date: Tue Oct 24 18:13:45 2017 +0200 - - 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. - -diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c -index 350a79b03f..dd8613e3fd 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 8779c65a72..758513e4db 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 241a690230..961e78ea5c 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 2e7e21207b..62404a05c6 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; - } - } - -commit 46f475664d66e25f0cc4212786c441f929a91d05 -Author: Emmanuele Bassi -Date: Tue Oct 24 16:58:06 2017 +0100 - - 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. - -diff --git a/gdk/wayland/gdkwindow-wayland.c b/gdk/wayland/gdkwindow-wayland.c -index bb15eb1820..2d738a63ca 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 * -commit 373b407bd26a940072173e0a509038185b63e936 -Author: Benjamin Otte -Date: Tue Oct 24 18:26:08 2017 +0200 - - Fix build - - Don't do two things at once and forget to run ninja before pushing. - -diff --git a/gdk/x11/gdkdevicemanager-core-x11.c b/gdk/x11/gdkdevicemanager-core-x11.c -index dd8613e3fd..c662d215ce 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 758513e4db..56fb2c8b25 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 62404a05c6..45a386e56b 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"; - } - } - diff --git a/gtk4.changes b/gtk4.changes index 37dcceb..45f0db5 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -3,31 +3,71 @@ Fri Dec 29 00:02:59 UTC 2017 - jengelh@inai.de - Sync summaries within package. +------------------------------------------------------------------- +Wed Dec 27 22:35:20 UTC 2017 - luc14n0@linuxmail.org + +- Update to version 3.93.0: + + GdkScreen has been removed. All screen-related APIs have + equivalents in GdkDisplay. + + GdkVisual has been removed. + + GdkDeviceManager has been replaced by GdkSeat. + + Clipboard handling has been moved from GTK to GDK, and has been + modernized to provide an extensible, asynchronous, stream-based + API. + + The GdkCursor API has been modernized. + + Settings and window-state changes have been converted from + events to signals on GdkDisplay and GdkWindow, respectively. + + GdkEvent has been converted to an opaque GObject. + + The GL renderer in GSK has been substantially completed, and is + now on par with the Vulkan renderer. + + The use of GdkPixbuf in APIs has been reduced, and the + GskTexture object has been moved to GDK as GdkTexture, to take + its place. + + The handling of icon sizes has been changed. + + Bugs fixed: bgo#668590, bgo#773299, bgo#775279, bgo#777072, + bgo#779009, bgo#779862, bgo#783995, bgo#784314, bgo#785176, + bgo#785210, bgo#786123, bgo#787089, bgo#787128, bgo#787142, + bgo#787665, bgo#788841, bgo#788898, bgo#789054, bgo#789134, + bgo#789149, bgo#789160, bgo#789163, bgo#789198, bgo#789213, + bgo#789327, bgo#789357, bgo#789678, bgo#789733, bgo#789777, + bgo#789870, bgo#790029, bgo#790031, bgo#790171, bgo#790201, + bgo#790287, bgo#790489, bgo#790920, bgo#790963, bgo#791062, + bgo#791176, bgo#791281, bgo#791363, bgo#791549, bgo#791650, + bgo#791926, bgo#791927. + + Updated translations. +- Drop gtk4-return-nonvoid.patch: fixed upstream. +- Add cairo-gobject, gobject-2.0, pangocairo, xrender and + graphene-gobject-1.0 pkgconfig modules BuildRequires complying + with meson checks. Note that all of these modules were being + pulled and used already since the spec file had some depedencies + on other modules that come from the same devel package as these + ones. + ------------------------------------------------------------------- Thu Oct 19 10:10:40 UTC 2017 - dimstar@opensuse.org - Update to version 3.92.1: - + Drop autotools support. Meson 0.42.1 is now required - + Implement most of CSS3 font-variant - + Add an Emoji chooser to GtkEntry - + Add new input hints for Emoji input - + Remaining widgets have been ported to GtkSnapshot - + GtkLabel and GtkEntry have been ported to use GSK - + Add a way for GtkOverlay to blur behind children. This is has a - demo in gtk4-demo - + Add support for native file choosers on older OS X versions - + Add support for libcloudproviders in GtkPlacesSidebar - + Non-windowed widgets are now allowed to have a size of 0x0 + + Drop autotools support. Meson 0.42.1 is now required. + + Implement most of CSS3 font-variant. + + Add an Emoji chooser to GtkEntry. + + Add new input hints for Emoji input. + + Remaining widgets have been ported to GtkSnapshot. + + GtkLabel and GtkEntry have been ported to use GSK. + + Add a way for GtkOverlay to blur behind children. This has a + demo in gtk4-demo. + + Add support for libcloudproviders in GtkPlacesSidebar. + + Non-windowed widgets are now allowed to have a size of 0x0. + Allow tiled windows to be resized. Under wayland, this uses version 2 of the gtk-shell protocol. Under X, it uses the - _GTK_EDGE_CONSTRAINTS property - + Input handling changes - - GdkEvent has new accessors for fields - - Traditional event signals (eg ::key-press-event) are now emitted from - an event controller - - Most widgets inside gtk have stopped using traditional event signals - - GDK_SEAT_CAPABILITY_ALL_POINTING now includes touch events - + Scrollbars allow middle-click to jump to a position again + _GTK_EDGE_CONSTRAINTS property. + + Input handling changes: + - GdkEvent has new accessors for fields; + - Traditional event signals (eg ::key-press-event) are now + emitted from an event controller; + - Most widgets inside gtk have stopped using traditional event + signals; + - GDK_SEAT_CAPABILITY_ALL_POINTING now includes touch events. + + Scrollbars allow middle-click to jump to a position again. + Bugs fixed: bgo#639931, bgo#644248, bgo#701296, bgo#705640, bgo#728452, bgo#763517, bgo#766909, bgo#773299, bgo#775074, bgo#775126, bgo#778382, bgo#778811, bgo#780750, bgo#780758, @@ -292,4 +332,3 @@ Fri Dec 9 12:38:11 UTC 2016 - jengelh@inai.de Mon Dec 5 13:13:47 UTC 2016 - dimstar@opensuse.org - Initial package, gtk4, version 3.89.1. - diff --git a/gtk4.spec b/gtk4.spec index 5960802..e4129a9 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -19,22 +19,20 @@ # When updating the binary version, do not forget to also update baselibs.conf %define gtk_binary_version 4.0.0 +%define _name gtk+ Name: gtk4 -%define _name gtk+ -Version: 3.92.1 +Version: 3.93.0 Release: 0 Summary: The GTK+ toolkit library (version 4) License: LGPL-2.1+ Group: Development/Libraries/X11 Url: http://www.gtk.org/ -Source: http://download.gnome.org/sources/gtk+/3.92/%{_name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gtk+/3.93/%{_name}-%{version}.tar.xz Source2: settings.ini Source3: macros.gtk4 Source98: gtk4-rpmlintrc Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gtk4-return-nonvoid.patch bgo#789180 dimstar@opensuse.org -- Backported fixes to not reach end of non-void functions -Patch0: gtk4-return-nonvoid.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -51,23 +49,27 @@ BuildRequires: xsltproc BuildRequires: pkgconfig(atk) >= 2.15.1 BuildRequires: pkgconfig(atk-bridge-2.0) BuildRequires: pkgconfig(cairo) >= 1.14.0 -BuildRequires: pkgconfig(cloudproviders) +BuildRequires: pkgconfig(cairo-gobject) >= 1.14.0 +BuildRequires: pkgconfig(cloudproviders) >= 0.2.5 BuildRequires: pkgconfig(colord) -BuildRequires: pkgconfig(epoxy) >= 1.0 +BuildRequires: pkgconfig(epoxy) >= 1.4 BuildRequires: pkgconfig(fontconfig) BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.0 -BuildRequires: pkgconfig(glib-2.0) >= 2.53.0 +BuildRequires: pkgconfig(glib-2.0) >= 2.53.7 BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gobject-2.0) >= 2.53.7 BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.39.0 BuildRequires: pkgconfig(graphene-1.0) >= 1.5.1 +BuildRequires: pkgconfig(graphene-gobject-1.0) >= 1.5.1 BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(pango) >= 1.37.3 +BuildRequires: pkgconfig(pangocairo) >= 1.14.0 BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(rest-0.7) BuildRequires: pkgconfig(wayland-client) >= 1.9.91 -BuildRequires: pkgconfig(wayland-cursor) +BuildRequires: pkgconfig(wayland-cursor) >= 1.9.91 BuildRequires: pkgconfig(wayland-egl) -BuildRequires: pkgconfig(wayland-protocols) >= 1.7 +BuildRequires: pkgconfig(wayland-protocols) >= 1.9 BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xcomposite) BuildRequires: pkgconfig(xcursor) @@ -77,7 +79,7 @@ BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xinerama) BuildRequires: pkgconfig(xkbcommon) -BuildRequires: pkgconfig(xrandr) +BuildRequires: pkgconfig(xrandr) >= 1.2.99 BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -314,7 +316,6 @@ Requires: gettext-its-%{name} >= %{version} Requires: libgtk-4-0 = %{version} Requires: typelib-1_0-Gtk-4_0 = %{version} Requires: vulkan-devel -%glib2_gsettings_schema_requires %description devel GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -336,8 +337,7 @@ This package enhances gettext with an International Tag Set for GTK+ 4 %lang_package %prep -%setup -q -n %{_name}-%{version} -%patch0 -p1 +%setup -qn %{_name}-%{version} %build %meson \ @@ -466,7 +466,7 @@ fi %files -n libgtk-4-0 %defattr(-, root, root) -%doc AUTHORS COPYING +%doc AUTHORS COPYING NEWS %dir %{_sysconfdir}/gtk-4.0 %dir %{_libdir}/gtk-4.0 %dir %{_libdir}/gtk-4.0/%{gtk_binary_version} @@ -474,11 +474,11 @@ fi %{_libdir}/gtk-4.0/%{gtk_binary_version}/immodules/im-cedilla.so %{_libdir}/gtk-4.0/%{gtk_binary_version}/immodules/im-cyrillic-translit.so %{_libdir}/gtk-4.0/%{gtk_binary_version}/immodules/im-ipa.so -#%dir %{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/ -#%{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/libprintbackend-cloudprint.so -#%{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/libprintbackend-cups.so -#%{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/libprintbackend-file.so -#%{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/libprintbackend-lpr.so +%dir %{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/ +%{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/libprintbackend-cloudprint.so +%{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/libprintbackend-cups.so +%{_libdir}/gtk-4.0/%{gtk_binary_version}/printbackends/libprintbackend-file.so +#%%{_libdir}/gtk-4.0/%%{gtk_binary_version}/printbackends/libprintbackend-lpr.so %dir %{_libdir}/gtk-4.0/%{gtk_binary_version}/theming-engines/ %ghost %{_libdir}/gtk-4.0/%{gtk_binary_version}/immodules.cache %dir %{_libdir}/gtk-4.0/modules @@ -563,13 +563,12 @@ fi %defattr(-,root,root) %{_datadir}/gtk-4.0/settings.ini -%files lang -f gtk40.lang -f gtk40-properties.lang - %files devel %defattr(-,root,root) -%%doc %{_datadir}/gtk-doc/html/gdk4/ -%%doc %{_datadir}/gtk-doc/html/gsk4/ -%%doc %{_datadir}/gtk-doc/html/gtk4/ +%doc CONTRIBUTING.md NEWS.pre-1-0 README.commits +%doc %{_datadir}/gtk-doc/html/gdk4/ +%doc %{_datadir}/gtk-doc/html/gsk4/ +%doc %{_datadir}/gtk-doc/html/gtk4/ %{_bindir}/gtk4-demo %{_bindir}/gtk4-demo-application %{_bindir}/gtk4-widget-factory @@ -601,4 +600,6 @@ fi %{_datadir}/gettext/its/gtkbuilder.its %{_datadir}/gettext/its/gtkbuilder.loc +%files lang -f gtk40.lang -f gtk40-properties.lang + %changelog