From e0acd72b35aeca7219e4658e6022292e949ca507 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 14:27:10 +0600 Subject: [PATCH 01/13] gedit: update to 3.36.2. --- srcpkgs/gedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index 4e273aaf182..e3ebea05ea7 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,6 +1,6 @@ # Template file for 'gedit' pkgname=gedit -version=3.36.1 +version=3.36.2 revision=1 build_helper="gir" build_style=meson @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Gedit" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6dc38eda227d1c368e039e9bff485d0bee9a49d5f9560c387ee08f5818a4e387 +checksum=6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197 shlib_provides="libgedit-3.36.so" python_version=3 From 04749c364b87c06d3ebb2295e7915d35f9d4605d Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 12:20:15 +0600 Subject: [PATCH 02/13] nautilus: update to 3.36.2. --- srcpkgs/nautilus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index 537a851973f..1010873f4f0 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=3.36.1.1 +version=3.36.2 revision=1 build_style=meson build_helper="gir" @@ -16,8 +16,8 @@ short_desc="GNOME file manager" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" -distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz" -checksum=f9252f508211d9f368a49db697890f895d080f09590aecaf33803a519def7bde +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=26673c9599502452cf299358729be8b554066a9b670d89b24e245160d15776fa build_options="gir" build_options_default="gir" From ea2c77c479e17f252875bbb0f3da1f1b983af30d Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 12:26:04 +0600 Subject: [PATCH 03/13] gnome-2048: update to 3.36.2. --- srcpkgs/gnome-2048/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-2048/template b/srcpkgs/gnome-2048/template index b59ccf6de46..989b6ff125b 100644 --- a/srcpkgs/gnome-2048/template +++ b/srcpkgs/gnome-2048/template @@ -1,6 +1,6 @@ # Template file for 'gnome-2048' pkgname=gnome-2048 -version=3.36.0 +version=3.36.2 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/2048" distfiles="${GNOME_SITE}/gnome-2048/${version%.*}/gnome-2048-${version}.tar.xz" -checksum=1b790f145d0bd67a5339c16a70674807344ed11831e8c0245ed31956b4b38281 +checksum=29da7499c89ee74f9834e8de2b85633239a66e5c53d956a8e95a987bdb4b3321 From 7457c7b528c01e5aee07b3e36468549a0a65998f Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 12:43:02 +0600 Subject: [PATCH 04/13] gnome-music: update to 3.36.2. --- srcpkgs/gnome-music/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index 12511736407..802bcea891f 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,6 +1,6 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=3.36.1 +version=3.36.2 revision=1 build_helper="gir" build_style=meson @@ -15,5 +15,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Music" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7b80f630d158334935a8760296550cc91b50d604fa68b402fe5165b1531ec332 +checksum=abad413aebfa8f8141abc7164809e8c4677f8b6538f892128193e097e0e982a5 lib32disabled=yes From a1b2e672cf7b293db406aa2b0e00ba5c4f460254 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 13:02:47 +0600 Subject: [PATCH 05/13] devhelp: update to 3.36.2. --- srcpkgs/devhelp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index a1c2dcbb762..ba75dffdce7 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -1,6 +1,6 @@ # Template file for 'devhelp' pkgname=devhelp -version=3.36.1 +version=3.36.2 revision=1 build_helper="gir" build_style=meson @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Devhelp" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4cf8ec9302bc4a79e01ac53bd9c8b95a596f71f35351f48b63263227f09a8a3d +checksum=8b5a84319efbb2ef1bc4022ee3ed2d6678794eba2dfa993e50e03d6e7b930c5e devhelp-devel_package() { short_desc+=" - development files" From e5463961a77f348e6e0df849410d050acc342bf5 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 13:17:42 +0600 Subject: [PATCH 06/13] eog: update to 3.36.2. --- srcpkgs/eog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index f5340000eb5..276399ca2cc 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,6 +1,6 @@ # Template file for 'eog' pkgname=eog -version=3.36.1 +version=3.36.2 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=e454a1a7aa5e3a3321eab0116778110e5a7a7b63bcf21676eda1a7be187c9c95 +checksum=5c056b0295a8e06d093b8fc60b10e2a8c19abdb7beae1c7e7e0595ece2e1b78c shlib_provides="libeog.so" lib32disabled=yes From a5150f36b688d6d06ff89a98393cd4dddb8d8eb8 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 13:30:56 +0600 Subject: [PATCH 07/13] gnome-maps: update to 3.36.2. --- srcpkgs/gnome-maps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 0300be60599..9fdd27db3bd 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=3.36.1 +version=3.36.2 revision=1 build_style=meson hostmakedepends="glib-devel gobject-introspection intltool pkg-config AppStream" @@ -12,5 +12,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1a32efd96ad898f77a636d2d0463d757009b4b812259c89ffdcb91d6afc052f9 +checksum=5ba219b9de98678cefa5848f6538db8dbd07f6c747fd43a99167a266878a9784 nocross="evolution-dataserver cross gir doesn't work" From 7d5413a1560ee12378bf927d4e2a842543d20ac7 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 15:02:14 +0600 Subject: [PATCH 08/13] gnome-contacts: update to 3.36.1. --- srcpkgs/gnome-contacts/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 5595ef8ce06..4931f6754ce 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,10 +1,10 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.34.0 -revision=2 +version=3.36.1 +revision=1 wrksrc="gnome-contacts-${version%.*}" build_style=meson -hostmakedepends="docbook-xsl glib-devel libxslt pkg-config vala" +hostmakedepends="gettext docbook-xsl glib-devel libxslt pkg-config vala" makedepends="cheese-devel folks-devel geocode-glib-devel gnome-desktop-devel libchamplain-devel libnotify-devel vala-devel libhandy-devel" depends="desktop-file-utils" @@ -13,4 +13,8 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Contacts" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version%.*}.tar.xz" -checksum=99602ec8d660c1f3c92cae6356f64f72fb6db58e55bce27a599330bf7b622f12 +checksum=eecbd2209d93c8d31df92f6ccf79183b456c6e07a28ae0155cbda18aabd36f7b + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" folks-devel" +fi From d50ee99633814ebd76ac206c31697021e8711efb Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 15:29:30 +0600 Subject: [PATCH 09/13] gnome-epub-thumbnailer: update to 1.6. --- srcpkgs/gnome-epub-thumbnailer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-epub-thumbnailer/template b/srcpkgs/gnome-epub-thumbnailer/template index b16e705475f..d67b77f1e43 100644 --- a/srcpkgs/gnome-epub-thumbnailer/template +++ b/srcpkgs/gnome-epub-thumbnailer/template @@ -1,13 +1,13 @@ # Template file for 'gnome-epub-thumbnailer' pkgname=gnome-epub-thumbnailer -version=1.5 +version=1.6 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gdk-pixbuf-devel libarchive-devel libxml2-devel" short_desc="Thumbnailer for EPub and MOBI books" maintainer="Alif Rachmawadi " -license="GPL-3" +license="GPL-2.0-or-later" homepage="https://git.gnome.org/browse/gnome-epub-thumbnailer" distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=308210f5800219f64cae4828e59bb8e6e4c53b888048cf487221aeb4337d791a +checksum=b502420d9b02ea0b0fc7986ef5a091a12b2286be14fed9e47594fe9fa0c5898e From f69b97dc7e89a29c72a3e4e1d6ab63c4aa31ee60 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 15:43:04 +0600 Subject: [PATCH 10/13] quadrapassel: update to 3.36.02. --- srcpkgs/quadrapassel/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/quadrapassel/template b/srcpkgs/quadrapassel/template index f3a3d017fc6..69fd822dad2 100644 --- a/srcpkgs/quadrapassel/template +++ b/srcpkgs/quadrapassel/template @@ -1,6 +1,6 @@ # Template file for 'quadrapassel' pkgname=quadrapassel -version=3.36.00 +version=3.36.02 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" @@ -11,4 +11,4 @@ maintainer="Jürgen Buchmüller " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Quadrapassel" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=eff43749fe2472e4f8eba84dc9a609413f23b53b4af67d88ac5985736fe869f6 +checksum=8bc65a6bf83094deb8792b656c95adde484e12d3ce35cf09f42ce67ee3bf0031 From 5a94e148ed295e7d70a0e40e9dfbd78a486add52 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 16:12:06 +0600 Subject: [PATCH 11/13] vte3: update to 0.60.2. --- srcpkgs/vte3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 2ab15918d3b..85f4d2db9cd 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template file for 'vte3' pkgname=vte3 -version=0.60.1 +version=0.60.2 revision=1 wrksrc="vte-${version}" build_style=meson @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Terminal/VTE" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=5e25807233f8a7e15204be7ff694bbcf6facbb0136092b5ba12584a7b70cf0c4 +checksum=35a0280e3f12feeb3096da05699191373c47a4a20c55cb7081e828e6015f8ca5 # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" From 7292d96f713a69096d70f21ad65942aa2663a7df Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 16:23:46 +0600 Subject: [PATCH 12/13] gnome-terminal: update to 3.36.2. --- srcpkgs/gnome-terminal/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index bf3d5bcdd42..22dbc11bada 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.36.1.1 +version=3.36.2 revision=1 build_style=gnu-configure configure_args="--disable-static --with-nautilus-extension" @@ -13,8 +13,8 @@ short_desc="GNOME terminal emulator application" maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.3-only" homepage="https://wiki.gnome.org/Apps/Terminal" -distfiles="${GNOME_SITE}/${pkgname}/${version:0:4}/${pkgname}-${version}.tar.xz" -checksum=f3d708a1e76d77c1c85b126f6e003220a15d4a46a50fd8070e1a3aabe678a376 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=41d1b6a3dc97c066e294acdb7f36931e81668638dcc92ffa25bca3ddebacdf46 lib32disabled=yes if [ "$CROSS_BUILD" ]; then From f021ad5191d53bee664b58c8cce3fc24a3eeab92 Mon Sep 17 00:00:00 2001 From: Nafis Date: Tue, 28 Apr 2020 18:18:00 +0600 Subject: [PATCH 13/13] gnome-podcasts: update to 0.4.7. --- .../gnome-podcasts/patches/fix-build.patch | 21 ---------------- srcpkgs/gnome-podcasts/template | 24 ++++++++++--------- 2 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/gnome-podcasts/patches/fix-build.patch diff --git a/srcpkgs/gnome-podcasts/patches/fix-build.patch b/srcpkgs/gnome-podcasts/patches/fix-build.patch deleted file mode 100644 index aeb9581bd79..00000000000 --- a/srcpkgs/gnome-podcasts/patches/fix-build.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- podcasts-gtk/src/widgets/episode.rs.orig 2019-06-09 15:54:59.793451047 +0200 -+++ podcasts-gtk/src/widgets/episode.rs 2019-06-09 15:55:19.191311512 +0200 -@@ -559,7 +559,7 @@ - .total_size - .get_text() - .as_ref() -- .map(|s| s.trim_right_matches(" MB")) -+ .map(|s| s.trim_end_matches(" MB")) - .and_then(|s| s.parse::().ok()) - .is_none() - { ---- podcasts-gtk/src/widgets/shows_view.rs.orig 2019-06-09 15:54:00.320878867 +0200 -+++ podcasts-gtk/src/widgets/shows_view.rs 2019-06-09 15:54:13.151786563 +0200 -@@ -80,7 +80,6 @@ - } - - fn on_child_activate(child: >k::FlowBoxChild, sender: &Sender) -> Result<(), Error> { -- use gtk::WidgetExt; - - // This is such an ugly hack... - let id = WidgetExt::get_name(child) diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template index 72e2db6b109..3c239df8424 100644 --- a/srcpkgs/gnome-podcasts/template +++ b/srcpkgs/gnome-podcasts/template @@ -1,26 +1,28 @@ # Template file for 'gnome-podcasts' pkgname=gnome-podcasts -version=0.4.6 -revision=3 +version=0.4.7 +revision=1 wrksrc="podcasts-${version}" build_style=meson -hostmakedepends="cargo gettext-devel glib-devel pkg-config" +build_helper="rust" +hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel" makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel - gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo" + gtk+3-devel libhandy-devel libressl-devel sqlite-devel rust-std" short_desc="Listen to your favorite podcasts" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Podcasts" distfiles="https://gitlab.gnome.org/World/podcasts/-/archive/${version}/podcasts-${version}.tar.gz" -checksum=953c63e8184ca1f748418d8a8262d40eaa41047f81e2d2c874a3035d9d9d0e4a -nocross="rustc cant be crosscompiled as of now" -broken="gettext-rs hash does not exists, if fixed build fails in gio 0.5.0" +checksum=a9a1b62dd3567e3cca38ee29df2fadd82e2fb5e837b0a2a26ecac74e9305161c export GETTEXT_BIN_DIR=/usr/bin export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext" export GETTEXT_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" -pre_build() { - cargo update --package openssl-sys --precise 0.9.46 - cargo update --package openssl --precise 0.10.22 -} +if [ "$CROSS_BUILD" ]; then + post_patch() { + vsed -i scripts/cargo.sh \ + -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \ + -e '/CARGO_HOME/d' + } +fi