diff mbox series

[meta-gnome,04/32] evolution-data-server: update 3.46.3 -> 3.48.0

Message ID 20230325080256.923752-4-f_l_k@t-online.de
State New
Headers show
Series [meta-gnome,01/32] polkit-gnome: add recipe | expand

Commit Message

Markus Volk March 25, 2023, 8:02 a.m. UTC 
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../evolution-data-server/evolution-data-server.bb            | 3 +--
 .../evolution-data-server/evolution-data-server.inc           | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

Comments

Khem Raj March 27, 2023, 4:59 a.m. UTC | #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)
|

On Sat, Mar 25, 2023 at 1:03 AM Markus Volk <f_l_k@t-online.de> wrote:
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  .../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
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#101717): https://lists.openembedded.org/g/openembedded-devel/message/101717
> Mute This Topic: https://lists.openembedded.org/mt/97840027/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Khem Raj March 27, 2023, 5:01 a.m. UTC | #2 
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

On Sun, Mar 26, 2023 at 9:59 PM Khem Raj <raj.khem@gmail.com> 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@t-online.de> wrote:
> >
> > Signed-off-by: Markus Volk <f_l_k@t-online.de>
> > ---
> >  .../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
> >
> >
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#101717): https://lists.openembedded.org/g/openembedded-devel/message/101717
> > Mute This Topic: https://lists.openembedded.org/mt/97840027/1997914
> > Group Owner: openembedded-devel+owner@lists.openembedded.org
> > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> >
diff mbox series

Patch

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"