diff options
Diffstat (limited to 'meta-gnome/recipes-support')
29 files changed, 757 insertions, 276 deletions
diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch new file mode 100644 index 0000000000..944d2f9165 --- /dev/null +++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch @@ -0,0 +1,36 @@ +From ff0718174faf1167fb4765ebe4bd280bbe8d2ac6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 8 Dec 2019 23:42:00 +0100 +Subject: [PATCH] musl: Hack to fix configure + +Upstream-Status: Inappropriate [Musl Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + meson.build | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 075776f..dfd7421 100644 +--- a/meson.build ++++ b/meson.build +@@ -101,9 +101,14 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') + + config_h.set('PATH_WTMP', '_PATH_WTMPX') + else +- path_wtmp = '/var/log/utx.log' +- assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes') +- config_h.set_quoted('PATH_WTMP', path_wtmp) ++ # musl: This is just a build fix hack. ++ # As usual they know better, consider all other projects crap and offer zero ++ # alternatives: So wtmp is a dead stub only [1] (= /dev/null/wtmp - taken ++ # from musl sources). ++ # Maybe a hero comes along and adds utmps [2] to make accountsservice useful for musl ++ # [1] https://wiki.musl-libc.org/faq.html#Q:-Why-is-the-utmp/wtmp-functionality-only-implemented-as-stubs? ++ # [2] https://github.com/skarnet/utmps ++ config_h.set_quoted('PATH_WTMP', '/dev/null/wtmp') + endif + + # compiler flags +-- +2.34.1 + diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch new file mode 100644 index 0000000000..2b0924b2e4 --- /dev/null +++ b/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch @@ -0,0 +1,44 @@ +From 7401e682400df87f3258f795bb1d143f64a35a9f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Mon, 9 Dec 2019 00:12:08 +0100 +Subject: [PATCH] musl: add missing fgetspent_r + +Stolen from void-linux + +Upstream-Status: Inappropriate [musl-specific] + +--- + src/daemon.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/daemon.c b/src/daemon.c +index c52bda3..a7676fe 100644 +--- a/src/daemon.c ++++ b/src/daemon.c +@@ -164,6 +164,26 @@ remove_cache_files (const gchar *user_name) + g_remove (icon_filename); + } + ++/* Musl libc does not support fgetspent_r(), write own ++ * wrapper ++ */ ++static int fgetspent_r(FILE *fp, struct spwd *spbuf, char *buf, size_t buflen, struct spwd **spbufp) { ++ struct spwd *shadow_entry = fgetspent(fp); ++ if(!shadow_entry) ++ return -1; ++ size_t namplen = strlen(shadow_entry->sp_namp); ++ size_t pwdplen = strlen(shadow_entry->sp_pwdp); ++ ++ if(namplen + pwdplen + 2 > buflen) ++ return -1; ++ ++ *spbufp = memcpy(spbuf, shadow_entry, sizeof(struct spwd)); ++ spbuf->sp_namp = strncpy(buf, shadow_entry->sp_namp, namplen + 1); ++ spbuf->sp_pwdp = strncpy(buf + namplen + 1, shadow_entry->sp_pwdp, pwdplen + 1); ++ ++ return 0; ++} ++ + static struct passwd * + entry_generator_fgetpwent (Daemon *daemon, + GHashTable *users, diff --git a/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb b/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb new file mode 100644 index 0000000000..439958c7d2 --- /dev/null +++ b/meta-gnome/recipes-support/accountsservice/accountsservice_22.08.8.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "D-Bus interfaces for querying and manipulating user account information" +HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService/" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = " \ + dbus \ + polkit \ +" + +inherit meson gobject-introspection gtk-doc features_check systemd vala + +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = "https://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" +SRC_URI:append:libc-musl = " \ + file://0001-musl-Hack-to-fix-build.patch \ + file://0002-musl-add-missing-fgetspent_r.patch \ +" +SRC_URI[sha256sum] = "909997a76919fe7dc138a9a01cea70bd622d5a932dbc9fb13010113023a7a391" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = ", -Dsystemdsystemunitdir='no', systemd" + +SYSTEMD_SERVICE:${PN} = "accounts-daemon.service" + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ +" diff --git a/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.8.2.bb b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.8.2.bb new file mode 100644 index 0000000000..efb85d77c5 --- /dev/null +++ b/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.8.2.bb @@ -0,0 +1,39 @@ +SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata" +HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + curl \ + gperf-native \ + glib-2.0 \ + gtk+3 \ + libyaml \ + libarchive \ + json-glib \ + gdk-pixbuf \ + freetype \ + fontconfig \ + libstemmer \ +" + +inherit meson gobject-introspection gettext bash-completion pkgconfig manpages + +SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz" +SRC_URI[sha256sum] = "71256500add5048d6f08878904708b3d0c3875f402e0adcd358e91d47dcd8b96" + +EXTRA_OEMESON = " \ + -Drpm=false \ +" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,docbook-xml-dtd4-native docbook-xsl-stylesheets-native libxslt-native" + +FILES:${PN} += "${libdir}/asb-plugins-5" + +FILES:${PN}-dev += " \ + ${datadir}/installed-tests \ + ${datadir}/gettext \ +" + +BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb new file mode 100644 index 0000000000..0e86d781ce --- /dev/null +++ b/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "GTK support library for colord" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +inherit meson gobject-introspection gettext gtk-doc features_check + +DEPENDS = " \ + colord \ +" + +SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0" + +PACKAGECONFIG ??= "gtk3 gtk4" +PACKAGECONFIG[gtk3] = "-Dgtk3=true, -Dgtk3=false, gtk+3" +PACKAGECONFIG[gtk4] = "-Dgtk4=true, -Dgtk4=false, gtk4" + +EXTRA_OEMESON = "-Dman=false" +GIR_MESON_OPTION = "" +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +# colord +REQUIRED_DISTRO_FEATURES += "polkit" diff --git a/meta-gnome/recipes-support/ibus/ibus-native.bb b/meta-gnome/recipes-support/ibus/ibus-native.bb new file mode 100644 index 0000000000..ca65114c4d --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus-native.bb @@ -0,0 +1,34 @@ +require ${BPN}.inc + +inherit native + +DEPENDS += " \ + glib-2.0-native \ + dbus-native \ + iso-codes \ +" + +PACKAGECONFIG = "" + +# for allarch iso-codes +EXTRA_NATIVE_PKGCONFIG_PATH = ":${RECIPE_SYSROOT}${datadir_native}/pkgconfig" +# for allarch unicode-ucd - just to make configure happy +EXTRA_OECONF += "--with-ucd-dir=${RECIPE_SYSROOT}${datadir_native}/unicode/ucd" + +do_compile() { + cd src + # seems by moving to src we break dependency tracking so build what's + # necessary step by step + oe_runmake ibusenumtypes.h + oe_runmake ibusmarshalers.h + oe_runmake ibusenumtypes.c + oe_runmake unicode-parser +} + +do_install() { + install -d ${D}/${libdir} + install -m 755 ${S}/src/.libs/libibus-*.so* ${D}/${libdir} + + install -d ${D}/${bindir} + install -m 755 ${S}/src/.libs/unicode-parser ${D}/${bindir} +} diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb new file mode 100644 index 0000000000..141341e341 --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus.bb @@ -0,0 +1,41 @@ +require ${BPN}.inc + +DEPENDS += " \ + ${BPN}-native \ + glib-2.0-native \ + glib-2.0 \ + dbus \ + iso-codes \ +" + +inherit gtk-icon-cache bash-completion features_check + +# for unicode-ucd +EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" + +PACKAGECONFIG ??= " \ + dconf vala \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3 gtk4', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ +" + +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk4', 'opengl', '', d)}" + +do_configure:prepend() { + # run native unicode-parser + sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am +} + +FILES:${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/GConf \ + ${datadir}/glib-2.0 \ + ${libdir}/gtk-3.0 \ + ${libdir}/gtk-4.0 \ + ${systemd_user_unitdir} \ +" + +FILES:${PN}-dev += " \ + ${datadir}/gettext \ +" +RDEPENDS:${PN} += "python3-core" diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc new file mode 100644 index 0000000000..9d0600c794 --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -0,0 +1,42 @@ +SUMMARY = "Intelligent Input Bus for Linux/Unix" +HOMEPAGE = "https://github.com/ibus/ibus/wiki" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala + +PV = "1.5.26" + +DEPENDS = "unicode-ucd" + +SRC_URI = " \ + git://github.com/ibus/ibus.git;branch=main;protocol=https \ + file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ + file://0001-makefile-don-t-gzip-the-man-pages.patch \ +" +SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3" +S = "${WORKDIR}/git" + +PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" +PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" +PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" +PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[gtk4] = "--enable-gtk4,--disable-gtk4,gtk4" +PACKAGECONFIG[systemd] = "--enable-systemd-services,--disable-systemd-services,systemd" +PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" +PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" + +EXTRA_OECONF = " \ + --disable-tests \ + --disable-emoji-dict \ + --disable-python2 \ +" +EXTRA_OECONF:append:class-target = "\ + --with-python=${bindir}/python3 \ +" + +do_configure:prepend() { + touch ${S}/ChangeLog + touch ${S}/ABOUT-NLS +} diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch new file mode 100644 index 0000000000..aec9e7abec --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch @@ -0,0 +1,34 @@ +From f567bcbc2108d722faa90afeb03d3a3bcdf5f58b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Fri, 10 May 2019 14:30:08 +0200 +Subject: [PATCH] Do not try to start dbus - we do not have dbus-lauch +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> +--- + data/dconf/make-dconf-override-db.sh | 6 ------ + 1 file changed, 6 deletions(-) + +--- a/data/dconf/make-dconf-override-db.sh ++++ b/data/dconf/make-dconf-override-db.sh +@@ -12,10 +12,6 @@ export XDG_CACHE_HOME="$TMPDIR/cache" + export GSETTINGS_SCHEMA_DIR="$TMPDIR/schemas" + mkdir -p $XDG_CONFIG_HOME $XDG_CACHE_HOME $GSETTINGS_SCHEMA_DIR + +-eval `dbus-launch --sh-syntax` +- +-trap 'rm -rf $TMPDIR; kill $DBUS_SESSION_BUS_PID' ERR +- + # in case that schema is not installed on the system + glib-compile-schemas --targetdir "$GSETTINGS_SCHEMA_DIR" "$PWD" + +@@ -52,5 +48,3 @@ if [ -d $TMPDIR/cache/gvfs ] ; then + umount $TMPDIR/cache/gvfs + fi + rm -rf $TMPDIR +- +-kill $DBUS_SESSION_BUS_PID diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch b/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch new file mode 100644 index 0000000000..105e34873a --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch @@ -0,0 +1,164 @@ +From 5307c3b310fabeaa52fafe743c5efaca73ccce46 Mon Sep 17 00:00:00 2001 +From: Emil Velikov <emil.l.velikov@gmail.com> +Date: Sun, 11 Jun 2023 16:16:35 +0900 +Subject: [PATCH] makefile: don't gzip the man pages + +Drop the gzip step from the manpages - distributions already do that as +needed. In addition this resolves the final reproducibility issue with +ibus. + +BUG=https://github.com/ibus/ibus/pull/2514 + +Upstream-Status: Backport [https://github.com/ibus/ibus/commit/1a25975d9f55f18eab609e4d147dd32689e367f3] +Note: This commit is included in version >= 1.5.29 and can be dropped +after upgrading. +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +--- + bus/Makefile.am | 6 +----- + data/dconf/Makefile.am | 6 +----- + setup/Makefile.am | 6 +----- + tools/Makefile.am | 6 +----- + ui/gtk3/Makefile.am | 6 +----- + 5 files changed, 5 insertions(+), 25 deletions(-) + +diff --git a/bus/Makefile.am b/bus/Makefile.am +index e173ee25..d0445d02 100644 +--- a/bus/Makefile.am ++++ b/bus/Makefile.am +@@ -169,7 +169,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_one_DATA) \ +- $(man_one_files) \ + $(NULL) + + $(libibus): +@@ -181,14 +180,11 @@ test: ibus-daemon + $(builddir)/ibus-daemon -v + + man_one_in_files = ibus-daemon.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + -include $(top_srcdir)/git.mk +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 5360f033..2352f770 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -38,15 +38,12 @@ dconfdb_DATA = 00-upstream-settings + { rc=$$?; $(RM) -rf $@; exit $$rc; } + + man_5_in_files = 00-upstream-settings.5.in ibus.5.in +-man_5_files = $(man_5_in_files:.5.in=.5) +-man_5_DATA =$(man_5_files:.5=.5.gz) ++man_5_DATA = $(man_5_in_files:.5.in=.5) + man_5dir = $(mandir)/man5 + %.5: %.5.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.5.gz: %.5 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + install-data-hook: + if test -z "$(DESTDIR)"; then \ +@@ -63,7 +60,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_5_DATA) \ +- $(man_5_files) \ + $(NULL) + + MAINTAINERCLEANFILES = \ +diff --git a/setup/Makefile.am b/setup/Makefile.am +index 34c8f136..b34aa8fc 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -56,20 +56,16 @@ org.freedesktop.IBus.Setup.desktop: ibus-setup.desktop + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + + man_one_in_files = ibus-setup.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + CLEANFILES = \ + $(desktop_DATA) \ + $(man_one_DATA) \ +- $(man_one_files) \ + *.pyc \ + ibus-setup \ + $(NULL) +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 5c18d3d6..1c716136 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -79,15 +79,12 @@ bash_completion_DATA= \ + bash_completiondir=@datadir@/bash-completion/completions + + man_one_in_files = ibus.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + EXTRA_DIST = \ + $(man_one_in_files) \ +@@ -96,7 +93,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_one_DATA) \ +- $(man_one_files) \ + $(NULL) + + if ENABLE_EMOJI_DICT +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index ab379328..aff035da 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -242,15 +242,12 @@ panelbinding.o: $(srcdir)/panelbinding.c + + MAINTAINERCLEANFILES += extension.c panelbinding.c + +-man_seven_files = $(man_seven_in_files:.7.in=.7) +-man_seven_DATA =$(man_seven_files:.7=.7.gz) ++man_seven_DATA = $(man_seven_in_files:.7.in=.7) + man_sevendir = $(mandir)/man7 + %.7: %.7.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.7.gz: %.7 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + desktop_in_files = \ + ibus-ui-emojier.desktop.in \ +@@ -278,7 +275,6 @@ CLEANFILES += \ + $(desktop_DATA) \ + $(desktop_notrans_files) \ + $(man_seven_DATA) \ +- $(man_seven_files) \ + $(NULL) + + endif diff --git a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb index 0a0a3e6b43..7960009078 100644 --- a/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb +++ b/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb @@ -9,20 +9,21 @@ DEPENDS = "gtk+3 gobject-introspection-native \ LIC_FILES_CHKSUM = "file://COPYING;md5=1f18f9c6d8b4cfcc7d7804a243a4c0b4" S = "${WORKDIR}/git" -B = "${S}" SRCREV = "736ccef40d39603b8111c8a3a0bca0319bbafdc0" -PV = "3.0+git${SRCPV}" -SRC_URI = "git://github.com/engla/keybinder.git;branch=keybinder-3.0 \ +PV = "3.0+git" +SRC_URI = "git://github.com/engla/keybinder.git;branch=keybinder-3.0;protocol=https \ " -RDEPENDS_${PN} = "gtk+" +RDEPENDS:${PN} = "gtk+" -inherit distro_features_check autotools gtk-doc gobject-introspection +inherit features_check autotools-brokensep gtk-doc gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" -do_configure_prepend() { +do_configure:prepend() { touch ${S}/ChangeLog } -SRC_DISTRIBUTE_LICENSES += "X11" +# gtk-doc generation doesn't work, so disable it: +# ../keybinder-docs.sgml:26: element include: XInclude error : could not load ../xml/tree_index.sgml, and no fallback was found +GTKDOC_ENABLED = "False" diff --git a/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb b/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb new file mode 100644 index 0000000000..f5660b5267 --- /dev/null +++ b/meta-gnome/recipes-support/libcloudproviders/libcloudproviders_0.3.6.bb @@ -0,0 +1,11 @@ +SUMMARY = "libcloudproviders is a DBus API that allows cloud storage sync clients to expose their services." +LICENSE="LGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e6a600fd5e1d9cbde2d983680233ad02" + +VALA_MESON_OPTION ?= 'vapigen' + +DEPENDS = "glib-2.0" + +inherit gnomebase gobject-introspection vala + +SRC_URI[archive.sha256sum] = "3b75110b3a4fdef4c5c5a440e48701fe054d2ae061d156c89136bb5ba05e74b7" diff --git a/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch b/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch deleted file mode 100644 index 79756b9a07..0000000000 --- a/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d0537cb7f2dc5877700ad78dfd191515379d4edc Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 7 Jan 2016 02:22:51 +0000 -Subject: [PATCH 1/2] Check for issetugid() - -If secure version of getenv is not there then we can use -issetugid() as aid to call getenv() - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - configure.ac | 1 + - lib/config.c | 12 +++++++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 1ded1a2..ee19e1f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -125,6 +125,7 @@ AC_TYPE_OFF_T - AC_TYPE_SIZE_T - - AC_CHECK_FUNCS([__secure_getenv secure_getenv]) -+AC_CHECK_FUNCS([issetugid]) - - # Modify CFLAGS after all tests are run (some of them could fail because - # of the -Werror). -diff --git a/lib/config.c b/lib/config.c -index 29e7120..30f9daf 100644 ---- a/lib/config.c -+++ b/lib/config.c -@@ -44,8 +44,10 @@ - # define safe_getenv(string) secure_getenv(string) - #elif defined(HAVE___SECURE_GETENV) - # define safe_getenv(string) __secure_getenv(string) -+#elif defined(HAVE_ISSETUGID) -+# define safe_getenv(string) safe_getenv_issetugid(string) - #else --# error Neither secure_getenv not __secure_getenv are available -+# error None of secure_getenv, __secure_getenv, or issetugid is available - #endif - - struct config_config { -@@ -59,6 +61,14 @@ struct config_key { - GList *values; - }; - -+static const char* -+safe_getenv_issetugid(const char* name) -+{ -+ if (issetugid ()) -+ return 0; -+ return getenv (name); -+} -+ - /* Compare two section names */ - static int - compare_section_names(gconstpointer a, gconstpointer b) --- -2.7.0 - diff --git a/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch b/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch new file mode 100644 index 0000000000..add2872cca --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser/0001-docs-Disable-building.patch @@ -0,0 +1,29 @@ +From e6bdf74a424652c4f9a38457c7fa93a2051157f5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 30 Aug 2022 13:09:07 -0700 +Subject: [PATCH] docs: Disable building + +It needs linuxdoc-tools which we do not have in OE anymore + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + docs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index daa2288..b355185 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -8,7 +8,7 @@ CLEANFILES = $(man_MANS) $(SGML_OUTPUTS) + EXTRA_DIST = attributes.txt libuser.conf.5.in rfc2307.txt sgml/libuser.sgml \ + $(SGML_OUTPUTS) + +-all: sgml/libuser.txt sgml/libuser.html ++all: + + libuser.conf.5: $(srcdir)/libuser.conf.5.in Makefile + sed 's,@sysconfdir\@,$(sysconfdir),g' \ +-- +2.37.2 + diff --git a/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch b/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch deleted file mode 100644 index 7c47df22e4..0000000000 --- a/meta-gnome/recipes-support/libuser/libuser/0001-modules-files.c-parse_field-fix-string-formating-in-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4857911ece5ebfcdef42aee4c070eb216f39597 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com> -Date: Fri, 13 May 2016 11:40:13 -0500 -Subject: [PATCH] modules/files.c: parse_field fix string formating in - g_warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[YOCTO #9547] - -Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> - -Upstream-Status: Pending ---- - modules/files.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/files.c b/modules/files.c -index 4ef0a57..35eafc9 100644 ---- a/modules/files.c -+++ b/modules/files.c -@@ -534,7 +534,7 @@ parse_field(const struct format_specifier *format, GValue *value, - string, &err); - if (ret == FALSE) { - g_assert(err != NULL); -- g_warning(lu_strerror(err)); -+ g_warning(lu_strerror(err), NULL); - lu_error_free(&err); - } - return ret; --- -2.1.4 - diff --git a/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch b/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch new file mode 100644 index 0000000000..4d11b94e02 --- /dev/null +++ b/meta-gnome/recipes-support/libuser/libuser/gtkdoc.patch @@ -0,0 +1,22 @@ +Update the GTK_DOC_CHECK invocation to specify where the +documentation will be built (as the default is ./docs). + +This is needed so that gtkdocize as run by autopoint knows where the +documentation will be built. + +Upstream-Status: Submitted [https://pagure.io/libuser/pull-request/70] +Signed-off-by: Ross Burton <ross.burton@arm.com> + +diff --git a/configure.ac b/configure.ac +index 0bd4a67..51508b7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -169,7 +169,7 @@ if test "$GCC" = yes ; then + AC_MSG_RESULT([$enable_Werror]) + fi + +-GTK_DOC_CHECK ++GTK_DOC_CHECK([1.14],[--flavour no-tmpl --docdir docs/reference]) + + AC_CONFIG_FILES([Makefile po/Makefile.in docs/Makefile docs/reference/Makefile + libuser.pc]) diff --git a/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/meta-gnome/recipes-support/libuser/libuser_0.64.bb index 7ec54eb16e..6d3bce8a1c 100644 --- a/meta-gnome/recipes-support/libuser/libuser_0.62.bb +++ b/meta-gnome/recipes-support/libuser/libuser_0.64.bb @@ -4,32 +4,38 @@ and group accounts" HOMEPAGE = "https://pagure.io/libuser" BUGTRACKER = "https://pagure.io/libuser/issues" -LICENSE = "LGPLv2" +LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ file://lib/user.h;endline=19;md5=76b301f63c39fa992062395efbdc9558 \ file://samples/testuser.c;endline=19;md5=3b87fa660fa3f4a6bb31d624afe30ba1" SECTION = "base" -SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ - file://0001-Check-for-issetugid.patch \ +SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.gz \ + file://0001-docs-Disable-building.patch \ file://0002-remove-unused-execinfo.h.patch \ - file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ + file://gtkdoc.patch \ " -SRC_URI[md5sum] = "63e5e5c551e99dc5302b40b80bd6d4f2" -SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3cace20b" +SRC_URI[sha256sum] = "ea6094c72cb9e60a42fb53509dc98d124a340f1c9222783b503208adc16a0a8f" -DEPENDS = "popt libpam glib-2.0 python3" +DEPENDS = "bison-native popt libpam glib-2.0 python3" -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "pam" +inherit autotools features_check gettext python3native python3-dir pkgconfig gtk-doc -inherit autotools gettext python3native python3-dir pkgconfig gtk-doc +REQUIRED_DISTRO_FEATURES = "pam" EXTRA_OEMAKE = "PYTHON_CPPFLAGS=-I${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI}" +do_configure:prepend() { + install -d ${S}/admin -d ${S}/m4 + touch ${S}/ABOUT-NLS ${S}/admin/config.rpath + cd ${S} + bison lib/getdate.y -o lib/getdate.c + cd - +} + PACKAGES += "${PN}-python " -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" diff --git a/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb b/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb new file mode 100644 index 0000000000..8f45221ad3 --- /dev/null +++ b/meta-gnome/recipes-support/libwacom/libwacom_2.8.0.bb @@ -0,0 +1,24 @@ +SUMMARY = "A tablet description library" +DESCRIPTION = "libwacom is a library to identify Wacom tablets and their model-specific features. \ + It provides easy access to information such as 'is this a built-in on-screen tablet\', \ + 'what is the size of this model', etc." +HOMEPAGE = "https://github.com/linuxwacom/libwacom" +BUGTRACKER = "https://github.com/linuxwacom/libwacom/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" + +SRC_URI = "git://github.com/linuxwacom/libwacom.git;branch=master;protocol=https" +SRCREV = "f5b92814320d0a5745b50b7b36103843ad23e299" + +DEPENDS = " \ + libxml2-native \ + libgudev \ +" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON = " \ + -Dtests=disabled \ +" diff --git a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch b/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch deleted file mode 100644 index fda37895c9..0000000000 --- a/meta-gnome/recipes-support/onboard/onboard/0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 1c95f64aa342147387ce4b1b7269a5c8b34bd898 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Jul 2017 09:01:04 -0700 -Subject: [PATCH] pypredict/lm: Define error API if platform does not have it - -error() API is not implemented across all libcs on linux -e.g. musl does not provide it. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Onboard/pypredict/lm/lm.cpp | 1 - - Onboard/pypredict/lm/lm.h | 13 +++++++++++++ - Onboard/pypredict/lm/lm_dynamic.cpp | 2 -- - 3 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/Onboard/pypredict/lm/lm.cpp b/Onboard/pypredict/lm/lm.cpp -index 2e64296..37ae241 100644 ---- a/Onboard/pypredict/lm/lm.cpp -+++ b/Onboard/pypredict/lm/lm.cpp -@@ -19,7 +19,6 @@ - - #include <stdlib.h> - #include <stdio.h> --#include <error.h> - #include <algorithm> - #include <cmath> - #include <string> -diff --git a/Onboard/pypredict/lm/lm.h b/Onboard/pypredict/lm/lm.h -index ed4164a..b8b63ee 100644 ---- a/Onboard/pypredict/lm/lm.h -+++ b/Onboard/pypredict/lm/lm.h -@@ -32,6 +32,19 @@ - #include <algorithm> - #include <string> - -+#if defined(HAVE_ERROR_H) -+#include <error.h> -+#else -+#include <err.h> -+#define _onboard_error(S, E, F, ...) do { \ -+ if (E) \ -+ err(S, F ": %s", ##__VA_ARGS__, strerror(E)); \ -+ else \ -+ err(S, F, ##__VA_ARGS__); \ -+} while(0) -+ -+#define error _onboard_error -+#endif - - // break into debugger - // step twice to come back out of the raise() call into known code -diff --git a/Onboard/pypredict/lm/lm_dynamic.cpp b/Onboard/pypredict/lm/lm_dynamic.cpp -index 7c62824..e7c7f40 100644 ---- a/Onboard/pypredict/lm/lm_dynamic.cpp -+++ b/Onboard/pypredict/lm/lm_dynamic.cpp -@@ -17,8 +17,6 @@ - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - --#include <error.h> -- - #include "lm_dynamic.h" - - using namespace std; --- -2.13.2 - diff --git a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb deleted file mode 100644 index 4e49becc4f..0000000000 --- a/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ /dev/null @@ -1,29 +0,0 @@ -SUMMARY = "An onscreen keyboard" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING.GPL3;md5=8521fa4dd51909b407c5150498d34f4e" - -DEPENDS += "gtk+3 hunspell libcanberra libxkbfile dconf python3-distutils-extra-native intltool-native" - -SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz \ - file://0001-pypredict-lm-Define-error-API-if-platform-does-not-h.patch \ - " -SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" -SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" - -inherit distro_features_check setuptools3 pkgconfig gtk-icon-cache gsettings - -REQUIRED_DISTRO_FEATURES = "x11" - -FILES_${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/icons \ - ${datadir}/gnome-shell \ - ${datadir}/help \ -" - -RDEPENDS_${PN} += " \ - ncurses \ - python3-dbus \ - python3-pycairo \ - python3-pygobject \ -" diff --git a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb new file mode 100644 index 0000000000..7151f93267 --- /dev/null +++ b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -0,0 +1,28 @@ +SUMMARY = "GNOME applications" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit packagegroup features_check + +REQUIRED_DISTRO_FEATURES = "x11 polkit gobject-introspection-data" + +RDEPENDS:${PN} = " \ + evolution-data-server \ + evince \ + file-roller \ + geary \ + gedit \ + ghex \ + gnome-calculator \ + gnome-calendar \ + gnome-commander \ + gnome-font-viewer \ + gnome-photos \ + gnome-screenshot \ + gnome-terminal \ + gnome-text-editor \ + gthumb \ + libwnck3 \ + nautilus \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor gnome-disk-utility', '', d)} \ +" diff --git a/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb new file mode 100644 index 0000000000..13394ca1db --- /dev/null +++ b/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb @@ -0,0 +1,30 @@ +SUMMARY = "Basic GNOME desktop" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +# gnome-menus & gmime get debian renamed +PACKAGE_ARCH = "${TUNE_PKGARCH}" + +inherit packagegroup features_check + +REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" + +RDEPENDS:${PN} = " \ + adwaita-icon-theme \ + adwaita-icon-theme-cursors \ + evolution-data-server \ + gnome-backgrounds \ + gnome-bluetooth \ + gnome-control-center \ + gnome-desktop \ + gnome-flashback \ + gnome-keyring \ + gnome-menus \ + gnome-session \ + gnome-settings-daemon \ + gnome-shell \ + gnome-shell-extensions \ + gnome-tweaks \ + gmime \ + gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash \ +" diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch deleted file mode 100644 index 277f6e21b0..0000000000 --- a/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 75539659396b18110d5a52a8a32845254b4d8eca Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 11 Aug 2018 18:25:47 -0700 -Subject: [PATCH] Include sys/sysmacros.h for major/minor - -usermount.c:238: undefined reference to `major' - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - usermount.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/usermount.c b/usermount.c -index 4107027..21ef77f 100644 ---- a/usermount.c -+++ b/usermount.c -@@ -40,6 +40,7 @@ - #include <sys/stat.h> - #include <sys/time.h> - #include <sys/types.h> -+#include <sys/sysmacros.h> - #include <errno.h> - #include <glob.h> - #include <libintl.h> diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch index 76640b0a1e..7a052b23b9 100644 --- a/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch +++ b/meta-gnome/recipes-support/usermode/usermode/0001-Makefile.am-Link-with-libm-for-powl-API.patch @@ -3,24 +3,25 @@ From: Khem Raj <raj.khem@gmail.com> Date: Tue, 25 Jul 2017 18:28:15 -0700 Subject: [PATCH] Makefile.am: Link with libm for powl() API +Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 4219f28..2a5ceac 100644 +index 779416a..67e2cc3 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -69,7 +69,7 @@ dist_pkgdata_DATA = usermode.ui +@@ -82,7 +82,7 @@ endif userhelper_SOURCES = userhelper.c userhelper.h shvar.c shvar.h userhelper_CPPFLAGS = $(AM_CPPFLAGS) -DSYSCONFDIR='"$(sysconfdir)"' - userhelper_LDADD = liblib.a $(LIBUSER_LIBS) $(GLIB_LIBS) $(PAM_LIBS) \ + userhelper_LDADD = liblib.a $(LIBUSER_LIBS) $(GLIB_LIBS) $(PAM_LIBS) -lm \ - $(SELINUX_LIBS) $(EFENCE_LIBS) + $(SELINUX_LIBS) $(EFENCE_LIBS) -lm + if GTK userinfo_SOURCES = userinfo.c - userinfo_CPPFLAGS = $(AM_CPPFLAGS) $(PIXMAPDIR_CPPFLAGS) $(SBINDIR_CPPFLAGS) \ -- -2.13.3 +2.31.1 diff --git a/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch b/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch deleted file mode 100644 index 9db700e96b..0000000000 --- a/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 7cbc6441cd06e0c0bb51ac37c8f22b0fd51f12f2 Mon Sep 17 00:00:00 2001 -From: Jiri Kucera <jkucera@redhat.com> -Date: Wed, 11 Apr 2018 17:13:44 +0200 -Subject: [PATCH] Missing \n in translated string - -Upstream-Status: Backport - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - po/tr.po | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/tr.po b/po/tr.po -index 84e5021..a28e947 100644 ---- a/po/tr.po -+++ b/po/tr.po -@@ -408,7 +408,7 @@ msgstr "Grafik pencere açılamadı ve uçbirim denetimi bulunamadı.\n" - #: ../../po/../userpasswd.c:37 - #, c-format - msgid "Unexpected command-line arguments\n" --msgstr "Beklenmeyen komut satırı argümanları" -+msgstr "Beklenmeyen komut satırı argümanları\n" - - #: ../../po/../userinfo.c:411 - #, c-format --- -2.7.4 - diff --git a/meta-gnome/recipes-support/usermode/usermode_1.112.bb b/meta-gnome/recipes-support/usermode/usermode_1.114.bb index 82ccf3eda7..1811b2d3c4 100644 --- a/meta-gnome/recipes-support/usermode/usermode_1.112.bb +++ b/meta-gnome/recipes-support/usermode/usermode_1.114.bb @@ -1,3 +1,4 @@ +SUMMARY = "Tools for certain user account management tasks" DESCRIPTION = "The usermode contains the userhelper program, which can be used to allow configured \ programs to be run with superuser privileges by ordinary users, and several \ graphical tools for users: \ @@ -6,7 +7,9 @@ graphical tools for users: \ * userpasswd allows users to change their passwords. \ " HOMEPAGE = "https://pagure.io/usermode" -LICENSE = "GPLv2+" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} \ gtk+ desktop-file-utils-native \ startup-notification intltool-native \ @@ -16,16 +19,12 @@ DEPENDS = "libuser ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', SRC_URI = "https://releases.pagure.org/${BPN}/${BPN}-${PV}.tar.xz \ file://0001-fix-compile-failure-against-musl-C-library.patch \ file://0001-Makefile.am-Link-with-libm-for-powl-API.patch \ - file://0001-Missing-n-in-translated-string.patch \ - file://0001-Include-sys-sysmacros.h-for-major-minor.patch \ " -SRC_URI[md5sum] = "a766a9f7600f573fb6de4655d4162196" -SRC_URI[sha256sum] = "37c4d667209da14082c08df6e48fe955d1532efebd5322f13f94683c6cc10370" +SRC_URI[sha256sum] = "e7f58712b12175965b3a21522052863a061f3f1a888df3ffbe713b434f80254f" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +REQUIRED_DISTRO_FEATURES = "x11 pam" -inherit distro_features_check autotools gettext pkgconfig +inherit features_check autotools gettext pkgconfig EXTRA_OEMAKE += "INSTALL='install -p'" -REQUIRED_DISTRO_FEATURES = "x11 pam" diff --git a/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb new file mode 100644 index 0000000000..73f22a3d95 --- /dev/null +++ b/meta-gnome/recipes-support/webp-pixbuf-loader/webp-pixbuf-loader_0.2.7.bb @@ -0,0 +1,23 @@ +SUMMARY = "WebP GDK Pixbuf Loader library" +HOMEPAGE = "https://github.com/aruiz/webp-pixbuf-loader" +LICENSE = "LGPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE.LGPL-2;md5=0d90e6d44bcf69014bfae649c75aa6ca" + +DEPENDS = " \ + gdk-pixbuf \ + libwebp \ +" + +inherit meson pkgconfig + +EXTRA_OEMESON = "-Dupdate_cache=true" + +SRC_URI = "git://github.com/aruiz/webp-pixbuf-loader.git;protocol=https;branch=mainline" + +S = "${WORKDIR}/git" +SRCREV = "52232e4ba282b2fed68e8fcb4b5d45ed0eaa4ed3" + +FILES:${PN} = " \ + ${datadir}/thumbnailers/webp-pixbuf.thumbnailer \ + ${libdir}/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-webp.so \ +" diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.1.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.1.bb new file mode 100644 index 0000000000..847907a5be --- /dev/null +++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gnome_46.1.bb @@ -0,0 +1,31 @@ +SUMMARY = "A xdg-desktop-portal backend for gnome." +HOMEPAGE = "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0-native \ + gtk4\ + xdg-desktop-portal \ + xdg-desktop-portal-gtk \ + libadwaita \ + fontconfig \ + gsettings-desktop-schemas \ + gnome-desktop \ + dconf \ +" + +RDEPENDS:${PN} = "xdg-desktop-portal xdg-desktop-portal-gtk" + +inherit gnomebase pkgconfig gsettings features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI[archive.sha256sum] = "7e8d9623e9d96a89c0897616827cd441dcf2832927d38f135c722552b1172aa1" + +PACKAGECONFIG ?= "screenshot screencast ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" +PACKAGECONFIG[wayland] = ",,wayland-native" +PACKAGECONFIG[screenshot] = ",,,gnome-shell" +PACKAGECONFIG[screencast] = ",,,mutter" + +FILES:${PN} += "${systemd_user_unitdir} ${datadir}" diff --git a/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.1.bb b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.1.bb new file mode 100644 index 0000000000..0d2b0012c5 --- /dev/null +++ b/meta-gnome/recipes-support/xdg-desktop-portal/xdg-desktop-portal-gtk_1.15.1.bb @@ -0,0 +1,30 @@ +SUMMARY = "A backend implementation for xdg-desktop-portal that is using GTK and various pieces of GNOME infrastructure." +HOMEPAGE = "https://github.com/flatpak/xdg-desktop-portal-gtk" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3\ + xdg-desktop-portal \ + libadwaita \ + dconf \ +" + +inherit gettext meson pkgconfig gsettings features_check + +REQUIRED_DISTRO_FEATURES = "polkit" + +SRC_URI = "git://github.com/flatpak/xdg-desktop-portal-gtk.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "54003825481c2b48fd0c42355b484469dea12020" + +PACKAGECONFIG ?= "wallpaper appchooser lockdown settings" + +PACKAGECONFIG[wallpaper] = "-Dwallpaper=enabled,-Dwallpaper=disabled,gnome-desktop" +PACKAGECONFIG[settings] = "-Dsettings=enabled,-Dsettings=disabled,gsettings-desktop-schemas fontconfig" +PACKAGECONFIG[appchooser] = "-Dappchooser=enabled,-Dappchooser=disabled" +PACKAGECONFIG[lockdown] = "-Dlockdown=enabled,-Dlockdown=disabled" + +FILES:${PN} += "${systemd_user_unitdir} ${datadir}" |