| Message ID | 20230923151033.902586-1-f_l_k@t-online.de |
|---|---|
| State | Under Review |
| Headers | show |
| Series | [meta-gnome,PATCHv3] gedit: Upgrade 44.2 -> 46.1 | expand |
something is still amiss. https://errors.yoctoproject.org/Errors/Build/171993/ On Sat, Sep 23, 2023 at 8:10 AM Markus Volk <f_l_k@t-online.de> wrote: > > - add recipes for libedit-amtk and libgedit-gtksourceview > - drop deprecated amtk recipe > - update dependencies > - fix reproducibility issue > > Signed-off-by: Markus Volk <f_l_k@t-online.de> > --- > meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb | 22 ------------------- > .../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 ++++++++++++++++ > 4 files changed, 46 insertions(+), 25 deletions(-) > delete mode 100644 meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb > 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/amtk/amtk_5.6.1.bb b/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb > deleted file mode 100644 > index fbc8f3845..000000000 > --- a/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb > +++ /dev/null > @@ -1,22 +0,0 @@ > -SUMMARY = "Actions, Menus and Toolbars Kit" > -LICENSE = "LGPL-3.0-or-later" > -LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" > - > -DEPENDS = " \ > - glib-2.0-native \ > - gtk+3 \ > - gtk-doc-native \ > - libxslt-native \ > - docbook-xsl-stylesheets-native \ > - python3-pygments-native \ > -" > - > -GNOMEBASEBUILDCLASS = "meson" > - > -GIR_MESON_OPTION = "" > - > -inherit gnomebase gettext features_check gobject-introspection > - > -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" > - > -SRC_URI[archive.sha256sum] = "d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228" > 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..8067407e4 > --- /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 = "glib-2.0 gtk+3" > + > +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..3f7ac9623 > --- /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=fbc093901857fcd118f065f900982c24" > + > +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 (#105095): https://lists.openembedded.org/g/openembedded-devel/message/105095 > Mute This Topic: https://lists.openembedded.org/mt/101541175/1997914 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
LIC_FILES_CHKSUM points to an invalid file It is really strange that this did not fail for me. On Sat, Sep 23 2023 at 07:52:24 PM -07:00:00, Khem Raj <raj.khem@gmail.com> wrote: > something is still amiss. > > <https://errors.yoctoproject.org/Errors/Build/171993/> > > On Sat, Sep 23, 2023 at 8:10 AM Markus Volk <f_l_k@t-online.de > <mailto:f_l_k@t-online.de>> wrote: >> >> - add recipes for libedit-amtk and libgedit-gtksourceview >> - drop deprecated amtk recipe >> - update dependencies >> - fix reproducibility issue >> >> Signed-off-by: Markus Volk <f_l_k@t-online.de >> <mailto:f_l_k@t-online.de>> >> --- >> meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb | 22 >> ------------------- >> .../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 ++++++++++++++++ >> 4 files changed, 46 insertions(+), 25 deletions(-) >> delete mode 100644 meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb >> 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/amtk/amtk_5.6.1.bb >> b/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb >> deleted file mode 100644 >> index fbc8f3845..000000000 >> --- a/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb >> +++ /dev/null >> @@ -1,22 +0,0 @@ >> -SUMMARY = "Actions, Menus and Toolbars Kit" >> -LICENSE = "LGPL-3.0-or-later" >> -LIC_FILES_CHKSUM = >> "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" >> <file://licenses/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117> >> - >> -DEPENDS = " \ >> - glib-2.0-native \ >> - gtk+3 \ >> - gtk-doc-native \ >> - libxslt-native \ >> - docbook-xsl-stylesheets-native \ >> - python3-pygments-native \ >> -" >> - >> -GNOMEBASEBUILDCLASS = "meson" >> - >> -GIR_MESON_OPTION = "" >> - >> -inherit gnomebase gettext features_check gobject-introspection >> - >> -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" >> - >> -SRC_URI[archive.sha256sum] = >> "d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228" >> 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..8067407e4 >> --- /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" >> <file://licenses;md5=75859989545e37968a99b631ef42722e/> >> + >> +DEPENDS = "glib-2.0 gtk+3" >> + >> +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..3f7ac9623 >> --- /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=fbc093901857fcd118f065f900982c24" >> <file://copying;md5=fbc093901857fcd118f065f900982c24/> >> + >> +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 (#105102): > <https://lists.openembedded.org/g/openembedded-devel/message/105102> > Mute This Topic: <https://lists.openembedded.org/mt/101541175/3618223> > Group Owner: openembedded-devel+owner@lists.openembedded.org > <mailto:openembedded-devel+owner@lists.openembedded.org> > Unsubscribe: > <https://lists.openembedded.org/g/openembedded-devel/unsub> > [f_l_k@t-online.de <mailto:f_l_k@t-online.de>] > -=-=-=-=-=-=-=-=-=-=-=- >
diff --git a/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb b/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb deleted file mode 100644 index fbc8f3845..000000000 --- a/meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Actions, Menus and Toolbars Kit" -LICENSE = "LGPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSES/LGPL-3.0-or-later.txt;md5=c51d3eef3be114124d11349ca0d7e117" - -DEPENDS = " \ - glib-2.0-native \ - gtk+3 \ - gtk-doc-native \ - libxslt-native \ - docbook-xsl-stylesheets-native \ - python3-pygments-native \ -" - -GNOMEBASEBUILDCLASS = "meson" - -GIR_MESON_OPTION = "" - -inherit gnomebase gettext features_check gobject-introspection - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -SRC_URI[archive.sha256sum] = "d50115b85c872aac296934b5ee726a3fa156c6f5ad96d27e0edd0aa5ad173228" 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..8067407e4 --- /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 = "glib-2.0 gtk+3" + +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..3f7ac9623 --- /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=fbc093901857fcd118f065f900982c24" + +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}"
- add recipes for libedit-amtk and libgedit-gtksourceview - drop deprecated amtk recipe - update dependencies - fix reproducibility issue Signed-off-by: Markus Volk <f_l_k@t-online.de> --- meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb | 22 ------------------- .../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 ++++++++++++++++ 4 files changed, 46 insertions(+), 25 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/amtk/amtk_5.6.1.bb 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