diff mbox series

[meta-gnome,1/2] tepl: Upgrade 6.4.0 -> 6.8.0

Message ID 20230923012830.3338338-1-f_l_k@t-online.de
State Under Review
Headers show
Series [meta-gnome,1/2] tepl: Upgrade 6.4.0 -> 6.8.0 | expand

Commit Message

Markus Volk Sept. 23, 2023, 1:28 a.m. UTC
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../recipes-gnome/tepl/{tepl_6.4.0.bb => tepl_6.8.0.bb}     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/tepl/{tepl_6.4.0.bb => tepl_6.8.0.bb} (88%)

Comments

Khem Raj Sept. 23, 2023, 2:47 p.m. UTC | #1
conflicting providers for same file I guess

https://errors.yoctoproject.org/Errors/Details/738110/

On Fri, Sep 22, 2023 at 6:28 PM Markus Volk <f_l_k@t-online.de> wrote:
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  .../recipes-gnome/tepl/{tepl_6.4.0.bb => tepl_6.8.0.bb}     | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>  rename meta-gnome/recipes-gnome/tepl/{tepl_6.4.0.bb => tepl_6.8.0.bb} (88%)
>
> diff --git a/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
> similarity index 88%
> rename from meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb
> rename to meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
> index 1eecfff4b..6c9c36f3e 100644
> --- a/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb
> +++ b/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
> @@ -6,8 +6,8 @@ DEPENDS = " \
>      gsettings-desktop-schemas \
>      glib-2.0 \
>      gtk+3 \
> -    gtksourceview4 \
> -    amtk \
> +    libgedit-amtk \
> +    libgedit-gtksourceview \
>      libxml2 \
>      uchardet \
>      gtk-doc-native \
> @@ -21,7 +21,7 @@ inherit meson gobject-introspection gettext features_check pkgconfig
>
>  ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>  SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main"
> -SRCREV = "d1e9cc2e4a0738f68d9002f13724b7239f075844"
> +SRCREV = "16ab2567257a053bd957699f89080fafd0999035"
>  S = "${WORKDIR}/git"
>
>  # gobject-introspection is mandatory and cannot be configured
> --
> 2.42.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105087): https://lists.openembedded.org/g/openembedded-devel/message/105087
> Mute This Topic: https://lists.openembedded.org/mt/101533595/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Markus Volk Sept. 23, 2023, 3:12 p.m. UTC | #2
On Sat, Sep 23 2023 at 07:47:15 AM -07:00:00, Khem Raj 
<raj.khem@gmail.com> wrote:
> conflicting providers for same file I guess

yes. libgedit-amtk replaces amtk but the latter was built as a 
dependency of libgedit-amtk
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb b/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
similarity index 88%
rename from meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb
rename to meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
index 1eecfff4b..6c9c36f3e 100644
--- a/meta-gnome/recipes-gnome/tepl/tepl_6.4.0.bb
+++ b/meta-gnome/recipes-gnome/tepl/tepl_6.8.0.bb
@@ -6,8 +6,8 @@  DEPENDS = " \
     gsettings-desktop-schemas \
     glib-2.0 \
     gtk+3 \
-    gtksourceview4 \
-    amtk \
+    libgedit-amtk \
+    libgedit-gtksourceview \
     libxml2 \
     uchardet \
     gtk-doc-native \
@@ -21,7 +21,7 @@  inherit meson gobject-introspection gettext features_check pkgconfig
 
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 SRC_URI = "git://gitlab.gnome.org/swilmet/tepl;protocol=https;branch=main"
-SRCREV = "d1e9cc2e4a0738f68d9002f13724b7239f075844"
+SRCREV = "16ab2567257a053bd957699f89080fafd0999035"
 S = "${WORKDIR}/git"
 
 # gobject-introspection is mandatory and cannot be configured