diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2020-06-13 18:40:47 +0300 |
|---|---|---|
| committer | Andrew Geissler <geissonator@yahoo.com> | 2020-06-13 18:45:48 +0300 |
| commit | 89770b09490d616883ab728cc628a844ca0e1150 (patch) | |
| tree | a24e3c597afe31a84abbb2685bf10c8ba6c9af74 /meta-openembedded/meta-gnome | |
| parent | 4accb8864625d1bb909b299d5ddbc11df53c22d3 (diff) | |
| download | openbmc-89770b09490d616883ab728cc628a844ca0e1150.tar.xz | |
meta-openembedded: subtree update:5caca0f7bd..fe77eaab8f
Adam Miartus (3):
meta-oe toybox-inittab: toybox inittab implementation
meta-oe toybox-inittab: allow getty as a packageconfig feature
meta-oe toybox: enable toybox init when selected as init manager
Alex Kiernan (1):
libgusb: Upgrade 0.3.0+ -> 0.3.4
Andreas Müller (48):
gfbgraph: initial add 0.2.4
libgdata: Change PACKAGECONFIG defaults
gnome-photos: initial add 3.34.2
dconf: upgrade 0.34.0 -> 0.36.0
dconf-editor: upgrade 3.34.2 -> 3.36.2
nautilus: upgrade 3.34.3 -> 3.36.3
evince: upgrade 3.34.2 -> 3.36.3
evolution-data-server: upgrade 3.34.4 -> 3.36.3
file-roller: upgrade 3.32.5 -> 3.36.2
amtk: initial add 5.1.1
uchardet: initial add 0.0.7
tepl: initial add 4.4.0
gedit: upgradde 3.34.1 -> 3.36.2
gdm: upgrade 3.34.1 -> 3.36.2
gnome-backgrounds: upgrade 3.34.0 -> 3.36.0
gnome-calculator: upgrade 3.34.1 -> 3.36.0
gnome-system-monitor: upgrade 3.32.1 -> 3.36.1
gvfs: upgrade 1.42.2 -> 1.44.1
gtksourceview4: upgrade 4.4.0 -> 4.6.0
gnome-desktop3; upgrade 3.34.5 -> 3.36.2
gnome-panel: upgrade 3.34.1 -> 3.36.1
gnome-flashback: upgrade 3.34.2 -> 3.36.3
gnome-keyring: upgrade 3.34.0 -> 3.36.0
gnome-menus3: upgrade 3.32.0 -> 3.36.0
gnome-online-accounts: upgrade 3.34.1 -> 3.36.0
gnome-session: upgrade 3.34.2 -> 3.36.0
gnome-settings-daemon: upgrade 3.34.2 -> 3.36.1
gnome-terminal: upgrade 3.34.2 -> 3.36.2
grilo: upgrade 0.3.10 -> 0.3.12
libgnomekbd: remove
libgweather: upgrade 3.34.0 -> 3.36.0
libwnck3: upgrade 3.32.0 -> 3.36.0
metacity: upgrade 3.34.1 -> 3.36.1
graphene: initial add 1.10.0
yelp-xsl: upgrade 3.34.2 -> 3.36.0
yelp: upgrade 3.34.0 -> 3.36.0
sysprof: upgrade 3.34.1 -> 3.36.0
gnome-control-center: upgrade 3.34.5 -> 3.36.2
libblockdev: upgrade 2.23 -> 2.24
poppler: upgrade 0.88.0 -> 0.89.0
gtksourceview: remove forgotten files
vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches
vlc: upgrade 3.0.9.2 -> 3.0.10
babl: upgrade 0.1.74 -> 0.1.78
gegl: upgrade 0.4.22 -> 0.4.24
libmypaint: upgrade 1.4.0 -> 1.6.1
mypaint-brushes-1.0: upgrade 1.3.0 -> 1.3.1
gimp: upgrade 2.10.18 -> 2.10.20
Andrej Valek (1):
thrift: drop unsupported features
Bog999 (1):
python3: Add python3-cryptography to RDEPENDS for python3-redis
Changqing Li (3):
packagegroup-xfce-base: add RDEPEND packagegroup-core-x11
python-django: add RDEPENDS
python-m2crypto: Add RDEPENDS
Chenxi Mao (1):
geoclue: select avahi-daemon if nmea enabled
Christian Eggers (4):
graphviz: Extend for nativesdk
ttf-dejavu: Extend for native and nativesdk
gd: Extend for native and nativesdk
mscgen: Extend for native and nativesdk
Denys Dmytriyenko (1):
serialcheck: switch to a fork and update to the latest
Jacob Kroon (1):
meta-oe: Don't inherit 'features_check' in recipes that don't utilize it
Joris Offouga (1):
c-periphery: add recipe
Kai Kang (1):
lvm2: remove service template from SYSTEMD_SERVICE
Khem Raj (5):
python3-zopeinterface: Upgrade to 5.1.0
multipath-tools: Fix build with json-c 0.14 and newer
toybox-inittab: Get rid of bashism
mpv: Drop unused features_check inherit
evince: Drop unused features_check inherit
Konrad Weihmann (3):
mpd: fix PACKAGECONFIG assignment
netkit-rsh: properly append PACKAGECONFIG
zile: properly append PACKAGECONFIG
Lei YU (1):
httpfs2: mount a http url as a file based on FUSE
Leon Anavi (57):
python3-unidiff: Upgrade 0.5.5 -> 0.6.0
python3-tzlocal: Upgrade 2.0.0 -> 2.1
python3-serpent: Upgrade 1.28 -> 1.30.2
python3-python-vlc: Upgrade 3.0.7110 -> 3.0.9113
python3-gast: Upgrade 0.2.2 -> 0.3.3
python3-langtable: Upgrade 0.0.38 -> 0.0.51
python3-automat: Upgrade 0.8.0 -> 20.2.0
python3-humanize: Upgrade 0.5.1 -> 2.4.0
python-pyaudio: Consolidate in a single file
python3-isort: Consolidate in a single file
python3-editor: Consolidate in a single file
python3-engineio: Upgrade 3.12.1 -> 3.13.0
python3-feedformatter: Consolidate in a single file
python3-decorator: Consolidate in a single file
python3-dateutil: Consolidate in a single file
python3-dnspython: Consolidate in a single file
python3-future: Consolidate in a single file
python3-requests-futures: Upgrade 0.9.5 -> 1.0.0
python3-greenlet: Consolidate in a single file
python3-html2text: Upgrade 2019.8.11 -> 2020.1.16
python3-jsonpatch: Consolidate in a single file
python3-jsonschema: Consolidate in a single file
python3-evdev: Consolidate in a single file
python3-oauthlib: Consolidate in a single file
python3-oauthlib: Upgrade 2.0.6 -> 3.1.0
python3-tornado: Consolidate in a single file
python3-tornado: Upgrade 6.0.3 -> 6.0.4
python3-waitress: Upgrade 1.4.3 -> 1.4.4
python3-urllib3: Upgrade 1.25.7 -> 1.25.9
python3-ujson: Upgrade 2.0.3 -> 3.0.0
python3-wheel: Upgrade 0.33.6 -> 0.34.2
python3-wcwidth: Upgrade 0.1.8 -> 0.2.4
python3-twine: Upgrade 1.13.0 -> 3.1.1
python3-beautifulsoup4: Upgrade 4.8.2 -> 4.9.1
python3-bitarray: Upgrade 1.2.1 -> 1.2.2
python3-soupsieve: Upgrade 1.9.4 -> 2.0.1
python3-meld3: Consolidate in a single file
python3-meld3: Upgrade 1.0.2 -> 2.0.1
python3-markupsafe: Consolidate in a single file
python3-more-itertools: Consolidate in a single file
python3-more-itertools: Upgrade 8.2.0 -> 8.3.0
python3-nmap: Upgrade 1.4.1 -> 1.4.7
python3-multidict: Upgrade 4.7.5 -> 4.7.6
python3-lxml: Consolidate in a single file
python3-hyperlink: Consolidate in a single file
python3-humanfriendly: Upgrade 4.18 -> 8.2
python3-html5lib: Consolidate in a single file
python3-progress: Consolidate in a single file
python3-prettytable: Consolidate in a single file
python3-lxml: Upgrade 4.5.0 -> 4.5.1
python3-pika: Consolidate in a single file
python3-pluggy: Consolidate in a single file
python3-ply: Consolidate in a single file
python3-pocketsphinx: Consolidate in a single file
python3-pocketsphinx: 0.1.0 -> 0.1.15
python3-pint: Consolidate in a single file
python3-pint: Upgrade 0.11 -> 0.12
Martin Jansa (1):
meta-python: depend on core version 12 or higher
Martin Kelly (4):
mosquitto: add native, nativesdk support
msgpack-c: add native, nativesdk support
mosquitto: typo fix
python3-paho-mqtt: add native,nativesdk support
Mingli Yu (2):
python3-webcolors: add the missing rdepends
python3-m2crypto: add the missing rdepends
Naveen Saini (2):
ace: add new recipe
ocl-icd_git.bb: Add recipe for OpenCL ICD loaders
Peace Lee (1):
guider: Upgrade to 3.9.7
Pierre-Jean Texier (14):
zchunk: upgrade 1.1.5 -> 1.1.6
uriparser: upgrade 0.9.3 -> 0.9.4
dbus-brocker: upgrade 22 -> 23
jsoncpp: upgrade 1.9.2 -> 1.9.3
hwdata: upgrade 0.333 -> 0.336
libiio: upgrade 0.19 -> 0.20
libnfc: upgrade 1.7.1 -> 1.8.0
tcpreplay: fix upstream check URL
tinyproxy: fix upstream check URL
jpnevulator: upgrade 2.3.4 -> 2.3.5
libnftnl: upgrade 1.1.6 -> 1.1.7
nftables: upgrade 0.9.4 -> 0.9.5
libzip: upgrade 1.6.1 -> 1.7.0
haveged: upgrade 1.9.8 -> 1.9.9
Qi.Chen@windriver.com (1):
python-django: set CVE_PRODUCT to be django
Wang Mingyu (5):
opensaf: upgrade 5.19.10 -> 5.20.05
dash: upgrade 0.5.10.2 -> 0.5.11
postgresql: 12.2 -> 12.3
python3-pycodestyle: upgrade 2.5.0 -> 2.6.0
python3-scapy: upgrade 0.25 -> 0.26
Yi Zhao (1):
gpsd: add new init script
Yongxin Liu (1):
intel-speed-select: Add new recipe for the tool to validate Intel SST
Zang Ruochen (7):
proj: upgrade 7.0.0 -> 7.0.1
mksh: upgrade 58 -> 59
libvpx: upgrade 1.8.1 -> 1.8.2
mercurial: upgrade 5.2 -> 5.4
libcgi-perl: upgrade 4.47 -> 4.48
mm-common: upgrade 1.0..0 -> 1.0.1
cryptsetup: upgrade 2.3.2 -> 2.3.3
Zheng Ruoqin (2):
nghttp2: upgrade 1.40.0 -> 1.41.0
python3-inflection: upgrade 0.3.1 -> 0.5.0
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I15cb7860a288b903ef186f1979ee028e6f54ea50
Diffstat (limited to 'meta-openembedded/meta-gnome')
56 files changed, 256 insertions, 660 deletions
diff --git a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb index c470987b4f..173d5aa74b 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.74.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/babl/babl_0.1.78.bb @@ -6,7 +6,7 @@ GNOMEBASEBUILDCLASS = "meson" GIR_MESON_OPTION = "enable-gir" -inherit setuptools3 gnomebase gobject-introspection +inherit setuptools3 gnomebase gobject-introspection vala DEPENDS += "lcms" @@ -15,7 +15,7 @@ CFLAGS_append_toolchain-clang_mipsarch = " -ffp-exception-behavior=ignore " CFLAGS_append_toolchain-clang_riscv64 = " -ffp-exception-behavior=ignore " SRC_URI = "https://download.gimp.org/pub/${BPN}/0.1/${BP}.tar.xz" -SRC_URI[md5sum] = "d032853f2678bc95054c39d4f02045c1" -SRC_URI[sha256sum] = "9a710b6950da37ada94cd9e2046cbce26de12473da32a7b79b7d1432fc66ce0e" +SRC_URI[md5sum] = "b1a85d1f3d710407164848708f1f49f1" +SRC_URI[sha256sum] = "17d5493633bff5585d9f375bc4df5925157cd1c70ccd7c22a635be75c172523a" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb index ca73e66f3e..77c30f7de9 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.22.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gegl/gegl_0.4.24.bb @@ -26,8 +26,8 @@ SRC_URI = " \ https://download.gimp.org/pub/${BPN}/${SHPV}/${BP}.tar.xz \ file://0001-meson.build-Give-note-if-sdl2-was-found.patch \ " -SRC_URI[md5sum] = "1776ac26792de0de3c3d680872e94b72" -SRC_URI[sha256sum] = "1888ec41dfd19fe28273795c2209efc1a542be742691561816683990dc642c61" +SRC_URI[md5sum] = "3a8062add20effb6f92b4b614facbbd5" +SRC_URI[sha256sum] = "7765499f27341b0d16032e665319cbc12876483ff6a944fcdf24a9c58e3e254a" PACKAGECONFIG ??= "gexiv2 jpeg libpng librsvg sdl2" PACKAGECONFIG_class-native = "libpng librsvg" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb index 1350573342..2923e6b0c4 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.18.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.20.bb @@ -38,8 +38,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SHPV = "${@gnome_verdir("${PV}")}" SRC_URI = "https://download.gimp.org/pub/${BPN}/v${SHPV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "096d04ffb2c4559cb2152f507ff31c9c" -SRC_URI[sha256sum] = "65bfe111e8eebffd3dde3016ccb507f9948d2663d9497cb438d9bb609e11d716" +SRC_URI[md5sum] = "7479a4e90b28628d2948e6612fe44049" +SRC_URI[sha256sum] = "e12f9f874b1a007c4277b60aa81e0b67330be7e6153e5749ead839b902fc7b3c" EXTRA_OECONF = "--disable-python \ --without-webkit \ diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb index 2ca80f3e69..37d41780d2 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/libmypaint_git.bb @@ -13,8 +13,8 @@ DEPENDS = " \ inherit autotools gobject-introspection gettext python3native SRC_URI = "git://github.com/mypaint/libmypaint.git;protocol=https;branch=libmypaint-v1" -SRCREV = "477cb94b596035b54a255faaf95d13f6a8ee3619" -PV = "1.4.0" +SRCREV = "2768251dacce3939136c839aeca413f4aa4241d0" +PV = "1.6.1" S = "${WORKDIR}/git" do_configure_append() { diff --git a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb index d4d08fe8da..4ecc2fef8b 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/mypaint/mypaint-brushes-1.0_git.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=65d3616852dbf7b1a6d4b53b00626032" inherit autotools allarch SRC_URI = "git://github.com/mypaint/mypaint-brushes.git;protocol=https;branch=v1.3.x" -SRCREV = "be9fdf9ef6c54e29c7499992f04e29114857b3fc" -PV = "1.3.0+git${SRCPV}" +SRCREV = "8a0124ac0675103eae8fa41fad533851768ae1ce" +PV = "1.3.1" S = "${WORKDIR}/git" FILES_${PN} += "${datadir}/mypaint-data" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb new file mode 100644 index 0000000000..58713c35cf --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/amtk/amtk_5.1.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Actions, Menus and Toolbars Kit" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ +" + +inherit gnomebase gettext features_check gobject-introspection + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +SRC_URI[archive.md5sum] = "f11c2e0cde10d5224a942b1e13d598b2" +SRC_URI[archive.sha256sum] = "f9656bdd4278aabfb8554f029049b9ffaf51b53faa463483a840365463355df1" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb index 699511f7aa..25f409c41a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf-editor_3.36.2.bb @@ -8,8 +8,8 @@ DEPENDS = "dconf gtk+3" inherit gnomebase vala gettext gsettings bash-completion -SRC_URI[archive.md5sum] = "2907205ad1a0e2774c981932cb7ff25b" -SRC_URI[archive.sha256sum] = "cecc2a5cb44af68be80e970e83fb9e3e92e2a74df7c90b63324e6da19a929d5f" +SRC_URI[archive.md5sum] = "78bd905ed3c770a00c850d8cffec88a4" +SRC_URI[archive.sha256sum] = "edcec8867f018589125f177407760c642bbbb52fe5122daac5905223d6b3e1c7" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch deleted file mode 100644 index 485c46509c..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf/fix-meson-0.52.patch +++ /dev/null @@ -1,25 +0,0 @@ -With meson 0.52 the build fails due to duplicate symbols. There is a fix -to meson but the dconf build also needs tweaking. - -https://gitlab.gnome.org/GNOME/dconf/issues/59 -https://github.com/mesonbuild/meson/pull/5936 - -Despite the comments there about this being incorrect, libdconf is unchanged -between 0.51 and 0.52 and this patch. - -Upstream-Status: Pending [under discussion, see above links] -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> - -Index: dconf-0.34.0/client/meson.build -=================================================================== ---- dconf-0.34.0.orig/client/meson.build -+++ dconf-0.34.0/client/meson.build -@@ -28,7 +28,7 @@ libdconf_client = static_library( - - libdconf_client_dep = declare_dependency( - dependencies: gio_dep, -- link_whole: libdconf_client, -+ link_with: libdconf_client, - ) - - libdconf = shared_library( diff --git a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb index 3c3802f34b..9146726884 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/dconf/dconf_0.36.0.bb @@ -3,8 +3,8 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" SECTION = "x11/gnome" -SRC_URI[archive.md5sum] = "a3ab18ed51a0494a1c8436fef20cc1b0" -SRC_URI[archive.sha256sum] = "943a94ab16121de5580ceaed2605b87444d1bca1c6cd8beefb778bcb0aa2da52" +SRC_URI[archive.md5sum] = "1a50c988d9f0206f74a44f7c6d09cead" +SRC_URI[archive.sha256sum] = "9fe6bb22191fc2a036ad86fd8e7d165e9983c687b9fedccf85d46c799301da2d" DEPENDS = "dbus glib-2.0 intltool-native" @@ -12,8 +12,6 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase bash-completion vala -SRC_URI += "file://fix-meson-0.52.patch" - # I/O error : Attempt to load network entity http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl EXTRA_OEMESON = "-Dman=false" # no bash-completion for native diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch index c374fc9430..94794a5f92 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/0002-add-a-formatting-attribute-check.patch @@ -19,17 +19,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> cut-n-paste/unarr/common/unarr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/cut-n-paste/unarr/common/unarr.c -+++ b/cut-n-paste/unarr/common/unarr.c -@@ -92,7 +92,7 @@ size_t ar_get_global_comment(ar_archive - return ar->get_comment(ar, buffer, count); - } - --void ar_log(const char *prefix, const char *file, int line, const char *msg, ...) -+void __attribute__((__format__ (__printf__, 4, 5))) ar_log(const char *prefix, const char *file, int line, const char *msg, ...) - { - va_list args; - va_start(args, msg); --- a/cut-n-paste/synctex/synctex_parser_utils.c +++ b/cut-n-paste/synctex/synctex_parser_utils.c @@ -87,11 +87,11 @@ void _synctex_free(void * ptr) { @@ -76,24 +65,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> result = NULL; return NULL; } ---- a/cut-n-paste/synctex/synctex_parser.c -+++ b/cut-n-paste/synctex/synctex_parser.c -@@ -8411,6 +8411,7 @@ struct synctex_updater_t { - int length; /* the number of chars appended */ - }; - -+static int _synctex_updater_print(synctex_updater_p updater, const char * format, ...) SYNCTEX_PRINTF_FORMAT(2, 3); - static int _synctex_updater_print(synctex_updater_p updater, const char * format, ...) { - int result = 0; - if (updater) { -@@ -8447,6 +8448,7 @@ static int vasprintf(char **ret, - /** - * gzvprintf is not available until OSX 10.10 - */ -+static int _synctex_updater_print_gz(synctex_updater_p updater, const char * format, ...) SYNCTEX_PRINTF_FORMAT(2, 3); - static int _synctex_updater_print_gz(synctex_updater_p updater, const char * format, ...) { - int result = 0; - if (updater) { --- a/cut-n-paste/synctex/synctex_parser_utils.h +++ b/cut-n-paste/synctex/synctex_parser_utils.h @@ -85,7 +85,11 @@ extern "C" { diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.3.bb index b792d4fcb1..29e01cc23d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_3.36.3.bb @@ -16,18 +16,21 @@ DEPENDS = " \ ${@bb.utils.contains('DISTRO_FEATURES','x11','gnome-desktop3','',d)} \ " -inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext features_check mime-xdg +GNOMEBASEBUILDCLASS = "meson" -SRC_URI[archive.md5sum] = "9e9e82fa8f6045ad7817157d9335d185" -SRC_URI[archive.sha256sum] = "3cc0955f11204e3a2db1c7ab99b866692749592257485b87304134ad69da0617" +inherit gnomebase itstool gnome-help pkgconfig gsettings gobject-introspection upstream-version-is-even gettext mime-xdg gtk-doc + +SRC_URI[archive.md5sum] = "9762dabdde37a804072bccbfd311d357" +SRC_URI[archive.sha256sum] = "af2ebdf7f74e6580c4f1a12bdfe26b9ff90374d7acae061de0666d64012a9db2" SRC_URI += " \ file://0001-Add-format-attribute-to-_synctex_malloc.patch \ file://0002-add-a-formatting-attribute-check.patch \ " -EXTRA_OECONF = " \ - --enable-thumbnailer \ - --without-systemduserunitdir \ +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = " \ + -Dsystemduserunitdir=no \ " do_compile_prepend() { @@ -35,8 +38,8 @@ do_compile_prepend() { } PACKAGECONFIG ??= "" -PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus" -PACKAGECONFIG[browser-plugin] = "--enable-browser-plugin,--disable-browser-plugin," +PACKAGECONFIG[nautilus] = "-Dnautilus=true,-Dnautilus=false,nautilus" +PACKAGECONFIG[browser-plugin] = "-Dbrowser_plugin=true,-Dbrowser_plugin=false" RDEPENDS_${PN} += "glib-2.0-utils" RRECOMMMENDS_${PN} = "adwaita-icon-theme" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc index 4da3f8259e..6150df1673 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc +++ b/meta-openembedded/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.inc @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6a6e689d19255cf0557f3fe7d7068212 \ inherit gnomebase upstream-version-is-even -SRC_URI[archive.md5sum] = "23293554e9d92c6c0c78b5568b286efd" -SRC_URI[archive.sha256sum] = "985c4b4b613c50c999a4ca5e9d52478acbea85e1e99bab3a8b6e57ba7eace8f3" -PV = "3.34.4" +SRC_URI[archive.md5sum] = "4990dbdbf5850cbbfc46727367776058" +SRC_URI[archive.sha256sum] = "1f5f48173d0f288219d73d4f193cb921ae631932ba84030f05751c42bb003db2" +PV = "3.36.3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb index 2070f18a93..bf5e6f6d13 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.32.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/file-roller/file-roller_3.36.2.bb @@ -13,8 +13,8 @@ DEPENDS = " \ inherit gnomebase gsettings itstool gnome-help gettext upstream-version-is-even mime-xdg -SRC_URI[archive.md5sum] = "2afc688ac66a50213f6c42ee99479a96" -SRC_URI[archive.sha256sum] = "d53d30b4b45f61158b7e550b71a8a5556e877695f43a2ceb88be895960e54176" +SRC_URI[archive.md5sum] = "caa0103ab34d237a9760fbf5e1c72bc1" +SRC_URI[archive.sha256sum] = "268f7fdad8d2a78dfed5e82eb8710bad389c311b720666d6f07a04ed51056bd2" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'packagekit', '', d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb index a47bf6fcf8..fbf25a30cb 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gdm/gdm_3.36.2.bb @@ -14,8 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11 systemd pam" inherit gnomebase gsettings gobject-introspection gettext systemd useradd upstream-version-is-even features_check -SRC_URI[archive.md5sum] = "65d1fd4bb85e8b133d1cbffb80ecf62e" -SRC_URI[archive.sha256sum] = "e85df657aa8d9361af4fb122014d8f123a93bfe45a7662fba2b373d839dbd8d3" +SRC_URI[archive.md5sum] = "18384eb8345dbee5a8219916debf7e43" +SRC_URI[archive.sha256sum] = "3f561c10ae2e5942b03026f02c0aa7d8712e382708b17a0970874df8175b83a8" SRC_URI += "file://0001-Ensure-pam-file-installation.patch" EXTRA_OECONF = " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb index 850ba4df98..75f1737c62 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gedit/gedit_3.36.2.bb @@ -6,30 +6,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" GNOMEBASEBUILDCLASS = "meson" DEPENDS = " \ - yelp-tools-native \ - libxml2-native \ gdk-pixbuf-native \ - iso-codes \ gtk+3 \ gsettings-desktop-schemas \ - gtksourceview4 \ libpeas \ libsoup-2.4 \ gspell \ gtksourceview4 \ + tepl \ " inherit gnomebase gsettings itstool gnome-help gobject-introspection gtk-doc vala gettext features_check upstream-version-is-even mime-xdg REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "4bca1d0a13db186cd84619b4bff42238" -SRC_URI[archive.sha256sum] = "ebf9ef4e19831699d26bb93ce029edfed65416d7c11147835fc370d73428d5c6" - -GTKDOC_MESON_OPTION = "documentation" +SRC_URI[archive.md5sum] = "438217bbbcf92a17c4f259b4a5426b03" +SRC_URI[archive.sha256sum] = "6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197" -PACKAGECONFIG ??= "gvfs" -PACKAGECONFIG[gvfs] = "-Denable-gvfs-metadata=yes,-Denable-gvfs-metadata=no,,gvfs" +GTKDOC_MESON_OPTION = "gtk_doc" PACKAGES += "${PN}-python" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb new file mode 100644 index 0000000000..0414b0c7cf --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gfbgraph/gfbgraph_0.2.4.bb @@ -0,0 +1,22 @@ +SUMMARY = "A GObject library for Facebook Graph API" +SECTION = "x11/gnome" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=5804fe91d3294da4ac47c02b454bbc8a" + +DEPENDS = " \ + glib-2.0 \ + json-glib \ + rest \ + gnome-online-accounts \ +" + +inherit gnomebase gtk-doc gobject-introspection + +SRC_URI[archive.md5sum] = "c38af63e49f8fe8baad99537956b69ba" +SRC_URI[archive.sha256sum] = "6065391f35e7335588cc6b0cc4c1abbce7341488573a654551264cb9793b9379" + +do_install_append() { + # they install all the autotools files (NEWS AUTHORS..) to /usr/doc which + # is not a standard path exactly + rm -rf ${D}${prefix}/doc +} diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.36.0.bb index 2350a7df3c..6a765bd8b6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_3.36.0.bb @@ -8,8 +8,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase allarch gettext upstream-version-is-even allarch -SRC_URI[archive.md5sum] = "f350804df16cdc9ef5306087157cf31b" -SRC_URI[archive.sha256sum] = "c2b7fb6db98c05e205053daaa7f58c7f06ff91b45c4006052af17c578ae7b47f" +SRC_URI[archive.md5sum] = "1330dd3895b0cf054668a7c0db1c8487" +SRC_URI[archive.sha256sum] = "b8cb81e4cf9d085fbb23540635b492d5c124a1f8611c2aa9ac6384111d77bb0b" FILES_${PN} += " \ ${datadir}/backgrounds \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb index b09e34d4c6..c250981c42 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-calculator/gnome-calculator_3.36.0.bb @@ -23,8 +23,8 @@ inherit gnomebase gobject-introspection gnome-help vala gtk-icon-cache gettext f REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "9157b93a3f41fdad80df26c062b95c7b" -SRC_URI[archive.sha256sum] = "4d5348c2fbf01d040a2cb5e84de812c503911e1ea498a83e7eefff52c4417051" +SRC_URI[archive.md5sum] = "71854fb58671b4a88ac990e2f2439e4f" +SRC_URI[archive.sha256sum] = "a2e830f9c9856fad65dad1d6c0ae6abad0f0b496c9984ac005315c5cc4220db3" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch index 7f82a152c7..8170f514ed 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center/0001-Add-meson-option-to-pass-sysroot.patch @@ -26,7 +26,7 @@ index a347168..2cd8121 100644 +option('oe_sysroot', type: 'string', value: '', description: 'Directory for OE-sysroot') option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') option('documentation', type: 'boolean', value: false, description: 'build documentation') - option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') + option('ibus', type: 'boolean', value: true, description: 'build with IBus support') diff --git a/panels/background/meson.build b/panels/background/meson.build index bb34b69..f22722e 100644 --- a/panels/background/meson.build diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb index bf8ec33557..d3673a1fd9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.34.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_3.36.2.bb @@ -30,8 +30,8 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES += "polkit pulseaudio systemd x11" -SRC_URI[archive.md5sum] = "ca92151a2a58cc3e0a73e88379e96ce2" -SRC_URI[archive.sha256sum] = "b30d0afb99252f150e37d5ca4bc83b89bf4aa6d18c5d367230053278634e0c47" +SRC_URI[archive.md5sum] = "45832b7217c8d5fa5e2dbc214972c12d" +SRC_URI[archive.sha256sum] = "e0a5eff0c6d6c22db0c54fd070460de874d367ef3f9072e1559b70f28b847817" SRC_URI += "file://0001-Add-meson-option-to-pass-sysroot.patch" PACKAGECONFIG ??= "ibus ${@bb.utils.filter('DISTRO_FEATURES', 'wayland', d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.5.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb index 63a96c8eea..1f5acd8d04 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.34.5.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop3_3.36.2.bb @@ -14,8 +14,8 @@ inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspecti REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" -SRC_URI[archive.md5sum] = "1cbcb9d9a5159447b9a45079c6157ca5" -SRC_URI[archive.sha256sum] = "ef13203bed721d271227d9928d91937733c312ef79b6f5c00b6c02e8e0b2fa21" +SRC_URI[archive.md5sum] = "9fa17a6e2eacde3f9dd0df6be10091b2" +SRC_URI[archive.sha256sum] = "38f994dcb1e1ae093d1c929c7acc4f88e39111e43b5fdc13125b0f6e2311c789" SRC_URI += " \ file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.36.3.bb index 3da8629c64..6dd9894158 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-flashback/gnome-flashback_3.36.3.bb @@ -12,12 +12,14 @@ DEPENDS += " \ libxkbfile \ polkit \ metacity \ + gdm \ gnome-desktop3 \ gnome-bluetooth \ + gnome-panel \ " -SRC_URI[archive.md5sum] = "251b51bad322c41d34d06fdb8f1799d4" -SRC_URI[archive.sha256sum] = "3be65388cd2c8f39741bcc05da87ef40035183a9a39502d67696242c2aeb469c" +SRC_URI[archive.md5sum] = "690b0d78c7d9265183ef18387b12fa50" +SRC_URI[archive.sha256sum] = "2dba9ea40f2da81c22954a8ccc29f8f1fa4ca8395a6bb552506635832751c1a7" do_install_append() { # no oe-layer has compiz -> remove dead session @@ -25,10 +27,12 @@ do_install_append() { } FILES_${PN} += " \ - ${datadir}/xsessions \ ${datadir}/desktop-directories \ + ${datadir}/gnome-panel \ ${datadir}/gnome-session \ + ${datadir}/xsessions \ + ${libdir}/gnome-panel \ ${systemd_user_unitdir} \ " -RDEPENDS_${PN} += "metacity gnome-panel" +RDEPENDS_${PN} += "metacity" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb index 52c254b288..8f318bb157 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_3.36.0.bb @@ -21,8 +21,8 @@ inherit gnomebase gsettings features_check remove-libtool gettext upstream-versi REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "7c8fd85e46ed4ba1add0288b2ead9aec" -SRC_URI[archive.sha256sum] = "e9cda9542a3e37c61636145e7e9e2513c569092ea8020752a834e1f40ad41943" +SRC_URI[archive.md5sum] = "38f0732845a510a8dff4f154c3406f65" +SRC_URI[archive.sha256sum] = "a264b57a8d1a71fdf0d66e8cd6033d013fb828be279c35766545eb9bb3734f87" SRC_URI += " \ file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ file://musl.patch \ @@ -39,6 +39,7 @@ EXTRA_OECONF = " \ FILES_${PN} += " \ ${datadir}/dbus-1/services \ ${datadir}/p11-kit \ + ${datadir}/xdg-desktop-portal \ ${base_libdir}/security/*${SOLIBSDEV} \ ${libdir}/pkcs11/gnome-keyring-pkcs11.so \ " diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.36.0.bb index 24d6451969..845b314788 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.36.0.bb @@ -12,7 +12,7 @@ REQUIRED_DISTRO_FEATURES = "x11" BPN = "gnome-menus" -SRC_URI[archive.md5sum] = "4262208c13f266d9ada7d356aada9e1b" -SRC_URI[archive.sha256sum] = "c850c64b2074265fe59e099a340b8689cf3dd4658dc9feddd2ab5e95f1a74b74" +SRC_URI[archive.md5sum] = "a8fd71fcf31a87fc799d80396a526829" +SRC_URI[archive.sha256sum] = "d9348f38bde956fc32753b28c1cde19c175bfdbf1f4d5b06003b3aa09153bb1f" FILES_${PN} += "${datadir}/desktop-directories/" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb index 74d71ec81e..c3142ad9f9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-online-accounts/gnome-online-accounts_3.36.0.bb @@ -11,8 +11,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "glib-2.0" -SRC_URI[archive.md5sum] = "aa94d1dd07ca53729a036b5df1c78c05" -SRC_URI[archive.sha256sum] = "4832ca8e48d3a497fc676e7b6f146009ab4206995362977b9805aa39f164783a" +SRC_URI[archive.md5sum] = "44a37e1f8d4cac1dca0c41b57b49c2d0" +SRC_URI[archive.sha256sum] = "1c8f62990833ca41188dbb80c5e99d99b57a62608ca675bbcd37bc2244742f2e" # backend is required for gnome-control-center PACKAGECONFIG = "backend other" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Do-not-try-to-find-ZONEINFO-it-tries-to-run-compiled.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Do-not-try-to-find-ZONEINFO-it-tries-to-run-compiled.patch deleted file mode 100644 index 6ab4daf020..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Do-not-try-to-find-ZONEINFO-it-tries-to-run-compiled.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d4b2f0922dfdd6040e5e9f62a2565452cf855c42 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 21 Oct 2019 22:10:56 +0200 -Subject: [PATCH] Do not try to find ZONEINFO - it tries to run compiled code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Missing configutation does not cause issues: The fallback in modules/clock/system-timezone.c -matches our default. - -Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c75a9fa..0c9d945 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -249,11 +249,6 @@ dnl yelp-tools stuff - - YELP_HELP_INIT - --dnl ************************************************************************** --dnl Find zoneinfo directory --dnl ************************************************************************** -- --AX_ZONEINFO - - dnl ************************************************************************** - dnl Process .in files --- -2.21.0 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.36.1.bb index 4d5fdb65a2..8fe4e1311b 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_3.36.1.bb @@ -17,11 +17,8 @@ DEPENDS += " \ gdm \ " -SRC_URI[archive.md5sum] = "cfd5d3fd548a2afdd8bd3bbdf9646bbd" -SRC_URI[archive.sha256sum] = "a6bc0255252eeb4b964bcbe55fd7908b69f914c062c5ec8dff5ac0262d29b90d" -SRC_URI += " \ - file://0001-Do-not-try-to-find-ZONEINFO-it-tries-to-run-compiled.patch \ -" +SRC_URI[archive.md5sum] = "b6bb185ce1724f4b19699042d90282a6" +SRC_URI[archive.sha256sum] = "1e21b726dd397523ae79d29eb538bcae09e3427e23ccd63f28eb25ef3552abd3" PACKAGECONFIG[eds] = "--enable-eds,--disable-eds,evolution-data-server" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb new file mode 100644 index 0000000000..bb70ae7a89 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-photos/gnome-photos_3.34.2.bb @@ -0,0 +1,36 @@ +SUMMARY = "Access, organize and share your photos on GNOME" +SECTION = "x11/gnome" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464" + +DEPENDS = " \ + glib-2.0-native \ + gdk-pixbuf-native \ + librsvg-native \ + gtk+3 \ + babl \ + gegl \ + geocode-glib \ + gnome-online-accounts \ + grilo \ + gsettings-desktop-schemas \ + libdazzle \ + libgdata \ + gfbgraph \ + tracker \ +" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gettext upstream-version-is-even gnome-help features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[archive.md5sum] = "1dd0d477eac4707e8cfe9f35e26d1f29" +SRC_URI[archive.sha256sum] = "3c59c76ef28618ec055a1799d1040287b90a0b021feb0a02b1eac28e9c2eb41a" + +FILES_${PN} += " \ + ${datadir}/dbus-1 \ + ${datadir}/metainfo \ + ${datadir}/gnome-shell \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.36.0.bb index 15bf489c7a..29a2e1ee2f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-session/gnome-session_3.36.0.bb @@ -22,8 +22,8 @@ inherit gnomebase gettext gsettings upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "x11 polkit systemd pam gobject-introspection-data" -SRC_URI[archive.md5sum] = "38dcdb844a0349cc2fb10998095543e4" -SRC_URI[archive.sha256sum] = "8bb77381650a03ae4be7260751363bd27da93f09bac1ddbc885f4ce44ebaf8e1" +SRC_URI[archive.md5sum] = "cd23e30c4991ca1f477020c67ea3a540" +SRC_URI[archive.sha256sum] = "d54b38b818c812f64b82cc6a1279e3ca5a6e391ee662793322a38cab5670bb7a" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit',d)}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb index 0b6865d293..a9f5274092 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.36.1.bb @@ -28,8 +28,8 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11 polkit pulseaudio systemd gobject-introspection-data" UNKNOWN_CONFIGURE_WHITELIST_append = " introspection" -SRC_URI[archive.md5sum] = "493332fa0f36645188468fed41c0060b" -SRC_URI[archive.sha256sum] = "9fbae67e217e53b99e4f9e7d392c91ffbe31253941c9b136ef09c2d9db7ad7ed" +SRC_URI[archive.md5sum] = "102dc488a6a726e4050cf5ab7e967e8d" +SRC_URI[archive.sha256sum] = "3e33dbd319b562a5ab602dcab6de3ca81b85f8346672e90ec632b36bbf15ee4b" # allow cross build mixed with build of native tools do_write_config_append() { diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb index f30edee68d..ddd11201b1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.32.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_3.36.1.bb @@ -18,8 +18,8 @@ inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check get REQUIRED_DISTRO_FEATURES = "x11 polkit" -SRC_URI[archive.md5sum] = "37356a1b8c20939adc6f47f739d2e49a" -SRC_URI[archive.sha256sum] = "48c131335091bd927862f40ef56400f997981df2acfc82abea662bf91a1ea4f1" +SRC_URI[archive.md5sum] = "b1443ab12c3b7bcca940d28754e5b948" +SRC_URI[archive.sha256sum] = "866b47ab0f4c75b0ec57d6300337a7373463aaad5df95eddfe5354c22be7bca1" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" PACKAGECONFIG[systemd] = "-Dsystemd=true, -Dsystemd=false, systemd" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb index ba9a79d89e..ce54faab2c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.36.2.bb @@ -19,8 +19,8 @@ DEPENDS = " \ libpcre2 \ " -SRC_URI[archive.md5sum] = "13fa9f5f459481c7f05b6964c470ef16" -SRC_URI[archive.sha256sum] = "3bd723f4058ec014da4715db4181b7d73eccc797b85ad5e6236996951c01803d" +SRC_URI[archive.md5sum] = "08150cbf2e23dd4f60f959a6eca8ef0c" +SRC_URI[archive.sha256sum] = "41d1b6a3dc97c066e294acdb7f36931e81668638dcc92ffa25bca3ddebacdf46" SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" EXTRA_OECONF += " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb new file mode 100644 index 0000000000..f715dd23d3 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/graphene/graphene_1.10.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "A thin layer of graphic data types" +HOMEPAGE = "http://ebassi.github.io/graphene/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" + +#DEPENDS = "gtk+3 iso-codes enchant2" + +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gtk-doc + +SRC_URI[archive.md5sum] = "07f72436bc7a85d12f5edd9fcedd0184" +SRC_URI[archive.sha256sum] = "406d97f51dd4ca61e91f84666a00c3e976d3e667cd248b76d92fdb35ce876499" + +GTKDOC_MESON_OPTION = "gtk_doc" + +EXTRA_OEMESON = "-Dinstalled_tests=false" + +FILES_${PN} += "${libdir}/graphene-1.0" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.10.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb index e3fd671728..0338455bcf 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.10.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.12.bb @@ -11,8 +11,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc gettext vala -SRC_URI[archive.md5sum] = "f02bf585d1a48dc65be8b90ae3b08330" -SRC_URI[archive.sha256sum] = "7e44b2e74c31ed24eb97e43265a9e41effe8660287b02295111805c7bda7f1e8" +SRC_URI[archive.md5sum] = "b464ce84db6f9354996a1d47b3c613da" +SRC_URI[archive.sha256sum] = "dbfbd6082103288592af97568180b9cc81a336a274ed5160412f87675ec11a71" GIR_MESON_OPTION = "enable-introspection" GTKDOC_MESON_OPTION = "enable-gtk-doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch deleted file mode 100644 index 6118b679a5..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/0001-test-widget.c-fix-non-literal-format-string-issues.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0781b218beb8ba160ea223ff3d74a4fa2abf86fa Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Apr 2017 16:21:14 -0700 -Subject: [PATCH] test-widget.c: fix non-literal format string issues - -clang errors out when using -Werror=format-nonliteral -since the definition of g_strdup_vprintf() from glib-2.0 -is using va_list and clang seems to still warn where as -gcc doesn't do that for va_list arguments - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/test-widget.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-widget.c b/tests/test-widget.c -index 46f5f4e..3f2e60f 100644 ---- a/tests/test-widget.c -+++ b/tests/test-widget.c -@@ -260,7 +260,7 @@ static const gchar *buffer_ui_description = - - /* File loading code ----------------------------------------------------------------- */ - --static void -+static void G_GNUC_PRINTF (2, 0) - error_dialog (GtkWindow *parent, const gchar *msg, ...) - { - va_list ap; --- -2.12.2 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4 b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4 deleted file mode 100644 index 53518fb2eb..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/acinclude.m4 +++ /dev/null @@ -1,90 +0,0 @@ -## this one is commonly used with AM_PATH_PYTHONDIR ... -dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]]) -dnl Check if a module containing a given symbol is visible to python. -AC_DEFUN(AM_CHECK_PYMOD, -[AC_REQUIRE([AM_PATH_PYTHON]) -py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'` -AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1) -AC_CACHE_VAL(py_cv_mod_$py_mod_var, [ -ifelse([$2],[], [prog=" -import sys -try: - import $1 -except ImportError: - sys.exit(1) -except: - sys.exit(0) -sys.exit(0)"], [prog=" -import $1 -$1.$2"]) -if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC - then - eval "py_cv_mod_$py_mod_var=yes" - else - eval "py_cv_mod_$py_mod_var=no" - fi -]) -py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"` -if test "x$py_val" != xno; then - AC_MSG_RESULT(yes) - ifelse([$3], [],, [$3 -])dnl -else - AC_MSG_RESULT(no) - ifelse([$4], [],, [$4 -])dnl -fi -]) - -dnl a macro to check for ability to create python extensions -dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE]) -dnl function also defines PYTHON_INCLUDES -AC_DEFUN([AM_CHECK_PYTHON_HEADERS], -[AC_REQUIRE([AM_PATH_PYTHON]) -AC_MSG_CHECKING(for headers required to compile python extensions) -dnl deduce PYTHON_INCLUDES -AC_ARG_WITH(python-includes, - [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval) -if test x$py_exec_prefix != x; then -PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}" -else -py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` -PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" -if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" -fi -fi -AC_SUBST(PYTHON_INCLUDES) -dnl check if the headers exist: -save_CPPFLAGS="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" -AC_TRY_CPP([#include <Python.h>],dnl -[AC_MSG_RESULT(found) -$1],dnl -[AC_MSG_RESULT(not found) -$2]) -CPPFLAGS="$save_CPPFLAGS" -]) - -dnl -dnl JH_ADD_CFLAG(FLAG) -dnl checks whether the C compiler supports the given flag, and if so, adds -dnl it to $CFLAGS. If the flag is already present in the list, then the -dnl check is not performed. -AC_DEFUN([JH_ADD_CFLAG], -[ -case " $CFLAGS " in -*@<:@\ \ @:>@$1@<:@\ \ @:>@*) - ;; -*) - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" - AC_MSG_CHECKING([whether [$]CC understands $1]) - AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no]) - AC_MSG_RESULT($jh_has_option) - if test $jh_has_option = no; then - CFLAGS="$save_CFLAGS" - fi - ;; -esac]) diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4 b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4 deleted file mode 100644 index 3ec41666b2..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.m4 +++ /dev/null @@ -1,53 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 1 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - dnl for overriding the documentation installation directory - AC_ARG_WITH(html-dir, - AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST(HTML_DIR) - - dnl enable/disable documentation building - AC_ARG_ENABLE(gtk-doc, - AC_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [default=no]]),, - enable_gtk_doc=no) - - have_gtk_doc=no - if test -z "$PKG_CONFIG"; then - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - fi - if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then - have_gtk_doc=yes - fi - - dnl do we want to do a version check? -ifelse([$1],[],, - [gtk_doc_min_version=$1 - if test "$have_gtk_doc" = yes; then - AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) - if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - have_gtk_doc=no - fi - fi -]) - if test x$enable_gtk_doc = xyes; then - if test "$have_gtk_doc" != yes; then - enable_gtk_doc=no - fi - fi - - AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) - AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") -]) diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make deleted file mode 100644 index 354ffb7c66..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/gtk-doc.make +++ /dev/null @@ -1,173 +0,0 @@ -# -*- mode: makefile -*- - -#################################### -# Everything below here is generic # -#################################### - -if GTK_DOC_USE_LIBTOOL -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -else -GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -endif - -# We set GPATH here; this gives us semantics for GNU make -# which are more like other make's VPATH, when it comes to -# whether a source that is a target of one rule is then -# searched for in VPATH/GPATH. -# -GPATH = $(srcdir) - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE)-sections.txt \ - $(DOC_MODULE)-overrides.txt - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -REPORT_FILES = \ - $(DOC_MODULE)-undocumented.txt \ - $(DOC_MODULE)-undeclared.txt \ - $(DOC_MODULE)-unused.txt - -CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS) - -if ENABLE_GTK_DOC -all-local: html-build.stamp -else -all-local: -endif - -docs: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB) - @echo 'gtk-doc: Scanning header files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt - @echo 'gtk-doc: Rebuilding template files' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -tmpl/*.sgml: - @true - - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files) - @echo 'gtk-doc: Building XML' - @-chmod -R u+w $(srcdir) - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo 'gtk-doc: Building HTML' - @-chmod -R u+w $(srcdir) - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo 'gtk-doc: Fixing cross-references' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp - -############## - -clean-local: - rm -f *~ *.bak - rm -rf .libs - -distclean-local: - cd $(srcdir) && \ - rm -rf xml $(REPORT_FILES) \ - $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf xml html - -install-data-local: - -installfiles=`echo $(srcdir)/html/*`; \ - if test "$$installfiles" = '$(srcdir)/html/*'; \ - then echo '-- Nothing to install' ; \ - else \ - $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \ - for i in $$installfiles; do \ - echo '-- Installing '$$i ; \ - $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ - done; \ - echo '-- Installing $(srcdir)/html/index.sgml' ; \ - $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ - which gtkdoc-rebase >/dev/null && \ - gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ - fi - - -uninstall-local: - rm -f $(DESTDIR)$(TARGET_DIR)/* - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/xml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - cp $(srcdir)/html/* $(distdir)/html - -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/ - -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/ - cd $(distdir) && rm -f $(DISTCLEANFILES) - -gtkdoc-rebase --online --relative --html-dir=$(distdir)/html - -.PHONY : dist-hook-local docs diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch deleted file mode 100644 index f9ae077631..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview2/suppress-string-format-literal-warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix build error with gcc6: -../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c: In function 'strdup_strftime': -../../gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c:1951:3: error: format not a string literal, format string not checked [-Werror=format-nonliteral] - tmplen = strftime (tmpbuf, tmpbufsize, locale_format, tm); - ^~~~~~ - -Patch Reference: -https://git.gnome.org/browse/glib/commit/?id=0817af40e8c74c721c30f6ef482b1f53d12044c7 -https://git.gnome.org/browse/glib/commit/?id=8cdbc7fb2c8c876902e457abe46ee18a0b134486 - -Upstream-Status: Pending -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> - -diff -Nurp gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c ---- gtksourceview-2.10.5.orig/gtksourceview/gtksourceprintcompositor.c 2016-07-01 13:11:43.631173762 +0800 -+++ gtksourceview-2.10.5/gtksourceview/gtksourceprintcompositor.c 2016-07-04 13:54:18.223726343 +0800 -@@ -1913,6 +1913,8 @@ setup_pango_layouts (GtkSourcePrintCompo - * GLIB - Library of useful routines for C programming - * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald */ - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat-nonliteral" - static gchar * - strdup_strftime (const gchar *format, const struct tm *tm) - { -@@ -1982,6 +1984,7 @@ strdup_strftime (const gchar *format, co - - return convbuf; - } -+#pragma GCC diagnostic pop - - static gchar * - evaluate_format_string (GtkSourcePrintCompositor *compositor, diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.0.bb index bb49550c5b..bc7f4b05e9 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.4.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gtksourceview/gtksourceview4_4.6.0.bb @@ -16,9 +16,9 @@ inherit gnomebase lib_package gettext features_check gtk-doc gobject-introspecti REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.4/${PNAME}-${PV}.tar.xz" -SRC_URI[md5sum] = "5c47e314517692f2622a0b724c65e628" -SRC_URI[sha256sum] = "9ddb914aef70a29a66acd93b4f762d5681202e44094d2d6370e51c9e389e689a" +SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtksourceview/4.6/${PNAME}-${PV}.tar.xz" +SRC_URI[md5sum] = "51558b386cd12602b7bb1c460c09bc62" +SRC_URI[sha256sum] = "4c13e30ab2e602abdc56f55d35f43c1142a79b1cd77aa8839d2fc85e966d9a85" GIR_MESON_OPTION = 'gir' GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb index f04246f168..ec0ac2b296 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.42.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.44.1.bb @@ -9,8 +9,8 @@ DEPENDS += "libsecret glib-2.0 glib-2.0-native libgudev shadow-native \ gsettings-desktop-schemas dbus" SRC_URI = "https://download.gnome.org/sources/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.xz;name=archive" -SRC_URI[archive.md5sum] = "8dea2f6a3f327a814a347758d4350e4b" -SRC_URI[archive.sha256sum] = "b57af97573bd295aa50037eed29c6ba7a36188230c515e007c3018855a5cf949" +SRC_URI[archive.md5sum] = "72383474f52d05c21ef2be96d0b91974" +SRC_URI[archive.sha256sum] = "50ef3245d1b03666a40455109169a2a1bd51419fd2d51f9fa6cfd4f89f04fb46" # depends on gsettings-desktop-schemas->gcr->gtk+3-> x11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb index 25bc202ae8..9ce8bb8e95 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgdata/libgdata_0.17.12.bb @@ -21,7 +21,8 @@ do_compile_prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gdata/.libs" } -PACKAGECONFIG ??= "" +# goa is required for gnome-photos +PACKAGECONFIG ??= "goa gtk" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false" PACKAGECONFIG[goa] = "-Dgoa=enabled,-Dgoa=disabled,gnome-online-accounts" PACKAGECONFIG[gtk] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb deleted file mode 100644 index 2a2db9c194..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgnome/libgnomekbd_3.26.1.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "GNOME keyboard library" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=6e29c688d912da12b66b73e32b03d812" - -SECTION = "x11/gnome/libs" - -DEPENDS = "glib-2.0 gtk+3 libxklavier" - -inherit features_check gnomebase gobject-introspection gsettings gettext - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "98040022484406e7ebe25f82cef93344" -SRC_URI[archive.sha256sum] = "f7ca02631576e9b88aee1b1bae37ac1488b80ee7975f20a97f29e761a7172679" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.0.bb index d72b6ce247..914010b21c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgweather/libgweather_3.36.0.bb @@ -7,8 +7,8 @@ GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext gtk-doc vala features_check upstream-version-is-even -SRC_URI[archive.md5sum] = "52c3b1e27887fc88f862c92c42d930c1" -SRC_URI[archive.sha256sum] = "02245395d639d9749fe2d19b7e66b64a152b9509ab0e5aad92514538b9c6f1b9" +SRC_URI[archive.md5sum] = "32e43c6b35bec88a5549ab62c71913cb" +SRC_URI[archive.sha256sum] = "d2ffeec01788d03d1bbf35113fc2f054c6c3600721088f827bcc31e5c603a32d" # gobject-introspection is mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb index d88161a3d8..8bca93f6d1 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.32.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libwnck/libwnck3_3.36.0.bb @@ -17,8 +17,8 @@ GIR_MESON_DISABLE_FLAG = 'disabled' inherit gnomebase gobject-introspection gtk-doc gettext features_check -SRC_URI[archive.md5sum] = "89dbe5a1843fd3745b8b64b34a2ef55d" -SRC_URI[archive.sha256sum] = "9595835cf28d0fc6af5526a18f77f2fcf3ca8c09e36741bb33915b6e69b8e3ca" +SRC_URI[archive.md5sum] = "00bb40dc6fab76af0da33e88a34b6378" +SRC_URI[archive.sha256sum] = "bc508150b3ed5d22354b0e6774ad4eee465381ebc0ace45eb0e2d3a4186c925f" # libxres means x11 only REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.36.1.bb index d8c8b53896..0cb59cdc9a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/metacity/metacity_3.36.1.bb @@ -21,8 +21,8 @@ REQUIRED_DISTRO_FEATURES = "x11" inherit gnomebase gsettings gettext upstream-version-is-even features_check -SRC_URI[archive.md5sum] = "c0c10204e4d6d024cb413042c1de316b" -SRC_URI[archive.sha256sum] = "31c7d1045c390afb3bf405735b0b26c459197cbf43af37c469eb8918ce3a453d" +SRC_URI[archive.md5sum] = "d1171705829bbebd42ac08ec49a9a90a" +SRC_URI[archive.sha256sum] = "11f07693e2b266840759063a4bc807346070e8e7fec8f53cd0757f6662c1b323" SRC_URI += "file://0001-drop-zenity-detection.patch" PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,libxinerama" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.34.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb index e7541664a3..fc9ab379d8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.34.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/nautilus/nautilus_3.36.3.bb @@ -17,8 +17,8 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gtk-doc gettext features_check upstream-version-is-even mime-xdg -SRC_URI[archive.md5sum] = "769053f14bb993605a2b60085c47b4cd" -SRC_URI[archive.sha256sum] = "02d984b794f3a34a7aa66bf5c70cc2a7780de55bd900504fb1014931781db36d" +SRC_URI[archive.md5sum] = "c3c8dbb90d8eeed6c127aa568e131395" +SRC_URI[archive.sha256sum] = "b6cafc7ab1e70a64383de391b6097fcccbf36b208f8502d8c46423224fd30ef8" REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch index 75aa86cdbf..75aa86cdbf 100644 --- a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch diff --git a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch index 2354892265..9db111e8ec 100644 --- a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch @@ -19,7 +19,7 @@ index 3449961..3c2d186 100644 --- a/src/libsysprof/meson.build +++ b/src/libsysprof/meson.build @@ -84,7 +84,7 @@ libsysprof_deps = [ - polkit_dep, + librax_dep, ] -if host_machine.system() == 'linux' diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch new file mode 100644 index 0000000000..d8fffbb7e9 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch @@ -0,0 +1,31 @@ +From 5dea152c7728f5a37370ad8a229115833e36b4f6 Mon Sep 17 00:00:00 2001 +From: Rasmus Thomsen <oss@cogitri.dev> +Date: Sat, 7 Mar 2020 10:44:16 +0100 +Subject: [PATCH] tests: use G_GSIZE_FORMAT instead of G_GUINT64_FORMAT for + gsize + +This fixes the build on 32-bit platforms with -Werror-format + +fixes #32 + +Upstream-Status: Applied[https://gitlab.gnome.org/GNOME/sysprof/-/commit/5dea152c7728f5a37370ad8a229115833e36b4f6] +--- + src/tests/allocs-by-size.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/tests/allocs-by-size.c b/src/tests/allocs-by-size.c +index 666113a..6260d4b 100644 +--- a/src/tests/allocs-by-size.c ++++ b/src/tests/allocs-by-size.c +@@ -109,7 +109,7 @@ allocs_by_size (SysprofCaptureReader *reader) + { + const Item *item = &g_array_index (ar, Item, i); + +- g_print ("%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT",%"G_GUINT64_FORMAT"\n", ++ g_print ("%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT",%"G_GSIZE_FORMAT"\n", + item->size, item->cmp, item->count); + } + } +-- +2.21.3 + diff --git a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb index ad69ab68c3..a769dbf7da 100644 --- a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/sysprof_3.34.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.36.0.bb @@ -5,24 +5,29 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ file://src/sysprof/sysprof-application.c;endline=17;md5=a3de8df3b0f8876dd01e1388d2d4b607" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext systemd upstream-version-is-even gsettings mime mime-xdg - -DEPENDS += "glib-2.0 libxml2-native glib-2.0-native" - -SRC_URI[archive.md5sum] = "cc32455277b31afb1965d627ae3e3629" -SRC_URI[archive.sha256sum] = "844bbb8d8b65071b3bca96f8e921319ceef81f2d2c51fcc9da63a4b355c893d0" -SRC_URI += "file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ - file://0001-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch \ - file://0001-libsysprof-ui-Rename-environ-to-sys_environ.patch \ - " +inherit gnomebase gnome-help gettext systemd upstream-version-is-even gsettings mime mime-xdg + +DEPENDS += " \ + glib-2.0-native \ + yelp-tools-native \ + libxml2-native \ + glib-2.0 \ +" + +SRC_URI[archive.md5sum] = "3956e82b8744715006dde59e0ce8910b" +SRC_URI[archive.sha256sum] = "8670db4dacf7b219d30c575c465b17c8ed6724dbade347f2cde9548bff039108" +SRC_URI += " \ + file://0001-sysprof-Define-NT_GNU_BUILD_ID-if-undefined.patch \ + file://0002-meson.build-do-not-hardcode-linux-as-host_machine-.s.patch \ + file://0003-tests-use-G_GSIZE_FORMAT-instead-of-G_GUINT64_FORMAT.patch \ +" PACKAGECONFIG ?= "sysprofd libsysprof ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)}" PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" -# Enablig this requries yelp -EXTRA_OEMESON += "-Dhelp=false -Dsystemdunitdir=${systemd_unitdir}/system" +EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system" SOLIBS = ".so" FILES_SOLIBSDEV = "" @@ -30,8 +35,8 @@ FILES_SOLIBSDEV = "" SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'sysprofd', 'sysprof2.service sysprof3.service', '', d)}" FILES_${PN} += " \ - ${datadir}/dbus-1/system-services \ - ${datadir}/dbus-1/system.d \ - ${datadir}/dbus-1/interfaces \ - ${datadir}/metainfo \ - " + ${datadir}/dbus-1/system-services \ + ${datadir}/dbus-1/system.d \ + ${datadir}/dbus-1/interfaces \ + ${datadir}/metainfo \ +" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb new file mode 100644 index 0000000000..4120c6260a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/tepl/tepl_4.4.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "Tepl library eases the development of GtkSourceView-based projects" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = " \ + glib-2.0-native \ + gtk+3 \ + gtksourceview4 \ + amtk \ + libxml2 \ + uchardet \ +" + +inherit gnomebase gobject-introspection gettext + +SRC_URI[archive.md5sum] = "013ee8aae178f75cc74e05fac70786b3" +SRC_URI[archive.sha256sum] = "e6f6673a8a27e8f280725db8fbacec79b20676ae0558755239d15a9808faa256" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb index 38947d1bea..6b9d769b78 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.34.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp-xsl_3.36.0.bb @@ -10,8 +10,8 @@ inherit gnomebase gettext itstool DEPENDS += "libxml2" -SRC_URI[archive.md5sum] = "b9c1c53a9114b42054789f212ab37f59" -SRC_URI[archive.sha256sum] = "0c3fe6146113df26fb1295901b1c7baed9f0fe67a87f4345e11543aefe7cb7ad" +SRC_URI[archive.md5sum] = "7d71af68fff4a92bcb2b8989f126be6c" +SRC_URI[archive.sha256sum] = "4fe51c0233b79a4c204c68498d45f09b342c30ed02c4e418506c0e35f0904ec3" RDEPENDS_${PN}_append_class-target = " libxml2 itstool" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb index f0106166fe..b9263f50cd 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.34.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_3.36.0.bb @@ -9,8 +9,8 @@ inherit gnomebase itstool autotools-brokensep gsettings gettext gtk-doc features # for webkitgtk REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[archive.md5sum] = "776e29bd16424c8712cbf340cfe6429b" -SRC_URI[archive.sha256sum] = "e3d6527c5963d73206891b32f1f23363164be57de248555513bd0be77a7bd045" +SRC_URI[archive.md5sum] = "32f879293f79b4042edc46aa13d82c71" +SRC_URI[archive.sha256sum] = "fd4b3e23d31ad2bebe42ac8f80242b2d9bef51418bf62b59acdf2440bd94ed24" DEPENDS += " \ libxml2-native \ diff --git a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch b/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch deleted file mode 100644 index 1e2b3c92b4..0000000000 --- a/meta-openembedded/meta-gnome/recipes-kernel/sysprof/files/0001-libsysprof-ui-Rename-environ-to-sys_environ.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4bd0d5d5dd6841fbac8385527617d18e7731244d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 15 Jan 2020 13:17:58 -0800 -Subject: [PATCH] libsysprof-ui: Rename environ to sys_environ - -This helps avoid namesapace conflict with glibc headers - -Fixes -/usr/include/unistd.h:545:15: note: previous declaration is here - -extern char **environ; - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/libsysprof-ui/sysprof-profiler-assistant.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/libsysprof-ui/sysprof-profiler-assistant.c b/src/libsysprof-ui/sysprof-profiler-assistant.c -index 22e3e24..c55d551 100644 ---- a/src/libsysprof-ui/sysprof-profiler-assistant.c -+++ b/src/libsysprof-ui/sysprof-profiler-assistant.c -@@ -235,7 +235,7 @@ sysprof_profiler_assistant_record_clicked_cb (SysprofProfilerAssistant *self, - { - g_auto(GStrv) argv = NULL; - g_auto(GStrv) env = NULL; -- SysprofEnviron *environ; -+ SysprofEnviron *sys_environ; - const gchar *command; - gint argc; - -@@ -245,8 +245,8 @@ sysprof_profiler_assistant_record_clicked_cb (SysprofProfilerAssistant *self, - sysprof_profiler_set_spawn (profiler, TRUE); - sysprof_profiler_set_spawn_argv (profiler, (const gchar * const *)argv); - -- environ = sysprof_environ_editor_get_environ (self->environ_editor); -- env = sysprof_environ_get_environ (environ); -+ sys_environ = sysprof_environ_editor_get_environ (self->environ_editor); -+ env = sysprof_environ_get_environ (sys_environ); - sysprof_profiler_set_spawn_env (profiler, (const gchar * const *)env); - - sysprof_profiler_set_spawn_inherit_environ (profiler, -@@ -405,7 +405,7 @@ sysprof_profiler_assistant_class_init (SysprofProfilerAssistantClass *klass) - static void - sysprof_profiler_assistant_init (SysprofProfilerAssistant *self) - { -- g_autoptr(SysprofEnviron) environ = sysprof_environ_new (); -+ g_autoptr(SysprofEnviron) sys_environ = sysprof_environ_new (); - - gtk_widget_init_template (GTK_WIDGET (self)); - -@@ -445,7 +445,7 @@ sysprof_profiler_assistant_init (SysprofProfilerAssistant *self) - self, - G_CONNECT_SWAPPED); - -- sysprof_environ_editor_set_environ (self->environ_editor, environ); -+ sysprof_environ_editor_set_environ (self->environ_editor, sys_environ); - } - - void --- -2.25.0 - diff --git a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb index 0b900f0e73..934101f9ba 100644 --- a/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb +++ b/meta-openembedded/meta-gnome/recipes-support/packagegroups/packagegroup-gnome-apps.bb @@ -14,6 +14,7 @@ RDEPENDS_${PN} = " \ ghex \ gnome-calculator \ gnome-font-viewer \ + gnome-photos \ gnome-terminal \ libwnck3 \ nautilus \ |