diff options
Diffstat (limited to 'external/meta-openembedded/meta-gnome/recipes-support')
23 files changed, 560 insertions, 124 deletions
diff --git a/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch b/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch new file mode 100644 index 00000000..c2310fe4 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0001-musl-Hack-to-fix-build.patch @@ -0,0 +1,36 @@ +From 2a1c7103839c20df5ca9ce2fa863535d802f8f3a 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 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +--- + meson.build | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 4465a26..726c9fe 100644 +--- a/meson.build ++++ b/meson.build +@@ -82,8 +82,14 @@ if cc.has_header_symbol('utmpx.h', 'WTMPX_FILENAME', prefix: '#define _GNU_SOURC + elif cc.has_header_symbol('paths.h', '_PATH_WTMPX') + config_h.set('PATH_WTMP', '_PATH_WTMPX') + else +- assert(run_command('test', '-e', '/var/log/utx.log').returncode() == 0, 'Do not know which filename to watch for wtmp changes') +- config_h.set_quoted('PATH_WTMP', '/var/log/utx.log') ++ # 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.21.0 + diff --git a/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch b/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch new file mode 100644 index 00000000..14161804 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice/0002-musl-add-missing-fgetspent_r.patch @@ -0,0 +1,46 @@ +From 820249ea8e38c568e6a36fbd9c852718c7665b56 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, +-- +2.21.0 + diff --git a/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb b/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb new file mode 100644 index 00000000..edc48900 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/accountsservice/accountsservice_0.6.55.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "D-Bus interfaces for querying and manipulating user account information" +HOMEPAGE = "https://www.freedesktop.org/wiki/Software/AccountsService/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = " \ + dbus \ + polkit \ +" + +inherit meson gobject-introspection gtk-doc features_check systemd + +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[md5sum] = "6e4c6fbd490260cfe17de2e76f5d803a" +SRC_URI[sha256sum] = "ff2b2419a7e06bd9cb335ffe391c7409b49a0f0130b890bd54692a3986699c9b" + +GTKDOC_MESON_OPTION = "gtk_doc" + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false -Dsystemdsystemunitdir='no', systemd" + +SYSTEMD_SERVICE_${PN} = "accounts-daemon.service" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/polkit-1 \ +" diff --git a/external/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb b/external/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb new file mode 100644 index 00000000..eb60bd96 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/appstream-glib/appstream-glib_0.7.17.bb @@ -0,0 +1,37 @@ +SUMMARY = "Objects and helper methods to help reading and writing AppStream metadata" +HOMEPAGE = "https://people.freedesktop.org/~hughsient/appstream-glib/index.htm" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + gperf-native \ + glib-2.0 \ + gtk+3 \ + libyaml \ + libarchive \ + libsoup-2.4 \ + json-glib \ + gdk-pixbuf \ + freetype \ + fontconfig \ + libstemmer \ +" + +inherit meson gobject-introspection gettext bash-completion + +SRC_URI = "https://people.freedesktop.org/~hughsient/${BPN}/releases/${BP}.tar.xz" +SRC_URI[md5sum] = "67d441fb0fb3e14551b47db656565fc4" +SRC_URI[sha256sum] = "7ca7e91d4accefa1c0d2c6e310cb3fe2686c017810e23b3f82d9f5724345e549" + +EXTRA_OEMESON = " \ + -Drpm=false \ +" + +FILES_${PN} += "${libdir}/asb-plugins-5" + +FILES_${PN}-dev += " \ + ${datadir}/installed-tests \ + ${datadir}/gettext \ +" + +BBCLASSEXTEND = "native" diff --git a/external/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb b/external/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb new file mode 100644 index 00000000..7845509b --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.2.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "GTK support library for colord" +HOMEPAGE = "https://www.freedesktop.org/software/colord/" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +inherit meson gobject-introspection gettext gtk-doc features_check + +DEPENDS = " \ + gtk+3 \ + colord \ +" + +SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "66d048803c8b89e5e63da4b461484933" +SRC_URI[sha256sum] = "2a4cfae08bc69f000f40374934cd26f4ae86d286ce7de89f1622abc59644c717" + +EXTRA_OEMESON = "-Dman=false" + +# gobject-introspection is mandatory and cannot be configured +REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" + +# colord +REQUIRED_DISTRO_FEATURES += "polkit" + +UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" diff --git a/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb b/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus-native.bb new file mode 100644 index 00000000..ca65114c --- /dev/null +++ b/external/meta-openembedded/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/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb b/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb new file mode 100644 index 00000000..caec455b --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.bb @@ -0,0 +1,37 @@ +require ${BPN}.inc + +DEPENDS += " \ + ${BPN}-native \ + glib-2.0-native \ + glib-2.0 \ + dbus \ + iso-codes \ +" + +inherit gtk-icon-cache bash-completion + +# for unicode-ucd +EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" + +PACKAGECONFIG ??= " \ + dconf vala \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', 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 \ +" + +FILES_${PN}-dev += " \ + ${datadir}/gettext \ +" + diff --git a/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc b/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc new file mode 100644 index 00000000..0f4ae7d0 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus.inc @@ -0,0 +1,36 @@ +SUMMARY = "Intelligent Input Bus for Linux/Unix" +HOMEPAGE = "https://github.com/ibus/ibus/wiki" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala + +PV = "1.5.21" + +DEPENDS = "unicode-ucd" + +SRC_URI = " \ + git://github.com/ibus/ibus.git \ + file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ +" +SRCREV = "ae0040c73466bb6e78fce5e669a55fcce6ffd16d" +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[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 \ +" + +do_configure_prepend() { + touch ${S}/ChangeLog + touch ${S}/ABOUT-NLS +} diff --git a/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch b/external/meta-openembedded/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 00000000..3701d19f --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/ibus/ibus/0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch @@ -0,0 +1,39 @@ +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(-) + +diff --git a/data/dconf/make-dconf-override-db.sh b/data/dconf/make-dconf-override-db.sh +index 9c650e97..02fbf059 100755 +--- 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" + +@@ -46,5 +42,3 @@ for schema in $schemas; do + done + + rm -rf $TMPDIR +- +-kill $DBUS_SESSION_BUS_PID +-- +2.20.1 + diff --git a/external/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb b/external/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb index 0a0a3e6b..d567d00d 100644 --- a/external/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb +++ b/external/meta-openembedded/meta-gnome/recipes-support/keybinder/keybinder_3.0.bb @@ -18,7 +18,7 @@ SRC_URI = "git://github.com/engla/keybinder.git;branch=keybinder-3.0 \ RDEPENDS_${PN} = "gtk+" -inherit distro_features_check autotools gtk-doc gobject-introspection +inherit features_check autotools gtk-doc gobject-introspection REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend() { diff --git a/external/meta-openembedded/meta-gnome/recipes-support/libhandy/libhandy_git.bb b/external/meta-openembedded/meta-gnome/recipes-support/libhandy/libhandy_git.bb new file mode 100644 index 00000000..8c6159f9 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/libhandy/libhandy_git.bb @@ -0,0 +1,21 @@ +SUMMARY = "A library full of GTK+ widgets for mobile phones" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI = "git://source.puri.sm/Librem5/${BPN}.git;protocol=https" +SRCREV = "ef7c4bf75ae239495141ada83d2fbaf034315563" +S = "${WORKDIR}/git" +PV = "0.0.12" + +GIR_MESON_ENABLE_FLAG = 'enabled' +GIR_MESON_DISABLE_FLAG = 'disabled' +GTKDOC_MESON_OPTION = 'gtk_doc' + +inherit meson gobject-introspection vala gettext gtk-doc features_check + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +DEPENDS += "gtk+3" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}" diff --git a/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch b/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch new file mode 100644 index 00000000..73ebeb48 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0001-Build-so-lib.patch @@ -0,0 +1,63 @@ +From eacc9e9c62a3857ce1e2e24b81fc22d8ae91f422 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Thu, 9 May 2019 22:06:48 +0200 +Subject: [PATCH] Build so-lib +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Stolen from [1] + +[1] https://aur.archlinux.org/cgit/aur.git/commit/dynamiclib.patch?h=snowball-git&id=a9cbf4f42f3661e4b8f791cd4374233821716ea1 + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + GNUmakefile | 7 +++++-- + libstemmer/symbol.map | 6 ++++++ + 2 files changed, 11 insertions(+), 2 deletions(-) + create mode 100644 libstemmer/symbol.map + +diff --git a/GNUmakefile b/GNUmakefile +index cbd6ff7..a85230b 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -142,10 +142,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.o) + JAVA_CLASSES = $(JAVA_SOURCES:.java=.class) + JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class) + +-CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations ++CFLAGS=-O2 -fPIC -W -Wall -Wmissing-prototypes -Wmissing-declarations + CPPFLAGS=-Iinclude + +-all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) ++all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS) + + clean: + rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \ +@@ -192,6 +192,9 @@ libstemmer/libstemmer.o: libstemmer/modules.h $(C_LIB_HEADERS) + libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(AR) -cru $@ $^ + ++libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ ++ + stemwords: $(STEMWORDS_OBJECTS) libstemmer.o + $(CC) $(CFLAGS) -o $@ $^ + +diff --git a/libstemmer/symbol.map b/libstemmer/symbol.map +new file mode 100644 +index 0000000..7a3d423 +--- /dev/null ++++ b/libstemmer/symbol.map +@@ -0,0 +1,6 @@ ++SB_STEMMER_0 { ++ global: ++ sb_stemmer_*; ++ local: ++ *; ++}; +-- +2.20.1 + diff --git a/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch b/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch new file mode 100644 index 00000000..69c1d670 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer/0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch @@ -0,0 +1,46 @@ +From 23eacfbcc10c777ce47283a5285455ec83c8aa41 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> +Date: Sun, 6 Oct 2019 13:05:08 +0200 +Subject: [PATCH] snowball/stemwords: do link with LDFLAGS set by build + environment +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some (cross-)build systems as OpeneEmbedded are picky (for certain reasons) if +their LDFLAGS are ignored. + +Upstream-Status: Submitted [1] + +[1] https://github.com/snowballstem/snowball/pull/120 + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + GNUmakefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/GNUmakefile b/GNUmakefile +index 76f6ae9..47c6077 100644 +--- a/GNUmakefile ++++ b/GNUmakefile +@@ -179,7 +179,7 @@ clean: + -rmdir $(js_output_dir) + + snowball: $(COMPILER_OBJECTS) +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + $(COMPILER_OBJECTS): $(COMPILER_HEADERS) + +@@ -204,7 +204,7 @@ libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS) + $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0,-version-script,libstemmer/symbol.map -o $@.0.0.0 $^ + + stemwords: $(STEMWORDS_OBJECTS) libstemmer.o +- $(CC) $(CFLAGS) -o $@ $^ ++ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ + + csharp_stemwords: $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) + $(MCS) -unsafe -target:exe -out:$@ $(CSHARP_STEMWORDS_SOURCES) $(CSHARP_RUNTIME_SOURCES) $(CSHARP_SOURCES) +-- +2.21.0 + diff --git a/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb b/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb new file mode 100644 index 00000000..96dd880b --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/libstemmer/libstemmer_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "Snowball compiler and stemming algorithms" +HOMEPAGE = "https://snowballstem.org/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=2750797da77c1d784e7626b3f7d7ff3e" + +DEPENDS_class-target = "${BPN}-native" + +SRC_URI = "\ + git://github.com/snowballstem/snowball.git \ + file://0001-Build-so-lib.patch \ + file://0002-snowball-stemwords-do-link-with-LDFLAGS-set-by-build.patch \ +" +SRCREV = "c70ed64f9d41c1032fba4e962b054f8e9d489a74" +S = "${WORKDIR}/git" +PV = "2.0.0" +LIBVER = "0.0.0" + +inherit lib_package + +BBCLASSEXTEND = "native" + +do_compile_prepend_class-target() { + # use native tools + sed -i 's:./snowball :snowball :g' ${S}/GNUmakefile +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${S}/snowball ${D}${bindir} + install -m 755 ${S}/stemwords ${D}${bindir} + + install -d ${D}${libdir} + install -m 755 ${S}/libstemmer.so.${LIBVER} ${D}${libdir}/ + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so.0 + ln -s libstemmer.so.${LIBVER} ${D}${libdir}/libstemmer.so + + install -d ${D}${includedir} + install -m 644 ${S}/include/*.h ${D}${includedir} +} diff --git a/external/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch b/external/meta-openembedded/meta-gnome/recipes-support/libuser/libuser/0001-Check-for-issetugid.patch deleted file mode 100644 index 79756b9a..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb b/external/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb index 7ec54eb1..2c580f87 100644 --- a/external/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb +++ b/external/meta-openembedded/meta-gnome/recipes-support/libuser/libuser_0.62.bb @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ SECTION = "base" SRC_URI = "https://releases.pagure.org/libuser/libuser-${PV}.tar.xz \ - file://0001-Check-for-issetugid.patch \ file://0002-remove-unused-execinfo.h.patch \ file://0001-modules-files.c-parse_field-fix-string-formating-in-.patch \ " @@ -22,7 +21,7 @@ SRC_URI[sha256sum] = "a58ff4fabb01a25043b142185a33eeea961109dd60d4b40b6a9df4fa3c DEPENDS = "popt libpam glib-2.0 python3" -inherit distro_features_check +inherit features_check REQUIRED_DISTRO_FEATURES = "pam" inherit autotools gettext python3native python3-dir pkgconfig gtk-doc diff --git a/external/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb b/external/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb new file mode 100644 index 00000000..6fb3b82e --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/libwacom/libwacom_0.33.bb @@ -0,0 +1,14 @@ +SUMMARY = "A tablet description library" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=40a21fffb367c82f39fd91a3b137c36e" + +DEPENDS = " \ + libxml2-native \ + libgudev \ +" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/linuxwacom/libwacom.git" +SRCREV = "87cc710e21a6220e267dd08936bbec2932aa3658" +S = "${WORKDIR}/git" diff --git a/external/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb b/external/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb index 4e49becc..1eb4a100 100644 --- a/external/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb +++ b/external/meta-openembedded/meta-gnome/recipes-support/onboard/onboard_1.4.1.bb @@ -10,7 +10,7 @@ SRC_URI = "https://launchpad.net/onboard/1.4/${PV}/+download/${BPN}-${PV}.tar.gz SRC_URI[md5sum] = "1a2fbe82e934f5b37841d17ff51e80e8" SRC_URI[sha256sum] = "01cae1ac5b1ef1ab985bd2d2d79ded6fc99ee04b1535cc1bb191e43a231a3865" -inherit distro_features_check setuptools3 pkgconfig gtk-icon-cache gsettings +inherit features_check setuptools3 pkgconfig gtk-icon-cache gsettings mime-xdg REQUIRED_DISTRO_FEATURES = "x11" diff --git a/external/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/external/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb new file mode 100644 index 00000000..0b900f0e --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -0,0 +1,21 @@ +SUMMARY = "GNOME applications" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit packagegroup features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +RDEPENDS_${PN} = " \ + evolution-data-server \ + evince \ + file-roller \ + gedit \ + ghex \ + gnome-calculator \ + gnome-font-viewer \ + gnome-terminal \ + libwnck3 \ + nautilus \ + ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'gnome-system-monitor', '', d)} \ +" diff --git a/external/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb b/external/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb new file mode 100644 index 00000000..3c333fe0 --- /dev/null +++ b/external/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-desktop.bb @@ -0,0 +1,27 @@ +SUMMARY = "Basic GNOME desktop" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +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-desktop3 \ + gnome-flashback \ + gnome-keyring \ + gnome-menus3 \ + gnome-session \ + gnome-settings-daemon \ + gnome-shell \ + gnome-shell-extensions \ + gnome-tweaks \ + gmime \ + gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash \ +" diff --git a/external/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch b/external/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Include-sys-sysmacros.h-for-major-minor.patch deleted file mode 100644 index 277f6e21..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch b/external/meta-openembedded/meta-gnome/recipes-support/usermode/usermode/0001-Missing-n-in-translated-string.patch deleted file mode 100644 index 9db700e9..00000000 --- a/external/meta-openembedded/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/external/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.112.bb b/external/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb index 82ccf3ed..a94440c9 100644 --- a/external/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.112.bb +++ b/external/meta-openembedded/meta-gnome/recipes-support/usermode/usermode_1.113.bb @@ -16,15 +16,13 @@ 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[md5sum] = "eadfbff18578b645096b6fa61854b41d" +SRC_URI[sha256sum] = "99fbfd248b411ed0e7c44d1957b0ecde699b5a968a4db5d37228e82e7b1ba092" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -inherit distro_features_check autotools gettext pkgconfig +inherit features_check autotools gettext pkgconfig EXTRA_OEMAKE += "INSTALL='install -p'" |