diff mbox series

[meta-gnome] gnome-session: update 45.0 -> 46.0

Message ID 20240319104318.873991-1-f_l_k@t-online.de
State New
Headers show
Series [meta-gnome] gnome-session: update 45.0 -> 46.0 | expand

Commit Message

Markus Volk March 19, 2024, 10:43 a.m. UTC
- consolekit support was removed upstream
- add PACKAGECONFIG for doc

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../gnome-session/gnome-session_46.0.bb           | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

Comments

Khem Raj March 19, 2024, 4:59 p.m. UTC | #1
Hi Markus

Subject seems to indicate that its upgrading 45.0 -> 46.0, however
patch is missing the file move/rename part.

On Tue, Mar 19, 2024 at 3:43 AM Markus Volk <f_l_k@t-online.de> wrote:
>
> - consolekit support was removed upstream
> - add PACKAGECONFIG for doc
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  .../gnome-session/gnome-session_46.0.bb           | 15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
> index ad8912b2c..87117fd17 100644
> --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
> +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
> @@ -4,29 +4,26 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>
>  DEPENDS = " \
>      glib-2.0-native \
> -    libxslt-native \
> -    xmlto-native \
>      xtrans \
>      libice \
>      libsm \
>      virtual/libx11 \
> -    gtk+3 \
>      gnome-desktop \
> -    gsettings-desktop-schemas \
> +    gtk+3 \
>      json-glib \
> +    systemd \
>  "
>
> -
>  inherit gnomebase gettext gsettings upstream-version-is-even features_check
>
> -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data"
> +REQUIRED_DISTRO_FEATURES = "polkit systemd pam gobject-introspection-data"
>
>  SRC_URI[archive.sha256sum] = "c6e1624af6090bc4e1a191fe2268abfa7a8de07831ca7a57f217e679bf7b9a54"
>
> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit',d)}"
> +PACKAGECONFIG ??= ""
>
> -PACKAGECONFIG[consolekit] = "-Dconsolekit=true, -Dconsolekit=false, dbus-glib"
> -PACKAGECONFIG[systemd] = "-Dsystemd=true -Dsystemd_journal=true, -Dsystemd=false -Dsystemd_journal=false, systemd"
> +PACKAGECONFIG[docbook] = "-Ddocbook=true, -Ddocbook=false"
> +PACKAGECONFIG[man] = "-Dman=true, -Dman=false,xmlto-native libxslt-native"
>
>  FILES:${PN} += " \
>     ${datadir}/xdg-desktop-portal \
> --
> 2.44.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#109478): https://lists.openembedded.org/g/openembedded-devel/message/109478
> Mute This Topic: https://lists.openembedded.org/mt/105021407/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk March 20, 2024, 7:58 a.m. UTC | #2
Hi Khem,

yes, sorry for that. I've sent a fixed version for gnome-session

On Tue, Mar 19 2024 at 09:59:08 AM -07:00:00, Khem Raj 
<raj.khem@gmail.com> wrote:
> Hi Markus
> 
> Subject seems to indicate that its upgrading 45.0 -> 46.0, however
> patch is missing the file move/rename part.
> 
> On Tue, Mar 19, 2024 at 3:43 AM Markus Volk <f_l_k@t-online.de 
> <mailto:f_l_k@t-online.de>> wrote:
>> 
>>  - consolekit support was removed upstream
>>  - add PACKAGECONFIG for doc
>> 
>>  Signed-off-by: Markus Volk <f_l_k@t-online.de 
>> <mailto:f_l_k@t-online.de>>
>>  ---
>>   .../gnome-session/gnome-session_46.0.bb           | 15 
>> ++++++---------
>>   1 file changed, 6 insertions(+), 9 deletions(-)
>> 
>>  diff --git 
>> a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb 
>> b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
>>  index ad8912b2c..87117fd17 100644
>>  --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
>>  +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
>>  @@ -4,29 +4,26 @@ LIC_FILES_CHKSUM = 
>> "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
>> 
>>   DEPENDS = " \
>>       glib-2.0-native \
>>  -    libxslt-native \
>>  -    xmlto-native \
>>       xtrans \
>>       libice \
>>       libsm \
>>       virtual/libx11 \
>>  -    gtk+3 \
>>       gnome-desktop \
>>  -    gsettings-desktop-schemas \
>>  +    gtk+3 \
>>       json-glib \
>>  +    systemd \
>>   "
>> 
>>  -
>>   inherit gnomebase gettext gsettings upstream-version-is-even 
>> features_check
>> 
>>  -REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam 
>> gobject-introspection-data"
>>  +REQUIRED_DISTRO_FEATURES = "polkit systemd pam 
>> gobject-introspection-data"
>> 
>>   SRC_URI[archive.sha256sum] = 
>> "c6e1624af6090bc4e1a191fe2268abfa7a8de07831ca7a57f217e679bf7b9a54"
>> 
>>  -PACKAGECONFIG ??= "${@bb.utils.contains 
>> <mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'systemd', 
>> 'systemd', 'consolekit',d)}"
>>  +PACKAGECONFIG ??= ""
>> 
>>  -PACKAGECONFIG[consolekit] = "-Dconsolekit=true, 
>> -Dconsolekit=false, dbus-glib"
>>  -PACKAGECONFIG[systemd] = "-Dsystemd=true -Dsystemd_journal=true, 
>> -Dsystemd=false -Dsystemd_journal=false, systemd"
>>  +PACKAGECONFIG[docbook] = "-Ddocbook=true, -Ddocbook=false"
>>  +PACKAGECONFIG[man] = "-Dman=true, -Dman=false,xmlto-native 
>> libxslt-native"
>> 
>>   FILES:${PN} += " \
>>      ${datadir}/xdg-desktop-portal \
>>  --
>>  2.44.0
>> 
>> 
>>  -=-=-=-=-=-=-=-=-=-=-=-
>>  Links: You receive all messages sent to this group.
>>  View/Reply Online (#109478): 
>> <https://lists.openembedded.org/g/openembedded-devel/message/109478>
>>  Mute This Topic: 
>> <https://lists.openembedded.org/mt/105021407/1997914>
>>  Group Owner: openembedded-devel+owner@lists.openembedded.org 
>> <mailto:openembedded-devel+owner@lists.openembedded.org>
>>  Unsubscribe: 
>> <https://lists.openembedded.org/g/openembedded-devel/unsub> 
>> [raj.khem@gmail.com <mailto:raj.khem@gmail.com>]
>>  -=-=-=-=-=-=-=-=-=-=-=-
>>
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
index ad8912b2c..87117fd17 100644
--- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
+++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb
@@ -4,29 +4,26 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
 
 DEPENDS = " \
     glib-2.0-native \
-    libxslt-native \
-    xmlto-native \
     xtrans \
     libice \
     libsm \
     virtual/libx11 \
-    gtk+3 \
     gnome-desktop \
-    gsettings-desktop-schemas \
+    gtk+3 \
     json-glib \
+    systemd \
 "
 
-
 inherit gnomebase gettext gsettings upstream-version-is-even features_check
 
-REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data"
+REQUIRED_DISTRO_FEATURES = "polkit systemd pam gobject-introspection-data"
 
 SRC_URI[archive.sha256sum] = "c6e1624af6090bc4e1a191fe2268abfa7a8de07831ca7a57f217e679bf7b9a54"
 
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit',d)}"
+PACKAGECONFIG ??= ""
 
-PACKAGECONFIG[consolekit] = "-Dconsolekit=true, -Dconsolekit=false, dbus-glib"
-PACKAGECONFIG[systemd] = "-Dsystemd=true -Dsystemd_journal=true, -Dsystemd=false -Dsystemd_journal=false, systemd"
+PACKAGECONFIG[docbook] = "-Ddocbook=true, -Ddocbook=false"
+PACKAGECONFIG[man] = "-Dman=true, -Dman=false,xmlto-native libxslt-native"
 
 FILES:${PN} += " \
    ${datadir}/xdg-desktop-portal \