aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-connectivity/geary/geary_43.0.bb (renamed from meta-gnome/recipes-connectivity/geary/geary_40.0.bb)7
-rw-r--r--meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb26
-rw-r--r--meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb (renamed from meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb)4
-rw-r--r--meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb2
-rw-r--r--meta-gnome/recipes-gimp/babl/babl_0.1.98.bb (renamed from meta-gnome/recipes-gimp/babl/babl_0.1.96.bb)2
-rw-r--r--meta-gnome/recipes-gimp/gegl/gegl_0.4.40.bb (renamed from meta-gnome/recipes-gimp/gegl/gegl_0.4.38.bb)2
-rw-r--r--meta-gnome/recipes-gnome/evince/evince_42.3.bb4
-rw-r--r--meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb17
-rw-r--r--meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc4
-rw-r--r--meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb4
-rw-r--r--meta-gnome/recipes-gnome/gjs/gjs_1.75.1.bb (renamed from meta-gnome/recipes-gnome/gjs/gjs_1.72.2.bb)4
-rw-r--r--meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_43.bb (renamed from meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb2
-rw-r--r--meta-gnome/recipes-gnome/gnome-online-accounts/files/0001-Update-to-rest-1.0.patch160
-rw-r--r--meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb34
-rw-r--r--meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb31
-rw-r--r--meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb (renamed from meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb)4
-rw-r--r--meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb (renamed from meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb)0
-rw-r--r--meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch27
-rw-r--r--meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb (renamed from meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb)7
-rw-r--r--meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb1
-rw-r--r--meta-gnome/recipes-gnome/gspell/gspell_1.12.0.bb (renamed from meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb1
-rw-r--r--meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb2
-rw-r--r--meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch21
-rw-r--r--meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb (renamed from meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb)6
-rw-r--r--meta-gnome/recipes-gnome/metacity/metacity_3.46.0.bb (renamed from meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/mutter/mutter_43.1.bb (renamed from meta-gnome/recipes-gnome/mutter/mutter_42.0.bb)9
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb2
-rw-r--r--meta-gnome/recipes-gnome/rest/files/0001-Use-GUri-instead-of-SoupURI.patch181
-rw-r--r--meta-gnome/recipes-gnome/rest/files/0002-Port-to-libsoup3.patch1696
-rw-r--r--meta-gnome/recipes-gnome/rest/rest_0.8.1.bb33
-rw-r--r--meta-gnome/recipes-gnome/rest/rest_0.9.0.bb25
-rw-r--r--meta-gnome/recipes-gnome/tracker/tracker-miners_3.4.1.bb (renamed from meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb)2
-rw-r--r--meta-gnome/recipes-gnome/tracker/tracker_3.4.1.bb (renamed from meta-gnome/recipes-gnome/tracker/tracker_3.4.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/yelp/yelp-tools_42.1.bb (renamed from meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb)2
-rw-r--r--meta-gnome/recipes-gnome/yelp/yelp_42.2.bb (renamed from meta-gnome/recipes-gnome/yelp/yelp_42.1.bb)8
-rw-r--r--meta-gnome/recipes-support/ibus/ibus.bb4
-rw-r--r--meta-gnome/recipes-support/libwacom/libwacom_2.5.0.bb (renamed from meta-gnome/recipes-support/libwacom/libwacom_2.4.0.bb)2
-rw-r--r--meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch67
-rw-r--r--meta-gnome/recipes-support/onboard/onboard_1.4.1.bb29
46 files changed, 170 insertions, 2280 deletions
diff --git a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
index 3ff0a412e..03738c554 100644
--- a/meta-gnome/recipes-connectivity/geary/geary_40.0.bb
+++ b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
@@ -6,10 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2a2244d5a13871ad950c55877546a6a2"
DEPENDS = " \
appstream-glib \
cairo \
+ desktop-file-utils-native \
enchant2 \
evolution-data-server \
folks \
- gcr \
+ gcr3 \
gmime \
gnome-online-accounts \
gsound \
@@ -34,12 +35,10 @@ inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala featu
SRC_URI = " \
git://github.com/GNOME/geary.git;nobranch=1;protocol=https \
- file://0001-Util.Cache.Lru-Workaround-missing-generic-type-argum.patch \
- file://0002-Fix-accessibility-issues-with-initializer-of-constan.patch \
"
S = "${WORKDIR}/git"
-SRCREV = "e561775c1580a9f60a726355b2b897bfc9cb3382"
+SRCREV = "94d6bec861daffb27efea85a296f347db7a5af6d"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb
new file mode 100644
index 000000000..36eb8ca19
--- /dev/null
+++ b/meta-gnome/recipes-connectivity/gtk-vnc/gtk-vnc_1.3.1.bb
@@ -0,0 +1,26 @@
+SUMMARY = "A VNC client viewer widget for GTK"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4339efb5fd592e45b9e2641de9fe734f"
+
+DEPENDS = " \
+ gdk-pixbuf \
+ glib-2.0 \
+ gnutls \
+ gtk+3 \
+ libgcrypt \
+ libx11 \
+ zlib \
+"
+
+GNOMEBASEBUILDCLASS = "meson"
+REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
+GIR_MESON_OPTION = ""
+
+PACKAGECONFIG[pulseaudio] = "-Dpulseaudio=enabled,-Dpulseaudio=disabled,pulseaudio"
+PACKAGECONFIG[sasl] = "-Dsasl=enabled,-Dsasl=disabled,cyrus-sasl"
+
+PACKAGECONFIG ??= "pulseaudio sasl"
+
+inherit pkgconfig gnomebase gettext gobject-introspection vala features_check
+
+SRC_URI[archive.sha256sum] = "512763ac4e0559d0158b6682ca5dd1a3bd633f082f5e4349d7158e6b5f80f1ce"
diff --git a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb
index 75c704bc2..6adb7ec29 100644
--- a/meta-gnome/recipes-connectivity/libnma/libnma_1.8.38.bb
+++ b/meta-gnome/recipes-connectivity/libnma/libnma_1.10.4.bb
@@ -7,10 +7,10 @@ DEPENDS = "glib-2.0 gtk+3 gtk4 networkmanager"
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gobject-introspection gtk-doc gettext vala features_check
-REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)}"
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)} opengl"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-SRC_URI[archive.sha256sum] = "5ed93eae18456ff5a8a4f408178c1ee198dc8d3a46c65f9075b101916e64e8b4"
+SRC_URI[archive.sha256sum] = "79e730dda19f9b34886f4064aa170f1a2326b08329d655d80b67e906c7f78b7c"
PACKAGECONFIG ?= "gcr iso_codes mobile_broadband_provider_info"
PACKAGECONFIG[gcr] = "-Dgcr=true,-Dgcr=false,gcr"
diff --git a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb
index 8046b139c..0c4834c94 100644
--- a/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb
+++ b/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_1.26.0.bb
@@ -7,7 +7,7 @@ DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes ns
GNOMEBASEBUILDCLASS = "meson"
inherit features_check gnomebase gsettings gtk-icon-cache gettext
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI[archive.sha256sum] = "69611b29064adbd57395fe3e51a9ebde1ea794615f776900453a2bbe3d8cddfd"
diff --git a/meta-gnome/recipes-gimp/babl/babl_0.1.96.bb b/meta-gnome/recipes-gimp/babl/babl_0.1.98.bb
index 85cc7793c..a9e192b75 100644
--- a/meta-gnome/recipes-gimp/babl/babl_0.1.96.bb
+++ b/meta-gnome/recipes-gimp/babl/babl_0.1.98.bb
@@ -15,6 +15,6 @@ CFLAGS:append:toolchain-clang:mipsarch = " -ffp-exception-behavior=ignore "
CFLAGS:append:toolchain-clang:riscv64 = " -ffp-exception-behavior=ignore "
SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz"
-SRC_URI[sha256sum] = "33673fe459a983f411245a49f81fd7f1966af1ea8eca9b095a940c542b8545f6"
+SRC_URI[sha256sum] = "f3b222f84e462735de63fa9c3651942f2b78fd314c73a22e05ff7c73afd23af1"
BBCLASSEXTEND = "native"
diff --git a/meta-gnome/recipes-gimp/gegl/gegl_0.4.38.bb b/meta-gnome/recipes-gimp/gegl/gegl_0.4.40.bb
index 541565809..335ce24aa 100644
--- a/meta-gnome/recipes-gimp/gegl/gegl_0.4.38.bb
+++ b/meta-gnome/recipes-gimp/gegl/gegl_0.4.40.bb
@@ -22,7 +22,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
SHPV = "${@gnome_verdir("${PV}")}"
SRC_URI = "https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz"
-SRC_URI[sha256sum] = "e4a33c8430a5042fba8439b595348e71870f0d95fbf885ff553f9020c1bed750"
+SRC_URI[sha256sum] = "cdde80d15a49dab9a614ef98f804c8ce6e4cfe1339a3c240c34f3fb45436b85d"
PACKAGECONFIG ??= "gexiv2 jpeg libpng libraw librsvg pango poppler sdl2"
PACKAGECONFIG:class-native = "libpng librsvg"
diff --git a/meta-gnome/recipes-gnome/evince/evince_42.3.bb b/meta-gnome/recipes-gnome/evince/evince_42.3.bb
index 0c97f75e9..5f35d5b33 100644
--- a/meta-gnome/recipes-gnome/evince/evince_42.3.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_42.3.bb
@@ -19,7 +19,9 @@ DEPENDS = " \
GNOMEBASEBUILDCLASS = "meson"
-inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gtk-doc
+inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection gettext mime-xdg gtk-doc features_check
+
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}"
def gnome_verdir(v):
return oe.utils.trim_version(v, 1)
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index 64774b0fe..681ff677a 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -2,8 +2,8 @@ require ${BPN}.inc
DEPENDS = " \
${BPN}-native intltool-native gperf-native \
- glib-2.0 gtk+3 libgdata libxml2 icu \
- dbus db virtual/libiconv zlib libsoup-2.4 libical nss libsecret \
+ glib-2.0 gtk+3 gtk4 libgdata libxml2 icu \
+ dbus db virtual/libiconv zlib libsoup-3.0 libical nss libsecret \
"
inherit pkgconfig gsettings gobject-introspection features_check cmake gtk-doc gettext perlnative vala
@@ -24,10 +24,6 @@ LKSTRFTIME:libc-musl = "HAVE_LKSTRFTIME=OFF"
EXTRA_OECMAKE = " \
-DSYSCONF_INSTALL_DIR=${sysconfdir} \
- -DWITH_KRB5=OFF \
- -DENABLE_GOA=OFF \
- -DENABLE_GOOGLE_AUTH=OFF \
- -DENABLE_WEATHER=OFF \
-DVAPIGEN=${STAGING_BINDIR_NATIVE}/vapigen \
${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
-D${LKSTRFTIME} \
@@ -37,13 +33,18 @@ EXTRA_OECMAKE = " \
EXTRA_OECMAKE:append:class-target = " -DG_IR_COMPILER=${STAGING_BINDIR}/g-ir-compiler-wrapper"
EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scanner-wrapper"
+PACKAGECONFIG ?= "oauth"
+
PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
+# ENABLE_OAUTH2_WEBKITGTK4 would require webkit to be built with gtk4
+PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK=ON -DENABLE_OAUTH2_WEBKITGTK4=OFF,-DENABLE_OAUTH2_WEBKITGTK=OFF,webkitgtk json-glib"
PACKAGECONFIG[goa] = "-DENABLE_GOA=ON,-DENABLE_GOA=OFF,gnome-online-accounts"
-
+PACKAGECONFIG[kerberos] = "-DWITH_KRB5=ON,-DWITH_KRB5=OFF,krb5"
# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs when
# searching for openldap-libs
PACKAGECONFIG[openldap] = "-DWITH_OPENLDAP=ON,-DWITH_OPENLDAP=OFF,openldap"
+PACKAGECONFIG[weather] = "-DENABLE_WEATHER=ON,-DENABLE_WEATHER=OFF,libgweather4"
+
# -ldb needs this on some platforms
LDFLAGS += "-lpthread -lgmodule-2.0 -lgthread-2.0"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
index 78efee004..e3c09f211 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \
inherit gnomebase upstream-version-is-even
-SRC_URI[archive.sha256sum] = "2ed72afe4d6bb170f8728faea0907fee10212dfde7a9fab82fbcc83d0f22f028"
-PV = "3.44.2"
+SRC_URI[archive.sha256sum] = "c55e72cff4190b42e63dd6eabc6dce48a1a1f79040531f1af6d51c1efa4aa6eb"
+PV = "3.46.1"
diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb
index 2b1ecad97..42659d0f6 100644
--- a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb
+++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb
@@ -11,9 +11,9 @@ inherit gnomebase gobject-introspection gettext gtk-doc upstream-version-is-even
DEPENDS = " \
json-glib \
- libsoup-2.4 \
+ libsoup-3.0 \
"
SRC_URI[archive.sha256sum] = "2d9a6826d158470449a173871221596da0f83ebdcff98b90c7049089056a37aa"
-EXTRA_OEMESON = "-Denable-installed-tests=false"
+EXTRA_OEMESON = "-Denable-installed-tests=false -Dsoup2=false"
diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.72.2.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.75.1.bb
index 317034156..b2c2b583b 100644
--- a/meta-gnome/recipes-gnome/gjs/gjs_1.72.2.bb
+++ b/meta-gnome/recipes-gnome/gjs/gjs_1.75.1.bb
@@ -4,11 +4,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48"
GNOMEBASEBUILDCLASS = "meson"
-DEPENDS = "mozjs-91 cairo"
+DEPENDS = "mozjs-102 cairo"
inherit gnomebase gsettings gobject-introspection vala gettext features_check upstream-version-is-even pkgconfig
-SRC_URI[archive.sha256sum] = "ddee379bdc5a7d303a5d894be2b281beb8ac54508604e7d3f20781a869da3977"
+SRC_URI[archive.sha256sum] = "81dcdf49d2665d08fa7e251700ea36466d77877418e9186d3a7e7efcd31aa960"
SRC_URI += " \
file://0001-Support-cross-builds-a-bit-better.patch \
file://0002-meson.build-Do-not-add-dir-installed-tests-when-inst.patch \
diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_43.bb
index d700c1bcb..9f94378d8 100644
--- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_42.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_43.bb
@@ -8,7 +8,7 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gettext allarch
-SRC_URI[archive.sha256sum] = "4c7fe1a09f459c5f77189a5982524fce05d888944955d679910f234606c1295d"
+SRC_URI[archive.sha256sum] = "19f749d8c37f872f155bb69a2bbe7aca381175e6929f1998047d775cbc637244"
FILES:${PN} += " \
${datadir}/backgrounds \
diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb
index 75e1244f8..1c3180f9d 100644
--- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb
+++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_42.4.bb
@@ -24,7 +24,7 @@ GTKIC_VERSION = "4"
inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI[archive.sha256sum] = "1d6fcf1cdb6cc9923ab334a2c0bc37a2c1bba9d18de153d484eedc04f3c0bcdc"
diff --git a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb
index 31513a5f6..66a29a094 100644
--- a/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_42.2.bb
@@ -26,7 +26,7 @@ inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext f
def gnome_verdir(v):
return oe.utils.trim_version(v, 1)
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI[archive.sha256sum] = "33dab1bca43658d66520958b0f674cb0ad3185cfd30c12e459e7f69481c5c6a0"
diff --git a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb
index 7b32be611..5498bb6ea 100644
--- a/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-calendar/gnome-calendar_42.0.bb
@@ -20,7 +20,7 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI[archive.sha256sum] = "b63f73f55032fc1390442f94cdf6b3cab9c91c774ddd2e5c61ecfec9d2c5e9aa"
diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb
index aae927a70..6eeaed0e1 100644
--- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_42.0.bb
@@ -10,7 +10,7 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
# gobject-introspection is mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb
index 50fd034af..130c26924 100644
--- a/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_43.0.bb
@@ -14,7 +14,7 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gtk-icon-cache gettext features_check mime-xdg
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
SRC_URI[archive.sha256sum] = "81c6bffb06d5332346e00eaecaec1bdcfd617c51dfd95bcd058d6c76c76dd2b9"
diff --git a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb
index 5937e7442..241a94cd7 100644
--- a/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_42.1.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = " \
DEPENDS = " \
glib-2.0-native \
gtk+3 \
- gcr \
+ gcr3 \
libgcrypt \
${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \
"
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/files/0001-Update-to-rest-1.0.patch b/meta-gnome/recipes-gnome/gnome-online-accounts/files/0001-Update-to-rest-1.0.patch
deleted file mode 100644
index 4a47fb2db..000000000
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/files/0001-Update-to-rest-1.0.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-From 3c4a6eda580c6e38aeedb63d73ae7b96cc7f9a07 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Mon, 7 Jun 2021 16:31:18 +0200
-Subject: [PATCH] Update to rest 1.0
-
-Updates to use the rest 1.0 API
-
-Upstream-Status: Inappropriate [rest 1.0 is not released yet]
-
-Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
----
- configure.ac | 2 +-
- src/goabackend/goalastfmprovider.c | 26 +++++++++++++-------------
- src/goabackend/goaoauthprovider.c | 17 +++++++++++------
- src/goabackend/goarestproxy.h | 2 --
- 4 files changed, 25 insertions(+), 22 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1f88bbd..e43303d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -129,7 +129,7 @@ if test "$enable_backend" != "no"; then
- AC_SUBST(JSON_GLIB_CFLAGS)
- AC_SUBST(JSON_GLIB_LIBS)
-
-- PKG_CHECK_MODULES(REST, [rest-0.7])
-+ PKG_CHECK_MODULES(REST, [rest-1.0])
- AC_SUBST(REST_CFLAGS)
- AC_SUBST(REST_LIBS)
-
-diff --git a/src/goabackend/goalastfmprovider.c b/src/goabackend/goalastfmprovider.c
-index cb9a6f2..a2db037 100644
---- a/src/goabackend/goalastfmprovider.c
-+++ b/src/goabackend/goalastfmprovider.c
-@@ -483,18 +483,18 @@ add_account_cb (GoaManager *manager, GAsyncResult *res, gpointer user_data)
-
- static void
- check_cb (RestProxyCall *call,
-- const GError *error,
-- GObject *weak_object,
-+ GAsyncResult *result,
- gpointer user_data)
- {
- AddAccountData *data = user_data;
- JsonNode *session;
-- JsonParser *parser;
-+ JsonParser *parser = NULL;
- JsonObject *json_obj;
- JsonObject *session_obj;
- const gchar *payload;
-
-- parser = NULL;
-+ if (!rest_proxy_call_invoke_finish (call, result, &data->error))
-+ goto out;
-
- parser = json_parser_new ();
- payload = rest_proxy_call_get_payload (call);
-@@ -562,12 +562,12 @@ on_rest_proxy_call_cancelled_cb (GCancellable *cancellable, RestProxyCall *call)
- }
-
- static void
--lastfm_login (GoaProvider *provider,
-- const gchar *username,
-- const gchar *password,
-- GCancellable *cancellable,
-- RestProxyCallAsyncCallback callback,
-- gpointer user_data)
-+lastfm_login (GoaProvider *provider,
-+ const gchar *username,
-+ const gchar *password,
-+ GCancellable *cancellable,
-+ GAsyncReadyCallback callback,
-+ gpointer user_data)
- {
- AddAccountData *data = user_data;
- RestProxyCall *call;
-@@ -598,7 +598,7 @@ lastfm_login (GoaProvider *provider,
- rest_proxy_call_add_param (call, "api_sig", sig_md5);
- rest_proxy_call_add_param (call, "format", "json");
-
-- rest_proxy_call_async (call, callback, NULL, data, &data->error);
-+ rest_proxy_call_invoke_async (call, NULL, callback, data);
-
- g_signal_connect (cancellable, "cancelled", G_CALLBACK (on_rest_proxy_call_cancelled_cb), call);
-
-@@ -665,7 +665,7 @@ add_account (GoaProvider *provider,
- username,
- password,
- data.cancellable,
-- (RestProxyCallAsyncCallback) check_cb,
-+ (GAsyncReadyCallback) check_cb,
- &data);
-
- gtk_widget_set_sensitive (data.connect_button, FALSE);
-@@ -819,7 +819,7 @@ refresh_account (GoaProvider *provider,
- username,
- password,
- data.cancellable,
-- (RestProxyCallAsyncCallback) check_cb,
-+ (GAsyncReadyCallback) check_cb,
- &data);
- gtk_widget_set_sensitive (data.connect_button, FALSE);
- gtk_widget_show (data.progress_grid);
-diff --git a/src/goabackend/goaoauthprovider.c b/src/goabackend/goaoauthprovider.c
-index 0bfab6b..6a69251 100644
---- a/src/goabackend/goaoauthprovider.c
-+++ b/src/goabackend/goaoauthprovider.c
-@@ -699,9 +699,15 @@ on_web_view_decide_policy (WebKitWebView *web_view,
- }
-
- static void
--rest_proxy_call_cb (RestProxyCall *call, const GError *error, GObject *weak_object, gpointer user_data)
-+rest_proxy_call_cb (GObject *source, GAsyncResult *result, gpointer user_data)
- {
-+ RestProxyCall *call = REST_PROXY_CALL (source);
- IdentifyData *data = user_data;
-+
-+ if (!rest_proxy_call_invoke_finish (call, result, &data->error))
-+ {
-+ g_prefix_error (&data->error, _("Error getting a Request Token: "));
-+ }
- g_main_loop_quit (data->loop);
- }
-
-@@ -768,11 +774,7 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
- for (n = 0; request_params[n] != NULL; n += 2)
- rest_proxy_call_add_param (call, request_params[n], request_params[n+1]);
- }
-- if (!rest_proxy_call_async (call, rest_proxy_call_cb, NULL, &data, &data.error))
-- {
-- g_prefix_error (&data.error, _("Error getting a Request Token: "));
-- goto out;
-- }
-+ rest_proxy_call_invoke_async (call, NULL, rest_proxy_call_cb, &data);
-
- goa_utils_set_dialog_title (GOA_PROVIDER (provider), dialog, add_account);
-
-@@ -794,6 +796,9 @@ get_tokens_and_identity (GoaOAuthProvider *provider,
- g_main_loop_run (data.loop);
- gtk_container_remove (GTK_CONTAINER (grid), spinner);
-
-+ if (data.error)
-+ goto out;
-+
- if (rest_proxy_call_get_status_code (call) != 200)
- {
- gchar *msg;
-diff --git a/src/goabackend/goarestproxy.h b/src/goabackend/goarestproxy.h
-index 09fb076..4948cb7 100644
---- a/src/goabackend/goarestproxy.h
-+++ b/src/goabackend/goarestproxy.h
-@@ -27,8 +27,6 @@
-
- G_BEGIN_DECLS
-
--G_DEFINE_AUTOPTR_CLEANUP_FUNC (RestProxy, g_object_unref);
--
- #define GOA_TYPE_REST_PROXY (goa_rest_proxy_get_type ())
- G_DECLARE_FINAL_TYPE (GoaRestProxy, goa_rest_proxy, GOA, REST_PROXY, RestProxy);
-
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb
deleted file mode 100644
index 451670e64..000000000
--- a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.44.0.bb
+++ /dev/null
@@ -1,34 +0,0 @@
-SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME"
-LICENSE = "LGPL-2.0-or-later"
-LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36"
-
-GNOMEBASEBUILDCLASS = "autotools"
-
-inherit gnomebase gsettings gobject-introspection gsettings gtk-doc vala gettext features_check
-
-ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-
-DEPENDS = "glib-2.0"
-
-SRC_URI += "file://0001-Update-to-rest-1.0.patch"
-SRC_URI[archive.sha256sum] = "381d5d4106f435b6f87786aa049be784774e15996adcc02789807afc87ea7342"
-
-# backend is required for gnome-control-center
-PACKAGECONFIG = "backend other"
-
-PACKAGECONFIG[backend] = "--enable-backend,--disable-backend,gtk+3 webkitgtk libsoup-2.4 json-glib libsecret rest libxml2"
-PACKAGECONFIG[krb5] = "--enable-kerberos, --disable-kerberos , krb5 gcr"
-
-# no extra dependencies!
-PACKAGECONFIG[other] = " \
- --enable-facebook --enable-foursquare --enable-exchange --enable-flickr --enable-google --enable-imap-smtp --enable-owncloud --enable-windows-live,\
- --disable-facebook --disable-foursquare --disable-exchange --disable-flickr --disable-google --disable-imap-smtp --disable-owncloud --disable-windows-live, \
-"
-
-FILES:${PN} += " \
- ${datadir}/dbus-1 \
- ${libdir}/goa-1.0/web-extensions/*.so \
-"
-
-# looked into pkg-config file: it is not a bug - they mean it
-FILES:${PN}-dev += "${libdir}/goa-1.0/include"
diff --git a/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb
new file mode 100644
index 000000000..80cf4969c
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.46.0.bb
@@ -0,0 +1,31 @@
+SUMMARY = "GNOME Online Accounts - Single sign-on framework for GNOME"
+LICENSE = "LGPL-2.0-or-later"
+LIC_FILES_CHKSUM = "file://COPYING;md5=34c88b124db5fb2762c1676be7dadd36"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+inherit gnomebase gsettings gobject-introspection gtk-icon-cache vala features_check
+
+DEPENDS = "gtk+3 gtk+3-native gdk-pixbuf dbus json-glib libxml2 webkitgtk glib-2.0 rest libsecret"
+
+SRC_URI[archive.sha256sum] = "5e7859ce4858a6b99d3995ed70527d66e297bb90bbf75ec8780fe9da22c1fcaa"
+
+PACKAGECONFIG_SOUP ?= "soup3"
+PACKAGECONFIG ?= "kerberos owncloud lastfm google windows_live ${PACKAGECONFIG_SOUP}"
+
+PACKAGECONFIG[kerberos] = "-Dkerberos=true, -Dkerberos=false,krb5 gcr3"
+PACKAGECONFIG[exchange] = "-Dexchange=true, -Dexchange=false"
+PACKAGECONFIG[google] = "-Dgoogle=true, -Dgoogle=false"
+PACKAGECONFIG[owncloud] = "-Downcloud=true, -Downcloud=false"
+PACKAGECONFIG[windows_live] = "-Dwindows_live=true, -Dwindows_live=false"
+PACKAGECONFIG[lastfm] = "-Dlastfm=true, -Dlastfm=false"
+PACKAGECONFIG[soup2] = ",,libsoup-2.4,,,soup3"
+PACKAGECONFIG[soup3] = ",,libsoup-3.0,,,soup2"
+
+FILES:${PN} += " \
+ ${datadir}/dbus-1 \
+ ${libdir}/goa-1.0/web-extensions/*.so \
+"
+
+# looked into pkg-config file: it is not a bug - they mean it
+FILES:${PN}-dev += "${libdir}/goa-1.0/include"
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb
index 3d5913ac0..fe246953f 100644
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_42.1.bb
+++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_43.0.bb
@@ -25,7 +25,7 @@ DEPENDS = " \
REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data"
GIR_MESON_OPTION = ""
-SRC_URI[archive.sha256sum] = "ed65851ae54adcd58a24c86837d624fc6a14bd84ab22e94df40a3a4cfd19ffdb"
+SRC_URI[archive.sha256sum] = "3513bb24fc6f8181667223a64a067534fdccf3bf66326a9403d38b0f0d6013d0"
PACKAGECONFIG ??= " \
cups nm \
@@ -42,5 +42,5 @@ PACKAGECONFIG[wayland] = "-Dwayland=true,-Dwayland=false,wayland"
FILES:${PN} += " \
${systemd_user_unitdir} \
- ${libdir}/gnome-settings-daemon-42/libgsd.so \
+ /usr/lib/gnome-settings-daemon-43/libgsd.so \
"
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb
index e8c95d6fb..e8c95d6fb 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_42.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell-extensions_43.1.bb
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
index 4a3662518..b583199e9 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell/0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch
@@ -1,4 +1,4 @@
-From 3bf597b16e23cd2ce0ee3b05c23b46add5e26cd4 Mon Sep 17 00:00:00 2001
+From 9f11c9e53d91b23113202b40500540242bcabdb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Thu, 28 Oct 2021 18:57:24 +0200
Subject: [PATCH] Introduce options 'gjs_path' to optionally set path to gjs
@@ -6,9 +6,15 @@ MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
Upstream-Status: Pending
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
+
---
js/dbusServices/meson.build | 2 +-
meson.build | 6 +++++-
@@ -19,10 +25,10 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
6 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/js/dbusServices/meson.build b/js/dbusServices/meson.build
-index eb941ed..16efaeb 100644
+index 48b7f89..700b590 100644
--- a/js/dbusServices/meson.build
+++ b/js/dbusServices/meson.build
-@@ -27,7 +27,7 @@ foreach service, dir : dbus_services
+@@ -22,7 +22,7 @@ foreach service, dir : dbus_services
serviceconf = configuration_data()
serviceconf.set('service', service)
@@ -32,10 +38,10 @@ index eb941ed..16efaeb 100644
configure_file(
diff --git a/meson.build b/meson.build
-index 8d7478f..7c9cc6a 100644
+index 252fb1e..250f722 100644
--- a/meson.build
+++ b/meson.build
-@@ -138,7 +138,11 @@ endif
+@@ -125,7 +125,11 @@ endif
mutter_typelibdir = mutter_dep.get_variable('typelibdir')
python = find_program('python3')
@@ -49,11 +55,11 @@ index 8d7478f..7c9cc6a 100644
cc = meson.get_compiler('c')
diff --git a/meson_options.txt b/meson_options.txt
-index f0f2ecf..a45f2e4 100644
+index 46ca8e7..3e9a31f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -45,3 +45,9 @@ option('soup2',
- value: true,
+ value: false,
description: 'Use Soup 2.4 instead of Soup 3. Must be in sync with libgweather'
)
+
@@ -76,10 +82,10 @@ index ce2a776..8f7bba4 100644
configure_file(
input: prgname + '.in',
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
-index c260d7a..c5b7554 100644
+index 66a39e9..331dc1d 100644
--- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build
-@@ -44,7 +44,12 @@ localedir = join_paths(datadir, 'locale')
+@@ -46,7 +46,12 @@ localedir = join_paths(datadir, 'locale')
metainfodir = join_paths(datadir, 'metainfo')
servicedir = join_paths(datadir, 'dbus-1', 'services')
@@ -107,6 +113,3 @@ index ca2eb41..2787785 100644
+ value: '',
+ description: 'Instead of searching gjs executable, configure path'
+)
---
-2.34.1
-
diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb
index f54d966c7..6adbb0a29 100644
--- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_42.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_43.1.bb
@@ -11,11 +11,13 @@ DEPENDS = " \
mutter \
evolution-data-server \
gcr \
+ geocode-glib \
gjs \
gnome-autoar \
polkit \
libcroco \
- startup-notification \
+ libsoup-3.0 \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', 'startup-notification', d)} \
ibus \
gsettings-desktop-schemas \
"
@@ -31,7 +33,7 @@ GIR_MESON_OPTION = ""
# gobject-introspection is mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES += "gobject-introspection-data"
-SRC_URI[archive.sha256sum] = "33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094"
+SRC_URI[archive.sha256sum] = "df0444765def1bd0afee9617d2b5919bc79b4db86e7e757ac0e1f73748ec1bdc"
SRC_URI += "file://0001-Introduce-options-gjs_path-to-optionally-set-path-to.patch"
PACKAGECONFIG ??= "bluetooth nm ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -44,6 +46,7 @@ EXTRA_OEMESON = " \
-Dextensions-app:gjs_path=${bindir}/gjs \
-Dtests=false \
-Dman=false \
+ -Dsoup2=false \
"
do_install:append() {
diff --git a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb
index 1446b151c..763384b7e 100644
--- a/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb
+++ b/meta-gnome/recipes-gnome/gnome-text-editor/gnome-text-editor_42.2.bb
@@ -10,6 +10,7 @@ DEPENDS = " \
gtk4 \
gtksourceview5 \
enchant2 \
+ libpcre \
"
GTKIC_VERSION = "4"
diff --git a/meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb b/meta-gnome/recipes-gnome/gspell/gspell_1.12.0.bb
index c76a48f19..b7e495496 100644
--- a/meta-gnome/recipes-gnome/gspell/gspell_1.11.1.bb
+++ b/meta-gnome/recipes-gnome/gspell/gspell_1.12.0.bb
@@ -7,4 +7,4 @@ DEPENDS = "gtk+3 iso-codes enchant2"
inherit gnomebase gettext gobject-introspection vala
-SRC_URI[archive.sha256sum] = "ef6aa4e3f711775158a7e241a5f809cf2426bc0e02c23a7d2b5c71fc3de00292"
+SRC_URI[archive.sha256sum] = "40d2850f1bb6e8775246fa1e39438b36caafbdbada1d28a19fa1ca07e1ff82ad"
diff --git a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb
index 52c270e6a..297f79fe2 100644
--- a/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb
+++ b/meta-gnome/recipes-gnome/gtksourceview/gtksourceview5_5.4.2.bb
@@ -23,6 +23,7 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase lib_package gettext features_check gtk-doc gtk-icon-cache gobject-introspection vala
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+REQUIRED_DISTRO_FEATURES = "opengl"
SRC_URI = "https://download.gnome.org/sources/gtksourceview/5.4/${PNAME}-${PV}.tar.xz"
SRC_URI[sha256sum] = "ad140e07eb841910de483c092bd4885abd29baadd6e95fa22d93ed2df0b79de7"
diff --git a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
index bd9180e8a..126ef712d 100644
--- a/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
+++ b/meta-gnome/recipes-gnome/libgdata/libgdata_0.18.1.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \
file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \
file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef"
-DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr json-glib"
+DEPENDS = "libxml2 glib-2.0 libsoup-2.4 intltool-native liboauth gcr3 json-glib"
GTKDOC_MESON_OPTION = "gtk_doc"
GNOMEBASEBUILDCLASS = "meson"
diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch b/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch
index 6c6a643ed..3a075de65 100644
--- a/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather4/0001-Allow-building-gir-in-cross-environments.patch
@@ -11,23 +11,16 @@ For us this works perfectly fine
Upstream-Status: Inappropriate [OE-specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
----
- libgweather/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+Signed-off-by: Markus Volk <f_l_k@t-online.de>
-diff --git a/libgweather/meson.build b/libgweather/meson.build
-index 08311af..ef554f2 100644
---- a/libgweather/meson.build
-+++ b/libgweather/meson.build
-@@ -208,7 +208,7 @@ lib_libgweather = library('gweather-4',
- )
+--- a/meson.build 2022-09-18 14:48:53.000000000 +0200
++++ b/meson.build 2022-11-26 14:05:13.302487232 +0100
+@@ -51,7 +51,7 @@
+ gen_locations_variant = find_program('build-aux/meson/gen_locations_variant.py')
g_ir_scanner = find_program('g-ir-scanner', required: get_option('introspection'))
-build_gir = get_option('introspection') and g_ir_scanner.found() and not meson.is_cross_build()
+build_gir = get_option('introspection') and g_ir_scanner.found()
+ build_docs = get_option('gtk_doc') and build_gir
- enable_vala = get_option('enable_vala')
- vapigen = find_program('vapigen', required: enable_vala == 'true')
---
-2.34.1
-
+ schemas_srcdir = meson.project_source_root() / 'schemas'
diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb
index 708d27a61..34d259ff3 100644
--- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb
+++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.2.0.bb
@@ -10,15 +10,15 @@ S = "${WORKDIR}/${GNOMEBN}-${PV}"
inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala
SRC_URI += "file://0001-Allow-building-gir-in-cross-environments.patch"
-SRC_URI[archive.sha256sum] = "440d44801b6f72b48c676e5e37f9109cfee1394fd74cc92725e1b1ba4fae834c"
+SRC_URI[archive.sha256sum] = "af8a812da0d8976a000e1d62572c256086a817323fbf35b066dbfdd8d2ca6203"
GTKDOC_MESON_OPTION = "gtk_doc"
DEPENDS = " \
geocode-glib \
- gtk+3 \
+ gtk4 \
json-glib \
- libsoup-2.4 \
+ libsoup-3.0 \
python3-pygobject-native \
"
diff --git a/meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb b/meta-gnome/recipes-gnome/metacity/metacity_3.46.0.bb
index b6708552a..2760d73df 100644
--- a/meta-gnome/recipes-gnome/metacity/metacity_3.44.0.bb
+++ b/meta-gnome/recipes-gnome/metacity/metacity_3.46.0.bb
@@ -23,7 +23,7 @@ REQUIRED_DISTRO_FEATURES = "x11"
inherit gnomebase gsettings gettext upstream-version-is-even features_check
-SRC_URI[archive.sha256sum] = "19c3c5d79d2171f45baa0f632cc8995f8607bf1231a16014439bac9ba165a7c0"
+SRC_URI[archive.sha256sum] = "4ba777e938547bfccbf9acca0967574c46643022e054c93a033419cb3cc7c1ec"
SRC_URI += "file://0001-drop-zenity-detection.patch"
PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama"
diff --git a/meta-gnome/recipes-gnome/mutter/mutter_42.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_43.1.bb
index 785536280..9b764c666 100644
--- a/meta-gnome/recipes-gnome/mutter/mutter_42.0.bb
+++ b/meta-gnome/recipes-gnome/mutter/mutter_43.1.bb
@@ -7,7 +7,7 @@ DEPENDS = " \
wayland-native \
virtual/libx11 \
graphene \
- gtk+3 \
+ gtk4 \
gdk-pixbuf \
cairo \
pango \
@@ -17,7 +17,7 @@ DEPENDS = " \
gnome-settings-daemon \
libxtst \
libxkbfile \
- xinerama \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xinerama', '', d)} \
xwayland \
"
@@ -25,7 +25,7 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings gobject-introspection gettext features_check
-SRC_URI[archive.sha256sum] = "d1e240446b7f8cd8a3ff9daae336c1c9016193ba7e0769c79a5e6c03849022e5"
+SRC_URI[archive.sha256sum] = "f2f08b252783948a5ecc82f00e9e935a61ebbf8564844bdd92788ab44aa78264"
# x11 is still manadatory - see meson.build
REQUIRED_DISTRO_FEATURES = "wayland x11 polkit"
@@ -60,7 +60,7 @@ PACKAGECONFIG[sm] = "-Dsm=true, -Dsm=false, libsm"
PACKAGECONFIG[profiler] = "-Dprofiler=true,-Dprofiler=false,sysprof"
PACKAGECONFIG[startup-notification] = "-Dstartup_notification=true, -Dstartup_notification=false, startup-notification, startup-notification"
-MUTTER_API_NAME = "mutter-10"
+MUTTER_API_NAME = "mutter-11"
do_install:append() {
# Add gir links in standard paths. That makes dependents life much easier
@@ -78,6 +78,7 @@ PACKAGES =+ "${PN}-tests ${PN}-gsettings"
FILES:${PN} += " \
${datadir}/gnome-control-center \
+ ${datadir}/gir-1.0 \
${libdir}/${MUTTER_API_NAME}/lib*${SOLIBS} \
${libdir}/${MUTTER_API_NAME}/*.typelib \
${libdir}/${MUTTER_API_NAME}/plugins \
diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb
index a0f928ce2..ec16b6879 100644
--- a/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb
+++ b/meta-gnome/recipes-gnome/nautilus/nautilus_42.2.bb
@@ -24,7 +24,7 @@ def gnome_verdir(v):
SRC_URI += " file://0001-Provide-parameter-prototype-for-functions-without-pa.patch"
SRC_URI[archive.sha256sum] = "99212d2eb75996f181728ad04a2e2d86f2577b064e68a34c8b81a7037df4ccb2"
-REQUIRED_DISTRO_FEATURES = "x11"
+REQUIRED_DISTRO_FEATURES = "x11 opengl"
EXTRA_OEMESON += " \
-Dtests=none \
diff --git a/meta-gnome/recipes-gnome/rest/files/0001-Use-GUri-instead-of-SoupURI.patch b/meta-gnome/recipes-gnome/rest/files/0001-Use-GUri-instead-of-SoupURI.patch
deleted file mode 100644
index 37ba0a042..000000000
--- a/meta-gnome/recipes-gnome/rest/files/0001-Use-GUri-instead-of-SoupURI.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From d39fd6d5f4c0a63cc048b84b0f989cb83f31e5fe Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Tue, 8 Jun 2021 10:57:06 +0200
-Subject: [PATCH 1/2] Use GUri instead of SoupURI
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/librest/-/merge_requests/6]
----
- configure.ac | 2 +-
- rest-extras/flickr-proxy.c | 19 ++++++++++++++-----
- rest/oauth-proxy-call.c | 19 ++++++++++++++-----
- rest/oauth2-proxy.c | 22 +++++++++++-----------
- 4 files changed, 40 insertions(+), 22 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d15e592..d586e69 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -40,7 +40,7 @@ AM_PROG_CC_C_O
- LT_PREREQ([2.2.6])
- LT_INIT([disable-static])
-
--PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.44)
-+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.67.4)
- PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.42)
- PKG_CHECK_MODULES(XML, libxml-2.0)
- PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
-diff --git a/rest-extras/flickr-proxy.c b/rest-extras/flickr-proxy.c
-index 3342a4d..7726359 100644
---- a/rest-extras/flickr-proxy.c
-+++ b/rest-extras/flickr-proxy.c
-@@ -304,13 +304,13 @@ flickr_proxy_build_login_url (FlickrProxy *proxy,
- const char *frob,
- const char *perms)
- {
-- SoupURI *uri;
-+ GUri *uri;
- GHashTable *params;
- char *sig, *s;
-+ char *query;
-
- g_return_val_if_fail (FLICKR_IS_PROXY (proxy), NULL);
-
-- uri = soup_uri_new ("http://flickr.com/services/auth/");
- params = g_hash_table_new (g_str_hash, g_str_equal);
-
- g_hash_table_insert (params, "api_key", proxy->priv->api_key);
-@@ -321,14 +321,23 @@ flickr_proxy_build_login_url (FlickrProxy *proxy,
-
- sig = flickr_proxy_sign (proxy, params);
- g_hash_table_insert (params, "api_sig", sig);
-+ query = soup_form_encode_hash (params);
-
-- soup_uri_set_query_from_form (uri, params);
-+ uri = g_uri_build (G_URI_FLAGS_ENCODED,
-+ "http",
-+ NULL,
-+ "flickr.com",
-+ -1,
-+ "services/auth/",
-+ query,
-+ NULL);
-
-- s = soup_uri_to_string (uri, FALSE);
-+ s = g_uri_to_string (uri);
-
-+ g_free (query);
- g_free (sig);
- g_hash_table_destroy (params);
-- soup_uri_free (uri);
-+ g_uri_unref (uri);
-
- return s;
- }
-diff --git a/rest/oauth-proxy-call.c b/rest/oauth-proxy-call.c
-index c90c69d..e238c3c 100644
---- a/rest/oauth-proxy-call.c
-+++ b/rest/oauth-proxy-call.c
-@@ -30,7 +30,7 @@
-
- G_DEFINE_TYPE (OAuthProxyCall, oauth_proxy_call, REST_TYPE_PROXY_CALL)
-
--#define OAUTH_ENCODE_STRING(x_) (x_ ? soup_uri_encode( (x_), "!$&'()*+,;=@") : g_strdup (""))
-+#define OAUTH_ENCODE_STRING(x_) (x_ ? g_uri_escape_string( (x_), NULL, TRUE) : g_strdup (""))
-
- static char *
- sign_plaintext (OAuthProxyPrivate *priv)
-@@ -136,15 +136,24 @@ sign_hmac (OAuthProxy *proxy, RestProxyCall *call, GHashTable *oauth_params)
- if (priv->oauth_echo) {
- g_string_append_uri_escaped (text, priv->service_url, NULL, FALSE);
- } else if (priv->signature_host != NULL) {
-- SoupURI *url = soup_uri_new (url_str);
-+ GUri *url = g_uri_parse (url_str, G_URI_FLAGS_ENCODED, NULL);
-+ GUri *new_url;
- gchar *signing_url;
-
-- soup_uri_set_host (url, priv->signature_host);
-- signing_url = soup_uri_to_string (url, FALSE);
-+ new_url = g_uri_build (g_uri_get_flags (url),
-+ g_uri_get_scheme (url),
-+ g_uri_get_userinfo (url),
-+ priv->signature_host,
-+ g_uri_get_port (url),
-+ g_uri_get_path (url),
-+ g_uri_get_query (url),
-+ g_uri_get_fragment (url));
-+ signing_url = g_uri_to_string (new_url);
-
- g_string_append_uri_escaped (text, signing_url, NULL, FALSE);
-
-- soup_uri_free (url);
-+ g_uri_unref (new_url);
-+ g_uri_unref (url);
- g_free (signing_url);
- } else {
- g_string_append_uri_escaped (text, url_str, NULL, FALSE);
-diff --git a/rest/oauth2-proxy.c b/rest/oauth2-proxy.c
-index 24e5da0..3382f8b 100644
---- a/rest/oauth2-proxy.c
-+++ b/rest/oauth2-proxy.c
-@@ -37,8 +37,6 @@ oauth2_proxy_error_quark (void)
- return g_quark_from_static_string ("rest-oauth2-proxy");
- }
-
--#define EXTRA_CHARS_ENCODE "!$&'()*+,;=@"
--
- enum {
- PROP_0,
- PROP_CLIENT_ID,
-@@ -242,8 +240,8 @@ append_query_param (gpointer key, gpointer value, gpointer user_data)
- char *encoded_val, *encoded_key;
- char *param;
-
-- encoded_val = soup_uri_encode (value, EXTRA_CHARS_ENCODE);
-- encoded_key = soup_uri_encode (key, EXTRA_CHARS_ENCODE);
-+ encoded_val = g_uri_escape_string (value, NULL, TRUE);
-+ encoded_key = g_uri_escape_string (key, NULL, TRUE);
-
- param = g_strdup_printf ("%s=%s", encoded_key, encoded_val);
- g_free (encoded_key);
-@@ -295,8 +293,8 @@ oauth2_proxy_build_login_url_full (OAuth2Proxy *proxy,
- g_hash_table_foreach (extra_params, append_query_param, params);
- }
-
-- encoded_uri = soup_uri_encode (redirect_uri, EXTRA_CHARS_ENCODE);
-- encoded_id = soup_uri_encode (proxy->priv->client_id, EXTRA_CHARS_ENCODE);
-+ encoded_uri = g_uri_escape_string (redirect_uri, NULL, TRUE);
-+ encoded_id = g_uri_escape_string (proxy->priv->client_id, NULL, TRUE);
-
- url = g_strdup_printf ("%s?client_id=%s&redirect_uri=%s&type=user_agent",
- proxy->priv->auth_endpoint, encoded_id,
-@@ -378,20 +376,22 @@ oauth2_proxy_extract_access_token (const char *url)
- {
- GHashTable *params;
- char *token = NULL;
-- SoupURI *soupuri = soup_uri_new (url);
-+ const char *fragment;
-+ GUri *uri = g_uri_parse (url, G_URI_FLAGS_ENCODED, NULL);
-
-- if (soupuri->fragment != NULL) {
-- params = soup_form_decode (soupuri->fragment);
-+ fragment = g_uri_get_fragment (uri);
-+ if (fragment != NULL) {
-+ params = soup_form_decode (fragment);
-
- if (params) {
- char *encoded = g_hash_table_lookup (params, "access_token");
- if (encoded)
-- token = soup_uri_decode (encoded);
-+ token = g_uri_unescape_string (encoded, NULL);
-
- g_hash_table_destroy (params);
- }
- }
-- soup_uri_free (soupuri);
-+ g_uri_unref (uri);
-
- return token;
- }
---
-2.33.1
-
diff --git a/meta-gnome/recipes-gnome/rest/files/0002-Port-to-libsoup3.patch b/meta-gnome/recipes-gnome/rest/files/0002-Port-to-libsoup3.patch
deleted file mode 100644
index eed522f77..000000000
--- a/meta-gnome/recipes-gnome/rest/files/0002-Port-to-libsoup3.patch
+++ /dev/null
@@ -1,1696 +0,0 @@
-From 3dc630ae5b9dc6cda1ba318de2cd654aaba7b4a2 Mon Sep 17 00:00:00 2001
-From: Carlos Garcia Campos <cgarcia@igalia.com>
-Date: Tue, 8 Jun 2021 17:44:04 +0200
-Subject: [PATCH 2/2] Port to libsoup3
-
-Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/librest/-/merge_requests/6]
----
- configure.ac | 39 ++++-
- rest-extras.pc.in | 2 +-
- rest-extras/youtube-proxy.c | 110 +++++++++++---
- rest.pc.in | 2 +-
- rest/rest-private.h | 22 ++-
- rest/rest-proxy-auth.c | 16 ++
- rest/rest-proxy-call.c | 296 +++++++++++++++++++++++++++++-------
- rest/rest-proxy.c | 209 ++++++++++++++++++++++---
- tests/custom-serialize.c | 18 +++
- tests/proxy-continuous.c | 37 ++++-
- tests/proxy.c | 63 +++++++-
- tests/threaded.c | 17 +++
- 12 files changed, 719 insertions(+), 112 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index d586e69..75c02fe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,12 +20,6 @@ AM_INIT_AUTOMAKE([1.11 foreign -Wno-portability no-define dist-xz])
-
- AM_SILENT_RULES([yes])
-
--API_MAJOR=1
--API_MINOR=0
--AC_SUBST([API_VERSION],[$API_MAJOR.$API_MINOR])
--AC_SUBST([API_VERSION_AM],[$API_MAJOR\_$API_MINOR])
--AC_DEFINE_UNQUOTED(API_VERSION, [$API_VERSION], [API version])
--
- AC_CANONICAL_HOST
-
- AC_PROG_CC
-@@ -41,7 +35,6 @@ LT_PREREQ([2.2.6])
- LT_INIT([disable-static])
-
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.67.4)
--PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.42)
- PKG_CHECK_MODULES(XML, libxml-2.0)
- PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
-
-@@ -58,6 +51,37 @@ AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
- localedir=${datadir}/locale
- AC_SUBST(localedir)
-
-+AC_MSG_CHECKING([for libsoup version to use])
-+AC_ARG_WITH(soup,
-+ [AC_HELP_STRING([--soup=2|3],
-+ [version of libsoup library to use (default: 2)])],
-+ [case "$withval" in
-+ 2|3) ;;
-+ *) AC_MSG_ERROR([invalid argument "$withval" for --with-soup]) ;;
-+ esac],
-+ [with_soup=2])
-+AC_MSG_RESULT([$with_soup])
-+
-+API_MAJOR=1
-+
-+if test "$with_soup" = "2"; then
-+ PKG_CHECK_MODULES(SOUP, libsoup-2.4 >= 2.42)
-+ SOUP_API_VERSION=2.4
-+ API_MINOR=0
-+ AC_DEFINE([WITH_SOUP_2],[1],[Define if libsoup version used is 2])
-+else
-+ PKG_CHECK_MODULES(SOUP, libsoup-3.0 >= 2.99.8)
-+ SOUP_API_VERSION=3.0
-+ API_MINOR=1
-+fi
-+
-+AM_CONDITIONAL([WITH_SOUP_2],[test "$with_soup" = "2"])
-+AC_SUBST(SOUP_API_VERSION)
-+
-+AC_SUBST([API_VERSION],[$API_MAJOR.$API_MINOR])
-+AC_SUBST([API_VERSION_AM],[$API_MAJOR\_$API_MINOR])
-+AC_DEFINE_UNQUOTED(API_VERSION, [$API_VERSION], [API version])
-+
- dnl === Coverage report =======================================================
- AC_PATH_PROG([GCOV], [lcov], [enable_gcov=no])
-
-@@ -130,6 +154,7 @@ echo " LibRest $VERSION"
- echo " ================"
- echo ""
- echo " prefix: ${prefix}"
-+echo " libsoup version: ${with_soup}"
- echo ""
- echo " Documentation: ${enable_gtk_doc}"
- echo " Introspection data: ${enable_introspection}"
-diff --git a/rest-extras.pc.in b/rest-extras.pc.in
-index 39f21bf..3723d6d 100644
---- a/rest-extras.pc.in
-+++ b/rest-extras.pc.in
-@@ -9,4 +9,4 @@ Description: RESTful web api query library
- Version: @VERSION@
- Libs: -L${libdir} -lrest-extras-${apiversion}
- Cflags: -I${includedir}/rest-${apiversion}
--Requires: glib-2.0 libsoup-2.4 libxml-2.0
-+Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ libxml-2.0
-diff --git a/rest-extras/youtube-proxy.c b/rest-extras/youtube-proxy.c
-index be0cf08..cd598f4 100644
---- a/rest-extras/youtube-proxy.c
-+++ b/rest-extras/youtube-proxy.c
-@@ -246,6 +246,9 @@ typedef struct {
- GObject *weak_object;
- gpointer user_data;
- gsize uploaded;
-+#ifndef WITH_SOUP_2
-+ GCancellable *cancellable;
-+#endif
- } YoutubeProxyUploadClosure;
-
- static void
-@@ -255,7 +258,11 @@ _upload_async_weak_notify_cb (gpointer *data,
- YoutubeProxyUploadClosure *closure =
- (YoutubeProxyUploadClosure *) data;
-
-+#ifdef WITH_SOUP_2
- _rest_proxy_cancel_message (REST_PROXY (closure->proxy), closure->message);
-+#else
-+ g_cancellable_cancel (closure->cancellable);
-+#endif
- }
-
- static void
-@@ -267,6 +274,9 @@ _upload_async_closure_free (YoutubeProxyUploadClosure *closure)
- closure);
-
- g_object_unref (closure->proxy);
-+#ifndef WITH_SOUP_2
-+ g_object_unref (closure->cancellable);
-+#endif
-
- g_slice_free (YoutubeProxyUploadClosure, closure);
- }
-@@ -286,6 +296,9 @@ _upload_async_closure_new (YoutubeProxy *self,
- closure->message = message;
- closure->weak_object = weak_object;
- closure->user_data = user_data;
-+#ifndef WITH_SOUP_2
-+ closure->cancellable = g_cancellable_new ();
-+#endif
-
- if (weak_object != NULL)
- g_object_weak_ref (weak_object,
-@@ -295,41 +308,67 @@ _upload_async_closure_new (YoutubeProxy *self,
- }
-
- static void
--_upload_completed_cb (SoupSession *session,
-- SoupMessage *message,
-+_upload_completed_cb (SoupMessage *message,
-+ GBytes *payload,
-+ GError *error,
- gpointer user_data)
- {
- YoutubeProxyUploadClosure *closure =
- (YoutubeProxyUploadClosure *) user_data;
-- GError *error = NULL;
-+ gsize length;
-+ gconstpointer data;
-+ guint status_code;
-+ const char *reason_phrase;
-
- if (closure->callback == NULL)
- return;
-
-- if (message->status_code < 200 || message->status_code >= 300)
-- error = g_error_new_literal (REST_PROXY_ERROR,
-- message->status_code,
-- message->reason_phrase);
--
-- closure->callback (closure->proxy, message->response_body->data,
-- message->request_body->length,
-- message->request_body->length,
-+#ifdef WITH_SOUP_2
-+ status_code = message->status_code;
-+ reason_phrase = message->reason_phrase;
-+#else
-+ status_code = soup_message_get_status (message);
-+ reason_phrase = soup_message_get_reason_phrase (message);
-+#endif
-+
-+ if (status_code < 200 || status_code >= 300)
-+ {
-+ g_clear_error (&error);
-+ error = g_error_new_literal (REST_PROXY_ERROR,
-+ status_code,
-+ reason_phrase);
-+ }
-+
-+ data = g_bytes_get_data (payload, &length);
-+ closure->callback (closure->proxy, data, length, length,
- error, closure->weak_object, closure->user_data);
-+ g_bytes_unref (payload);
-
- _upload_async_closure_free (closure);
- }
-
- static void
- _message_wrote_data_cb (SoupMessage *msg,
-+#ifdef WITH_SOUP_2
- SoupBuffer *chunk,
-+#else
-+ gsize chunk_size,
-+#endif
- YoutubeProxyUploadClosure *closure)
- {
-- closure->uploaded = closure->uploaded + chunk->length;
-+#ifdef WITH_SOUP_2
-+ gsize chunk_size = chunk->length;
-+ goffset content_length = msg->request_body->length;
-+#else
-+ goffset content_length = soup_message_headers_get_content_length (soup_message_get_request_headers (msg));
-+#endif
-+
-+ closure->uploaded = closure->uploaded + chunk_size;
-
-- if (closure->uploaded < msg->request_body->length)
-+ if (closure->uploaded < content_length)
- closure->callback (closure->proxy,
- NULL,
-- msg->request_body->length,
-+ content_length,
- closure->uploaded,
- NULL,
- closure->weak_object,
-@@ -364,7 +403,12 @@ youtube_proxy_upload_async (YoutubeProxy *self,
- SoupMultipart *mp;
- SoupMessage *message;
- SoupMessageHeaders *part_headers;
-+ SoupMessageHeaders *request_headers;
-+#ifdef WITH_SOUP_2
- SoupBuffer *sb;
-+#else
-+ GBytes *sb;
-+#endif
- gchar *content_type;
- gchar *atom_xml;
- GMappedFile *map;
-@@ -380,10 +424,17 @@ youtube_proxy_upload_async (YoutubeProxy *self,
-
- atom_xml = _construct_upload_atom_xml (fields, incomplete);
-
-+#ifdef WITH_SOUP_2
- sb = soup_buffer_new_with_owner (atom_xml,
- strlen(atom_xml),
- atom_xml,
- (GDestroyNotify) g_free);
-+#else
-+ sb = g_bytes_new_with_free_func (atom_xml,
-+ strlen (atom_xml),
-+ (GDestroyNotify) g_free,
-+ atom_xml);
-+#endif
-
- part_headers = soup_message_headers_new (SOUP_MESSAGE_HEADERS_MULTIPART);
-
-@@ -393,7 +444,11 @@ youtube_proxy_upload_async (YoutubeProxy *self,
-
- soup_multipart_append_part (mp, part_headers, sb);
-
-+#ifdef WITH_SOUP_2
- soup_buffer_free (sb);
-+#else
-+ g_bytes_unref (sb);
-+#endif
-
- content_type = g_content_type_guess (
- filename,
-@@ -401,24 +456,37 @@ youtube_proxy_upload_async (YoutubeProxy *self,
- g_mapped_file_get_length (map),
- NULL);
-
-+#ifdef WITH_SOUP_2
- sb = soup_buffer_new_with_owner (g_mapped_file_get_contents (map),
- g_mapped_file_get_length (map),
- map,
- (GDestroyNotify) g_mapped_file_unref);
-+#else
-+ sb = g_bytes_new_with_free_func (g_mapped_file_get_contents (map),
-+ g_mapped_file_get_length (map),
-+ (GDestroyNotify) g_mapped_file_unref,
-+ map);
-+#endif
-
- soup_message_headers_replace (part_headers, "Content-Type", content_type);
-
- soup_multipart_append_part (mp, part_headers, sb);
-
-+#ifdef WITH_SOUP_2
- soup_buffer_free (sb);
--
- soup_message_headers_free (part_headers);
--
- message = soup_form_request_new_from_multipart (UPLOAD_URL, mp);
-+ request_headers = message->request_headers;
-+#else
-+ g_bytes_unref (sb);
-+ soup_message_headers_unref (part_headers);
-+ message = soup_message_new_from_multipart (UPLOAD_URL, mp);
-+ request_headers = soup_message_get_request_headers (message);
-+#endif
-
- soup_multipart_free (mp);
-
-- _set_upload_headers (self, message->request_headers, filename);
-+ _set_upload_headers (self, request_headers, filename);
-
- closure = _upload_async_closure_new (self, callback, message, weak_object,
- user_data);
-@@ -429,7 +497,13 @@ youtube_proxy_upload_async (YoutubeProxy *self,
- closure);
-
-
-- _rest_proxy_queue_message (REST_PROXY (self), message, _upload_completed_cb,
-+ _rest_proxy_queue_message (REST_PROXY (self), message,
-+#ifdef WITH_SOUP_2
-+ NULL,
-+#else
-+ closure->cancellable,
-+#endif
-+ _upload_completed_cb,
- closure);
-
- return TRUE;
-diff --git a/rest.pc.in b/rest.pc.in
-index 94c384b..e6bae3e 100644
---- a/rest.pc.in
-+++ b/rest.pc.in
-@@ -9,4 +9,4 @@ Description: RESTful web api query library
- Version: @VERSION@
- Libs: -L${libdir} -lrest-${apiversion}
- Cflags: -I${includedir}/rest-${apiversion}
--Requires: glib-2.0 libsoup-2.4 libxml-2.0
-+Requires: glib-2.0 libsoup-@SOUP_API_VERSION@ libxml-2.0
-diff --git a/rest/rest-private.h b/rest/rest-private.h
-index 9e91fa0..6e71322 100644
---- a/rest/rest-private.h
-+++ b/rest/rest-private.h
-@@ -31,6 +31,11 @@
-
- G_BEGIN_DECLS
-
-+typedef void (*RestMessageFinishedCallback) (SoupMessage *msg,
-+ GBytes *body,
-+ GError *error,
-+ gpointer user_data);
-+
- typedef enum
- {
- REST_DEBUG_XML_PARSER = 1 << 0,
-@@ -53,12 +58,23 @@ gboolean _rest_proxy_get_binding_required (RestProxy *proxy);
- const gchar *_rest_proxy_get_bound_url (RestProxy *proxy);
- void _rest_proxy_queue_message (RestProxy *proxy,
- SoupMessage *message,
-- SoupSessionCallback callback,
-+ GCancellable *cancellable,
-+ RestMessageFinishedCallback callback,
- gpointer user_data);
- void _rest_proxy_cancel_message (RestProxy *proxy,
- SoupMessage *message);
--guint _rest_proxy_send_message (RestProxy *proxy,
-- SoupMessage *message);
-+GBytes *_rest_proxy_send_message (RestProxy *proxy,
-+ SoupMessage *message,
-+ GCancellable *cancellable,
-+ GError **error);
-+void _rest_proxy_send_message_async (RestProxy *proxy,
-+ SoupMessage *message,
-+ GCancellable *cancellable,
-+ GAsyncReadyCallback callback,
-+ gpointer user_data);
-+GInputStream *_rest_proxy_send_message_finish (RestProxy *proxy,
-+ GAsyncResult *result,
-+ GError **error);
-
- RestXmlNode *_rest_xml_node_new (void);
- void _rest_xml_node_reverse_children_siblings (RestXmlNode *node);
-diff --git a/rest/rest-proxy-auth.c b/rest/rest-proxy-auth.c
-index b96e443..0b2ec9f 100644
---- a/rest/rest-proxy-auth.c
-+++ b/rest/rest-proxy-auth.c
-@@ -29,7 +29,9 @@
- struct _RestProxyAuthPrivate {
- /* used to hold state during async authentication */
- RestProxy *proxy;
-+#ifdef WITH_SOUP_2
- SoupSession *session;
-+#endif
- SoupMessage *message;
- SoupAuth *auth;
- gboolean paused;
-@@ -43,7 +45,9 @@ rest_proxy_auth_dispose (GObject *object)
- RestProxyAuthPrivate *priv = ((RestProxyAuth*)object)->priv;
-
- g_clear_object (&priv->proxy);
-+#ifdef WITH_SOUP_2
- g_clear_object (&priv->session);
-+#endif
- g_clear_object (&priv->message);
- g_clear_object (&priv->auth);
-
-@@ -73,13 +77,17 @@ rest_proxy_auth_new (RestProxy *proxy,
- RestProxyAuth *rest_auth;
-
- g_return_val_if_fail (REST_IS_PROXY (proxy), NULL);
-+#ifdef WITH_SOUP_2
- g_return_val_if_fail (SOUP_IS_SESSION (session), NULL);
-+#endif
- g_return_val_if_fail (SOUP_IS_MESSAGE (message), NULL);
- g_return_val_if_fail (SOUP_IS_AUTH (soup_auth), NULL);
-
- rest_auth = REST_PROXY_AUTH (g_object_new (REST_TYPE_PROXY_AUTH, NULL));
- rest_auth->priv->proxy = g_object_ref(proxy);
-+#ifdef WITH_SOUP_2
- rest_auth->priv->session = g_object_ref(session);
-+#endif
- rest_auth->priv->message = g_object_ref(message);
- rest_auth->priv->auth = g_object_ref(soup_auth);
-
-@@ -104,7 +112,9 @@ rest_proxy_auth_pause (RestProxyAuth *auth)
- return;
-
- auth->priv->paused = TRUE;
-+#ifdef WITH_SOUP_2
- soup_session_pause_message (auth->priv->session, auth->priv->message);
-+#endif
- }
-
- /**
-@@ -128,7 +138,9 @@ rest_proxy_auth_unpause (RestProxyAuth *auth)
- soup_auth_authenticate (auth->priv->auth, username, password);
- g_free (username);
- g_free (password);
-+#ifdef WITH_SOUP_2
- soup_session_unpause_message (auth->priv->session, auth->priv->message);
-+#endif
- auth->priv->paused = FALSE;
- }
-
-@@ -146,7 +158,11 @@ rest_proxy_auth_cancel (RestProxyAuth *auth)
- {
- g_return_if_fail (REST_IS_PROXY_AUTH (auth));
-
-+#ifdef WITH_SOUP_2
- soup_session_cancel_message (auth->priv->session, auth->priv->message, SOUP_STATUS_CANCELLED);
-+#else
-+ soup_auth_cancel (auth->priv->auth);
-+#endif
- }
-
- G_GNUC_INTERNAL gboolean rest_proxy_auth_is_paused (RestProxyAuth *auth)
-diff --git a/rest/rest-proxy-call.c b/rest/rest-proxy-call.c
-index 2ab722f..62b00da 100644
---- a/rest/rest-proxy-call.c
-+++ b/rest/rest-proxy-call.c
-@@ -20,12 +20,14 @@
- *
- */
-
-+#include <config.h>
- #include <rest/rest-proxy.h>
- #include <rest/rest-proxy-call.h>
- #include <rest/rest-params.h>
- #include <libsoup/soup.h>
-
- #include "rest-private.h"
-+#include "rest-proxy-auth-private.h"
- #include "rest-proxy-call-private.h"
-
-
-@@ -38,12 +40,15 @@ struct _RestProxyCallAsyncClosure {
- };
- typedef struct _RestProxyCallAsyncClosure RestProxyCallAsyncClosure;
-
-+#define READ_BUFFER_SIZE 8192
-+
- struct _RestProxyCallContinuousClosure {
- RestProxyCall *call;
- RestProxyCallContinuousCallback callback;
- GObject *weak_object;
- gpointer userdata;
- SoupMessage *message;
-+ guchar buffer[READ_BUFFER_SIZE];
- };
- typedef struct _RestProxyCallContinuousClosure RestProxyCallContinuousClosure;
-
-@@ -70,8 +75,7 @@ struct _RestProxyCallPrivate {
- gchar *url;
-
- GHashTable *response_headers;
-- goffset length;
-- gchar *payload;
-+ GBytes *payload;
- guint status_code;
- gchar *status_message;
-
-@@ -160,7 +164,7 @@ rest_proxy_call_finalize (GObject *object)
- g_free (priv->method);
- g_free (priv->function);
-
-- g_free (priv->payload);
-+ g_clear_pointer (&priv->payload, g_bytes_unref);
- g_free (priv->status_message);
-
- g_free (priv->url);
-@@ -546,14 +550,23 @@ _populate_headers_hash_table (const gchar *name,
- g_hash_table_insert (headers, g_strdup (name), g_strdup (value));
- }
-
-+#ifdef WITH_SOUP_2
- /* I apologise for this macro, but it saves typing ;-) */
- #define error_helper(x) g_set_error_literal(error, REST_PROXY_ERROR, x, message->reason_phrase)
-+#endif
- static gboolean
- _handle_error_from_message (SoupMessage *message, GError **error)
- {
-- if (message->status_code < 100)
-+ guint status_code;
-+ const char *reason_phrase;
-+
-+#ifdef WITH_SOUP_2
-+ status_code = message->status_code;
-+
-+ if (status_code < 100)
- {
-- switch (message->status_code)
-+ g_clear_error (error);
-+ switch (status_code)
- {
- case SOUP_STATUS_CANCELLED:
- error_helper (REST_PROXY_ERROR_CANCELLED);
-@@ -580,61 +593,84 @@ _handle_error_from_message (SoupMessage *message, GError **error)
- }
- return FALSE;
- }
-+ reason_phrase = message->reason_phrase;
-+#else
-+ status_code = soup_message_get_status (message);
-+ reason_phrase = soup_message_get_reason_phrase (message);
-+#endif
-
-- if (message->status_code >= 200 && message->status_code < 300)
-+ if (status_code >= 200 && status_code < 300)
- {
- return TRUE;
- }
-
-+ if (*error != NULL)
-+ return FALSE;
-+
- /* If we are here we must be in some kind of HTTP error, lets try */
- g_set_error_literal (error,
- REST_PROXY_ERROR,
-- message->status_code,
-- message->reason_phrase);
-+ status_code,
-+ reason_phrase);
- return FALSE;
- }
-
- static gboolean
--finish_call (RestProxyCall *call, SoupMessage *message, GError **error)
-+finish_call (RestProxyCall *call, SoupMessage *message, GBytes *payload, GError **error)
- {
- RestProxyCallPrivate *priv = GET_PRIVATE (call);
-+ SoupMessageHeaders *response_headers;
-
- g_assert (call);
- g_assert (message);
-+ g_assert (payload);
-+
-+#ifdef WITH_SOUP_2
-+ response_headers = message->response_headers;
-+#else
-+ response_headers = soup_message_get_response_headers (message);
-+#endif
-
- /* Convert the soup headers in to hash */
- /* FIXME: Eeek..are you allowed duplicate headers? ... */
- g_hash_table_remove_all (priv->response_headers);
-- soup_message_headers_foreach (message->response_headers,
-+ soup_message_headers_foreach (response_headers,
- (SoupMessageHeadersForeachFunc)_populate_headers_hash_table,
- priv->response_headers);
-
-- priv->payload = g_memdup (message->response_body->data,
-- message->response_body->length + 1);
-- priv->length = message->response_body->length;
-+ priv->payload = payload;
-
-+#ifdef WITH_SOUP_2
- priv->status_code = message->status_code;
- priv->status_message = g_strdup (message->reason_phrase);
-+#else
-+ priv->status_code = soup_message_get_status (message);
-+ priv->status_message = g_strdup (soup_message_get_reason_phrase (message));
-+#endif
-
- return _handle_error_from_message (message, error);
- }
-
- static void
--_continuous_call_message_completed_cb (SoupSession *session,
-- SoupMessage *message,
-- gpointer userdata)
-+_continuous_call_message_completed (SoupMessage *message,
-+ GError *error,
-+ gpointer userdata)
- {
- RestProxyCallContinuousClosure *closure;
- RestProxyCall *call;
- RestProxyCallPrivate *priv;
-- GError *error = NULL;
-
- closure = (RestProxyCallContinuousClosure *)userdata;
- call = closure->call;
- priv = GET_PRIVATE (call);
-
-+#ifdef WITH_SOUP_2
- priv->status_code = message->status_code;
- priv->status_message = g_strdup (message->reason_phrase);
-+#else
-+ priv->status_code = soup_message_get_status (message);
-+ priv->status_message = g_strdup (soup_message_get_reason_phrase (message));
-+#endif
-
- _handle_error_from_message (message, &error);
-
-@@ -657,6 +693,7 @@ _continuous_call_message_completed_cb (SoupSession *session,
-
- priv->cur_call_closure = NULL;
- g_object_unref (closure->call);
-+ g_object_unref (message);
- g_slice_free (RestProxyCallContinuousClosure, closure);
- }
-
-@@ -715,6 +752,49 @@ set_url (RestProxyCall *call)
- return TRUE;
- }
-
-+#ifndef WITH_SOUP_2
-+static gboolean
-+authenticate (RestProxyCall *call,
-+ SoupAuth *soup_auth,
-+ gboolean retrying,
-+ SoupMessage *message)
-+{
-+ RestProxyCallPrivate *priv = GET_PRIVATE (call);
-+ RestProxyAuth *rest_auth;
-+ gboolean try_auth;
-+
-+ rest_auth = rest_proxy_auth_new (priv->proxy, NULL, message, soup_auth);
-+ g_signal_emit_by_name (priv->proxy, "authenticate", rest_auth, retrying, &try_auth);
-+ if (try_auth && !rest_proxy_auth_is_paused (rest_auth)) {
-+ char *username, *password;
-+
-+ g_object_get (priv->proxy, "username", &username, "password", &password, NULL);
-+ soup_auth_authenticate (soup_auth, username, password);
-+ g_free (username);
-+ g_free (password);
-+ }
-+ g_object_unref (rest_auth);
-+
-+ return try_auth;
-+}
-+
-+static gboolean
-+accept_certificate (RestProxyCall *call,
-+ GTlsCertificate *tls_certificate,
-+ GTlsCertificateFlags *tls_errors,
-+ SoupMessage *message)
-+{
-+ RestProxyCallPrivate *priv = GET_PRIVATE (call);
-+ gboolean ssl_strict;
-+
-+ if (tls_errors == 0)
-+ return TRUE;
-+
-+ g_object_get (priv->proxy, "ssl-strict", &ssl_strict, NULL);
-+ return !ssl_strict;
-+}
-+#endif
-+
- static SoupMessage *
- prepare_message (RestProxyCall *call, GError **error_out)
- {
-@@ -722,6 +802,7 @@ prepare_message (RestProxyCall *call, GError **error_out)
- RestProxyCallClass *call_class;
- const gchar *user_agent;
- SoupMessage *message;
-+ SoupMessageHeaders *request_headers;
- GError *error = NULL;
-
- call_class = REST_PROXY_CALL_GET_CLASS (call);
-@@ -748,6 +829,9 @@ prepare_message (RestProxyCall *call, GError **error_out)
- gchar *content;
- gchar *content_type;
- gsize content_len;
-+#ifndef WITH_SOUP_2
-+ GBytes *body;
-+#endif
-
- if (!call_class->serialize_params (call, &content_type,
- &content, &content_len, &error))
-@@ -780,8 +864,14 @@ prepare_message (RestProxyCall *call, GError **error_out)
- "Could not parse URI");
- return NULL;
- }
-+#ifdef WITH_SOUP_2
- soup_message_set_request (message, content_type,
- SOUP_MEMORY_TAKE, content, content_len);
-+#else
-+ body = g_bytes_new_take (content, content_len);
-+ soup_message_set_request_body_from_bytes (message, content_type, body);
-+ g_bytes_unref (body);
-+#endif
-
- g_free (content_type);
- } else if (rest_params_are_strings (priv->params)) {
-@@ -798,9 +888,15 @@ prepare_message (RestProxyCall *call, GError **error_out)
-
- hash = rest_params_as_string_hash_table (priv->params);
-
-+#ifdef WITH_SOUP_2
- message = soup_form_request_new_from_hash (priv->method,
- priv->url,
- hash);
-+#else
-+ message = soup_message_new_from_encoded_form (priv->method,
-+ priv->url,
-+ soup_form_encode_hash (hash));
-+#endif
-
- g_hash_table_unref (hash);
-
-@@ -827,19 +923,28 @@ prepare_message (RestProxyCall *call, GError **error_out)
- if (rest_param_is_string (param)) {
- soup_multipart_append_form_string (mp, name, rest_param_get_content (param));
- } else {
-- SoupBuffer *sb;
--
-- sb = soup_buffer_new_with_owner (rest_param_get_content (param),
-- rest_param_get_content_length (param),
-- rest_param_ref (param),
-- (GDestroyNotify)rest_param_unref);
-+#ifdef WITH_SOUP_2
-+ SoupBuffer *sb = soup_buffer_new_with_owner (rest_param_get_content (param),
-+ rest_param_get_content_length (param),
-+ rest_param_ref (param),
-+ (GDestroyNotify)rest_param_unref);
-+#else
-+ GBytes *sb = g_bytes_new_with_free_func (rest_param_get_content (param),
-+ rest_param_get_content_length (param),
-+ (GDestroyNotify)rest_param_unref,
-+ rest_param_ref (param));
-+#endif
-
- soup_multipart_append_form_file (mp, name,
- rest_param_get_file_name (param),
- rest_param_get_content_type (param),
- sb);
-
-+#ifdef WITH_SOUP_2
- soup_buffer_free (sb);
-+#else
-+ g_bytes_unref (sb);
-+#endif
- }
- }
-
-@@ -853,19 +958,36 @@ prepare_message (RestProxyCall *call, GError **error_out)
- return NULL;
- }
-
-+#ifdef WITH_SOUP_2
- message = soup_form_request_new_from_multipart (priv->url, mp);
-+#else
-+ message = soup_message_new_from_multipart (priv->url, mp);
-+#endif
-
- soup_multipart_free (mp);
- }
-
-+#ifdef WITH_SOUP_2
-+ request_headers = message->request_headers;
-+#else
-+ request_headers = soup_message_get_request_headers (message);
-+ g_signal_connect_swapped (message, "authenticate",
-+ G_CALLBACK (authenticate),
-+ call);
-+ g_signal_connect_swapped (message, "accept-certificate",
-+ G_CALLBACK (accept_certificate),
-+ call);
-+#endif
-+
-+
- /* Set the user agent, if one was set in the proxy */
- user_agent = rest_proxy_get_user_agent (priv->proxy);
- if (user_agent) {
-- soup_message_headers_append (message->request_headers, "User-Agent", user_agent);
-+ soup_message_headers_append (request_headers, "User-Agent", user_agent);
- }
-
- /* Set the headers */
-- g_hash_table_foreach (priv->headers, set_header, message->request_headers);
-+ g_hash_table_foreach (priv->headers, set_header, request_headers);
-
- return message;
- }
-@@ -878,17 +1000,17 @@ _call_message_call_cancelled_cb (GCancellable *cancellable,
- }
-
- static void
--_call_message_call_completed_cb (SoupSession *session,
-- SoupMessage *message,
-+_call_message_call_completed_cb (SoupMessage *message,
-+ GBytes *payload,
-+ GError *error,
- gpointer user_data)
- {
- GTask *task = user_data;
- RestProxyCall *call;
-- GError *error = NULL;
-
- call = REST_PROXY_CALL (g_task_get_source_object (task));
-
-- finish_call (call, message, &error);
-+ finish_call (call, message, payload, &error);
-
- if (error != NULL)
- g_task_return_error (task, error);
-@@ -938,6 +1060,7 @@ rest_proxy_call_invoke_async (RestProxyCall *call,
-
- _rest_proxy_queue_message (priv->proxy,
- message,
-+ priv->cancellable,
- _call_message_call_completed_cb,
- task);
- }
-@@ -962,16 +1085,55 @@ rest_proxy_call_invoke_finish (RestProxyCall *call,
- }
-
- static void
--_continuous_call_message_got_chunk_cb (SoupMessage *msg,
-- SoupBuffer *chunk,
-- RestProxyCallContinuousClosure *closure)
-+_continuous_call_read_cb (GObject *source,
-+ GAsyncResult *result,
-+ gpointer user_data)
- {
-+ GInputStream *stream = G_INPUT_STREAM (source);
-+ RestProxyCallContinuousClosure *closure = user_data;
-+ RestProxyCallPrivate *priv = GET_PRIVATE (closure->call);
-+ gssize bytes_read;
-+ GError *error = NULL;
-+
-+ bytes_read = g_input_stream_read_finish (stream, result, &error);
-+ if (bytes_read <= 0)
-+ {
-+ _continuous_call_message_completed (closure->message, error, user_data);
-+ return;
-+ }
-+
- closure->callback (closure->call,
-- chunk->data,
-- chunk->length,
-+ (gconstpointer)closure->buffer,
-+ bytes_read,
- NULL,
- closure->weak_object,
- closure->userdata);
-+
-+ g_input_stream_read_async (stream, closure->buffer, READ_BUFFER_SIZE, G_PRIORITY_DEFAULT,
-+ priv->cancellable, _continuous_call_read_cb, closure);
-+}
-+
-+static void
-+_continuous_call_message_sent_cb (GObject *source,
-+ GAsyncResult *result,
-+ gpointer user_data)
-+{
-+ RestProxy *proxy = REST_PROXY (source);
-+ RestProxyCallContinuousClosure *closure = user_data;
-+ RestProxyCallPrivate *priv = GET_PRIVATE (closure->call);
-+ GInputStream *stream;
-+ GError *error = NULL;
-+
-+ stream = _rest_proxy_send_message_finish (proxy, result, &error);
-+ if (!stream)
-+ {
-+ _continuous_call_message_completed (closure->message, error, user_data);
-+ return;
-+ }
-+
-+ g_input_stream_read_async (stream, closure->buffer, READ_BUFFER_SIZE, G_PRIORITY_DEFAULT,
-+ priv->cancellable, _continuous_call_read_cb, closure);
-+ g_object_unref (stream);
- }
-
-
-@@ -1021,9 +1183,6 @@ rest_proxy_call_continuous (RestProxyCall *call,
- if (message == NULL)
- return FALSE;
-
-- /* Must turn off accumulation */
-- soup_message_body_set_accumulate (message->response_body, FALSE);
--
- closure = g_slice_new0 (RestProxyCallContinuousClosure);
- closure->call = g_object_ref (call);
- closure->callback = callback;
-@@ -1041,33 +1200,29 @@ rest_proxy_call_continuous (RestProxyCall *call,
- closure);
- }
-
-- g_signal_connect (message,
-- "got-chunk",
-- (GCallback)_continuous_call_message_got_chunk_cb,
-- closure);
--
-- _rest_proxy_queue_message (priv->proxy,
-- message,
-- _continuous_call_message_completed_cb,
-- closure);
-+ _rest_proxy_send_message_async (priv->proxy,
-+ message,
-+ priv->cancellable,
-+ _continuous_call_message_sent_cb,
-+ closure);
- return TRUE;
- }
-
- static void
--_upload_call_message_completed_cb (SoupSession *session,
-- SoupMessage *message,
-+_upload_call_message_completed_cb (SoupMessage *message,
-+ GBytes *payload,
-+ GError *error,
- gpointer user_data)
- {
- RestProxyCall *call;
- RestProxyCallPrivate *priv;
-- GError *error = NULL;
- RestProxyCallUploadClosure *closure;
-
- closure = (RestProxyCallUploadClosure *) user_data;
- call = closure->call;
- priv = GET_PRIVATE (call);
-
-- finish_call (call, message, &error);
-+ finish_call (call, message, payload, &error);
-
- closure->callback (closure->call,
- closure->uploaded,
-@@ -1093,14 +1248,25 @@ _upload_call_message_completed_cb (SoupSession *session,
-
- static void
- _upload_call_message_wrote_data_cb (SoupMessage *msg,
-+#ifdef WITH_SOUP_2
- SoupBuffer *chunk,
-+#else
-+ gsize chunk_size,
-+#endif
- RestProxyCallUploadClosure *closure)
- {
-- closure->uploaded = closure->uploaded + chunk->length;
-+#ifdef WITH_SOUP_2
-+ gsize chunk_size = chunk->length;
-+ goffset content_length = msg->request_body->length;
-+#else
-+ goffset content_length = soup_message_headers_get_content_length (soup_message_get_request_headers (msg));
-+#endif
-
-- if (closure->uploaded < msg->request_body->length)
-+ closure->uploaded = closure->uploaded + chunk_size;
-+
-+ if (closure->uploaded < content_length)
- closure->callback (closure->call,
-- msg->request_body->length,
-+ content_length,
- closure->uploaded,
- NULL,
- closure->weak_object,
-@@ -1178,6 +1344,7 @@ rest_proxy_call_upload (RestProxyCall *call,
-
- _rest_proxy_queue_message (priv->proxy,
- message,
-+ priv->cancellable,
- _upload_call_message_completed_cb,
- closure);
- return TRUE;
-@@ -1206,6 +1373,10 @@ rest_proxy_call_cancel (RestProxyCall *call)
- if (priv->cancellable)
- {
- g_signal_handler_disconnect (priv->cancellable, priv->cancel_sig);
-+#ifndef WITH_SOUP_2
-+ if (!g_cancellable_is_cancelled (priv->cancellable))
-+ g_cancellable_cancel (priv->cancellable);
-+#endif
- g_clear_object (&priv->cancellable);
- }
-
-@@ -1240,6 +1411,7 @@ rest_proxy_call_sync (RestProxyCall *call,
- RestProxyCallPrivate *priv = GET_PRIVATE (call);
- SoupMessage *message;
- gboolean ret;
-+ GBytes *payload;
-
- g_return_val_if_fail (REST_IS_PROXY_CALL (call), FALSE);
-
-@@ -1247,9 +1419,9 @@ rest_proxy_call_sync (RestProxyCall *call,
- if (!message)
- return FALSE;
-
-- _rest_proxy_send_message (priv->proxy, message);
-+ payload = _rest_proxy_send_message (priv->proxy, message, priv->cancellable, error_out);
-
-- ret = finish_call (call, message, error_out);
-+ ret = finish_call (call, message, payload, error_out);
-
- g_object_unref (message);
-
-@@ -1314,9 +1486,16 @@ rest_proxy_call_get_response_headers (RestProxyCall *call)
- goffset
- rest_proxy_call_get_payload_length (RestProxyCall *call)
- {
-+ GBytes *payload;
-+
- g_return_val_if_fail (REST_IS_PROXY_CALL (call), 0);
-
-- return GET_PRIVATE (call)->length;
-+ payload = GET_PRIVATE (call)->payload;
-+#ifdef WITH_SOUP_2
-+ return payload ? g_bytes_get_size (payload) - 1 : 0;
-+#else
-+ return payload ? g_bytes_get_size (payload) : 0;
-+#endif
- }
-
- /**
-@@ -1331,9 +1510,12 @@ rest_proxy_call_get_payload_length (RestProxyCall *call)
- const gchar *
- rest_proxy_call_get_payload (RestProxyCall *call)
- {
-+ GBytes *payload;
-+
- g_return_val_if_fail (REST_IS_PROXY_CALL (call), NULL);
-
-- return GET_PRIVATE (call)->payload;
-+ payload = GET_PRIVATE (call)->payload;
-+ return payload ? g_bytes_get_data (payload, NULL) : NULL;
- }
-
- /**
-diff --git a/rest/rest-proxy.c b/rest/rest-proxy.c
-index 80972a3..171f6cb 100644
---- a/rest/rest-proxy.c
-+++ b/rest/rest-proxy.c
-@@ -45,6 +45,9 @@ struct _RestProxyPrivate {
- SoupSession *session;
- gboolean disable_cookies;
- char *ssl_ca_file;
-+#ifndef WITH_SOUP_2
-+ gboolean ssl_strict;
-+#endif
- };
-
-
-@@ -116,11 +119,15 @@ rest_proxy_get_property (GObject *object,
- g_value_set_string (value, priv->password);
- break;
- case PROP_SSL_STRICT: {
-+#ifdef WITH_SOUP_2
- gboolean ssl_strict;
- g_object_get (G_OBJECT(priv->session),
- "ssl-strict", &ssl_strict,
- NULL);
- g_value_set_boolean (value, ssl_strict);
-+#else
-+ g_value_set_boolean (value, priv->ssl_strict);
-+#endif
- break;
- }
- case PROP_SSL_CA_FILE:
-@@ -172,9 +179,13 @@ rest_proxy_set_property (GObject *object,
- priv->password = g_value_dup_string (value);
- break;
- case PROP_SSL_STRICT:
-+#ifdef WITH_SOUP_2
- g_object_set (G_OBJECT(priv->session),
- "ssl-strict", g_value_get_boolean (value),
- NULL);
-+#else
-+ priv->ssl_strict = g_value_get_boolean (value);
-+#endif
- break;
- case PROP_SSL_CA_FILE:
- g_free(priv->ssl_ca_file);
-@@ -207,6 +218,7 @@ default_authenticate_cb (RestProxy *self,
- return !retrying;
- }
-
-+#ifdef WITH_SOUP_2
- static void
- authenticate (RestProxy *self,
- SoupMessage *msg,
-@@ -224,6 +236,7 @@ authenticate (RestProxy *self,
- soup_auth_authenticate (soup_auth, priv->username, priv->password);
- g_object_unref (G_OBJECT (rest_auth));
- }
-+#endif
-
- static void
- rest_proxy_constructed (GObject *object)
-@@ -238,14 +251,20 @@ rest_proxy_constructed (GObject *object)
- }
-
- if (REST_DEBUG_ENABLED(PROXY)) {
-+#ifdef WITH_SOUP_2
- SoupSessionFeature *logger = (SoupSessionFeature*)soup_logger_new (SOUP_LOGGER_LOG_BODY, 0);
-+#else
-+ SoupSessionFeature *logger = (SoupSessionFeature*)soup_logger_new (SOUP_LOGGER_LOG_HEADERS);
-+#endif
- soup_session_add_feature (priv->session, logger);
- g_object_unref (logger);
- }
-
-+#ifdef WITH_SOUP_2
- /* session lifetime is same as self, no need to keep signalid */
- g_signal_connect_swapped (priv->session, "authenticate",
- G_CALLBACK(authenticate), object);
-+#endif
- }
-
- static void
-@@ -391,23 +410,62 @@ rest_proxy_class_init (RestProxyClass *klass)
- proxy_class->authenticate = default_authenticate_cb;
- }
-
-+static gboolean
-+transform_ssl_ca_file_to_tls_database (GBinding *binding,
-+ const GValue *from_value,
-+ GValue *to_value,
-+ gpointer user_data)
-+{
-+ g_value_take_object (to_value,
-+ g_tls_file_database_new (g_value_get_string (from_value), NULL));
-+ return TRUE;
-+}
-+
-+static gboolean
-+transform_tls_database_to_ssl_ca_file (GBinding *binding,
-+ const GValue *from_value,
-+ GValue *to_value,
-+ gpointer user_data)
-+{
-+ GTlsDatabase *tls_database;
-+ char *path = NULL;
-+
-+ tls_database = g_value_get_object (from_value);
-+ if (tls_database)
-+ g_object_get (tls_database, "anchors", &path, NULL);
-+ g_value_take_string (to_value, path);
-+ return TRUE;
-+}
-+
- static void
- rest_proxy_init (RestProxy *self)
- {
- RestProxyPrivate *priv = GET_PRIVATE (self);
-+ GTlsDatabase *tls_database;
-+
-+#ifndef WITH_SOUP_2
-+ priv->ssl_strict = TRUE;
-+#endif
-
- priv->session = soup_session_new ();
-
- #ifdef REST_SYSTEM_CA_FILE
- /* with ssl-strict (defaults TRUE) setting ssl-ca-file forces all
- * certificates to be trusted */
-- g_object_set (priv->session,
-- "ssl-ca-file", REST_SYSTEM_CA_FILE,
-- NULL);
-+ tls_database = g_tls_file_database_new (REST_SYSTEM_CA_FILE, NULL);
-+ if (tls_database) {
-+ g_object_set (priv->session,
-+ "tls-database", tls_database,
-+ NULL);
-+ g_object_unref (tls_database);
-+ }
- #endif
-- g_object_bind_property (self, "ssl-ca-file",
-- priv->session, "ssl-ca-file",
-- G_BINDING_BIDIRECTIONAL);
-+ g_object_bind_property_full (self, "ssl-ca-file",
-+ priv->session, "tls-database",
-+ G_BINDING_BIDIRECTIONAL,
-+ transform_ssl_ca_file_to_tls_database,
-+ transform_tls_database_to_ssl_ca_file,
-+ NULL, NULL);
- }
-
- /**
-@@ -689,27 +747,127 @@ rest_proxy_simple_run (RestProxy *proxy,
- return ret;
- }
-
-+typedef struct {
-+ RestMessageFinishedCallback callback;
-+ gpointer user_data;
-+} RestMessageQueueData;
-+
-+#ifdef WITH_SOUP_2
-+static void
-+message_finished_cb (SoupSession *session,
-+ SoupMessage *message,
-+ gpointer user_data)
-+{
-+ RestMessageQueueData *data = user_data;
-+ GBytes *body;
-+ GError *error = NULL;
-+
-+ body = g_bytes_new (message->response_body->data,
-+ message->response_body->length + 1);
-+ data->callback (message, body, error, data->user_data);
-+ g_free (data);
-+}
-+#else
-+static void
-+message_send_and_read_ready_cb (GObject *source,
-+ GAsyncResult *result,
-+ gpointer user_data)
-+{
-+ SoupSession *session = SOUP_SESSION (source);
-+ RestMessageQueueData *data = user_data;
-+ GBytes *body;
-+ GError *error = NULL;
-+
-+ body = soup_session_send_and_read_finish (session, result, &error);
-+ data->callback (soup_session_get_async_result_message (session, result), body, error, data->user_data);
-+ g_free (data);
-+}
-+#endif
-+
- void
--_rest_proxy_queue_message (RestProxy *proxy,
-- SoupMessage *message,
-- SoupSessionCallback callback,
-- gpointer user_data)
-+_rest_proxy_queue_message (RestProxy *proxy,
-+ SoupMessage *message,
-+ GCancellable *cancellable,
-+ RestMessageFinishedCallback callback,
-+ gpointer user_data)
- {
- RestProxyPrivate *priv = GET_PRIVATE (proxy);
-+ RestMessageQueueData *data;
-
- g_return_if_fail (REST_IS_PROXY (proxy));
- g_return_if_fail (SOUP_IS_MESSAGE (message));
-
-+ data = g_new0 (RestMessageQueueData, 1);
-+ data->callback = callback;
-+ data->user_data = user_data;
-+
-+#ifdef WITH_SOUP_2
- soup_session_queue_message (priv->session,
- message,
-- callback,
-- user_data);
-+ message_finished_cb,
-+ data);
-+#else
-+ soup_session_send_and_read_async (priv->session,
-+ message,
-+ G_PRIORITY_DEFAULT,
-+ cancellable,
-+ message_send_and_read_ready_cb,
-+ data);
-+#endif
-+}
-+
-+static void
-+message_send_ready_cb (GObject *source,
-+ GAsyncResult *result,
-+ gpointer user_data)
-+{
-+ SoupSession *session = SOUP_SESSION (source);
-+ GTask *task = user_data;
-+ GInputStream *stream;
-+ GError *error = NULL;
-+
-+ stream = soup_session_send_finish (session, result, &error);
-+ if (stream)
-+ g_task_return_pointer (task, stream, g_object_unref);
-+ else
-+ g_task_return_error (task, error);
-+ g_object_unref (task);
-+}
-+
-+void
-+_rest_proxy_send_message_async (RestProxy *proxy,
-+ SoupMessage *message,
-+ GCancellable *cancellable,
-+ GAsyncReadyCallback callback,
-+ gpointer user_data)
-+{
-+ RestProxyPrivate *priv = GET_PRIVATE (proxy);
-+ GTask *task;
-+
-+ task = g_task_new (proxy, cancellable, callback, user_data);
-+ soup_session_send_async (priv->session,
-+ message,
-+#ifndef WITH_SOUP_2
-+ G_PRIORITY_DEFAULT,
-+#endif
-+ cancellable,
-+ message_send_ready_cb,
-+ task);
-+}
-+
-+GInputStream *
-+_rest_proxy_send_message_finish (RestProxy *proxy,
-+ GAsyncResult *result,
-+ GError **error)
-+{
-+ return g_task_propagate_pointer (G_TASK (result), error);
- }
-
- void
- _rest_proxy_cancel_message (RestProxy *proxy,
- SoupMessage *message)
- {
-+#ifdef WITH_SOUP_2
- RestProxyPrivate *priv = GET_PRIVATE (proxy);
-
- g_return_if_fail (REST_IS_PROXY (proxy));
-@@ -718,16 +876,31 @@ _rest_proxy_cancel_message (RestProxy *proxy,
- soup_session_cancel_message (priv->session,
- message,
- SOUP_STATUS_CANCELLED);
-+#endif
- }
-
--guint
--_rest_proxy_send_message (RestProxy *proxy,
-- SoupMessage *message)
-+GBytes *
-+_rest_proxy_send_message (RestProxy *proxy,
-+ SoupMessage *message,
-+ GCancellable *cancellable,
-+ GError **error)
- {
- RestProxyPrivate *priv = GET_PRIVATE (proxy);
-+ GBytes *body;
-
-- g_return_val_if_fail (REST_IS_PROXY (proxy), 0);
-- g_return_val_if_fail (SOUP_IS_MESSAGE (message), 0);
-+ g_return_val_if_fail (REST_IS_PROXY (proxy), NULL);
-+ g_return_val_if_fail (SOUP_IS_MESSAGE (message), NULL);
-+
-+#ifdef WITH_SOUP_2
-+ soup_session_send_message (priv->session, message);
-+ body = g_bytes_new (message->response_body->data,
-+ message->response_body->length + 1);
-+#else
-+ body = soup_session_send_and_read (priv->session,
-+ message,
-+ cancellable,
-+ error);
-+#endif
-
-- return soup_session_send_message (priv->session, message);
-+ return body;
- }
-diff --git a/tests/custom-serialize.c b/tests/custom-serialize.c
-index c3fde93..01b3a56 100644
---- a/tests/custom-serialize.c
-+++ b/tests/custom-serialize.c
-@@ -88,22 +88,40 @@ custom_proxy_call_init (CustomProxyCall *self)
- }
-
- static void
-+#ifdef WITH_SOUP_2
- server_callback (SoupServer *server, SoupMessage *msg,
- const char *path, GHashTable *query,
- SoupClientContext *client, gpointer user_data)
-+#else
-+server_callback (SoupServer *server, SoupServerMessage *msg,
-+ const char *path, GHashTable *query, gpointer user_data)
-+#endif
- {
- if (g_str_equal (path, "/ping")) {
- const char *content_type = NULL;
-+#ifdef WITH_SOUP_2
- SoupMessageHeaders *headers = msg->request_headers;
- SoupMessageBody *body = msg->request_body;
-+#else
-+ SoupMessageHeaders *headers = soup_server_message_get_request_headers (msg);
-+ SoupMessageBody *body = soup_server_message_get_request_body (msg);
-+#endif
- content_type = soup_message_headers_get_content_type (headers, NULL);
- g_assert_cmpstr (content_type, ==, "application/json");
-
- g_assert_cmpstr (body->data, ==, "{}");
-
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_OK);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
-+#endif
- } else {
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_NOT_IMPLEMENTED, NULL);
-+#endif
- }
- }
-
-diff --git a/tests/proxy-continuous.c b/tests/proxy-continuous.c
-index 8f4b7a8..7967bbd 100644
---- a/tests/proxy-continuous.c
-+++ b/tests/proxy-continuous.c
-@@ -39,9 +39,15 @@ static SoupServer *server;
- static gboolean
- send_chunks (gpointer user_data)
- {
-- SoupMessage *msg = SOUP_MESSAGE (user_data);
- guint i;
- guint8 data[SIZE_CHUNK];
-+#ifdef WITH_SOUP_2
-+ SoupMessage *msg = SOUP_MESSAGE (user_data);
-+ SoupMessageBody *response_body = msg->response_body;
-+#else
-+ SoupServerMessage *msg = SOUP_SERVER_MESSAGE (user_data);
-+ SoupMessageBody *response_body = soup_server_message_get_response_body (msg);
-+#endif
-
- for (i = 0; i < SIZE_CHUNK; i++)
- {
-@@ -49,12 +55,12 @@ send_chunks (gpointer user_data)
- server_count++;
- }
-
-- soup_message_body_append (msg->response_body, SOUP_MEMORY_COPY, data, SIZE_CHUNK);
-+ soup_message_body_append (response_body, SOUP_MEMORY_COPY, data, SIZE_CHUNK);
- soup_server_unpause_message (server, msg);
-
- if (server_count == NUM_CHUNKS * SIZE_CHUNK)
- {
-- soup_message_body_complete (msg->response_body);
-+ soup_message_body_complete (response_body);
- return FALSE;
- } else {
- return TRUE;
-@@ -62,13 +68,28 @@ send_chunks (gpointer user_data)
- }
-
- static void
-+#ifdef WITH_SOUP_2
- server_callback (SoupServer *server, SoupMessage *msg,
- const char *path, GHashTable *query,
- SoupClientContext *client, gpointer user_data)
-+#else
-+server_callback (SoupServer *server, SoupServerMessage *msg,
-+ const char *path, GHashTable *query, gpointer user_data)
-+#endif
- {
-+#ifdef WITH_SOUP_2
-+ SoupMessageHeaders *response_headers = msg->response_headers;
-+#else
-+ SoupMessageHeaders *response_headers = soup_server_message_get_response_headers (msg);
-+#endif
-+
- g_assert_cmpstr (path, ==, "/stream");
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_OK);
-- soup_message_headers_set_encoding (msg->response_headers,
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
-+#endif
-+ soup_message_headers_set_encoding (response_headers,
- SOUP_ENCODING_CHUNKED);
- soup_server_pause_message (server, msg);
-
-@@ -142,13 +163,21 @@ continuous ()
- uris = soup_server_get_uris (server);
- g_assert (g_slist_length (uris) > 0);
-
-+#ifdef WITH_SOUP_2
- url = soup_uri_to_string (uris->data, FALSE);
-+#else
-+ url = g_uri_to_string (uris->data);
-+#endif
-
- loop = g_main_loop_new (NULL, FALSE);
-
- proxy = rest_proxy_new (url, FALSE);
- stream_test (proxy);
-+#ifdef WITH_SOUP_2
- g_slist_free_full (uris, (GDestroyNotify)soup_uri_free);
-+#else
-+ g_slist_free_full (uris, (GDestroyNotify)g_uri_unref);
-+#endif
-
- g_main_loop_run (loop);
- g_free (url);
-diff --git a/tests/proxy.c b/tests/proxy.c
-index 89a9325..652c600 100644
---- a/tests/proxy.c
-+++ b/tests/proxy.c
-@@ -49,20 +49,35 @@ SoupServer *server;
- GMainLoop *server_loop;
-
- static void
-+#ifdef WITH_SOUP_2
- server_callback (SoupServer *server, SoupMessage *msg,
- const char *path, GHashTable *query,
- SoupClientContext *client, gpointer user_data)
-+#else
-+server_callback (SoupServer *server, SoupServerMessage *msg,
-+ const char *path, GHashTable *query, gpointer user_data)
-+#endif
- {
- if (g_str_equal (path, "/ping")) {
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_OK);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
-+#endif
- }
- else if (g_str_equal (path, "/echo")) {
- const char *value;
-
- value = g_hash_table_lookup (query, "value");
-+#ifdef WITH_SOUP_2
- soup_message_set_response (msg, "text/plain", SOUP_MEMORY_COPY,
- value, strlen (value));
- soup_message_set_status (msg, SOUP_STATUS_OK);
-+#else
-+ soup_server_message_set_response (msg, "text/plain", SOUP_MEMORY_COPY,
-+ value, strlen (value));
-+ soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
-+#endif
- }
- else if (g_str_equal (path, "/reverse")) {
- char *value;
-@@ -70,9 +85,15 @@ server_callback (SoupServer *server, SoupMessage *msg,
- value = g_strdup (g_hash_table_lookup (query, "value"));
- g_strreverse (value);
-
-+#ifdef WITH_SOUP_2
- soup_message_set_response (msg, "text/plain", SOUP_MEMORY_TAKE,
- value, strlen (value));
- soup_message_set_status (msg, SOUP_STATUS_OK);
-+#else
-+ soup_server_message_set_response (msg, "text/plain", SOUP_MEMORY_TAKE,
-+ value, strlen (value));
-+ soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
-+#endif
- }
- else if (g_str_equal (path, "/status")) {
- const char *value;
-@@ -81,25 +102,61 @@ server_callback (SoupServer *server, SoupMessage *msg,
- value = g_hash_table_lookup (query, "status");
- if (value) {
- status = atoi (value);
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, status ?: SOUP_STATUS_INTERNAL_SERVER_ERROR);
-+#else
-+ soup_server_message_set_status (msg, status ?: SOUP_STATUS_INTERNAL_SERVER_ERROR, NULL);
-+#endif
- } else {
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR, NULL);
-+#endif
- }
- }
- else if (g_str_equal (path, "/useragent/none")) {
-- if (soup_message_headers_get (msg->request_headers, "User-Agent") == NULL) {
-+#ifdef WITH_SOUP_2
-+ SoupMessageHeaders *request_headers = msg->request_headers;
-+#else
-+ SoupMessageHeaders *request_headers = soup_server_message_get_request_headers (msg);
-+#endif
-+
-+ if (soup_message_headers_get (request_headers, "User-Agent") == NULL) {
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_OK);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
-+#endif
- } else {
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_EXPECTATION_FAILED);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_EXPECTATION_FAILED, NULL);
-+#endif
- }
- }
- else if (g_str_equal (path, "/useragent/testsuite")) {
-+#ifdef WITH_SOUP_2
-+ SoupMessageHeaders *request_headers = msg->request_headers;
-+#else
-+ SoupMessageHeaders *request_headers = soup_server_message_get_request_headers (msg);
-+#endif
- const char *value;
-- value = soup_message_headers_get (msg->request_headers, "User-Agent");
-+ value = soup_message_headers_get (request_headers, "User-Agent");
- if (g_strcmp0 (value, "TestSuite-1.0") == 0) {
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_OK);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
-+#endif
- } else {
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_EXPECTATION_FAILED);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_EXPECTATION_FAILED, NULL);
-+#endif
-+
- }
- }
- }
-@@ -325,7 +382,7 @@ main (int argc, char **argv)
- char *url;
- RestProxy *proxy;
-
-- server = soup_server_new ("", NULL);
-+ server = soup_server_new (NULL);
- g_thread_new ("Server Thread", server_thread_func, NULL);
-
- url = g_strdup_printf ("http://127.0.0.1:%d/", PORT);
-diff --git a/tests/threaded.c b/tests/threaded.c
-index a251900..411361c 100644
---- a/tests/threaded.c
-+++ b/tests/threaded.c
-@@ -36,13 +36,22 @@ GMainLoop *main_loop;
- SoupServer *server;
-
- static void
-+#ifdef WITH_SOUP_2
- server_callback (SoupServer *server, SoupMessage *msg,
- const char *path, GHashTable *query,
- SoupClientContext *client, gpointer user_data)
-+#else
-+server_callback (SoupServer *server, SoupServerMessage *msg,
-+ const char *path, GHashTable *query, gpointer user_data)
-+#endif
- {
- g_assert_cmpstr (path, ==, "/ping");
-
-+#ifdef WITH_SOUP_2
- soup_message_set_status (msg, SOUP_STATUS_OK);
-+#else
-+ soup_server_message_set_status (msg, SOUP_STATUS_OK, NULL);
-+#endif
- g_atomic_int_add (&threads_done, 1);
-
- if (threads_done == N_THREADS) {
-@@ -96,7 +105,11 @@ static void ping ()
- uris = soup_server_get_uris (server);
- g_assert (g_slist_length (uris) > 0);
-
-+#ifdef WITH_SOUP_2
- url = soup_uri_to_string (uris->data, FALSE);
-+#else
-+ url = g_uri_to_string (uris->data);
-+#endif
-
- main_loop = g_main_loop_new (NULL, TRUE);
-
-@@ -109,7 +122,11 @@ static void ping ()
- g_main_loop_run (main_loop);
-
- g_free (url);
-+#ifdef WITH_SOUP_2
- g_slist_free_full (uris, (GDestroyNotify)soup_uri_free);
-+#else
-+ g_slist_free_full (uris, (GDestroyNotify)g_uri_unref);
-+#endif
- g_object_unref (server);
- g_main_loop_unref (main_loop);
- }
---
-2.33.1
-
diff --git a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb b/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb
deleted file mode 100644
index f1c9915c0..000000000
--- a/meta-gnome/recipes-gnome/rest/rest_0.8.1.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "library to access web services that claim to be "RESTful""
-HOMEPAGE = "https://wiki.gnome.org/Projects/Librest"
-LICENSE = "LGPL-2.1-only"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
-
-GNOMEBASEBUILDCLASS = "autotools"
-
-DEPENDS = " \
- libxml2-native \
- glib-2.0-native \
- glib-2.0 \
- libsoup-2.4 \
-"
-
-inherit gnomebase gobject-introspection gtk-doc vala
-
-PV .= "+git${SRCPV}"
-SRCREV = "7b46065dea860ef09861f4d70124728b8270c8b7"
-SRC_URI = "git://gitlab.gnome.org/GNOME/librest;protocol=https;branch=master \
- file://0001-Use-GUri-instead-of-SoupURI.patch \
- file://0002-Port-to-libsoup3.patch \
-"
-S = "${WORKDIR}/git"
-
-do_configure:prepend() {
- # rest expects introspection.m4 at custom location (see aclocal.m4).
- cp -f ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/build
-}
-
-do_compile:prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/rest/.libs"
-}
-
diff --git a/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb b/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb
new file mode 100644
index 000000000..2256a1899
--- /dev/null
+++ b/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb
@@ -0,0 +1,25 @@
+SUMMARY = "library to access web services that claim to be "RESTful""
+HOMEPAGE = "https://wiki.gnome.org/Projects/Librest"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
+
+GNOMEBASEBUILDCLASS = "meson"
+
+DEPENDS = " \
+ gi-docgen \
+ gi-docgen-native \
+ glib-2.0 \
+ glib-2.0-native \
+ json-glib \
+ libxml2-native \
+"
+
+inherit gnomebase gobject-introspection vala pkgconfig
+
+PACKAGECONFIG_SOUP ?= "soup3"
+PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
+
+PACKAGECONFIG[soup2] = "-Dsoup2=true,,libsoup-2.4"
+PACKAGECONFIG[soup3] = "-Dsoup2=false,,libsoup-3.0"
+
+SRC_URI[archive.sha256sum] = "85b2bc9341128139539b53ee53f0533310bc96392fd645863a040410b81ebe66"
diff --git a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.4.1.bb
index 92039a2a6..273110e8e 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker-miners_3.2.1.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker-miners_3.4.1.bb
@@ -19,7 +19,7 @@ SRC_URI += "file://0001-meson.build-Just-warn-if-we-build-without-libseccomp.pat
file://0001-Set-header-file-to-a-fixed-path-instead-of-a-host-pa.patch \
"
-SRC_URI[archive.sha256sum] = "44369f53e2edef41437406dbeecd477a97f8a9afdd9134832ea45d1ba2aa2c47"
+SRC_URI[archive.sha256sum] = "2fce0ec85fb7617c8b2887c22797740d5dec84ec036db74d6c208bbab5c58c24"
# gobject-introspection is mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/tracker/tracker_3.4.0.bb b/meta-gnome/recipes-gnome/tracker/tracker_3.4.1.bb
index ed0fbb6f0..1428159ce 100644
--- a/meta-gnome/recipes-gnome/tracker/tracker_3.4.0.bb
+++ b/meta-gnome/recipes-gnome/tracker/tracker_3.4.1.bb
@@ -22,7 +22,7 @@ GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase gsettings gobject-introspection vala gtk-doc manpages bash-completion features_check python3native
-SRC_URI[archive.sha256sum] = "b3b380c9571d7c7423b5f401e4a2f2d78de47143b035eb2c1281e2423c59218b"
+SRC_URI[archive.sha256sum] = "ea9d41a9fb9c2b42ad80fc2c82327b5c713d594c969b09e1a49be63fb74f4fae"
# gobject-introspection is mandatory and cannot be configured
REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
diff --git a/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-tools_42.1.bb
index a5da8590f..28ba39288 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_42.1.bb
@@ -16,7 +16,7 @@ DEPENDS += " \
yelp-xsl \
"
-SRC_URI[archive.sha256sum] = "2cd43063ffa7262df15dd8d379aa3ea3999d42661f07563f4802daa1149f7df4"
+SRC_URI[archive.sha256sum] = "3e496a4020d4145b99fd508a25fa09336a503a4e8900028421e72c6a4b11f905"
RDEPENDS:${PN} += "python3-core yelp-xsl"
diff --git a/meta-gnome/recipes-gnome/yelp/yelp_42.1.bb b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb
index ab8b9c37b..200ed0f70 100644
--- a/meta-gnome/recipes-gnome/yelp/yelp_42.1.bb
+++ b/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb
@@ -9,7 +9,7 @@ inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features
# for webkitgtk
REQUIRED_DISTRO_FEATURES = "x11"
-SRC_URI[archive.sha256sum] = "25b1146ab8549888a5a8da067f63b470b0f0f800b6ae889cacd114d01d713b41"
+SRC_URI[archive.sha256sum] = "a2c5fd0787a9089c722cc66bd0f85cdf7088d870e7b6cc85799f8e5bff9eac4b"
DEPENDS += " \
libxml2-native \
@@ -22,11 +22,13 @@ DEPENDS += " \
webkitgtk \
yelp-xsl \
"
-PACKAGECONFIG ?= ""
+PACKAGECONFIG_SOUP ?= "soup3"
+PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}"
-# Enable if soup3 is enabled in webkit recipe
+PACKAGECONFIG[soup2] = "--with-webkit2gtk-4-0,,"
PACKAGECONFIG[soup3] = ",--with-webkit2gtk-4-0,"
+
do_configure:prepend() {
export ITSTOOL=${STAGING_BINDIR_NATIVE}/itstool
}
diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb
index be43d0d50..715608149 100644
--- a/meta-gnome/recipes-support/ibus/ibus.bb
+++ b/meta-gnome/recipes-support/ibus/ibus.bb
@@ -8,7 +8,7 @@ DEPENDS += " \
iso-codes \
"
-inherit gtk-icon-cache bash-completion
+inherit gtk-icon-cache bash-completion features_check
# for unicode-ucd
EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd"
@@ -19,6 +19,8 @@ PACKAGECONFIG ??= " \
${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
"
+REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk4', 'opengl', '', d)}"
+
do_configure:prepend() {
# run native unicode-parser
sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am
diff --git a/meta-gnome/recipes-support/libwacom/libwacom_2.4.0.bb b/meta-gnome/recipes-support/libwacom/libwacom_2.5.0.bb
index d690df922..a290d95b7 100644
--- a/meta-gnome/recipes-support/libwacom/libwacom_2.4.0.bb
+++ b/meta-gnome/recipes-support/libwacom/libwacom_2.5.0.bb
@@ -8,7 +8,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e"
SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https"
-SRCREV = "9fd28747534ef776ffecc245721a4faa43bdd89b"
+SRCREV = "c6c1b26ad149a88b22ff790dae377fcc935b7e08"
DEPENDS = " \
libxml2-native \
diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
deleted file mode 100644
index fda37895c..000000000
--- a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 1c95f64aa342147387ce4b1b7269a5c8b34bd898 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 13 Jul 2017 09:01:04 -0700
-Subject: [PATCH] pypredict/lm: Define error API if platform does not have it
-
-error() API is not implemented across all libcs on linux
-e.g. musl does not provide it.
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- Onboard/pypredict/lm/lm.cpp | 1 -
- Onboard/pypredict/lm/lm.h | 13 +++++++++++++
- Onboard/pypredict/lm/lm_dynamic.cpp | 2 --
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp
-index 2e64296..37ae241 100644
---- a/Onboard/pypredict/lm/lm.cpp
-+++ b/Onboard/pypredict/lm/lm.cpp
-@@ -19,7 +19,6 @@
-
- #include <stdlib.h>
- #include <stdio.h>
--#include <error.h>
- #include <algorithm>
- #include <cmath>
- #include <string>
-diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h
-index ed4164a..b8b63ee 100644
---- a/Onboard/pypredict/lm/lm.h
-+++ b/Onboard/pypredict/lm/lm.h
-@@ -32,6 +32,19 @@
- #include <algorithm>
- #include <string>
-
-+#if defined(HAVE_ERROR_H)
-+#include <error.h>
-+#else
-+#include <err.h>
-+#define _onboard_error(S, E, F, ...) do { \
-+ if (E) \
-+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \
-+ else \
-+ err(S, F, ##__VA_ARGS__); \
-+} while(0)
-+
-+#define error _onboard_error
-+#endif
-
- // break into debugger
- // step twice to come back out of the raise() call into known code
-diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp
-index 7c62824..e7c7f40 100644
---- a/Onboard/pypredict/lm/lm_dynamic.cpp
-+++ b/Onboard/pypredict/lm/lm_dynamic.cpp
-@@ -17,8 +17,6 @@
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
--#include <error.h>
--
- #include "lm_dynamic.h"
-
- using namespace std;
---
-2.13.2
-
diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb
deleted file mode 100644
index 9325ef9c2..000000000
--- a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb
+++ /dev/null
@@ -1,29 +0,0 @@
-SUMMARY = "An onscreen keyboard"
-LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e"
-
-DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native"
-
-SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz \
- file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \
- "
-SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8"
-SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865"
-
-inherit features_check setuptools3-base pkgconfig gtk-icon-cache gsettings mime-xdg
-
-REQUIRED_DISTRO_FEATURES = "x11"
-
-FILES:${PN} += " \
- ${datadir}/dbus-1 \
- ${datadir}/icons \
- ${datadir}/gnome-shell \
- ${datadir}/help \
-"
-
-RDEPENDS:${PN} += " \
- ncurses \
- python3-dbus \
- python3-pycairo \
- python3-pygobject \
-"