diff --git a/common/shlibs b/common/shlibs index 0505949ae3..6a018fa5aa 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3356,3 +3356,4 @@ libdqlite.so.0 dqlite-0.2.1_1 libwoff2common.so.1.0.2 libwoff2common1.0.2-1.0.2_1 libwoff2enc.so.1.0.2 libwoff2enc1.0.2-1.0.2_1 libwoff2dec.so.1.0.2 libwoff2dec1.0.2-1.0.2_1 +libcloudproviders.so.0 libcloudproviders-0.2.5_2 diff --git a/srcpkgs/gtk+3/patches/2905fc861acda3d134a198e56ef2f6c962ad3061.patch b/srcpkgs/gtk+3/patches/2905fc861acda3d134a198e56ef2f6c962ad3061.patch new file mode 100644 index 0000000000..98209c5234 --- /dev/null +++ b/srcpkgs/gtk+3/patches/2905fc861acda3d134a198e56ef2f6c962ad3061.patch @@ -0,0 +1,34 @@ +Upstream: Yes +From 2905fc861acda3d134a198e56ef2f6c962ad3061 Mon Sep 17 00:00:00 2001 +From: Daniel Boles +Date: Wed, 12 Dec 2018 19:03:11 +0000 +Subject: [PATCH] Revert "Fix deprecation warnings" + +This reverts commit 5aedfe048b0fe07382433f1a78ec5bd26acd82dd. + +It had a typo that broke the build, only replaced half of the uses, and +replaced them with other functions that are also deprecated anyway. +--- + docs/tools/shooter.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/docs/tools/shooter.c b/docs/tools/shooter.c +index 3d910c6ab8..8cefa8bbf7 100644 +--- a/docs/tools/shooter.c ++++ b/docs/tools/shooter.c +@@ -170,10 +170,10 @@ take_window_shot (Window child, + y_orig = 0; + } + +- if (x_orig + width > gdk_screen_get_width (gdk_screen_get_dfeault ())) ++ if (x_orig + width > gdk_screen_width ()) + width = gdk_screen_width () - x_orig; + +- if (y_orig + height > gdk_screen_get_height (gdk_screen_get_default ())) ++ if (y_orig + height > gdk_screen_height ()) + height = gdk_screen_height () - y_orig; + + tmp = gdk_pixbuf_get_from_window (window, +-- +2.18.1 + diff --git a/srcpkgs/gtk+3/patches/e3a1593a0984cc0156ec1892a46af8f256a64878.patch b/srcpkgs/gtk+3/patches/e3a1593a0984cc0156ec1892a46af8f256a64878.patch new file mode 100644 index 0000000000..0181d903a3 --- /dev/null +++ b/srcpkgs/gtk+3/patches/e3a1593a0984cc0156ec1892a46af8f256a64878.patch @@ -0,0 +1,43 @@ +Upstream: Yes +Reason: fixes crashing of some programs, e.g. FF 64 +From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001 +From: Daniel Boles +Date: Thu, 13 Dec 2018 17:20:13 +0100 +Subject: [PATCH] x11: Fix deprecation macro use + +G_GNUC_END_IGNORE_DEPRECATIONS terminates the if statement and does not +consider the following block to be part of the if. So that block was +always taken irregardless of the pattern. + +Fixes #1280 +--- + gdk/x11/gdkwindow-x11.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c +index 97ada6d739..764e39495f 100644 +--- a/gdk/x11/gdkwindow-x11.c ++++ b/gdk/x11/gdkwindow-x11.c +@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow *window, + double r, g, b, a; + cairo_surface_t *surface; + cairo_matrix_t matrix; ++ cairo_pattern_t *parent_relative_pattern; + + if (GDK_WINDOW_DESTROYED (window)) + return; +@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow *window, + } + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS +- if (pattern == gdk_x11_get_parent_relative_pattern ()) ++ parent_relative_pattern = gdk_x11_get_parent_relative_pattern (); + G_GNUC_END_IGNORE_DEPRECATIONS ++ ++ if (pattern == parent_relative_pattern) + { + GdkWindow *parent; + +-- +2.18.1 + diff --git a/srcpkgs/gtk+3/template b/srcpkgs/gtk+3/template index 481a88eb5c..64e0934801 100644 --- a/srcpkgs/gtk+3/template +++ b/srcpkgs/gtk+3/template @@ -1,34 +1,40 @@ # Template file for 'gtk+3' pkgname=gtk+3 -version=3.24.1 +version=3.24.2 revision=1 wrksrc="gtk+-${version}" build_style=gnu-configure +#XXX broken configure script: Can't use vopt_enable cloudproviders, configure +#checks for libcloudproviders when we pass '--disable-cloudproviders' to it! configure_args="--disable-schemas-compile $(vopt_enable broadway broadway-backend) $(vopt_enable colord) $(vopt_enable cups) $(vopt_enable gir introspection) - $(vopt_enable wayland wayland-backend) $(vopt_enable x11 x11-backend)" -hostmakedepends="automake gettext-devel glib-devel gobject-introspection gtk-doc - gtk-update-icon-cache pkg-config libtool + $(vopt_enable wayland wayland-backend) $(vopt_enable x11 x11-backend) + $(vopt_if cloudproviders '--enable-cloudproviders')" +conf_files="/etc/gtk-3.0/im-multipress.conf" +hostmakedepends="gettext-devel glib-devel gobject-introspection gtk-doc + gtk-update-icon-cache pkg-config perl $(vopt_if wayland 'wayland-devel wayland-protocols')" makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel - $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') + iso-codes $(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel') $(vopt_if wayland 'libxkbcommon-devel wayland-devel wayland-protocols MesaLib-devel') - $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel')" + $(vopt_if x11 'libXcursor-devel libXdamage-devel libXext-devel libXinerama-devel libXi-devel libXrandr-devel libXcomposite-devel') + $(vopt_if cloudproviders 'libcloudproviders-devel')" depends="gtk-update-icon-cache shared-mime-info $(vopt_if x11 'dbus-x11')" short_desc="The GTK+ toolkit (v3)" -maintainer="Juan RP " +maintainer="Rasmus Thomsen " license="LGPL-2.1-or-later" homepage="https://www.gtk.org/" distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz" -checksum=68387be307b99aadcdc653561d7a2a7f0113b93561fb18ded7075ec9ced5b02f -conf_files="/etc/gtk-3.0/im-multipress.conf" +checksum=5b3b05e427cc928d103561ed2e91b2b2881fe88b1f167b0b1c9990da6aac8892 +patch_args="-Np1" # Package build options -build_options="broadway colord cups gir wayland x11" +build_options="broadway colord cups gir cloudproviders wayland x11" desc_option_broadway="Enable support for the HTML5 Broadway backend" +desc_option_cloudproviders="Enable integration with cloudproviders, such as Nextcloud" -# Enable all options by default. +# Enable all options (other than cloudproviders) by default. build_options_default="colord cups broadway wayland x11" # Enable gir only for native builds. @@ -36,11 +42,6 @@ if [ -z "$CROSS_BUILD" ]; then build_options_default+=" gir" fi -pre_configure() { - sed -i 's,pkg-config,/usr/bin/pkg-config,' autogen.sh - NOCONFIGURE=1 ./autogen.sh -} - do_check() { # Requires xserver running :