Date
1 - 2 of 2
[PATCH 6/7] gtkwave: upgrade 3.3.108 -> 3.3.109 / move to gtk3 / tidy up recipe
|
Andreas Müller
Signed-off-by: Andreas Müller <schnitzeltony@...>
--- ...{gtkwave_3.3.108.bb => gtkwave_3.3.109.bb} | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) rename meta-oe/recipes-graphics/gtkwave/{gtkwave_3.3.108.bb => gtkwave_3.3.109.bb} (47%) diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb similarity index 47% rename from meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb rename to meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb index d9b6886ec..2b572f7e2 100644 --- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.108.bb +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.109.bb @@ -5,19 +5,36 @@ HOMEPAGE = "http://gtkwave.sourceforge.net/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -SRC_URI = "http://gtkwave.sourceforge.net/${BP}.tar.gz" +SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" +SRC_URI[sha256sum] = "35461eccd9b8b4470caa78ab9a8f14ecacbcc9eff63033d8dce58093e786deb7" +S = "${WORKDIR}/${BPN}-gtk3-${PV}" -SRC_URI[md5sum] = "dd40f09f44d7aed937e63c29b63cd3af" -SRC_URI[sha256sum] = "ece447340442e7ad029713789552e8392b75dd3808c882ac5193d42fce55eb3b" +DEPENDS = " \ + gperf-native \ + gtk+3 \ + gdk-pixbuf \ + tcl \ + tk \ + bzip2 \ + xz \ + pango \ + zlib \ +" inherit pkgconfig autotools gettext texinfo mime mime-xdg -DEPENDS += "tcl tk gperf-native bzip2 xz pango zlib gtk+ gdk-pixbuf glib-2.0" -RDEPENDS_${PN} += "tk-lib" -# depends on gtk+ which has this restriction +# depends on gtk+3 which has this restriction inherit features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -EXTRA_OECONF = "--with-tcl=${STAGING_BINDIR_CROSS} --with-tk=${STAGING_BINDIR_CROSS} --with-tirpc --disable-mime-update" +EXTRA_OECONF = " \ + --enable-gtk3 \ + --with-tcl=${STAGING_BINDIR_CROSS} \ + --with-tk=${STAGING_BINDIR_CROSS} \ + --with-tirpc \ + --disable-mime-update \ +" FILES_${PN} = "${bindir} ${datadir}" + +RDEPENDS_${PN} += "tk-lib" -- 2.31.1 |
|
|
|
Martin Jansa
This is now failing with: | In file included from ../../gtkwave-gtk3-3.3.109/src/debug.h:17, | from ../../gtkwave-gtk3-3.3.109/src/vlist.h:18, | from ../../gtkwave-gtk3-3.3.109/src/analyzer.h:18, | from ../../gtkwave-gtk3-3.3.109/src/symbol.h:20, | from ../../gtkwave-gtk3-3.3.109/src/vcd.h:32, | from ../../gtkwave-gtk3-3.3.109/src/ae2.h:16, | from ../../gtkwave-gtk3-3.3.109/src/globals.h:27, | from ../../gtkwave-gtk3-3.3.109/src/timeentry.c:11: | ../../gtkwave-gtk3-3.3.109/src/gtk23compat.h:12:10: fatal error: gdk/gdkwayland.h: No such file or directory | 12 | #include <gdk/gdkwayland.h> | | ^~~~~~~~~~~~~~~~~~ Will send a patch to restrict REQUIRED_DISTRO_FEATURES to wayland only (instead of GTK3DISTROFEATURES which includes x11 as well). On Mon, May 24, 2021 at 12:34 AM Andreas Müller <schnitzeltony@...> wrote: Signed-off-by: Andreas Müller <schnitzeltony@...> |
|
|