muffin: initial add 4.4.2

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
Andreas Müller
2020-01-04 03:21:48 +01:00
parent fa8ce5f8f8
commit 709bdd3d6f
4 changed files with 122 additions and 0 deletions

View File

@@ -0,0 +1,42 @@
SUMMARY = "The window management library for the Cinnamon desktop"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=8955bdc698cdc995fb6abba2cb6f7347"
DEPENDS = " \
glib-2.0-native \
intltool-native \
gdk-pixbuf-native \
gnome-doc-utils-stub \
gtk+3 \
json-glib \
libinput \
cinnamon-desktop \
"
inherit autotools features_check gettext gtk-doc gobject-introspection gsettings
REQUIRED_DISTRO_FEATURES = "x11"
SRC_URI = " \
git://github.com/linuxmint/muffin.git \
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"
S = "${WORKDIR}/git"
EXTRA_OECONF = "--disable-gtk-doc"
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} += " \
${datadir}/glib-2.0/schemas \
"
RDEPENDS_${PN} += "zenity"

View File

@@ -0,0 +1,34 @@
From fdce58e4898510db6b6913bd622ab06621f1e9ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
Date: Sat, 4 Jan 2020 01:56:25 +0100
Subject: [PATCH] Do not check fo zenity executable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
configure.ac | 5 -----
1 file changed, 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 919a7d7..780d2d4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -450,11 +450,6 @@ fi
AC_SUBST(GDK_PIXBUF_CSOURCE)
-AC_PATH_PROG(ZENITY, zenity, no)
-if test x"$ZENITY" = xno; then
- AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
-fi
-
AC_ARG_ENABLE(debug,
[ --enable-debug enable debugging],,
enable_debug=no)
--
2.21.0

View File

@@ -0,0 +1,31 @@
From 9f380ffd93616832919ab45d9d5c24cb393d7df7 Mon Sep 17 00:00:00 2001
From: Leigh Scott <leigh123linux@googlemail.com>
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

View File

@@ -0,0 +1,15 @@
# -*- mode: makefile -*-
# We need dummy variables so we don't fail if someone appends to them
# with +=
# stolen from https://github.com/GNOME/gtk-doc-stub/blob/master/gtk-doc.make
GPATH=
TARGET_DIR=
SETUP_FILES=
EXTRA_DIST=
DOC_STAMPS=
SCANOBJ_FILES=
REPORT_FILES=
CLEANFILES=