diff --git a/gtk+-3.94.0.tar.xz b/gtk+-3.94.0.tar.xz deleted file mode 100644 index 39dcdd1..0000000 --- a/gtk+-3.94.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a947caa5296610b0f1d7a03b58df34765c227c577c78e683e75eea3251a67035 -size 13505016 diff --git a/gtk-3.96.0.tar.xz b/gtk-3.96.0.tar.xz new file mode 100644 index 0000000..494385b --- /dev/null +++ b/gtk-3.96.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bdb8b03bbbcc3ad72ccf1b854a73fc40cf472da5f9c0948ce25a1e67d99344ce +size 12628172 diff --git a/gtk4-fix-dependency-error.patch b/gtk4-fix-dependency-error.patch deleted file mode 100644 index 45651e7..0000000 --- a/gtk4-fix-dependency-error.patch +++ /dev/null @@ -1,52 +0,0 @@ -https://gitlab.gnome.org/GNOME/gtk/commit/5df4d277527858481ca6eb7af0762c73d804f19d - -Fix build - -broadway-server.c requires broadwayjs.h -this failed osc build -j1 - -Fixes #1218 - -Index: gtk+-3.94.0/gdk/broadway/meson.build -=================================================================== ---- gtk+-3.94.0.orig/gdk/broadway/meson.build -+++ gtk+-3.94.0/gdk/broadway/meson.build -@@ -43,8 +43,19 @@ clienthtml_h = custom_target('clienthtml - ], - ) - -+broadwayjs_h = custom_target('broadwayjs.h', -+ input : ['broadway.js'], -+ output : 'broadwayjs.h', -+ command : [ -+ gen_c_array, -+ '--array-name=broadway_js', -+ '--output=@OUTPUT@', -+ '@INPUT0@', -+ ], -+) -+ - libgdk_broadway = static_library('gdk-broadway', -- clienthtml_h, -+ clienthtml_h, broadwayjs_h, - gdk_broadway_sources, gdkconfig, gdkenum_h, - include_directories: [confinc, gdkinc], - c_args: [ -@@ -58,17 +69,6 @@ libgdk_broadway = static_library('gdk-br - - broadwayd_syslib = os_win32 ? find_library('ws2_32') : shmlib - --broadwayjs_h = custom_target('broadwayjs.h', -- input : ['broadway.js'], -- output : 'broadwayjs.h', -- command : [ -- gen_c_array, -- '--array-name=broadway_js', -- '--output=@OUTPUT@', -- '@INPUT0@', -- ], --) -- - executable('gtk4-broadwayd', - clienthtml_h, broadwayjs_h, - 'broadwayd.c', 'broadway-server.c', 'broadway-output.c', diff --git a/gtk4.changes b/gtk4.changes index b60f648..4de911d 100644 --- a/gtk4.changes +++ b/gtk4.changes @@ -1,3 +1,89 @@ +------------------------------------------------------------------- +Tue Sep 10 08:41:08 UTC 2019 - Dominique Leuenberger + +- No longer provide/obsolete gtk3-schema: upstream changed the + schema names for gtk4 finally and cut compatibility with gtk3. So + from now on, we have gtk3-schema and gtk4-schema in parallel. + +------------------------------------------------------------------- +Fri Sep 6 03:41:07 UTC 2019 - Luke Jones + +- Update to version 3.96.0: + + + DND has been refactored. There are now separate GdkDrag and + GdkDrop objects. This work is still incomplete + + The GDK_SURFACE_SUBSURFACE surface type has been removed. + + Use of child surfaces has been greatly reduced. This work is still + incomplete + + The use of global coordinates in GDK apis has been reduced. This + work is still incomplete + + Events have been simplified and are used just for input + - expose events have been replaced by a GdkSurface::render signal + - configure events have been replaced by a + GdkSurface::size-changed signal + - map events have been replaced by a GdkSurface::mapped property + - gdk_event_handler_set has been replaced by a GdkSurface::event + signal + - key events no longer contain a string + - events on unmapped widgets are ignored + + Warping the pointer is no longer supported + + The Wayland backend now uses the Settings portal for GtkSettings + + The Wayland input module uses the text-input-unstable-v3 protocol + + The Broadway backend has been rewritten to work well with GSK + + The color chooser has a color picker + + GtkApplication tracks screensaver state and has a ::query-end + signal + + The file chooser portal backend supports file filters + + A number of list models have been introduced, for internal use + and as public api: + - GtkMapListModel + - GtkSliceListModel + - GtkSortListModel + - GtkSelectionModel + - GtkSingleSelection + + Support for tabular menus and combo boxes has been dropped + + Key themes are no longer supported + + GtkInvisible has been dropped + + A GtkRoot interface has been added that is currently implemented + just by GtkWindow. This work is incomplete + + GtkWidgets can transform their children using projective linear + transformations. This functionality is available in CSS and + as GskTransform argument to gtk_widget_allocate. GtkFixed is + a container that exposes this functionality. For examples of this, + see the swing transition of GtkRevealer, the rotate transitions + of GtkStack or the Fixed Layout example in gtk-demo. + + GtkEntry functionality has been moved into a new GtkText widget, + the GtkEditable interface has been expanded, and new a new + GtkPasswordEntry widget has been introduced. + + Focus handling has been rewritten, and focus-change event + generation has been unified with crossing events. + + All demos and settings schemas have been renamed to avoid + collisions with GTK3. + + GtkWidget can now use a GtkLayoutManager for size allocation. + Layout managers can optionally use layout children holding layout + properties. A number of layout managers are available: + - GtkBinLayout + - GtkBoxLayout + - GtkGridLayout + - GtkFixedLayout + - GtkCustomLayout + More layout manager implementations will appear in the future. + + GtkAssistant, GtkStack and GtkNotebook now have publicly + accessible page objects for their children. The page objects + are also exposed via a list model. + + GtkContainer no longer supports child properties. All existing + child properties have been removed, converted to regular properties, + moved to layout properties or moved to child meta objects. + + GtkListBox has gained a ::show-separators property that gets + translated into a CSS style class. + + A number of X11-specific GtkWindow and GdkSurface apis have been + removed or changed to backend APIs. + + GtkBuilder can specify object-valued properties inline. + + The gtk4-builder-tool simplify command has gained a --3to4 option + to convert GTK3 ui files to GTK4. + + The inspector can show child meta objects and layout properties. +- Remove gtk4-fix-dependency-error.patch, fixed upstream. + ------------------------------------------------------------------- Fri Sep 28 14:17:47 UTC 2018 - bjorn.lie@gmail.com diff --git a/gtk4.spec b/gtk4.spec index 55fd510..12d6dcf 100644 --- a/gtk4.spec +++ b/gtk4.spec @@ -1,7 +1,7 @@ # # spec file for package gtk4 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands # # All modifications and additions to the file contributed by third parties @@ -19,21 +19,19 @@ # When updating the binary version, do not forget to also update baselibs.conf %define gtk_binary_version 4.0.0 -%define _name gtk+ +%define _name gtk Name: gtk4 -Version: 3.94.0 +Version: 3.96.0 Release: 0 Summary: The GTK+ toolkit library (version 4) License: LGPL-2.1-or-later Group: Development/Libraries/X11 URL: http://www.gtk.org/ -Source: http://download.gnome.org/sources/gtk+/3.94/%{_name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/gtk/3.96/%{_name}-%{version}.tar.xz Source2: settings.ini Source3: macros.gtk4 Source98: gtk4-rpmlintrc Source99: baselibs.conf -# PATCH-FIX-UPSTREAM gtk4-fix-dependency-error.patch luc14n0@linuxmail.org glgo#GNOME/gtk#1218 fix build failure when using few threads. -Patch0: gtk4-fix-dependency-error.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets @@ -42,7 +40,7 @@ BuildRequires: gcc-c++ BuildRequires: gettext-tools >= 0.19.7 BuildRequires: gtk-doc BuildRequires: hicolor-icon-theme -BuildRequires: meson >= 0.42.1 +BuildRequires: meson >= 0.50.1 BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: vulkan-devel @@ -60,8 +58,8 @@ 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(graphene-1.0) >= 1.9.1 +BuildRequires: pkgconfig(graphene-gobject-1.0) >= 1.9.1 BuildRequires: pkgconfig(gstreamer-player-1.0) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(pango) >= 1.37.3 @@ -145,8 +143,6 @@ ranging from small one-off projects to complete application suites. Summary: Config schema for the GTK+ toolkit library v4 # The schema is shared between gtk3 and gtk4 - gtk4 wins Group: System/Libraries -Provides: gtk3-schema = %{version} -Obsoletes: gtk3-schema < %{version} BuildArch: noarch %description schema @@ -204,7 +200,6 @@ This package enhances gettext with an International Tag Set for GTK+ 4 %prep %setup -q -n %{_name}-%{version} -%patch0 -p1 translation-update-upstream %build @@ -279,7 +274,7 @@ cp %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm %{_bindir}/gtk4-launch %{_bindir}/gtk4-query-settings %{_bindir}/gtk4-update-icon-cache -%{_datadir}/applications/gtk4-icon-browser.desktop +%{_datadir}/applications/org.gtk.IconBrowser4.desktop %{_mandir}/man1/gtk4-broadwayd.1%{?ext_man} %{_mandir}/man1/gtk4-icon-browser.1%{ext_man} %{_mandir}/man1/gtk4-builder-tool.1%{?ext_man} @@ -289,17 +284,17 @@ cp %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm %{_mandir}/man1/gtk4-update-icon-cache.1%{?ext_man} %files schema -%{_datadir}/glib-2.0/schemas/org.gtk.Demo.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.Settings.EmojiChooser.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.Demo4.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.ColorChooser.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.Debug.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.EmojiChooser.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gtk.gtk4.Settings.FileChooser.gschema.xml %files branding-upstream %{_datadir}/gtk-4.0/settings.ini %files devel -%doc CONTRIBUTING.md README.commits +%doc CONTRIBUTING.md %doc %{_datadir}/gtk-doc/html/gdk4/ %doc %{_datadir}/gtk-doc/html/gsk4/ %doc %{_datadir}/gtk-doc/html/gtk4/ @@ -309,31 +304,33 @@ cp %{SOURCE3} %{buildroot}%{_sysconfdir}/rpm %{_mandir}/man1/gtk4-demo.1%{?ext_man} %{_mandir}/man1/gtk4-demo-application.1%{?ext_man} %{_mandir}/man1/gtk4-widget-factory.1%{?ext_man} -%{_datadir}/applications/gtk4-demo.desktop -%{_datadir}/metainfo/org.gtk.Demo.appdata.xml -%{_datadir}/applications/gtk4-widget-factory.desktop -%{_datadir}/metainfo/org.gtk.WidgetFactory.appdata.xml +%{_datadir}/applications/org.gtk.Demo4.desktop +%{_datadir}/metainfo/org.gtk.Demo4.appdata.xml +%{_datadir}/applications/org.gtk.WidgetFactory4.desktop +%{_datadir}/metainfo/org.gtk.WidgetFactory4.appdata.xml %{_datadir}/gir-1.0/*.gir %dir %{_datadir}/gtk-4.0 -%{_datadir}/gtk-4.0/gtkbuilder.rng -%{_datadir}/icons/hicolor/*/apps/gtk4-demo.png -%{_datadir}/icons/hicolor/*/apps/gtk4-widget-factory.png -%{_datadir}/icons/hicolor/*/apps/gtk4-demo-symbolic.symbolic.png -%{_datadir}/icons/hicolor/*/apps/gtk4-widget-factory-symbolic.symbolic.png +%{_datadir}/gtk-4.0/gtk4builder.rng +%{_datadir}/icons/hicolor/scalable/apps/org.gtk.Demo4.svg +%{_datadir}/icons/hicolor/scalable/apps/org.gtk.IconBrowser4.svg +%{_datadir}/icons/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.gtk.Demo4-symbolic.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.gtk.IconBrowser4-symbolic.svg +%{_datadir}/icons/hicolor/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg %{_includedir}/gtk-4.0/ -%{_libdir}/pkgconfig/gtk+-4.0.pc -%{_libdir}/pkgconfig/gtk+-broadway-4.0.pc -%{_libdir}/pkgconfig/gtk+-wayland-4.0.pc -%{_libdir}/pkgconfig/gtk+-unix-print-4.0.pc -%{_libdir}/pkgconfig/gtk+-x11-4.0.pc +%{_libdir}/pkgconfig/gtk4.pc +%{_libdir}/pkgconfig/gtk4-broadway.pc +%{_libdir}/pkgconfig/gtk4-wayland.pc +%{_libdir}/pkgconfig/gtk4-unix-print.pc +%{_libdir}/pkgconfig/gtk4-x11.pc %{_libdir}/libgtk-4.so %{_sysconfdir}/rpm/macros.gtk4 %files -n gettext-its-%{name} %dir %{_datadir}/gettext/ %dir %{_datadir}/gettext/its/ -%{_datadir}/gettext/its/gtkbuilder.its -%{_datadir}/gettext/its/gtkbuilder.loc +%{_datadir}/gettext/its/gtk4builder.its +%{_datadir}/gettext/its/gtk4builder.loc %files lang -f gtk40.lang -f gtk40-properties.lang