Date
1 - 3 of 3
[meta-gnome][PATCH 04/32] evolution-data-server: update 3.46.3 -> 3.48.0
Markus Volk
Signed-off-by: Markus Volk <f_l_k@...>
---
.../evolution-data-server/evolution-data-server.bb | 3 +--
.../evolution-data-server/evolution-data-server.inc | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-dat=
a-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-da=
ta-server.bb
index a27115267..d6f6d7c23 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-serve=
r.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-serve=
r.bb
@@ -37,8 +37,7 @@ EXTRA_OECMAKE:append:class-target =3D " -DG_IR_SCANNER=3D=
${STAGING_BINDIR}/g-ir-scan
PACKAGECONFIG ?=3D "oauth"
=20
PACKAGECONFIG[canberra] =3D "-DENABLE_CANBERRA=3DON,-DENABLE_CANBERRA=3D=
OFF,libcanberra"
-# ENABLE_OAUTH2_WEBKITGTK4 would require webkit to be built with gtk4
-PACKAGECONFIG[oauth] =3D "-DENABLE_OAUTH2_WEBKITGTK=3DON -DENABLE_OAU=
TH2_WEBKITGTK4=3DOFF,-DENABLE_OAUTH2_WEBKITGTK=3DOFF,webkitgtk json-glib"
+PACKAGECONFIG[oauth] =3D "-DENABLE_OAUTH2_WEBKITGTK4=3DON,-DENABLE_OA=
UTH2_WEBKITGTK4=3DOFF,webkitgtk json-glib"
PACKAGECONFIG[goa] =3D "-DENABLE_GOA=3DON,-DENABLE_GOA=3DOFF,gnome-on=
line-accounts"
PACKAGECONFIG[kerberos] =3D "-DWITH_KRB5=3DON,-DWITH_KRB5=3DOFF,krb5"
# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs =
when
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-dat=
a-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-d=
ata-server.inc
index 2b74b2e60..9db5e9011 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-serve=
r.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-serve=
r.inc
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM =3D "file://COPYING;md5=3D6a6e689d19255c=
f0557f3fe7d7068212 \
=20
inherit gnomebase upstream-version-is-even
=20
-SRC_URI[archive.sha256sum] =3D "0938e2279e5cfbc2204766ca9d3fea570911699b=
07c10cbe01aca62a7e8b2bee"
-PV =3D "3.46.3"
+SRC_URI[archive.sha256sum] =3D "0f25f73331edf53909be40f412b2a86939270327=
517616303f322de157083c35"
+PV =3D "3.48.0"
--=20
2.34.1
---
.../evolution-data-server/evolution-data-server.bb | 3 +--
.../evolution-data-server/evolution-data-server.inc | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-dat=
a-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-da=
ta-server.bb
index a27115267..d6f6d7c23 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-serve=
r.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-serve=
r.bb
@@ -37,8 +37,7 @@ EXTRA_OECMAKE:append:class-target =3D " -DG_IR_SCANNER=3D=
${STAGING_BINDIR}/g-ir-scan
PACKAGECONFIG ?=3D "oauth"
=20
PACKAGECONFIG[canberra] =3D "-DENABLE_CANBERRA=3DON,-DENABLE_CANBERRA=3D=
OFF,libcanberra"
-# ENABLE_OAUTH2_WEBKITGTK4 would require webkit to be built with gtk4
-PACKAGECONFIG[oauth] =3D "-DENABLE_OAUTH2_WEBKITGTK=3DON -DENABLE_OAU=
TH2_WEBKITGTK4=3DOFF,-DENABLE_OAUTH2_WEBKITGTK=3DOFF,webkitgtk json-glib"
+PACKAGECONFIG[oauth] =3D "-DENABLE_OAUTH2_WEBKITGTK4=3DON,-DENABLE_OA=
UTH2_WEBKITGTK4=3DOFF,webkitgtk json-glib"
PACKAGECONFIG[goa] =3D "-DENABLE_GOA=3DON,-DENABLE_GOA=3DOFF,gnome-on=
line-accounts"
PACKAGECONFIG[kerberos] =3D "-DWITH_KRB5=3DON,-DWITH_KRB5=3DOFF,krb5"
# BROKEN: due missing pkg-config in openldap eds' cmake finds host-libs =
when
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-dat=
a-server.inc b/meta-gnome/recipes-gnome/evolution-data-server/evolution-d=
ata-server.inc
index 2b74b2e60..9db5e9011 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-serve=
r.inc
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-serve=
r.inc
@@ -9,5 +9,5 @@ LIC_FILES_CHKSUM =3D "file://COPYING;md5=3D6a6e689d19255c=
f0557f3fe7d7068212 \
=20
inherit gnomebase upstream-version-is-even
=20
-SRC_URI[archive.sha256sum] =3D "0938e2279e5cfbc2204766ca9d3fea570911699b=
07c10cbe01aca62a7e8b2bee"
-PV =3D "3.46.3"
+SRC_URI[archive.sha256sum] =3D "0f25f73331edf53909be40f412b2a86939270327=
517616303f322de157083c35"
+PV =3D "3.48.0"
--=20
2.34.1
It fails to build
| -- Checking for module 'webkit2gtk-4.1>=2.34.0'
| -- No package 'webkit2gtk-4.1' found
| CMake Error at cmake/modules/PkgConfigEx.cmake:32 (message):
| Necessary libraries not found or not enough version. If you want to
| disable WebKitGTK gtk3 for built-in OAuth2 authentications, please use
| -DENABLE_OAUTH2_WEBKITGTK=OFF argument to cmake command.
| Call Stack (most recent call first):
| CMakeLists.txt:418 (pkg_check_modules_for_option)
|
toggle quoted message
Show quoted text
| -- Checking for module 'webkit2gtk-4.1>=2.34.0'
| -- No package 'webkit2gtk-4.1' found
| CMake Error at cmake/modules/PkgConfigEx.cmake:32 (message):
| Necessary libraries not found or not enough version. If you want to
| disable WebKitGTK gtk3 for built-in OAuth2 authentications, please use
| -DENABLE_OAUTH2_WEBKITGTK=OFF argument to cmake command.
| Call Stack (most recent call first):
| CMakeLists.txt:418 (pkg_check_modules_for_option)
|
On Sat, Mar 25, 2023 at 1:03 AM Markus Volk <f_l_k@...> wrote:
Signed-off-by: Markus Volk <f_l_k@...>
---
.../evolution-data-server/evolution-data-server.bb | 3 +--
.../evolution-data-server/evolution-data-server.inc | 4 ++--
2 files changed, 3 insertions(+), 4 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 a27115267..d6f6d7c23 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
@@ -37,8 +37,7 @@ EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan
PACKAGECONFIG ?= "oauth"
PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-# 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[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
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 2b74b2e60..9db5e9011 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] = "0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee"
-PV = "3.46.3"
+SRC_URI[archive.sha256sum] = "0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35"
+PV = "3.48.0"
--
2.34.1
something like below make it run further in build
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 d6f6d7c231..ad91dffb74 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
@@ -37,7 +37,7 @@ EXTRA_OECMAKE:append:class-target = "
-DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan
PACKAGECONFIG ?= "oauth"
PACKAGECONFIG[canberra] =
"-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth] =
"-DENABLE_OAUTH2_WEBKITGTK4=ON,-DENABLE_OAUTH2_WEBKITGTK4=OFF,webkitgtk
json-glib"
+PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK4=ON
-DENABLE_OAUTH2_WEBKITGTK=OFF,-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
toggle quoted message
Show quoted text
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 d6f6d7c231..ad91dffb74 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
@@ -37,7 +37,7 @@ EXTRA_OECMAKE:append:class-target = "
-DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan
PACKAGECONFIG ?= "oauth"
PACKAGECONFIG[canberra] =
"-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-PACKAGECONFIG[oauth] =
"-DENABLE_OAUTH2_WEBKITGTK4=ON,-DENABLE_OAUTH2_WEBKITGTK4=OFF,webkitgtk
json-glib"
+PACKAGECONFIG[oauth] = "-DENABLE_OAUTH2_WEBKITGTK4=ON
-DENABLE_OAUTH2_WEBKITGTK=OFF,-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
On Sun, Mar 26, 2023 at 9:59 PM Khem Raj <raj.khem@...> wrote:
It fails to build
| -- Checking for module 'webkit2gtk-4.1>=2.34.0'
| -- No package 'webkit2gtk-4.1' found
| CMake Error at cmake/modules/PkgConfigEx.cmake:32 (message):
| Necessary libraries not found or not enough version. If you want to
| disable WebKitGTK gtk3 for built-in OAuth2 authentications, please use
| -DENABLE_OAUTH2_WEBKITGTK=OFF argument to cmake command.
| Call Stack (most recent call first):
| CMakeLists.txt:418 (pkg_check_modules_for_option)
|
On Sat, Mar 25, 2023 at 1:03 AM Markus Volk <f_l_k@...> wrote:
Signed-off-by: Markus Volk <f_l_k@...>
---
.../evolution-data-server/evolution-data-server.bb | 3 +--
.../evolution-data-server/evolution-data-server.inc | 4 ++--
2 files changed, 3 insertions(+), 4 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 a27115267..d6f6d7c23 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
@@ -37,8 +37,7 @@ EXTRA_OECMAKE:append:class-target = " -DG_IR_SCANNER=${STAGING_BINDIR}/g-ir-scan
PACKAGECONFIG ?= "oauth"
PACKAGECONFIG[canberra] = "-DENABLE_CANBERRA=ON,-DENABLE_CANBERRA=OFF,libcanberra"
-# 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[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
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 2b74b2e60..9db5e9011 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] = "0938e2279e5cfbc2204766ca9d3fea570911699b07c10cbe01aca62a7e8b2bee"
-PV = "3.46.3"
+SRC_URI[archive.sha256sum] = "0f25f73331edf53909be40f412b2a86939270327517616303f322de157083c35"
+PV = "3.48.0"
--
2.34.1