- updated to 3.99.1

- removed obsolete cloudprint patch

diff --git a/gtk4-cloudprint.patch b/gtk4-cloudprint.patch
deleted file mode 100644 (file)
index 12cadb0..0000000
--- a/gtk4-cloudprint.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gtk-3.99.0/modules/printbackends/gtkprintbackendcloudprint.c.orig  2020-07-31 04:16:36.465869700 +0200
-+++ gtk-3.99.0/modules/printbackends/gtkprintbackendcloudprint.c       2020-08-16 11:32:00.376303666 +0200
-@@ -71,8 +71,6 @@
- } typedef TGOAAccount;
- 
- static GObjectClass *backend_parent_class;
--static void                 gtk_print_backend_cloudprint_class_init      (GtkPrintBackendCloudprintClass *class);
--static void                 gtk_print_backend_cloudprint_init            (GtkPrintBackendCloudprint      *impl);
- static void                 gtk_print_backend_cloudprint_finalize      (GObject *object);
- static void                 cloudprint_printer_get_settings_from_options (GtkPrinter           *printer,
-                                                                         GtkPrinterOptionSet  *options,
-@@ -921,7 +919,7 @@
-   /* How many document pages to go onto one side of paper. */
-   option = gtk_printer_option_new ("gtk-n-up", _("Pages per _sheet:"), GTK_PRINTER_OPTION_TYPE_PICKONE);
-   gtk_printer_option_choices_from_array (option, G_N_ELEMENTS (n_up),
--                                       (char **) n_up, (char **) n_up /* FIXME i18n (localised digits)! */);
-+                                       (const char **) n_up, (const char **) n_up /* FIXME i18n (localised digits)! */);
-   gtk_printer_option_set (option, "1");
-   gtk_printer_option_set_add (set, option);
-   g_object_unref (option);

diff --git a/gtk4.spec b/gtk4.spec
index 9119b87be7c82b418a9d202c7c68dc27e12823b1..eca2d688fa8d5af6498180669ec48db7585f5354 100644 (file)
--- a/gtk4.spec
+++ b/gtk4.spec
@@ -1,3 +1,4 @@
+# TODO: tracker=enabled (BR: tracker3)
 #
 # Conditional build:
 %bcond_with    apidocs         # gtk-doc build (requires gtk-doc 2)
@@ -19,15 +20,14 @@ Summary(it.UTF-8):  Il toolkit per GIMP
 Summary(pl.UTF-8):     GIMP Toolkit
 Summary(tr.UTF-8):     GIMP ToolKit arayüz kitaplığı
 Name:          gtk4
-Version:       3.99.0
+Version:       3.99.1
 Release:       1
 License:       LGPL v2+
 Group:         X11/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gtk/3.99/gtk-%{version}.tar.xz
-# Source0-md5: f6bf0c49db854783b566fd25b9d341e2
+# Source0-md5: c99623a48b6635dc55a8b18dd09075d7
 Patch0:                %{name}-lpr.patch
 Patch1:                %{name}-pc.patch
-Patch2:                %{name}-cloudprint.patch
 URL:           https://www.gtk.org/
 %{?with_vulkan:BuildRequires:  Vulkan-Loader-devel}
 # cairo-gobject + cairo-pdf,cairo-ps,cairo-svg
@@ -45,7 +45,7 @@ BuildRequires:        freetype-devel >= 1:2.7.1
 BuildRequires: fribidi-devel >= 0.19.7
 BuildRequires: gdk-pixbuf2-devel >= 2.31.0
 BuildRequires: gettext-tools >= 0.19.7
-BuildRequires: glib2-devel >= 1:2.63.1
+BuildRequires: glib2-devel >= 1:2.65.0
 BuildRequires: gobject-introspection-devel >= 1.39.0
 BuildRequires: graphene-devel >= 1.9.1
 %{?with_gstreamer:BuildRequires:       gstreamer-devel >= 1.12.3}
@@ -62,7 +62,7 @@ BuildRequires:        libxml2-progs >= 1:2.6.31
 BuildRequires: libxslt-progs >= 1.1.20
 BuildRequires: meson >= 0.53
 BuildRequires: ninja >= 1.5
-BuildRequires: pango-devel >= 1:1.45.0
+BuildRequires: pango-devel >= 1:1.45.5
 BuildRequires: perl-base
 BuildRequires: pkgconfig
 %{?with_cloudprint:BuildRequires:      rest-devel >= 0.7}
@@ -93,15 +93,15 @@ BuildRequires:      wayland-protocols >= 1.20
 BuildRequires: xorg-lib-libxkbcommon-devel >= 0.2.0
 %endif
 Requires:      xorg-lib-libX11 >= 1.5.0
-Requires(post,postun): glib2 >= 1:2.63.1
+Requires(post,postun): glib2 >= 1:2.65.0
 Requires:      cairo-gobject >= 1.14.0
 Requires:      freetype >= 1:2.7.1
 Requires:      gdk-pixbuf2 >= 2.31.0
-Requires:      glib2 >= 1:2.63.1
+Requires:      glib2 >= 1:2.65.0
 Requires:      graphene >= 1.9.1
 %{?with_cloudproviders:Requires:       libcloudproviders >= 0.3.1}
 Requires:      libepoxy >= 1.4
-Requires:      pango >= 1:1.45.0
+Requires:      pango >= 1:1.45.5
 Requires:      xorg-lib-libXi >= 1.3.0
 Requires:      xorg-lib-libXrandr >= 1.5.0
 %if %{with wayland}
@@ -174,7 +174,7 @@ Summary:    Utility to update icon cache used by GTK+ library
 Summary(pl.UTF-8):     Narzędzie do uaktualniania cache'a ikon używanego przez bibliotekę GTK+
 Group:         Applications/System
 Requires:      gdk-pixbuf2 >= 2.31.0
-Requires:      glib2 >= 1:2.63.1
+Requires:      glib2 >= 1:2.65.0
 Obsoletes:     gtk+4-update-icon-cache < 3.95
 
 %description update-icon-cache
@@ -200,10 +200,10 @@ Requires: %{name} = %{version}-%{release}
 Requires:      cairo-gobject-devel >= 1.14.0
 Requires:      fontconfig-devel
 Requires:      gdk-pixbuf2-devel >= 2.31.0
-Requires:      glib2-devel >= 1:2.63.1
+Requires:      glib2-devel >= 1:2.65.0
 Requires:      graphene-devel >= 1.9.1
 Requires:      libepoxy-devel >= 1.4
-Requires:      pango-devel >= 1:1.45.0
+Requires:      pango-devel >= 1:1.45.5
 Requires:      shared-mime-info
 Requires:      xorg-lib-libX11-devel >= 1.5.0
 Requires:      xorg-lib-libXcomposite-devel
@@ -262,7 +262,7 @@ Dokumentacja API GTK+.
 Summary:       GTK+ - example programs
 Summary(pl.UTF-8):     GTK+ - programy przykładowe
 Group:         X11/Development/Libraries
-Requires(post,postun): glib2 >= 1:2.63.1
+Requires(post,postun): glib2 >= 1:2.65.0
 Requires:      %{name}-devel = %{version}-%{release}
 Obsoletes:     gtk+4-examples < 3.95
 
@@ -303,22 +303,21 @@ Moduł GTK+ do drukowania przez CUPS.
 %setup -q -n gtk-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' demos/gtk-demo/geninclude.py
 
 %build
 %meson build \
        %{?with_broadway:-Dbroadway-backend=true} \
-       %{?with_cloudproviders:-Dcloudproviders=true} \
+       %{?with_cloudproviders:-Dcloudproviders=enabled} \
+       -Dcolord=enabled \
        %{?with_apidocs:-Dgtk_doc=true} \
        -Dinstall-tests=false \
        -Dman-pages=true \
        -Dmedia=%{!?with_ffmpeg:%{!?with_gstreamer:no}}%{?with_ffmpeg:ffmpeg,}%{?with_gstreamer:gstreamer} \
-       -Dprint-backends=file,lpr%{?with_cups:,cups}%{?with_cloudprint:,cloudprint} \
+       -Dprint=file,lpr%{?with_cups:,cups}%{?with_cloudprint:,cloudprint} \
        %{!?with_vulkan:-Dvulkan=no} \
-       %{!?with_wayland:-Dwayland-backend=false} \
-       -Dxinerama=yes
+       %{!?with_wayland:-Dwayland-backend=false}
 
 %ninja_build -C build
 
@@ -492,13 +491,10 @@ exit 0
 %{_iconsdir}/hicolor/scalable/apps/org.gtk.PrintEditor4.svg
 %{_iconsdir}/hicolor/scalable/apps/org.gtk.PrintEditor4.Devel.svg
 %{_iconsdir}/hicolor/scalable/apps/org.gtk.WidgetFactory4.svg
-%{_iconsdir}/hicolor/scalable/apps/org.gtk.gtk4.NodeEditor.svg
-%{_iconsdir}/hicolor/scalable/apps/org.gtk.gtk4.NodeEditor.Devel.svg
 %{_iconsdir}/hicolor/symbolic/apps/org.gtk.Demo4-symbolic.svg
 %{_iconsdir}/hicolor/symbolic/apps/org.gtk.IconBrowser4-symbolic.svg
 %{_iconsdir}/hicolor/symbolic/apps/org.gtk.PrintEditor4-symbolic.svg
 %{_iconsdir}/hicolor/symbolic/apps/org.gtk.WidgetFactory4-symbolic.svg
-%{_iconsdir}/hicolor/symbolic/apps/org.gtk.gtk4.NodeEditor-symbolic.svg
 %{_mandir}/man1/gtk4-demo.1*
 %{_mandir}/man1/gtk4-demo-application.1*
 %{_mandir}/man1/gtk4-icon-browser.1*