From 6192a45ad1a31bf3e9c4ba632b114de1dc589f87 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Wed, 4 Nov 2020 12:43:14 -0500 Subject: [PATCH] Add gnome-system-monitor and gnome-disk-utility --- .../packagegroups/packagegroup-gnome.bb | 4 +- meta-gnome/classes/gnome-help.bbclass | 67 +++++++++++++++++++ meta-gnome/classes/itstool.bbclass | 5 ++ .../gnome-disk-utility_3.38.0.bb | 36 ++++++++++ .../gnome-system-monitor_3.38.0.bb | 30 +++++++++ .../libdvdread/libdvdread_6.1.1.bb | 12 ++++ .../libsigc++-2.0/libsigc++-2.0_2.10.3.bb | 20 ++++++ .../libsigc++-2.0/libsigc++-3_3.0.3.bb | 20 ++++++ meta-gnome/recipes-support/mm/atkmm_2.28.0.bb | 19 ++++++ .../recipes-support/mm/cairomm_1.12.0.bb | 15 +++++ .../mm/glibmm/remove-examples.patch | 40 +++++++++++ .../recipes-support/mm/glibmm_2.62.0.bb | 35 ++++++++++ .../mm/gtkmm/0001-do-not-build-demos.patch | 51 ++++++++++++++ .../recipes-support/mm/gtkmm3_3.24.2.bb | 23 +++++++ ...ot-ask-for-python-installation-versi.patch | 41 ++++++++++++ .../recipes-support/mm/mm-common_1.0.2.bb | 13 ++++ .../recipes-support/mm/pangomm_2.42.1.bb | 23 +++++++ 17 files changed, 452 insertions(+), 2 deletions(-) create mode 100644 meta-gnome/classes/gnome-help.bbclass create mode 100644 meta-gnome/classes/itstool.bbclass create mode 100644 meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.38.0.bb create mode 100644 meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.38.0.bb create mode 100644 meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb create mode 100644 meta-gnome/recipes-support/libsigc++-2.0/libsigc++-2.0_2.10.3.bb create mode 100644 meta-gnome/recipes-support/libsigc++-2.0/libsigc++-3_3.0.3.bb create mode 100644 meta-gnome/recipes-support/mm/atkmm_2.28.0.bb create mode 100644 meta-gnome/recipes-support/mm/cairomm_1.12.0.bb create mode 100644 meta-gnome/recipes-support/mm/glibmm/remove-examples.patch create mode 100644 meta-gnome/recipes-support/mm/glibmm_2.62.0.bb create mode 100644 meta-gnome/recipes-support/mm/gtkmm/0001-do-not-build-demos.patch create mode 100644 meta-gnome/recipes-support/mm/gtkmm3_3.24.2.bb create mode 100644 meta-gnome/recipes-support/mm/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch create mode 100644 meta-gnome/recipes-support/mm/mm-common_1.0.2.bb create mode 100644 meta-gnome/recipes-support/mm/pangomm_2.42.1.bb diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb index dd26633..690ea30 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-gnome.bb @@ -12,10 +12,10 @@ RDEPENDS_${PN} = "\ gnome-screenshot \ gnome-settings-daemon \ gnome-terminal \ - gnome-usage \ + gnome-disk-utility \ + gnome-system-monitor \ libgnome-desktop \ mutter \ - nautilus \ gjs \ gvfs \ gnome-keyring \ diff --git a/meta-gnome/classes/gnome-help.bbclass b/meta-gnome/classes/gnome-help.bbclass new file mode 100644 index 0000000..9c4771d --- /dev/null +++ b/meta-gnome/classes/gnome-help.bbclass @@ -0,0 +1,67 @@ +# Class to pack gnome help files or delete them during install +# There are the following cases: +# +# if 'helpfiles' not in DISTRO_FEATURES +# delete all help contants during install +# else +# if PACKAGE_NO_HELP_SPLIT == 1 +# pack all help files to ${PN}-help +# else +# pack all help files to ${PN}-help- + +# Dummy to get yelp build & PACKAGE_NO_HELP_SPLIT set 1 +PACKAGES_append = " ${PN}-help" +FILES_${PN}-help = "${datadir}/help" +RRECOMMENDS_${PN}-help = "${@bb.utils.contains('DISTRO_FEATURES','helpfiles','yelp','',d)}" + +do_install_append() { + if ${@bb.utils.contains('DISTRO_FEATURES','helpfiles','false','true',d)}; then + rm -rf ${D}${datadir}/help/* + fi +} + +python gnome_do_split_help() { + if bb.utils.contains('DISTRO_FEATURES', 'helpfiles', False, True, d): + return + + if (d.getVar('PACKAGE_NO_HELP_SPLIT') == '1'): + # all help files go to ${ + bb.debug(1, "package requested not splitting help-files") + return + + packages = (d.getVar('PACKAGES') or "").split() + datadir = d.getVar('datadir') + dvar = d.getVar('PKGD') + pn = d.getVar('PN') + + if pn + '-help' in packages: + packages.remove(pn + '-help') + + helpdir = os.path.join(dvar + datadir, 'help') + + if not cpath.isdir(helpdir): + bb.warn("No help files in this package - remove gnome-help from inherit?") + return + + helps = os.listdir(helpdir) + + summary = d.getVar('SUMMARY') or pn + description = d.getVar('DESCRIPTION') or "" + locale_section = d.getVar('LOCALE_SECTION') + mlprefix = d.getVar('MLPREFIX') or "" + for l in sorted(helps): + ln = legitimize_package_name(l) + pkg = pn + '-help-' + ln + packages.append(pkg) + d.setVar('FILES_' + pkg, os.path.join(datadir, 'help', l)) + d.setVar('RRECOMMENDS_' + pkg, '%syelp' % mlprefix) + d.setVar('SUMMARY_' + pkg, '%s - %s help' % (summary, l)) + d.setVar('DESCRIPTION_' + pkg, '%s This package contains language help files for the %s locale.' % (description, l)) + if locale_section: + d.setVar('SECTION_' + pkg, locale_section) + + d.setVar('PACKAGES', ' '.join(packages)) +} + +PACKAGESPLITFUNCS_prepend = "gnome_do_split_help " + diff --git a/meta-gnome/classes/itstool.bbclass b/meta-gnome/classes/itstool.bbclass new file mode 100644 index 0000000..45e3fb8 --- /dev/null +++ b/meta-gnome/classes/itstool.bbclass @@ -0,0 +1,5 @@ +# helper class to prepare correct environment for native itstool + +inherit python3native + +DEPENDS_append = " itstool-native" diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.38.0.bb new file mode 100644 index 0000000..2a425e1 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.38.0.bb @@ -0,0 +1,36 @@ +SUMMARY = "GNOME disk utility" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SECTION = "x11/gnome" + +DEPENDS = " \ + gtk+3 \ + libdvdread \ + libcanberra \ + libnotify \ + libsecret \ + libpwquality \ + udisks2 \ + libxml2-native \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gtk-icon-cache gettext features_check upstream-version-is-even mime-xdg + +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" + +# As soon as elogind is of interest this needs rework: meson option is combo +PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" + +EXTRA_OEMESON += "-Dman=false" +SRC_URI[archive.sha256sum] = "7734ce668d9ec31286abd7944f95190210288fbc54704f05bc55cbd0340b5223" + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/dbus-1 \ +" + diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.38.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.38.0.bb new file mode 100644 index 0000000..3208d9c --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.38.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "Gnome system monitor" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = " \ + gnome-common-native \ + libxml2-native \ + glib-2.0-native \ + gtkmm3 \ + libgtop \ + librsvg \ + polkit \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext upstream-version-is-even + +SRC_URI[archive.md5sum] = "0494ca62d2d59b5de5efc2eddef58463" +SRC_URI[archive.sha256sum] = "73bf7ab4d5503c2567d76f831c9ae3fe27c31495761889ad3b351ef4c068aff4" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" + +RRECOMMENDS_${PN} = "adwaita-icon-theme" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ +" diff --git a/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb b/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb new file mode 100644 index 0000000..65f5b6a --- /dev/null +++ b/meta-gnome/recipes-support/libdvdread/libdvdread_6.1.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "DVD access multimeda library" +SECTION = "libs/multimedia" +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27" + +SRC_URI = "http://download.videolan.org/pub/videolan/libdvdread/${PV}/libdvdread-${PV}.tar.bz2" +SRC_URI[md5sum] = "09c7423568fb679279fd2a2bc6b10b6e" +SRC_URI[sha256sum] = "3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796" + +inherit autotools lib_package binconfig pkgconfig + +CONFIGUREOPTS_remove = "--disable-silent-rules" diff --git a/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-2.0_2.10.3.bb b/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-2.0_2.10.3.bb new file mode 100644 index 0000000..e6129e2 --- /dev/null +++ b/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-2.0_2.10.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "A library for loose coupling of C++ method calls" +SECTION = "libs" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499" + +DEPENDS = "mm-common" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-${PV}.tar.xz" +SRC_URI[md5sum] = "ea68c7afc23a4b89a2dfa78344460785" +SRC_URI[sha256sum] = "0b68dfc6313c6cc90ac989c6d722a1bf0585ad13846e79746aa87cb265904786" + +S = "${WORKDIR}/libsigc++-${PV}" + +inherit autotools + +FILES_${PN}-dev += "${libdir}/sigc++-*/" +FILES_${PN}-doc += "${datadir}/devhelp" + +BBCLASSEXTEND = "native" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-3_3.0.3.bb b/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-3_3.0.3.bb new file mode 100644 index 0000000..fc4f5d6 --- /dev/null +++ b/meta-gnome/recipes-support/libsigc++-2.0/libsigc++-3_3.0.3.bb @@ -0,0 +1,20 @@ +SUMMARY = "A library for loose coupling of C++ method calls" +SECTION = "libs" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=959bffe2993816eb32ec4bc1ec1d5875" + +DEPENDS = "mm-common" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.0/libsigc++-${PV}.tar.xz" +SRC_URI[md5sum] = "8dca4559e732f47710370baa8bc2e66f" +SRC_URI[sha256sum] = "e4f4866a894bdbe053e4fb22ccc6bc4b6851fd31a4746fdd20b2cf6e87c6edb6" + +S = "${WORKDIR}/libsigc++-${PV}" + +inherit setuptools3 meson + +FILES_${PN}-dev += "${libdir}/sigc++-*/" +FILES_${PN}-doc += "${datadir}/devhelp" + +BBCLASSEXTEND = "native" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-gnome/recipes-support/mm/atkmm_2.28.0.bb b/meta-gnome/recipes-support/mm/atkmm_2.28.0.bb new file mode 100644 index 0000000..0e09c3a --- /dev/null +++ b/meta-gnome/recipes-support/mm/atkmm_2.28.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "C++ bindings for the atk" +SECTION = "libs" + +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "atk glibmm" + +inherit features_check gnomebase autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "6194ac577f15567adfa3c923944c6651" +SRC_URI[archive.sha256sum] = "4c4cfc917fd42d3879ce997b463428d6982affa0fb660cafcc0bc2d9afcedd3a" + +EXTRA_OECONF = " --disable-documentation " + +FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-gnome/recipes-support/mm/cairomm_1.12.0.bb b/meta-gnome/recipes-support/mm/cairomm_1.12.0.bb new file mode 100644 index 0000000..d49a509 --- /dev/null +++ b/meta-gnome/recipes-support/mm/cairomm_1.12.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "C++ bindings for Cairo graphics library" + +LICENSE = "LGPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9" + +inherit gnomebase + +DEPENDS = "cairo libsigc++-2.0" + +SRC_URI[archive.md5sum] = "c62b476b61bd0abf7e9851f417d73291" +SRC_URI[archive.sha256sum] = "a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6" + +FILES_${PN}-doc += "${datadir}/devhelp" +FILES_${PN}-dev += "${libdir}/cairomm-*/" + diff --git a/meta-gnome/recipes-support/mm/glibmm/remove-examples.patch b/meta-gnome/recipes-support/mm/glibmm/remove-examples.patch new file mode 100644 index 0000000..42f2520 --- /dev/null +++ b/meta-gnome/recipes-support/mm/glibmm/remove-examples.patch @@ -0,0 +1,40 @@ +From 52360260c0d73a00082d867bc416225fbc2b657e Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 12 Jul 2011 11:46:37 +0200 +Subject: [PATCH] glibmm: add 2.28.2 + +--- + Makefile.am | 7 +------ + configure.ac | 1 - + 2 files changed, 1 insertion(+), 7 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 1b366b4..0ff58b5 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -23,12 +23,7 @@ src_subdirs = glib/src gio/src + else + src_subdirs = + endif +-if ENABLE_DOCUMENTATION +-doc_subdirs = docs +-else +-doc_subdirs = +-endif +-SUBDIRS = tools $(src_subdirs) glib/glibmm gio/giomm tests examples $(doc_subdirs) ++SUBDIRS = tools $(src_subdirs) glib/glibmm gio/giomm tests + + glibmm_includedir = $(includedir)/$(GLIBMM_MODULE_NAME) + glibmm_include_HEADERS = glib/glibmm.h +diff --git a/configure.ac b/configure.ac +index e706687..198e0d0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -166,7 +166,6 @@ AC_CONFIG_FILES([Makefile + gio/src/Makefile + gio/giomm/Makefile + tests/Makefile +- examples/Makefile + docs/Makefile + docs/reference/Doxyfile + MSVC_NMake/glibmm/glibmm.rc diff --git a/meta-gnome/recipes-support/mm/glibmm_2.62.0.bb b/meta-gnome/recipes-support/mm/glibmm_2.62.0.bb new file mode 100644 index 0000000..75eea4e --- /dev/null +++ b/meta-gnome/recipes-support/mm/glibmm_2.62.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "C++ bindings for the glib library" +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "mm-common glib-2.0 libsigc++-2.0 glib-2.0-native" +inherit gnomebase + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +SRC_URI += " \ + file://remove-examples.patch \ +" +SRC_URI[archive.md5sum] = "7da228e3f0c6a10024b9a7708c53691e" +SRC_URI[archive.sha256sum] = "36659f13cc73282392d1305858f3bbca46fbd1ce2f078cc9db8b9f79b2e93cfe" + +do_install_append() { + install -d ${D}${datadir}/glibmm-2.4 + install -d ${D}${datadir}/aclocal + + install -m 0644 glib/glibmmconfig.h ${D}${datadir}/glibmm-2.4/ + install -m 0644 scripts/glibmm_check_perl.m4 ${D}${datadir}/aclocal/ || true + + for i in generate_wrap_init.pl gmmproc; do + sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/glibmm-2.4/proc/$i + done +} + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" + +RDEPENDS_${PN}-dev = "perl" +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-gnome/recipes-support/mm/gtkmm/0001-do-not-build-demos.patch b/meta-gnome/recipes-support/mm/gtkmm/0001-do-not-build-demos.patch new file mode 100644 index 0000000..176e979 --- /dev/null +++ b/meta-gnome/recipes-support/mm/gtkmm/0001-do-not-build-demos.patch @@ -0,0 +1,51 @@ +From 6914eccee34376f9067b0ee9f17039fe182125e8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 31 Mar 2018 22:29:16 +0200 +Subject: [PATCH] do not build demos +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +They are not installed anyway and add libepoxy dependency + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + Makefile.am | 3 ++- + configure.ac | 3 --- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 984b6a7..6c754a6 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -28,7 +28,8 @@ doc_subdirs = docs + else + doc_subdirs = + endif +-SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests demos $(doc_subdirs) ++ ++SUBDIRS = tools $(src_subdirs) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs) + + gdkmm_includedir = $(includedir)/$(GDKMM_MODULE_NAME) + gdkmm_include_HEADERS = gdk/gdkmm.h +diff --git a/configure.ac b/configure.ac +index e5e82dc..c1c7658 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -109,11 +109,8 @@ AS_IF([test "x$gtkmm_enable_api_atkmm" != xno], + [GTKMM_MODULES="atkmm-1.6 >= 2.24.2 $GTKMM_MODULES"]) + AC_SUBST([GTKMM_MODULES]) + +-AC_SUBST([GTKMM_DEMOS_EXTRA_MODULES], ['epoxy >= 1.2']) +- + PKG_CHECK_MODULES([GDKMM], [$GDKMM_MODULES]) + PKG_CHECK_MODULES([GTKMM], [$GTKMM_MODULES]) +-PKG_CHECK_MODULES([GTKMM_DEMOS_EXTRA], [$GTKMM_DEMOS_EXTRA_MODULES]) + + MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0]) + MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0]) +-- +2.14.3 + diff --git a/meta-gnome/recipes-support/mm/gtkmm3_3.24.2.bb b/meta-gnome/recipes-support/mm/gtkmm3_3.24.2.bb new file mode 100644 index 0000000..adc38d8 --- /dev/null +++ b/meta-gnome/recipes-support/mm/gtkmm3_3.24.2.bb @@ -0,0 +1,23 @@ +SUMMARY = "C++ bindings for the GTK+ toolkit V3" +HOMEPAGE = "http://www.gtkmm.org/" +SECTION = "libs" + +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "atkmm pangomm glibmm gtk+3 cairomm" + +BPN = "gtkmm" + +inherit gnomebase features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "e311db484ca9c53f1689d35f5f58a06b" +SRC_URI[archive.sha256sum] = "6d71091bcd1863133460d4188d04102810e9123de19706fb656b7bb915b4adc3" +SRC_URI += "file://0001-do-not-build-demos.patch" + +EXTRA_OECONF = " --disable-documentation " + +FILES_${PN}-dev += "${libdir}/*/include ${libdir}/*/proc/m4" diff --git a/meta-gnome/recipes-support/mm/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-gnome/recipes-support/mm/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch new file mode 100644 index 0000000..6031eaa --- /dev/null +++ b/meta-gnome/recipes-support/mm/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch @@ -0,0 +1,41 @@ +From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 4 Nov 2019 19:19:47 +0100 +Subject: [PATCH] meson.build: do not ask for python installation / version +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Even by adding python3-setuptools-native the following error is not fixed so +just ask for python3 executable. + +| meson.build:9:0: ERROR: ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools + +Upstream-Status: Inappropriate [OE specific] + +Signed-off-by: Andreas Müller +--- + meson.build | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 3255328..7a6094c 100644 +--- a/meson.build ++++ b/meson.build +@@ -6,12 +6,7 @@ project('mm-common', + license: 'GPLv2+' + ) + +-python3 = import('python').find_installation('python3') +-python_version = python3.language_version() +-python_version_req = '>= 3.5' +-if not python_version.version_compare(python_version_req) +- error('Requires Python @0@, found @1@.'.format(python_version_req, python_version)) +-endif ++python3 = import('python3').find_python() + + # Use these instead of meson.source_root() and meson.build_root(). + # source_root() and build_root() are not useful, if this is a subproject. +-- +2.21.0 + diff --git a/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb b/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb new file mode 100644 index 0000000..207d939 --- /dev/null +++ b/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Common GNOME build files for C++ bindings" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase + +SRC_URI[archive.md5sum] = "440133a2676275ae26770b3651f89827" +SRC_URI[archive.sha256sum] = "a2a99f3fa943cf662f189163ed39a2cfc19a428d906dd4f92b387d3659d1641d" +SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" + +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-support/mm/pangomm_2.42.1.bb b/meta-gnome/recipes-support/mm/pangomm_2.42.1.bb new file mode 100644 index 0000000..57d9ff9 --- /dev/null +++ b/meta-gnome/recipes-support/mm/pangomm_2.42.1.bb @@ -0,0 +1,23 @@ +SUMMARY = "C++ bindings for the pango library" +SECTION = "libs" +LICENSE = "LGPLv2.1 & GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ + file://COPYING.tools;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "mm-common cairomm glibmm pango" + +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" + +SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/pangomm/${SHRT_VER}/pangomm-${PV}.tar.xz" +SRC_URI[md5sum] = "339c48dd92ebd3a9911b231708f7a819" +SRC_URI[sha256sum] = "14bf04939930870d5cfa96860ed953ad2ce07c3fd8713add4a1bfe585589f40f" + +inherit features_check autotools pkgconfig + +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECONF = " --disable-documentation " + +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${libdir}/*/include/ ${libdir}/pangomm-*/" +