diff --git a/recipes-cinnamon/muffin/muffin.bb b/recipes-cinnamon/muffin/muffin.bb index 99a652c..9f60e79 100644 --- a/recipes-cinnamon/muffin/muffin.bb +++ b/recipes-cinnamon/muffin/muffin.bb @@ -18,24 +18,23 @@ inherit autotools features_check gettext gtk-doc gobject-introspection gsettings REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = " \ - git://github.com/linuxmint/muffin.git \ + git://github.com/linuxmint/muffin.git;branch=master;protocol=https \ file://0001-Do-not-check-fo-zenity-executable.patch \ - file://0002-fix-warnings-when-compiling.patch \ file://gtk-doc.make \ " -SRCREV = "a00332bfd5e437883cdf38dfaa455a4b3448c6e4" -PV = "4.4.2" +SRCREV = "6a2a5a65f6dad71c37fdea34dad80035bd4ca336" +PV = "5.2.0" S = "${WORKDIR}/git" EXTRA_OECONF = "--disable-gtk-doc" -do_configure_prepend() { +do_configure:prepend() { cp ${WORKDIR}/gtk-doc.make ${S}/ } export GIR_EXTRA_LIBS_PATH="${B}/cogl/cogl/.libs:${B}/cogl/cogl-pango/.libs:${B}/cogl/cogl-path/.libs:${B}/clutter/clutter/.libs" -FILES_${PN} += " \ +FILES:${PN} += " \ ${datadir}/glib-2.0/schemas \ " diff --git a/recipes-cinnamon/muffin/muffin/0002-fix-warnings-when-compiling.patch b/recipes-cinnamon/muffin/muffin/0002-fix-warnings-when-compiling.patch deleted file mode 100644 index 0e38704..0000000 --- a/recipes-cinnamon/muffin/muffin/0002-fix-warnings-when-compiling.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9f380ffd93616832919ab45d9d5c24cb393d7df7 Mon Sep 17 00:00:00 2001 -From: Leigh Scott -Date: Fri, 27 Sep 2019 10:41:56 +0100 -Subject: [PATCH] fix warnings when compiling - -This reverts commit 312ab2bf6791fbad0a1b3139fc398d741ac4ed61. - -Under discussion at [1] - -[1] https://github.com/linuxmint/muffin/issues/535 ---- - src/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index cbb5b3a..d2aa04f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -281,7 +281,7 @@ Meta-$(api_version).gir: libmuffin.la - muffin-enum-types.h \ - $(libmuffininclude_base_headers) \ - $(filter %.c,$(libmuffin_la_SOURCES)) --@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all --warn-error -+@META_GIR@_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --warn-all - - endif - --- -2.21.0 - -