From 39522f900b31bb6a078d516d8b508f368520745b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:09:02 +0100 Subject: [PATCH 01/25] granite: update to 6.2.0. --- common/shlibs | 2 +- srcpkgs/granite/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index f26b9bab58fd..a78630b0eb09 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1190,7 +1190,7 @@ libconfig.so.11 libconfig-1.7.1_1 libopusfile.so.0 opusfile-0.12_2 libopusurl.so.0 opusfile-0.12_2 libopusenc.so.0 libopusenc-0.2_1 -libgranite.so.5 granite-0.5.0_1 +libgranite.so.6 granite-6.2.0_1 libprotobuf-vala.so.0 libprotobuf-vala-0.1.0_1 librlog.so.5 librlog-1.4_1 libtinyxml.so.0 tinyxml-2.6.2_1 diff --git a/srcpkgs/granite/template b/srcpkgs/granite/template index 2ae77d6ee66c..f3a53c4165bb 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -1,10 +1,10 @@ # Template file for 'granite' pkgname=granite -version=5.5.0 +version=6.2.0 revision=1 build_style=meson build_helper="gir" -hostmakedepends="pkg-config vala" +hostmakedepends="pkg-config gettext vala" makedepends="gtk+3-devel libgee08-devel" depends="hicolor-icon-theme" short_desc="GTK3 widget library for elementary OS" @@ -12,7 +12,7 @@ maintainer="Cameron Nemo " license="LGPL-3.0-or-later" homepage="https://github.com/elementary/granite" distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz" -checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557 +checksum=067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5 granite-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 9676d0314763b772e63f957b085cacbee64b2df4 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:02 +0100 Subject: [PATCH 02/25] Minder: revbump for granite 6, build translations --- srcpkgs/Minder/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template index da4f9b751c20..8ee716a6f9f3 100644 --- a/srcpkgs/Minder/template +++ b/srcpkgs/Minder/template @@ -1,9 +1,9 @@ # Template file for 'Minder' pkgname=Minder version=1.14.0 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config glib-devel vala" +hostmakedepends="pkg-config gettext glib-devel vala" makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel libarchive-devel discount-devel gtksourceview4-devel libhandy1-devel json-glib-devel" short_desc="Mind-mapping application designed for Pantheon" From a194b7200e8f658f58a8f7ea58cbe50a0a11a88c Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:02 +0100 Subject: [PATCH 03/25] bookworm: revbump for granite 6, build translations --- srcpkgs/bookworm/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template index 3e319fb786d9..0205a6e62427 100644 --- a/srcpkgs/bookworm/template +++ b/srcpkgs/bookworm/template @@ -1,9 +1,9 @@ # Template file for 'bookworm' pkgname=bookworm version=1.1.2 -revision=4 +revision=5 build_style=meson -hostmakedepends="pkg-config glib-devel vala" +hostmakedepends="pkg-config glib-devel gettext vala" makedepends="gtk+3-devel libgee08-devel granite-devel webkit2gtk-devel sqlite-devel poppler-glib-devel libxml2-devel glib-devel libsoup-devel" From 4381be1ec3d3aa539c033334c4a3592d17e1c477 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:04 +0100 Subject: [PATCH 04/25] notes-up: update to 2.0.6. --- srcpkgs/notes-up/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template index 481a214cfbc2..55db14d47b32 100644 --- a/srcpkgs/notes-up/template +++ b/srcpkgs/notes-up/template @@ -1,6 +1,6 @@ # Template file for 'notes-up' pkgname=notes-up -version=2.0.5 +version=2.0.6 revision=1 wrksrc=Notes-up-${version} build_style=meson @@ -13,7 +13,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, BSD-3-Clause" homepage="https://github.com/Philip-Scott/Notes-up" distfiles="https://github.com/Philip-Scott/Notes-up/archive/${version}.tar.gz" -checksum=56ddf5ab3468c3bbb806106c41b485b020ade3c7f48d271bda1e78ddce5e1664 +checksum=6e7b6ac4a3a917867a1555db0a6e03e40ccd9955b5d76e980a26fa8e40744f07 post_install() { ln -s com.github.philip_scott.notes-up ${DESTDIR}/usr/bin/notes-up From daddfe39aa6ed561dbfce5994955d7233acb88f9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:04 +0100 Subject: [PATCH 05/25] nutty: revbump for granite 6, build translations --- srcpkgs/nutty/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template index 37396577835b..eb263a89af4d 100644 --- a/srcpkgs/nutty/template +++ b/srcpkgs/nutty/template @@ -1,18 +1,18 @@ # Template file for 'nutty' pkgname=nutty version=1.1.1 -revision=1 +revision=2 build_style=meson -hostmakedepends="pkg-config vala glib-devel" +hostmakedepends="pkg-config gettext vala glib-devel" makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel sqlite-devel" short_desc="Network Utility" maintainer="linarcx " license="GPL-3.0-or-later" homepage="https://github.com/babluboy/nutty" -distfiles="${homepage}/archive/${version}.tar.gz" +distfiles="https://github.com/babluboy/nutty/archive/${version}.tar.gz" checksum=b6c9ef1966d1c60480943313f20cd66ee1b5d23ac8d6578f457fb99f0898d9ba -python_version=2 #unverified +python_version=2 post_install() { vinstall data/com.github.babluboy.nutty.desktop 644 usr/share/applications From 0eb04b3d196399c62c13ee44f85d612ad84edd20 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:04 +0100 Subject: [PATCH 06/25] pantheon-agent-polkit: update to 1.0.0. --- srcpkgs/pantheon-agent-polkit/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template index c2ae95b313e4..4285532c67b5 100644 --- a/srcpkgs/pantheon-agent-polkit/template +++ b/srcpkgs/pantheon-agent-polkit/template @@ -1,13 +1,13 @@ # Template file for 'pantheon-agent-polkit' pkgname=pantheon-agent-polkit version=1.0.0 -revision=1 +revision=2 build_style=meson -hostmakedepends="intltool pkg-config vala gobject-introspection" +hostmakedepends="gettext pkg-config vala gobject-introspection" makedepends="gtk+3-devel polkit-devel granite-devel" short_desc="Pantheon Polkit Agent" maintainer="Orphaned " license="LGPL-3.0-or-later" -homepage="https://github.com/elementary/${pkgname}" -distfiles="${homepage}/archive/${version}.tar.gz" +homepage="https://github.com/elementary/pantheon-agent-polkit" +distfiles="https://github.com/elementary/pantheon-agent-polkit/archive/${version}.tar.gz" checksum=8e730f335545a4ca2717e1c9ccad61c329c1f19ea51f76ae4783da9e0416d484 From cb404f6b1db5f3cf2316f0b62422921229b56a97 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 07/25] pantheon-screenshot: update to 6.0.2. --- srcpkgs/pantheon-screenshot/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template index 3492b0c0d49e..fb2ee8e7b095 100644 --- a/srcpkgs/pantheon-screenshot/template +++ b/srcpkgs/pantheon-screenshot/template @@ -1,18 +1,18 @@ # Template file for 'pantheon-screenshot' pkgname=pantheon-screenshot -version=1.7.1 +version=6.0.2 revision=1 wrksrc="screenshot-${version}" build_style=meson -hostmakedepends="desktop-file-utils glib-devel intltool pkgconf vala" -makedepends="granite-devel libcanberra-devel" -depends="desktop-file-utils gdk-pixbuf gtk+3 hicolor-icon-theme" +hostmakedepends="desktop-file-utils glib-devel gettext pkg-config vala" +makedepends="granite-devel libcanberra-devel libhandy1-devel" +depends="desktop-file-utils gdk-pixbuf hicolor-icon-theme" short_desc="Screenshot tool" maintainer="Orphaned " license="LGPL-3.0-only" homepage="https://github.com/elementary/screenshot-tool" distfiles="https://github.com/elementary/screenshot-tool/archive/${version}.tar.gz" -checksum=2789abf01b9b41ae62e39eea4d5765dd606898435e1723939a06301922c431e2 +checksum=af1d67b196a22af529190f593183ff2eebad51a1329be7279cddb7dc0ce406f4 post_install() { ln -s io.elementary.screenshot-tool "$DESTDIR"/usr/bin/"$pkgname" From b4d2776c53cb81e97876101a05797d1a1139f7c2 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 08/25] planner: update to 3.0.6. --- srcpkgs/planner/template | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template index 7be79ab4c6ba..b55a40f9306f 100644 --- a/srcpkgs/planner/template +++ b/srcpkgs/planner/template @@ -1,32 +1,19 @@ # Template file for 'planner' pkgname=planner -version=2.7 +version=3.0.6 revision=1 build_style=meson build_helper="gir" hostmakedepends="gettext pkg-config vala glib-devel curl" -makedepends="evolution-data-server-devel libgee08-devel granite-devel - webkit2gtk-devel libsoup-devel libpeas-devel libhandy1-devel" +makedepends="libgee08-devel granite-devel webkit2gtk-devel libsoup-devel + libhandy1-devel json-glib-devel" depends="io.elementary.icons io.elementary.stylesheet curl" short_desc="Task manager with Todoist support designed for GNU/Linux" maintainer="linarcx " license="GPL-3.0-or-later" homepage="https://github.com/alainm23/planner" distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz" -checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69 - -if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" evolution-data-server-devel" -fi -pre_configure() { - if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - # In musl libc there is no _NL_TIME_FIRST_WEEKDAY in langinfo.h - # thus replace Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; - # with 0; (sunday) - vsed -i src/Services/Calendar/CalendarModel.vala \ - -e "s#\(int week_start =\) Posix.*#\1 0;#" - fi -} +checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5 post_install() { vinstall data/com.github.alainm23.planner.desktop.in 644 \ From c8268ea3570b70b4846f579410c8b897c4c5d8ca Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 09/25] quickDocs: revbump for granite 6 --- srcpkgs/quickDocs/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/quickDocs/template b/srcpkgs/quickDocs/template index 940ad376d9c7..c4a22e6bbe7d 100644 --- a/srcpkgs/quickDocs/template +++ b/srcpkgs/quickDocs/template @@ -1,7 +1,7 @@ # Template file for 'quickDocs' pkgname=quickDocs version=2.2.6 -revision=1 +revision=2 build_style=meson hostmakedepends="vala pkg-config" makedepends="libarchive-devel gtk+3-devel devhelp-devel webkit2gtk-devel libgee08-devel granite-devel" From d88b9a61bbf84ef76865b8c86e84218239f45e13 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 10/25] sequeler: revbump for granite 6 --- srcpkgs/sequeler/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/sequeler/template b/srcpkgs/sequeler/template index a36107372bd9..32f127dc5c6e 100644 --- a/srcpkgs/sequeler/template +++ b/srcpkgs/sequeler/template @@ -1,7 +1,7 @@ # Template file for 'sequeler' pkgname=sequeler version=0.8.2 -revision=1 +revision=2 build_style=meson hostmakedepends="gettext pkg-config glib-devel vala" makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel From b55ad20f52fab773f15d7410d614c95fefa05d90 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:05 +0100 Subject: [PATCH 11/25] switchboard: update to 6.0.0. --- srcpkgs/switchboard/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template index ebb706e5d9e5..9397fea8cdeb 100644 --- a/srcpkgs/switchboard/template +++ b/srcpkgs/switchboard/template @@ -1,16 +1,16 @@ # Template file for 'switchboard' pkgname=switchboard -version=2.3.7 -revision=2 +version=6.0.0 +revision=1 build_style=meson hostmakedepends="pkg-config vala gettext" -makedepends="granite-devel clutter-gtk-devel gtk+3-devel" +makedepends="granite-devel gtk+3-devel libhandy1-devel" short_desc="Extensible System Settings app designed for elementary OS" maintainer="Orphaned " license="LGPL-2.1-or-later" homepage="https://github.com/elementary/switchboard" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=373db840b254897b2a59f6f421508f8f1361adc5d4d35b7963ba024e5c8234c9 +distfiles="https://github.com/elementary/switchboard/archive/${version}.tar.gz" +checksum=40c2fd17535cba239b7c78b62d93a3f5ef7e990b31a7c4ecf04cba0c2b60d792 switchboard-devel_package() { short_desc+=" - development files" From 38350d2e2e725d95108e7eae75e11f7327c4caed Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:06 +0100 Subject: [PATCH 12/25] switchboard-plug-bluetooth: update to 2.3.6. --- srcpkgs/switchboard-plug-bluetooth/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template index 373368918159..b1b6977a5269 100644 --- a/srcpkgs/switchboard-plug-bluetooth/template +++ b/srcpkgs/switchboard-plug-bluetooth/template @@ -1,13 +1,13 @@ # Template file for 'switchboard-plug-bluetooth' pkgname=switchboard-plug-bluetooth -version=2.3.0 +version=2.3.6 revision=1 build_style=meson -hostmakedepends="pkg-config vala" +hostmakedepends="pkg-config vala gettext" makedepends="switchboard-devel granite-devel gtk+3-devel" short_desc="Switchboard Bluetooth Plug" maintainer="Cameron Nemo " license="GPL-3.0-or-later" -homepage="https://github.com/elementary/${pkgname}" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=ffeb4cdb53696b241e203f4e0920bb90c05fd77b99a05bd9483cb4c8367f1000 +homepage="https://github.com/elementary/switchboard-plug-bluetooth" +distfiles="https://github.com/elementary/switchboard-plug-bluetooth/archive/${version}.tar.gz" +checksum=fec5d135dc17c3ab1396cbe78f255e767f1834dfc4db8ec30579ff0ef29836b9 From 943e894e7282f3a63620cf9a17c87c4c5a76eafe Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:06 +0100 Subject: [PATCH 13/25] switchboard-plug-network: update to 2.4.2. * build translations --- srcpkgs/switchboard-plug-network/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template index 31f640cf25df..5c421fde8be4 100644 --- a/srcpkgs/switchboard-plug-network/template +++ b/srcpkgs/switchboard-plug-network/template @@ -1,15 +1,15 @@ # Template file for 'switchboard-plug-network' pkgname=switchboard-plug-network -version=2.3.3 +version=2.4.2 revision=1 build_style=meson -hostmakedepends="pkg-config vala" +hostmakedepends="pkg-config vala gettext" makedepends="switchboard-devel granite-devel gtk+3-devel libnma-devel NetworkManager-devel" short_desc="Switchboard Network Plug" maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://github.com/elementary/switchboard-plug-network" -distfiles="https://github.com/elementary/${pkgname}/archive/${version}.tar.gz" -checksum=a2f29b3054c187f2be9688bb04b6800cf4c2d3dd74cdd4fa37626f0b2ac5df50 +distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz" +checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971 nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363" From 36cf005a93a7fd262aca472248ecc8ac835474a9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:08:06 +0100 Subject: [PATCH 14/25] switchboard-plug-printers: update to 2.1.10. --- .../patches/fix-signal_subscribe.patch | 11 --------- .../patches/ftbfs.patch | 23 ------------------- srcpkgs/switchboard-plug-printers/template | 10 ++++---- 3 files changed, 5 insertions(+), 39 deletions(-) delete mode 100644 srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch delete mode 100644 srcpkgs/switchboard-plug-printers/patches/ftbfs.patch diff --git a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch b/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch deleted file mode 100644 index 48eb8948a642..000000000000 --- a/srcpkgs/switchboard-plug-printers/patches/fix-signal_subscribe.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/CUPSNotifier.vala 2018-11-28 12:34:33.000000000 +0100 -+++ b/src/CUPSNotifier.vala 2021-01-29 19:26:11.191992396 +0100 -@@ -63,7 +63,7 @@ - Bus.get_proxy.begin (BusType.SYSTEM, "org.cups.cupsd.Notifier", "/org/cups/cupsd/Notifier", GLib.DBusProxyFlags.NONE, null, (obj, res) => { - try { - dbus_notifier = Bus.get_proxy.end (res); -- ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, subscription_callback); -+ ((GLib.DBusProxy) dbus_notifier).g_connection.signal_subscribe (null, "org.cups.cupsd.Notifier", null, "/org/cups/cupsd/Notifier", null, GLib.DBusSignalFlags.NONE, (GLib.DBusSignalCallback)subscription_callback); - } catch (IOError e) { - critical (e.message); - } diff --git a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch b/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch deleted file mode 100644 index e8e21e2c4841..000000000000 --- a/srcpkgs/switchboard-plug-printers/patches/ftbfs.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 3175c2ebf106145a95355d2571e0a2aa4834e884 Mon Sep 17 00:00:00 2001 -From: Enerccio -Date: Tue, 17 Sep 2019 15:31:37 +0200 -Subject: [PATCH] Update cups.vapi (#118) - -Fixed bug with compilation ---- - vapi/cups.vapi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vapi/cups.vapi b/vapi/cups.vapi -index 7f1b795..5dcdba6 100644 ---- a/vapi/cups.vapi -+++ b/vapi/cups.vapi -@@ -605,7 +605,7 @@ namespace CUPS { - [CCode (cname = "ippAddBooleans")] - private unowned Attribute _add_booleans (Tag group, string name, [CCode (array_length_pos = 0.9)] char[] values); - public unowned Attribute add_booleans (Tag group, string name, bool[] values) { -- char[] char_values; -+ char[] char_values = {}; - foreach (var val in values) { - char_values += val ? 1 : 0; - } diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template index caecd10c886c..05f3c86abd79 100644 --- a/srcpkgs/switchboard-plug-printers/template +++ b/srcpkgs/switchboard-plug-printers/template @@ -1,14 +1,14 @@ # Template file for 'switchboard-plug-printers' pkgname=switchboard-plug-printers -version=2.1.6 +version=2.1.10 revision=1 build_style=meson -hostmakedepends="pkg-config vala intltool" +hostmakedepends="pkg-config vala gettext" makedepends="switchboard-devel granite-devel gtk+3-devel cups-devel" depends="cups-pk-helper" short_desc="Switchboard Printers Plug" maintainer="Orphaned " license="GPL-3.0-or-later" -homepage="https://github.com/elementary/${pkgname}" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=fe2c748e3737c3304ea8613d43d5ba8596f95499a65b8d13f93c4f702901f442 +homepage="https://github.com/elementary/switchboard-plug-printers" +distfiles="https://github.com/elementary/switchboard-plug-printers/archive/${version}.tar.gz" +checksum=448f6ae28fc4dacc2c329532e21aacc4ec7aa4af7d93bd6d7013002253faef3d From 1bd9dc37f3e535ef2b4e6cf6bbd06fc9df3ab5c9 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 21:59:08 +0100 Subject: [PATCH 15/25] io.elementary.calculator: update to 1.7.2. --- srcpkgs/io.elementary.calculator/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template index 56abf698403b..35a363c7ae9a 100644 --- a/srcpkgs/io.elementary.calculator/template +++ b/srcpkgs/io.elementary.calculator/template @@ -1,17 +1,17 @@ # Template file for 'io.elementary.calculator' pkgname=io.elementary.calculator -version=1.6.0 -revision=2 +version=1.7.2 +revision=1 wrksrc="calculator-${version}" build_style=meson -hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream" -makedepends="granite-devel gtk+3-devel" +hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream" +makedepends="granite-devel gtk+3-devel libhandy1-devel" short_desc="Calculator app designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-only" homepage="https://github.com/elementary/calculator" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=c650d5ff7d2df2d122ade0cbd35be50927f22b0d260f28e374b1112114f24540 +checksum=d296d06b36a0c7dd84e7e91e9801989e83312612d6ee6f0479030c1b340d397b pantheon-calculator_package() { depends="io.elementary.calculator>=${version}_${revision}" From 9032015c23b4565a12c772236d63411237c01458 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:06 +0100 Subject: [PATCH 16/25] io.elementary.calendar: update to 6.1.0. --- .../patches/00-musl.patch | 65 ++++++++++--------- .../01-fix-build-without-locale-command.patch | 32 +++++++++ srcpkgs/io.elementary.calendar/template | 18 ++--- 3 files changed, 76 insertions(+), 39 deletions(-) create mode 100644 srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch index f85beca403fa..9b50a7e6e259 100644 --- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch +++ b/srcpkgs/io.elementary.calendar/patches/00-musl.patch @@ -1,44 +1,49 @@ -commit c9ba80af072819261a9e24a04a0859b93b5db810 -Author: Cameron Nemo -Date: Thu Oct 18 11:33:15 2018 -0700 - - Check for _NL_TIME_FIRST_WEEKDAY declaration - -diff --git core/Model/CalendarModel.vala core/Model/CalendarModel.vala -index 3e3b8cbd..b33f75f8 100644 ---- a/core/Model/CalendarModel.vala -+++ b/core/Model/CalendarModel.vala -@@ -68,7 +68,11 @@ public class Maya.Model.CalendarModel : Object { - } - - private CalendarModel () { +--- a/core/Services/Calendar/EventStore.vala ++++ b/core/Services/Calendar/EventStore.vala +@@ -304,6 +304,7 @@ public class Calendar.EventStore : Object { + // number we want, so we convert the pointer address to a uint to get + // the data. Since the pointer address is actually data, using it as a + // pointer will segfault. ++#if HAVE_NL_TIME_WEEK_1STDAY + uint week_day1 = (uint) Posix.NLTime.WEEK_1STDAY.to_string (); + var week_1stday = 0; // Default to 0 if unrecognized data + if (week_day1 == 19971130) { // Sunday +@@ -313,6 +314,9 @@ public class Calendar.EventStore : Object { + } else { + warning ("Unknown value of _NL_TIME_WEEK_1STDAY: %u", week_day1); + } ++#else ++ var week_1stday = 0; ++#endif + /* The offset between GLib and local POSIX numbering. + * If week_1stday is Monday, data is correct for GLib: Monday=1 through Sunday=7, + * so offset is 0. +@@ -323,7 +327,11 @@ public class Calendar.EventStore : Object { + // Get the start of week + // HACK This line produces a string of 3 bytes. It takes the raw value + // of the first one and uses that as the value of week_start. +#if HAVE_NL_TIME_FIRST_WEEKDAY - int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; + int week_start_posix = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0]; +#else -+ int week_start = 0; ++ int week_start_posix = 0; +#endif - if (week_start >= 1 && week_start <= 7) { - week_starts_on = (Maya.Settings.Weekday)week_start-1; - } -diff --git meson.build meson.build -index a0cd2dd7..02b4e1d1 100644 + + var week_start = week_start_posix + glib_offset; + if (week_start == 0) { // Sunday special case --- a/meson.build +++ b/meson.build -@@ -31,7 +31,17 @@ folks_dep = dependency('folks') - geocode_glib_dep = dependency('geocode-glib-1.0') - gclue_dep = dependency('libgeoclue-2.0') +@@ -48,7 +48,14 @@ else + add_project_arguments('--vapidir', join_paths(meson.current_source_dir(), 'vapi'), language: 'vala') + endif -m_dep = meson.get_compiler('c').find_library('m', required : false) +cc = meson.get_compiler('c') +m_dep = cc.find_library('m', required : false) -+libnotify_dep = dependency('libnotify', required: false) -+ -+if libnotify_dep.found() -+ add_project_arguments('--define=HAVE_LIBNOTIFY', language: 'vala') -+endif -+ +if cc.has_header_symbol('langinfo.h', '_NL_TIME_FIRST_WEEKDAY') + add_project_arguments('--define=HAVE_NL_TIME_FIRST_WEEKDAY', language: 'vala') ++endif ++if cc.has_header_symbol('langinfo.h', '_NL_TIME_WEEK_1STDAY') ++ add_project_arguments('--define=HAVE_NL_TIME_WEEK_1STDAY', language: 'vala') +endif gresource_calendar = gnome.compile_resources( diff --git a/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch new file mode 100644 index 000000000000..6513e4c5422b --- /dev/null +++ b/srcpkgs/io.elementary.calendar/patches/01-fix-build-without-locale-command.patch @@ -0,0 +1,32 @@ +--- a/core/Tests/meson.build ++++ b/core/Tests/meson.build +@@ -18,15 +18,20 @@ util_tests = executable( + ) + test('Utils Tests', util_tests, suite: 'core', is_parallel: false) + ++locale_prog = find_program('locale', required: false) + # We need these three locales to run the tests +-locales = run_command('locale', '-a').stdout().split('\n') +-if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8') +- eventstore_tests = executable( +- tests_name + '-eventstore', +- 'eventstore-tests.vala', +- dependencies: tests_deps +- ) +- test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false) ++if locale_prog.found() ++ locales = run_command(locale_prog, '-a').stdout().split('\n') ++ if locales.contains ('en_GB.utf8') and locales.contains ('en_US.utf8') and locales.contains ('ar_AE.utf8') ++ eventstore_tests = executable( ++ tests_name + '-eventstore', ++ 'eventstore-tests.vala', ++ dependencies: tests_deps ++ ) ++ test('EventStore Tests', eventstore_tests, suite: 'core', is_parallel: false) ++ else ++ message('EventStore Tests have been disabled, a locale is missing in the system.') ++ endif + else +-message('EventStore Tests have been disabled, a locale is missing in the system.') ++ message('EventStore Tests have been disabled, the locale command is missing in the system.') + endif diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template index a5ea019353a0..bf87c7599001 100644 --- a/srcpkgs/io.elementary.calendar/template +++ b/srcpkgs/io.elementary.calendar/template @@ -1,22 +1,21 @@ # Template file for 'io.elementary.calendar' pkgname=io.elementary.calendar -version=5.0 -revision=6 -_git_commit=46346e48b53e9d3d59d9f567b622532338f50f32 -wrksrc="calendar-${_git_commit}" +version=6.1.0 +revision=1 +wrksrc="calendar-${version}" build_style=meson build_helper="gir" -hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream +hostmakedepends="gettext pkg-config vala desktop-file-utils AppStream glib-devel evolution-data-server-devel" makedepends="granite-devel libglib-devel gtk+3-devel libgee08-devel - libchamplain-devel clutter-devel evolution-data-server-devel + libchamplain-devel clutter-devel evolution-data-server-devel libhandy1-devel folks-devel geocode-glib-devel geoclue2-devel libical-devel libnotify-devel" short_desc="Desktop calendar app designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-only" homepage="https://github.com/elementary/calendar" -distfiles="${homepage}/archive/${_git_commit}.tar.gz" -checksum=3be3851baeed67144e5cbed209b2c1b982fe9830db13372e3051423295dee345 +distfiles="https://github.com/elementary/calendar/archive/refs/tags/${version}.tar.gz" +checksum=3cb4ba6f4d9fa6addfbe39b58cea282c0f0c6f139c49214c05e52adf457d949d libio.elementary.calendar_package() { short_desc+=" - library" @@ -28,7 +27,8 @@ libio.elementary.calendar_package() { libio.elementary.calendar-devel_package() { short_desc+=" - library development files" depends="libio.elementary.calendar>=${version} evolution-data-server-devel - granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel" + granite-devel gtk+3-devel libglib-devel libical-devel libsoup-devel + libhandy1-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From 6322ba3d48f02fe4ce23891a5fb77da01ef99f53 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:04 +0100 Subject: [PATCH 17/25] io.elementary.code: update to 6.1.0. --- .../io.elementary.code/patches/vala050.patch | 25 ------------------- srcpkgs/io.elementary.code/template | 18 ++++++------- 2 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/io.elementary.code/patches/vala050.patch diff --git a/srcpkgs/io.elementary.code/patches/vala050.patch b/srcpkgs/io.elementary.code/patches/vala050.patch deleted file mode 100644 index ec3abb8fd9f0..000000000000 --- a/srcpkgs/io.elementary.code/patches/vala050.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a185de0e7716aa2de2bf21de96e6c9af1dca81aa Mon Sep 17 00:00:00 2001 -From: Daniel Kolesa -Date: Wed, 16 Sep 2020 20:43:07 +0200 -Subject: [PATCH] fix with vala-0.50 - ---- - plugins/outline/Vala/ValaSymbolOutline.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git plugins/outline/Vala/ValaSymbolOutline.vala plugins/outline/Vala/ValaSymbolOutline.vala -index c8db339..31386a6 100644 ---- a/plugins/outline/Vala/ValaSymbolOutline.vala -+++ b/plugins/outline/Vala/ValaSymbolOutline.vala -@@ -61,7 +61,7 @@ public class Code.Plugins.ValaSymbolOutline : Object, Code.Plugins.SymbolOutline - - public void parse_symbols () { - var context = new Vala.CodeContext (); -- context.profile = Vala.Profile.GOBJECT; -+ context.set_target_profile(Vala.Profile.GOBJECT); - context.add_source_filename (doc.file.get_path ()); - context.report = new Report (); - if (cancellable != null) --- -2.28.0 - diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template index 05d84cc39c9f..c47d667b8a96 100644 --- a/srcpkgs/io.elementary.code/template +++ b/srcpkgs/io.elementary.code/template @@ -1,19 +1,19 @@ # Template file for 'io.elementary.code' pkgname=io.elementary.code -version=3.4.1 -revision=5 +version=6.1.0 +revision=1 wrksrc="code-${version}" build_style=meson -hostmakedepends="pkg-config vala intltool glib-devel" +hostmakedepends="pkg-config vala gettext polkit glib-devel" makedepends="editorconfig-devel libgee08-devel granite-devel libpeas-devel - gtksourceview-devel vte3-devel gtkspell3-devel zeitgeist-devel libsoup-devel - webkit2gtk-devel gtk+3-devel libgit2-glib-devel" + gtksourceview4-devel vte3-devel gtkspell3-devel libsoup-devel + gtk+3-devel libgit2-glib-devel polkit-devel libhandy1-devel" short_desc="Code editor designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/code" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=d84b38193b72cd93995aae604358c83c5b6976d8472ce985027b947cfed990bf +distfiles="https://github.com/elementary/code/archive/${version}.tar.gz" +checksum=d44851eb827dc9a069ab81b6a9cfe255795e3319a6882ca344152781968ce3ce libio.elementary.code_package() { short_desc+=" - library" @@ -25,8 +25,8 @@ libio.elementary.code_package() { libio.elementary.code-devel_package() { short_desc+=" - library development files" depends="libio.elementary.code>=${version} fontconfig-devel granite-devel - gtk+3-devel gtksourceview-devel libgee08-devel libgit2-glib-devel - libglib-devel libpeas-devel pango-devel zeitgeist-devel" + gtk+3-devel gtksourceview4-devel libgee08-devel libgit2-glib-devel + libglib-devel libpeas-devel pango-devel polkit-devel libhandy1-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From 15ffbd9247ab5e3f83ce8e888e256cf607933faf Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:07 +0100 Subject: [PATCH 18/25] io.elementary.files: update to 6.1.2. --- common/shlibs | 4 ++-- srcpkgs/io.elementary.files/template | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/shlibs b/common/shlibs index a78630b0eb09..f15f32422e77 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3524,8 +3524,8 @@ libadwaita-1.so.0 libadwaita-1.0.0alpha2_1 libswitchboard-2.0.so.0 switchboard-2.3.2_1 libcodecore.so.0 libio.elementary.code-3.0_1 libio.elementary.music-core.so.0 libio.elementary.music-5.0_1 -libpantheon-files-core.so.4 libio.elementary.files-4.1.4_1 -libpantheon-files-widgets.so.4 libio.elementary.files-4.1.4_1 +libpantheon-files-core.so.6 libio.elementary.files-6.0.0_1 +libpantheon-files-widgets.so.6 libio.elementary.files-6.0.0_1 libwlroots.so.9 wlroots0.14-0.14.1_1 libwlroots.so.10 wlroots-0.15.0_1 libbaseencode.so.1 libbaseencode-1.0.9_1 diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template index cb0643a02449..0e8d5fb177d6 100644 --- a/srcpkgs/io.elementary.files/template +++ b/srcpkgs/io.elementary.files/template @@ -1,20 +1,20 @@ # Template file for 'io.elementary.files' pkgname=io.elementary.files -version=4.5.0 +version=6.1.2 revision=1 wrksrc="files-${version}" build_style=meson -configure_args="-Dwith-unity=disabled" -hostmakedepends="vala glib-devel pkg-config intltool" +configure_args="-Dsystemduserunitdir=no" +hostmakedepends="vala glib-devel pkg-config gettext" makedepends="gtk+3-devel libglib-devel libgee08-devel sqlite-devel plank-devel libcanberra-devel granite-devel pango-devel zeitgeist-devel dbus-glib-devel - libnotify-devel libcloudproviders-devel libgit2-glib-devel" + libnotify-devel libcloudproviders-devel libgit2-glib-devel libhandy1-devel" short_desc="File browser designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/files" distfiles="https://github.com/elementary/files/archive/${version}.tar.gz" -checksum=987f87df2a74c97cb866b34a20ea395ae1f67d03c9517185494860653fbc065c +checksum=2a328d8df901186bb700c835064c9a526e5694545b668df512282773cfaa7b08 CFLAGS="-fcommon" @@ -28,7 +28,7 @@ libio.elementary.files_package() { libio.elementary.files-devel_package() { short_desc+=" - library development files" depends="libio.elementary.files>=${version} libgee08-devel gtk+3-devel - libcanberra-devel libglib-devel zeitgeist-devel" + libcanberra-devel libglib-devel zeitgeist-devel libhandy1-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From 246f22abd22b65466ca09580064ef770481267f8 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:04 +0100 Subject: [PATCH 19/25] io.elementary.icons: update to 6.1.0. --- srcpkgs/io.elementary.icons/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/io.elementary.icons/template b/srcpkgs/io.elementary.icons/template index fb3a6c06cc84..95dbc0ca3ddb 100644 --- a/srcpkgs/io.elementary.icons/template +++ b/srcpkgs/io.elementary.icons/template @@ -1,6 +1,6 @@ # Template file for 'io.elementary.icons' pkgname=io.elementary.icons -version=5.3.1 +version=6.1.0 revision=1 wrksrc="icons-${version}" build_style=meson @@ -11,8 +11,8 @@ short_desc="Named, vector icons for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/icons" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=67b349453f8990e399521bb8d96f4caf4c23a27cf22cbc18ddacf0e817c59e12 +distfiles="https://github.com/elementary/icons/archive/${version}.tar.gz" +checksum=bab0f638a60d7a28bf269f4a11346b28495a819e3f516403a7e0bb880c441c2f post_install() { # How did that get there? From 077d2f3d59b35260d9efcd9069c259265b3a8b74 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:07 +0100 Subject: [PATCH 20/25] io.elementary.music: update to 5.1.1. --- .../io.elementary.music/patches/vala-array-size.patch | 11 ----------- srcpkgs/io.elementary.music/template | 11 ++++++----- 2 files changed, 6 insertions(+), 16 deletions(-) delete mode 100644 srcpkgs/io.elementary.music/patches/vala-array-size.patch diff --git a/srcpkgs/io.elementary.music/patches/vala-array-size.patch b/srcpkgs/io.elementary.music/patches/vala-array-size.patch deleted file mode 100644 index 2cc268cdae64..000000000000 --- a/srcpkgs/io.elementary.music/patches/vala-array-size.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/core/GStrewamer/Equalizer.vala 2020-03-04 23:50:04.000000000 +0100 -+++ b/core/GStreamer/Equalizer.vala 2020-12-14 15:53:22.359597220 +0100 -@@ -31,7 +31,7 @@ - construct { - element = Gst.ElementFactory.make ("equalizer-10bands", "equalizer"); - -- int[10] freqs = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000}; -+ int freqs[10] = {60, 170, 310, 600, 1000, 3000, 6000, 12000, 14000, 16000}; - - float last_freq = 0; - for (int index = 0; index < 10; index++) { diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template index de6ae0f94d90..3ef8c1568630 100644 --- a/srcpkgs/io.elementary.music/template +++ b/srcpkgs/io.elementary.music/template @@ -1,20 +1,21 @@ # Template file for 'io.elementary.music' pkgname=io.elementary.music -version=5.0.5 +version=5.1.1 revision=1 wrksrc="music-${version}" build_style=meson configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod" -hostmakedepends="vala desktop-file-utils intltool pkg-config AppStream glib-devel" +hostmakedepends="vala desktop-file-utils gettext pkg-config AppStream glib-devel" makedepends="taglib-devel granite-devel vala-devel gtk+3-devel libgee08-devel clutter-gtk-devel dbus-glib-devel libgda-devel libgpod-devel libxml2-devel - json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel" + json-glib-devel libnotify-devel libsoup-devel zeitgeist-devel libpeas-devel + libhandy1-devel" short_desc="Music player and library designed for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/music" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=ed7cba3b07189273890b321b21cda198f18b102e4466eb7207c0b5f27b31dfc9 +checksum=35e97ec496327b4eb388308168711bf9f8e976a857eb97bca21805f83abf9d15 libio.elementary.music_package() { short_desc+=" - library" @@ -26,7 +27,7 @@ libio.elementary.music-devel_package() { short_desc+=" - library development files" depends="libio.elementary.music>=${version} granite-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libglib-devel - libpeas-devel" + libpeas-devel libhandy1-devel" pkg_install() { vmove "usr/lib/*.so" vmove usr/lib/pkgconfig From f5fc80b006f5e758f2be9c0cf44a10831e477a6e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:05 +0100 Subject: [PATCH 21/25] io.elementary.photos: update to 2.7.4. --- .../patches/fix-meson.patch | 95 ------------------- srcpkgs/io.elementary.photos/template | 11 +-- 2 files changed, 5 insertions(+), 101 deletions(-) delete mode 100644 srcpkgs/io.elementary.photos/patches/fix-meson.patch diff --git a/srcpkgs/io.elementary.photos/patches/fix-meson.patch b/srcpkgs/io.elementary.photos/patches/fix-meson.patch deleted file mode 100644 index 820e3b8ef96d..000000000000 --- a/srcpkgs/io.elementary.photos/patches/fix-meson.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 27e529fc96da828982563e2e19a6f0cef883a29e Mon Sep 17 00:00:00 2001 -From: Rico Tzschichholz -Date: Wed, 22 Jul 2020 19:35:53 +0200 -Subject: [PATCH] meson: Properly include config.vapi and config.h (#578) - ---- - meson.build | 21 +++++++++++++++++++-- - src/meson.build | 13 ------------- - 2 files changed, 19 insertions(+), 15 deletions(-) - -diff --git meson.build meson.build -index 5edb5314..9bebaca0 100644 ---- a/meson.build -+++ b/meson.build -@@ -11,14 +11,33 @@ add_project_arguments([ - '-Wno-unused', - '-Wl,--enable-new-dtags', - -+ '-include', 'config.h', - '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()) - ], - language: 'c', - ) -+add_project_arguments([ -+ '--vapidir', join_paths(meson.current_source_dir(), 'vapi'), -+ '--pkg', 'config', -+ ], -+ language: 'vala', -+) - - libexecdir = join_paths(get_option('prefix'), get_option('libexecdir'), meson.project_name()) - pluginsdir = join_paths(get_option('prefix'), get_option('libdir'), meson.project_name(), 'plugins') - -+conf_data = configuration_data() -+conf_data.set_quoted('PROJECT_NAME', meson.project_name()) -+conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) -+conf_data.set_quoted('_VERSION', meson.project_version()) -+conf_data.set_quoted('_PREFIX', get_option('prefix')) -+conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir'))) -+conf_data.set_quoted('_LIBEXECDIR', libexecdir) -+config_header = configure_file( -+ output : 'config.h', -+ configuration : conf_data -+) -+ - gnome = import('gnome') - i18n = import('i18n') - -@@ -52,7 +71,6 @@ gstreamer_plugins_base_vapi = meson.get_compiler('vala').find_library('gstreamer - gstreamer_plugins_base_dep = declare_dependency(dependencies: [gstreamer_plugins_base_vapi]) - lconv_dep = meson.get_compiler('vala').find_library('LConv', dirs: join_paths(meson.current_source_dir(), 'vapi')) - linux_dep = meson.get_compiler('vala').find_library('linux') --config_dep = meson.get_compiler('vala').find_library('config', dirs: join_paths(meson.current_source_dir(), 'vapi')) - - vapi_include = include_directories('./vapi') - -@@ -82,7 +100,6 @@ dependencies = [ - webkit2gtk_dep, - lconv_dep, - linux_dep, -- config_dep - ] - - add_project_arguments(['--vapidir', join_paths(meson.current_source_dir(), 'vapi')], language: 'vala') -diff --git src/meson.build src/meson.build -index 45bf4c1b..1215d778 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -4,18 +4,6 @@ library_files = files( - 'plugins/TransitionsInterfaces.vala' - ) - --conf_data = configuration_data() --conf_data.set_quoted('PROJECT_NAME', meson.project_name()) --conf_data.set_quoted('GETTEXT_PACKAGE', meson.project_name()) --conf_data.set_quoted('_VERSION', meson.project_version()) --conf_data.set_quoted('_PREFIX', get_option('prefix')) --conf_data.set_quoted('_LIB', join_paths(get_option('prefix'), get_option('libdir'))) --conf_data.set_quoted('_LIBEXECDIR', libexecdir) --config_header = configure_file( -- output : 'config.h', -- configuration : conf_data --) -- - photos_files = files( - 'AppDirs.vala', - 'Application.vala', -@@ -233,7 +221,6 @@ photos_exe = executable( - meson.project_name(), - photos_files, - library_files, -- config_header, - icons_gresource, - global_gresource, - dependencies: dependencies, diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template index 81c1734164ba..d0f69169be3b 100644 --- a/srcpkgs/io.elementary.photos/template +++ b/srcpkgs/io.elementary.photos/template @@ -1,22 +1,21 @@ # Template file for 'io.elementary.photos' pkgname=io.elementary.photos -version=2.7.0 -revision=2 +version=2.7.4 +revision=1 wrksrc="photos-${version}" build_style=meson -configure_args="-Dlibunity=false" -hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream +hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel python3-scour" makedepends="libaccounts-glib-devel libexif-devel libgee08-devel geocode-glib-devel libgexiv2-devel libglib-devel libgphoto2-devel gst-plugins-base1-devel gstreamer1-devel gtk+3-devel libgudev-devel json-glib-devel libraw-devel rest-devel libsoup-devel sqlite-devel webkit2gtk-devel libwebp-devel libxml2-devel granite-devel libnotify-devel - vte3-devel" + vte3-devel libhandy1-devel" depends="desktop-file-utils gsettings-desktop-schemas" short_desc="Photo viewer and organizer designed for elementary OS" maintainer="Cameron Nemo " license="LGPL-2.1-or-later" homepage="https://github.com/elementary/photos" distfiles="https://github.com/elementary/photos/archive/${version}.tar.gz" -checksum=9f6ad409d053e3239b9ec7fc59429afe9ce89e40878697a73c2c3f215556a074 +checksum=3227f498e483b150f0a1407f4cf244d69f1c7453fc9bcba164fe3ab944283315 From 44fa568fb5ce20ed7b47601758bd7ed039cb7953 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:05 +0100 Subject: [PATCH 22/25] io.elementary.stylesheet: update to 6.1.1. --- srcpkgs/io.elementary.stylesheet/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/io.elementary.stylesheet/template b/srcpkgs/io.elementary.stylesheet/template index 791bca04709c..618ac82dda0c 100644 --- a/srcpkgs/io.elementary.stylesheet/template +++ b/srcpkgs/io.elementary.stylesheet/template @@ -1,12 +1,13 @@ # Template file for 'io.elementary.stylesheet' pkgname=io.elementary.stylesheet -version=5.4.2 -revision=2 +version=6.1.1 +revision=1 wrksrc="stylesheet-${version}" build_style=meson +hostmakedepends="sassc gettext" short_desc="GTK Stylesheet for elementary OS" maintainer="Cameron Nemo " license="GPL-3.0-or-later" homepage="https://github.com/elementary/stylesheet" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec +checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e From 2005cde51a2c6871e83412dfb27ecd36dc67b7db Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:08 +0100 Subject: [PATCH 23/25] io.elementary.terminal: update to 6.0.1. --- srcpkgs/io.elementary.terminal/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/io.elementary.terminal/template b/srcpkgs/io.elementary.terminal/template index 2aba6a5b563f..f3e0972cdfe3 100644 --- a/srcpkgs/io.elementary.terminal/template +++ b/srcpkgs/io.elementary.terminal/template @@ -1,19 +1,19 @@ # Template file for 'io.elementary.terminal' pkgname=io.elementary.terminal -version=5.5.2 +version=6.0.1 revision=1 wrksrc="terminal-${version}" build_style=meson configure_args="-Dubuntu-bionic-patched-vte=false" -hostmakedepends="desktop-file-utils intltool pkg-config vala AppStream glib-devel" -makedepends="granite-devel libnotify-devel vte3-devel" +hostmakedepends="desktop-file-utils gettext pkg-config vala AppStream glib-devel" +makedepends="granite-devel libnotify-devel vte3-devel libhandy1-devel" depends="desktop-file-utils gsettings-desktop-schemas" short_desc="Terminal from elementary OS for the 21st century" maintainer="Cameron Nemo " license="LGPL-3.0-only" homepage="https://github.com/elementary/terminal" distfiles="https://github.com/elementary/terminal/archive/${version}.tar.gz" -checksum=589ad0225e3a45700d95c8ead1b646f22a22c7688f647876a5329b3b4bd923cd +checksum=de741ad5deadb927243a7007be0f5d3bb4070f780362d59ded600692064b0eca pantheon-terminal_package() { depends="io.elementary.terminal>=${version}_${revision}" From 07820b8a2338b2cafb73714f55114131d09d9d7e Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:16:06 +0100 Subject: [PATCH 24/25] io.elementary.videos: update to 2.8.3. --- srcpkgs/io.elementary.videos/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template index c989ccaf6954..eaca37a83723 100644 --- a/srcpkgs/io.elementary.videos/template +++ b/srcpkgs/io.elementary.videos/template @@ -1,15 +1,15 @@ # Template file for 'io.elementary.videos' pkgname=io.elementary.videos -version=2.7.2 +version=2.8.3 revision=1 wrksrc="videos-${version}" build_style=meson -hostmakedepends="intltool pkg-config vala AppStream" +hostmakedepends="gettext pkg-config vala AppStream" makedepends="granite-devel clutter-gst3-devel clutter-gtk-devel - gstreamer1-devel gst-plugins-base1-devel" + gstreamer1-devel gst-plugins-base1-devel libhandy1-devel" short_desc="Video player and library app designed for elementary OS" maintainer="Ulf " license="GPL-3.0-or-later" homepage="https://github.com/elementary/videos" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a +checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6 From 4d355c318a8aa8a911a58f5cef3d6029fbb85f3a Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Thu, 10 Mar 2022 22:49:31 +0100 Subject: [PATCH 25/25] giti: remove package * doesn't build with recent vala --- srcpkgs/giti/template | 13 ------------- srcpkgs/removed-packages/template | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 srcpkgs/giti/template diff --git a/srcpkgs/giti/template b/srcpkgs/giti/template deleted file mode 100644 index e3c8663fa536..000000000000 --- a/srcpkgs/giti/template +++ /dev/null @@ -1,13 +0,0 @@ -# Template file for 'giti' -pkgname=giti -version=1.0.0 -revision=1 -build_style=meson -hostmakedepends="pkg-config vala gettext" -makedepends="gtk+3-devel libgit2-glib-devel libgee08-devel granite-devel" -short_desc="Permanent observer of your git directories" -maintainer="linarcx " -license="GPL-3.0-or-later" -homepage="https://github.com/LinArcX/giti" -distfiles="${homepage}/archive/${version}.tar.gz" -checksum=8054581f9eddf226a3e16e404ef062ebaba0ea1223255d8b0c3eeac301cf6872 diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index a7a19630a01a..f6d314b3615d 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,7 +1,7 @@ # Template file for 'removed-packages' pkgname=removed-packages version=0.1 -revision=64 +revision=65 build_style=meta short_desc="Uninstalls packages removed from repository" maintainer="Piotr Wójcik " @@ -77,6 +77,7 @@ replaces=" gens-gs<=2.16.7_2 geoip-data<=20171002_2 gespeaker<=0.8.6_3 + giti<=1.0.0_1 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 gnome-doc-utils<=0.20.10_9