diff mbox series

[meta-gnome,2/2] gedit: Upgrade 44.2 -> 46.1

Message ID 20230923012830.3338338-2-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
- add recipes for libedit-amtk and libgedit-gtksourceview
- update dependencies
- fix reproducibility issue

Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 .../gedit/{gedit_44.2.bb => gedit_46.1.bb}    | 13 ++++++++++---
 .../gedit/libgedit-amtk_5.8.0.bb              | 17 +++++++++++++++++
 .../gedit/libgedit-gtksourceview_299.0.4.bb   | 19 +++++++++++++++++++
 3 files changed, 46 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/gedit/{gedit_44.2.bb => gedit_46.1.bb} (67%)
 create mode 100644 meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
 create mode 100644 meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb

Comments

Khem Raj Sept. 23, 2023, 2:45 p.m. UTC | #1
fails in license check

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

Does this happen for you ?

On Fri, Sep 22, 2023 at 6:28 PM Markus Volk <f_l_k@t-online.de> wrote:
>
> - add recipes for libedit-amtk and libgedit-gtksourceview
> - update dependencies
> - fix reproducibility issue
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
>  .../gedit/{gedit_44.2.bb => gedit_46.1.bb}    | 13 ++++++++++---
>  .../gedit/libgedit-amtk_5.8.0.bb              | 17 +++++++++++++++++
>  .../gedit/libgedit-gtksourceview_299.0.4.bb   | 19 +++++++++++++++++++
>  3 files changed, 46 insertions(+), 3 deletions(-)
>  rename meta-gnome/recipes-gnome/gedit/{gedit_44.2.bb => gedit_46.1.bb} (67%)
>  create mode 100644 meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
>  create mode 100644 meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb
>
> diff --git a/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
> similarity index 67%
> rename from meta-gnome/recipes-gnome/gedit/gedit_44.2.bb
> rename to meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
> index 34c782297..0538221f4 100644
> --- a/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb
> +++ b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
> @@ -6,27 +6,34 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
>  GNOMEBASEBUILDCLASS = "meson"
>
>  DEPENDS = " \
> +    appstream-glib-native \
> +    desktop-file-utils-native \
> +    libgedit-amtk \
> +    libgedit-gtksourceview \
>      gdk-pixbuf-native \
>      gtk+3 \
>      gsettings-desktop-schemas \
>      libpeas \
>      libsoup \
>      gspell \
> -    gtksourceview4 \
>      tepl \
>  "
>
> -inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig
> +inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg gtk-icon-cache python3targetconfig
>
>  def gnome_verdir(v):
>      return oe.utils.trim_version(v, 1)
>
> -SRC_URI[archive.sha256sum] = "3bbb1b3775d4c277daf54aaab44b0eb83a4eb1f09f0391800041c9e56893ec11"
> +SRC_URI[archive.sha256sum] = "a1a6e37f041765dff7227a1f5578b6f49faaf016b1e17e869caf5bfb94c6aa4e"
>
>  # gobject-introspection is mandatory and cannot be configured
>  REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
>  ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>
> +do_install:prepend() {
> +    sed -i -e 's|${S}/src|/usr/src/debug/${PN}/${PV}-${PR}/src|g' ${B}/plugins/filebrowser/gedit-file-browser-enum-types.c
> +}
> +
>  GIR_MESON_OPTION = ""
>
>  GTKDOC_MESON_OPTION = "gtk_doc"
> diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
> new file mode 100644
> index 000000000..59ae16948
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
> @@ -0,0 +1,17 @@
> +SUMMARY = "libgedit-amtk - Actions, Menus and Toolbars Kit for GTK applications"
> +SECTION = "gnome"
> +LICENSE = "LGPL-3.0-or-later"
> +LIC_FILES_CHKSUM = "file://LICENSES;md5=75859989545e37968a99b631ef42722e"
> +
> +DEPENDS = "amtk"
> +
> +inherit meson pkgconfig gobject-introspection gtk-doc
> +
> +SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main"
> +S = "${WORKDIR}/git"
> +SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4"
> +
> +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> +
> +GIR_MESON_OPTION = "gobject_introspection"
> +GTKDOC_MESON_OPTION = "gtk_doc"
> diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb
> new file mode 100644
> index 000000000..9a68bbda2
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb
> @@ -0,0 +1,19 @@
> +SUMMARY = "Gedit Technology - Source code editing widget"
> +SECTION = "gnome"
> +LICENSE = "LGPL-2.1-only"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
> +
> +DEPENDS = "glib-2.0 gtk+3 libxml2"
> +
> +inherit meson pkgconfig gobject-introspection gtk-doc
> +
> +SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main"
> +S = "${WORKDIR}/git"
> +SRCREV = "7062264d635f6efe04d88217a893a97ff385b873"
> +
> +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> +
> +GIR_MESON_OPTION = "gobject_introspection"
> +GTKDOC_MESON_OPTION = "gtk_doc"
> +
> +FILES:${PN} += "${datadir}"
> --
> 2.42.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#105088): https://lists.openembedded.org/g/openembedded-devel/message/105088
> Mute This Topic: https://lists.openembedded.org/mt/101533596/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, 2:49 p.m. UTC | #2
On Sat, Sep 23 2023 at 07:45:43 AM -07:00:00, Khem Raj 
<raj.khem@gmail.com> wrote:
> Does this happen for you ?

Not for now. I'll do a bitbake -c cleansstate libgedit-gtksourceview

That will  make it appear I guess
Markus Volk Sept. 23, 2023, 2:55 p.m. UTC | #3
On Sat, Sep 23 2023 at 04:49:11 PM +02:00:00, Markus Volk 
<f_l_k@t-online.de> wrote:
> Not for now. I'll do a bitbake -c cleansstate libgedit-gtksourceview

After cleansstate I also have this message.
diff mbox series

Patch

diff --git a/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
similarity index 67%
rename from meta-gnome/recipes-gnome/gedit/gedit_44.2.bb
rename to meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
index 34c782297..0538221f4 100644
--- a/meta-gnome/recipes-gnome/gedit/gedit_44.2.bb
+++ b/meta-gnome/recipes-gnome/gedit/gedit_46.1.bb
@@ -6,27 +6,34 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
 GNOMEBASEBUILDCLASS = "meson"
 
 DEPENDS = " \
+    appstream-glib-native \
+    desktop-file-utils-native \
+    libgedit-amtk \
+    libgedit-gtksourceview \
     gdk-pixbuf-native \
     gtk+3 \
     gsettings-desktop-schemas \
     libpeas \
     libsoup \
     gspell \
-    gtksourceview4 \
     tepl \
 "
 
-inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg python3targetconfig
+inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check mime-xdg gtk-icon-cache python3targetconfig
 
 def gnome_verdir(v):
     return oe.utils.trim_version(v, 1)
 
-SRC_URI[archive.sha256sum] = "3bbb1b3775d4c277daf54aaab44b0eb83a4eb1f09f0391800041c9e56893ec11"
+SRC_URI[archive.sha256sum] = "a1a6e37f041765dff7227a1f5578b6f49faaf016b1e17e869caf5bfb94c6aa4e"
 
 # gobject-introspection is mandatory and cannot be configured
 REQUIRED_DISTRO_FEATURES = "gobject-introspection-data"
 ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 
+do_install:prepend() {
+    sed -i -e 's|${S}/src|/usr/src/debug/${PN}/${PV}-${PR}/src|g' ${B}/plugins/filebrowser/gedit-file-browser-enum-types.c
+}
+
 GIR_MESON_OPTION = ""
 
 GTKDOC_MESON_OPTION = "gtk_doc"
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
new file mode 100644
index 000000000..59ae16948
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-amtk_5.8.0.bb
@@ -0,0 +1,17 @@ 
+SUMMARY = "libgedit-amtk - Actions, Menus and Toolbars Kit for GTK applications"
+SECTION = "gnome"
+LICENSE = "LGPL-3.0-or-later"
+LIC_FILES_CHKSUM = "file://LICENSES;md5=75859989545e37968a99b631ef42722e"
+
+DEPENDS = "amtk"
+
+inherit meson pkgconfig gobject-introspection gtk-doc
+
+SRC_URI = "git://github.com/gedit-technology/libgedit-amtk.git;protocol=https;branch=main"
+S = "${WORKDIR}/git"
+SRCREV = "f6fbfd1c57de3d97cab2056a5c3088b0da49e8a4"
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+GIR_MESON_OPTION = "gobject_introspection"
+GTKDOC_MESON_OPTION = "gtk_doc"
diff --git a/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb
new file mode 100644
index 000000000..9a68bbda2
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gedit/libgedit-gtksourceview_299.0.4.bb
@@ -0,0 +1,19 @@ 
+SUMMARY = "Gedit Technology - Source code editing widget"
+SECTION = "gnome"
+LICENSE = "LGPL-2.1-only"
+LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e"
+
+DEPENDS = "glib-2.0 gtk+3 libxml2"
+
+inherit meson pkgconfig gobject-introspection gtk-doc
+
+SRC_URI = "git://github.com/gedit-technology/libgedit-gtksourceview.git;protocol=https;branch=main"
+S = "${WORKDIR}/git"
+SRCREV = "7062264d635f6efe04d88217a893a97ff385b873"
+
+ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
+
+GIR_MESON_OPTION = "gobject_introspection"
+GTKDOC_MESON_OPTION = "gtk_doc"
+
+FILES:${PN} += "${datadir}"