[meta-gnome][PATCH 1/4] geary: use gtk4 by default

[meta-gnome][PATCH 1/4] geary: use gtk4 by default

[Markus Volk]

---
 meta-gnome/recipes-connectivity/geary/geary_43.0.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
index 8dd0ea67d..6d18867cf 100644
--- a/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
+++ b/meta-gnome/recipes-connectivity/geary/geary_43.0.bb
@@ -15,7 +15,7 @@ DEPENDS = " \
     gnome-online-accounts \
     gsound \
     gspell \
-    gtk+3 \
+    gtk4 \
     icu \
     iso-codes \
     json-glib \
-- 
2.34.1

[meta-gnome][PATCH 2/4] libgweather: update 4.0.0 -> 4.2.0

[Markus Volk]

- use gtk4
- build with libsoup-3.0

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 ...w-building-gir-in-cross-environments.patch | 21 +++++++------------
 ...eather4_4.0.0.bb => libgweather4_4.2.0.bb} |  6 +++---
 2 files changed, 10 insertions(+), 17 deletions(-)
 rename meta-gnome/recipes-gnome/libgweather/{libgweather4_4.0.0.bb => libgweather4_4.2.0.bb} (82%)

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
similarity index 82%
rename from meta-gnome/recipes-gnome/libgweather/libgweather4_4.0.0.bb
rename to 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 \
 "
 
-- 
2.34.1

[meta-gnome][PATCH 3/4] geocode-glib: build with libsoup-3.0

[Markus Volk]

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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"
-- 
2.34.1

[meta-gnome][PATCH 4/4] evolution-data-server: update 3.44.2 -> 3.46.1

[Markus Volk]

- build with libsoup-3.0
- use gtk4

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../evolution-data-server.bb                    | 17 +++++++++--------
 .../evolution-data-server.inc                   |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

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..6a631d20b 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 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 ?= ""
+
 PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2=ON,-DENABLE_OAUTH2=OFF,webkitgtk json-glib"
+# for builtin oauth authentification webkitgtk needs to be built with gtk4 also.
+PACKAGECONFIG[oauth]    = "-DENABLE_OAUTH2_WEBKITGTK4=ON,-DENABLE_OAUTH2_WEBKITGTK4=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"
-- 
2.34.1

Re: [meta-gnome][PATCH 1/4] geary: use gtk4 by default

[Markus Volk]

[-- Attachment #1: Type: text/plain, Size: 438 bytes --]

Am Sa, 26. Nov 2022 um 14:16:09 +0100 schrieb Markus Volk 
<f_l_k@t-online.de>:
>  meta-gnome/recipes-connectivity/geary/geary_43.0.bb | 2 +-

The geary patch is wrong. I updated gnome-shell this afternoon and  
needed to update some more gnome recipes.
I think its best to drop this 4 patches. I'll send a v2 and will 
include them.

Will be quite an invasive change and also would need patching in 
oe-core. No hurry for merging them.


[-- Attachment #2: Type: text/html, Size: 652 bytes --]