X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=gtk%2B3-cloudproviders.patch;h=f5c6065c7e3bc06aa51a63f9cdab2d7205894264;hb=43183e8de80f1b0451f8a3a97331ae1e632243d2;hp=d4a014445667e5b099e6a79a68f8c1af7436d56d;hpb=23d30dd7fa970b189348e7e73d28ce86e1b624b7;p=packages%2Fgtk%2B3.git

diff --git a/gtk+3-cloudproviders.patch b/gtk+3-cloudproviders.patch
index d4a0144..f5c6065 100644
--- a/gtk+3-cloudproviders.patch
+++ b/gtk+3-cloudproviders.patch
@@ -1,21 +1,19 @@
-diff -urN gtk+-3.24.7.orig/configure.ac gtk+-3.24.7/configure.ac
---- gtk+-3.24.7.orig/configure.ac	2019-03-13 23:01:14.537215653 +0100
-+++ gtk+-3.24.7/configure.ac	2019-03-13 23:02:04.326913648 +0100
-@@ -1377,7 +1377,7 @@
- LDFLAGS="$saved_ldflags"
+--- gtk+-3.24.36/meson.build.orig	2022-12-24 22:25:03.301902858 +0100
++++ gtk+-3.24.36/meson.build	2022-12-24 22:26:43.555542218 +0100
+@@ -914,7 +914,7 @@
  
- GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
--GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES $PROFILER_PACKAGES fribidi >= fribidi_required_version"
-+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $PROFILER_PACKAGES fribidi >= fribidi_required_version"
+ pkgconf.set('GDK_PRIVATE_PACKAGES',
+             ' '.join(gio_packages + x11_pkgs + wayland_pkgs + cairo_backends +
+-                     ['epoxy', epoxy_req] + cloudproviders_packages +
++                     ['epoxy', epoxy_req] +
+                      ['fribidi', fribidi_req]))
  
- PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
- GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
-@@ -1411,7 +1411,7 @@
- PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)
+ gtk_packages = ' '.join([
+@@ -933,6 +933,7 @@
+   gtk_private_packages += ['pangoft2']
+ endif
+ gtk_private_packages += gio_packages
++gtk_private_packages += cloudproviders_packages
+ 
+ pkgconf.set('GTK_PRIVATE_PACKAGES', ' '.join(gtk_private_packages))
  
- GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
--GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
-+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version $CLOUDPROVIDER_PACKAGES"
- if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
-   GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
- fi