pool/gtk4
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 538597 from GNOME:Next

Browse Source 
- 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
  + 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
  + 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,
    bgo#781757, bgo#782981, bgo#783649, bgo#783669, bgo#784016,
    bgo#784421, bgo#785210, bgo#785306, bgo#785736, bgo#786144,
    bgo#786209, bgo#786400, bgo#786469, bgo#786485, bgo#786492,
    bgo#786553, bgo#786613, bgo#786673, bgo#786794, bgo#786885,
    bgo#786931, bgo#786932, bgo#786938, bgo#786940, bgo#786956,

OBS-URL: https://build.opensuse.org/request/show/538597
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk4?expand=0&rev=23
This commit is contained in:
Dominique Leuenberger 2017-11-07 09:41:31 +00:00 committed by Git OBS Bridge
parent 8aacbac8c6
commit c347416251
6 changed files with 260 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk+-3.91.2.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:878a313f6de108c77ee1915ae8ce5ec4ba9c1f9e059a4a3bc1ed230ef29e4bc9
size 20195864

3
gtk+-3.92.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:020d54d85b66af19de01c4db6dc0d320c58e68af9328e73bdd80bf77837b263c
size 13161384

156
gtk4-return-nonvoid.patch Normal file
View File

@ -0,0 +1,156 @@
commit 8549e62d8595bb6f94b51f2051f8542e357f236b
Author: Benjamin Otte <otte@redhat.com>
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 <ebassi@gnome.org>
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 <otte@redhat.com>
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";
}
}

1
gtk4-rpmlintrc Normal file
View File

@ -0,0 +1 @@
addFilter("shlib-policy-name-error");

52
gtk4.changes
View File

@ -1,3 +1,55 @@
-------------------------------------------------------------------
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
+ 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
+ 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,
bgo#781757, bgo#782981, bgo#783649, bgo#783669, bgo#784016,
bgo#784421, bgo#785210, bgo#785306, bgo#785736, bgo#786144,
bgo#786209, bgo#786400, bgo#786469, bgo#786485, bgo#786492,
bgo#786553, bgo#786613, bgo#786673, bgo#786794, bgo#786885,
bgo#786931, bgo#786932, bgo#786938, bgo#786940, bgo#786956,
bgo#786960, bgo#786964, bgo#786966, bgo#787021, bgo#787103,
bgo#787172, bgo#787279, bgo#787302, bgo#787303, bgo#787410,
bgo#787416, bgo#787444, bgo#787531, bgo#787600, bgo#787669,
bgo#787757, bgo#787866, bgo#788230, bgo#788458, bgo#788534,
bgo#788573, bgo#788614, bgo#788787, bgo#788905.
+ Updated translations.
- Add meson BuildRequires and replace configure/make/make_install
calls with meson/meson_build and meson_install: follow upstreams
port to meson as build system.
- Add gcc-c++ BuildRequires: small parts of GTK+ now are written in
C++.
- Add gtk-doc BuildRequires: in order to build man-pages,
documentation needs to be enabled, which in turn requires
gtk-doc. In the past, we provided upstream shipped documentation.
- Add gtk4-return-nonvoid.patch: Fix 'reaches end of non-void
function without return value', taken from git.
- Add rpmlintrc: multiple GTK4 libraries are not goint to be
supported in parallel and the name will stabilize.
-------------------------------------------------------------------
Thu Sep 14 14:28:41 UTC 2017 - fezhang@suse.com

84
gtk4.spec
View File

@ -22,21 +22,27 @@
Name: gtk4
%define _name gtk+
Version: 3.91.2
Version: 3.92.1
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.91/%{_name}-%{version}.tar.xz
Source: http://download.gnome.org/sources/gtk+/3.92/%{_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
BuildRequires: gcc-c++
BuildRequires: gettext-tools >= 0.19.7
BuildRequires: gtk-doc
BuildRequires: hicolor-icon-theme
BuildRequires: meson >= 0.42.1
%if !0%{?is_opensuse}
BuildRequires: translation-update-upstream
%endif
@ -45,6 +51,7 @@ 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(colord)
BuildRequires: pkgconfig(epoxy) >= 1.0
BuildRequires: pkgconfig(fontconfig)
@ -82,7 +89,10 @@ ranging from small one-off projects to complete application suites.
Summary: The GTK+ toolkit library (version 4)
Group: System/Libraries
Requires(post): %{name}-tools
# gtk4-data is currently not being built, might be an upstream oversight though
Requires: %{name}-data >= %{version}
Obsoletes: %{name}-data <= %{version}
Provides: %{name}-data = %{version}
Requires: %{name}-schema >= %{version}
# While hicolor is not a Requires strictly speaking, we put it as
# such instead of as a Recommends because many applications just
@ -327,25 +337,28 @@ This package enhances gettext with an International Tag Set for GTK+ 4
%lang_package
%prep
%setup -q -n %{_name}-%{version}
%patch0 -p1
%build
%configure \
--disable-static \
--enable-man \
--enable-x11-backend \
--enable-introspection \
--enable-broadway-backend \
--enable-wayland-backend \
--enable-explicit-deps=yes \
--enable-colord \
--enable-vulkan
%{__make} %{?_smp_mflags}
%meson \
-Dbuild-tests=false \
-Ddocumentation=true \
-Denable-broadway-backend=true \
-Denable-cloudprint-print-backend=yes \
-Denable-cloudproviders=false \
-Denable-colord=yes \
-Denable-cups-print-backend=yes \
-Denable-vulkan=yes \
-Denable-wayland-backend=true \
-Denable-x11-backend=true \
-Denable-xinerama=yes \
-Dintrospection=true \
-Dman-pages=true
%meson_build
%install
%makeinstall
find %{buildroot}%{_libdir} -name '*.la' -delete -print
# Do not install the exampleapp glib schema, as the app itself is noinst
rm %{buildroot}%{_datadir}/glib-2.0/schemas/org.gtk.exampleapp.gschema.xml
%meson_install
%find_lang gtk40
%find_lang gtk40-properties
install -m 644 -D %{S:2} %{buildroot}%{_datadir}/gtk-4.0/settings.ini
@ -453,7 +466,7 @@ fi
%files -n libgtk-4-0
%defattr(-, root, root)
%doc AUTHORS COPYING README NEWS
%doc AUTHORS COPYING
%dir %{_sysconfdir}/gtk-4.0
%dir %{_libdir}/gtk-4.0
%dir %{_libdir}/gtk-4.0/%{gtk_binary_version}
@ -461,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
@ -533,17 +546,18 @@ fi
%{_mandir}/man1/gtk4-query-settings.1%{?ext_man}
%{_mandir}/man1/gtk4-update-icon-cache.1%{?ext_man}
#files data
#defattr(-,root,root)
#{_datadir}/themes/Default/
#{_datadir}/themes/Emacs/
%files schema
%defattr(-,root,root)
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.ColorChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.Debug.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Demo.gschema.xml
%files data
%defattr(-,root,root)
%{_datadir}/themes/Default/
%{_datadir}/themes/Emacs/
%{_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.Settings.EmojiChooser.gschema.xml
%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
%files branding-upstream
%defattr(-,root,root)
@ -553,10 +567,9 @@ fi
%files devel
%defattr(-,root,root)
%doc ChangeLog
%doc %{_datadir}/gtk-doc/html/gdk4/
%doc %{_datadir}/gtk-doc/html/gsk4/
%doc %{_datadir}/gtk-doc/html/gtk4/
%%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
@ -573,7 +586,6 @@ fi
%{_datadir}/icons/hicolor/*/apps/gtk4-demo-symbolic.symbolic.png
%{_datadir}/icons/hicolor/*/apps/gtk4-widget-factory-symbolic.symbolic.png
%{_includedir}/gtk-4.0/
%{_libdir}/pkgconfig/gail-4.0.pc
%{_libdir}/pkgconfig/gtk+-4.0.pc
%{_libdir}/pkgconfig/gtk+-broadway-4.0.pc
%{_libdir}/pkgconfig/gtk+-wayland-4.0.pc