* Re: granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
@ 2022-03-10 23:32 ` paper42
2022-03-11 7:52 ` CameronNemo
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-10 23:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 425 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36085#issuecomment-1064621824
Comment:
@LinArcX we need to rebuild everything that links against granite for this update which includes giti, but the giti build is currently broken because of a new vala version, so I added a commit to remove it from void-packages for now. If we can fix it, it doesn't need to be removed.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
2022-03-10 23:32 ` paper42
@ 2022-03-11 7:52 ` CameronNemo
2022-03-11 11:24 ` [PR PATCH] [Updated] " paper42
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: CameronNemo @ 2022-03-11 7:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 377 bytes --]
New comment by CameronNemo on void-packages repository
https://github.com/void-linux/void-packages/pull/36085#issuecomment-1064861218
Comment:
Wow thanks for tackling this... was just staring at my long list of out of date packages. Many of them elementary-ware.
What was your logic on updating vs. just revbump-ing? E.g. switchboard-plug-bluetooth has updates available.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
2022-03-10 23:32 ` paper42
2022-03-11 7:52 ` CameronNemo
@ 2022-03-11 11:24 ` paper42
2022-03-11 11:25 ` paper42
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-11 11:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages granite6
https://github.com/void-linux/void-packages/pull/36085
granite 6
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36085.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-granite6-36085.patch --]
[-- Type: text/x-diff, Size: 48155 bytes --]
From 1ecf273b71fbc3f6ab3ef4b0e8748a4a8acf1075 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 d60e60a87534..5f7c3c94c1a4 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 <cnemo@tutanota.com>"
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 e51f62d3e3ee812e6f8654dc96df42cc7270dacb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 203c76baa618f5b086aa94d6824e7915db250ec7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 cf53e6137c08f5f7ab28e059fce172e899673f57 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 b1461c092661fc085f12d61fd52214f017cb5a6a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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..5a28f44424d9 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 <linarcx@riseup.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/babluboy/nutty"
-distfiles="${homepage}/archive/${version}.tar.gz"
+homepage="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 f03f3694c65c3560fa9d3ec929d77dfa7233c677 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 b16b7eb9c840b0b116c5df0a47aa0dc9c231e34e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 d590eb30ecd5a1556c7900a3e6264a75a70aa8db Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 08/25] planner: update to 3.0.6.
---
srcpkgs/planner/template | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 7be79ab4c6ba..d8d04c588161 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,23 +1,20 @@
# 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 <linarcx@riseup.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/alainm23/planner"
distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69
+checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5
-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
From f477319ef4b5a3214fdbb9115866793d0092828b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 d3e8258b7c167bceedb00272c3af7c37d7c00daf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 1679af38e6008c82810aeefd7461bed587550f92 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 629b8de1c5c57f9de62754ba6f8d896f89fa1bd6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 61f8a4b9d1da36a1d608cac2d6adc06889996c83 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 be6f37fb468e39a461b2b4bf5bf43cdb8db31203 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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<NotifierDBus> (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 <admin@en-circle.com>
-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 <orphan@voidlinux.org>"
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 fefca86927c81c375b478f13d9db230e6eeb4d96 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 20599ae5e97f5f72acbbeab37b6e18eb4c6a8aaa Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 45 -------------------
srcpkgs/io.elementary.calendar/template | 18 ++++----
2 files changed, 9 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/io.elementary.calendar/patches/00-musl.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
deleted file mode 100644
index f85beca403fa..000000000000
--- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit c9ba80af072819261a9e24a04a0859b93b5db810
-Author: Cameron Nemo <camerontnorman@gmail.com>
-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 () {
-+#if HAVE_NL_TIME_FIRST_WEEKDAY
- int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
-+#else
-+ int week_start = 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
---- 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')
-
--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
-
- gresource_calendar = gnome.compile_resources(
- 'gresource_calendar',
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 <cnemo@tutanota.com>"
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 5ec4c2fbc7079ff52356e8dee74f27a649184b77 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <daniel@octaforge.org>
-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..35927b238713 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 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 <cnemo@tutanota.com>"
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 49f33fe67a8323a7d8ffed982bafde0233aacdd2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 5f7c3c94c1a4..2b4a75ef1a15 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 <cnemo@tutanota.com>"
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 e8b4b77b0462280babf383652515f87302ead76c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 fa207d08963385b61e31dc3282b59475e949ec29 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 57b74127a913c82ddbaae54fbcdc29ac68eeb504 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <ricotz@ubuntu.com>
-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 <cnemo@tutanota.com>"
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 8569a3989f22c8476c7c3d3e1d5194c038fb868d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
From 44a0d659d28634d23f69d315afb88be04e26630f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 9c3faf147087e02b0819d7b8e499b4152ed3113c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/videos"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
From 54eb017a2fd40024e80b735662cd2a23466b19d5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 1 +
2 files changed, 1 insertion(+), 13 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 <linarcx@riseup.net>"
-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..83258b2978ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (2 preceding siblings ...)
2022-03-11 11:24 ` [PR PATCH] [Updated] " paper42
@ 2022-03-11 11:25 ` paper42
2022-03-11 11:29 ` [PR PATCH] [Updated] " paper42
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-11 11:25 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 387 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36085#issuecomment-1065024851
Comment:
> What was your logic on updating vs. just revbump-ing? E.g. switchboard-plug-bluetooth has updates available.
I updated packages that fail to build with meson 0.61 to avoid patching every single one of them. Now everything should be updated.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (3 preceding siblings ...)
2022-03-11 11:25 ` paper42
@ 2022-03-11 11:29 ` paper42
2022-03-12 15:34 ` paper42
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-11 11:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages granite6
https://github.com/void-linux/void-packages/pull/36085
granite 6
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36085.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-granite6-36085.patch --]
[-- Type: text/x-diff, Size: 48156 bytes --]
From 1ecf273b71fbc3f6ab3ef4b0e8748a4a8acf1075 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 d60e60a87534..5f7c3c94c1a4 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 <cnemo@tutanota.com>"
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 e51f62d3e3ee812e6f8654dc96df42cc7270dacb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 203c76baa618f5b086aa94d6824e7915db250ec7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 cf53e6137c08f5f7ab28e059fce172e899673f57 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 789cc28938945b68b9efeeadcce38bbd6143062e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 4a8b7d4c770b5ffc830d1e414f8fa675dd7dbb50 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 e91c8e99d71568953f06b625d39d394c763ae1c8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 40317e6c304b6161bc287823824070699bfd7560 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:05 +0100
Subject: [PATCH 08/25] planner: update to 3.0.6.
---
srcpkgs/planner/template | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template
index 7be79ab4c6ba..d8d04c588161 100644
--- a/srcpkgs/planner/template
+++ b/srcpkgs/planner/template
@@ -1,23 +1,20 @@
# 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 <linarcx@riseup.net>"
license="GPL-3.0-or-later"
homepage="https://github.com/alainm23/planner"
distfiles="https://github.com/alainm23/planner/archive/${version}.tar.gz"
-checksum=cd34953867a91b2992aa4eafddc5093a695d1e6096571ade75640dddcc425d69
+checksum=345a9ad2220820f08f583321e874528eee9f7e009236127efacee72d071c7ea5
-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
From 07768ddbb0e68aa91c7cf4b4dd76f91ef9503b86 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 16e2ba959549b4158166dec181a2f4d02429eb48 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 c720c2096b228bb0afb686ca552b4fbc0b39e1e4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 4b32c89f1c43205ba42372f62bf0044e6244908d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 1b3d3c074cdb8cfba7803f6c82f8bb9d0fe2d6a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 81fafb6765305e428b85b99ea4d4480c840e85b4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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<NotifierDBus> (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 <admin@en-circle.com>
-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 <orphan@voidlinux.org>"
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 b26b9446f40bd0086f0f94382f8cb63afc30d422 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 e025b040f2c521a2d9bd0df802aabeb8244201d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 45 -------------------
srcpkgs/io.elementary.calendar/template | 18 ++++----
2 files changed, 9 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/io.elementary.calendar/patches/00-musl.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
deleted file mode 100644
index f85beca403fa..000000000000
--- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit c9ba80af072819261a9e24a04a0859b93b5db810
-Author: Cameron Nemo <camerontnorman@gmail.com>
-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 () {
-+#if HAVE_NL_TIME_FIRST_WEEKDAY
- int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
-+#else
-+ int week_start = 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
---- 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')
-
--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
-
- gresource_calendar = gnome.compile_resources(
- 'gresource_calendar',
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 <cnemo@tutanota.com>"
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 ccd0f14ba059c02df058273ea376e6aba9a3b7e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <daniel@octaforge.org>
-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..35927b238713 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 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 <cnemo@tutanota.com>"
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 d416222c010cbe47dc2641544e055abd89760113 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 5f7c3c94c1a4..2b4a75ef1a15 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 <cnemo@tutanota.com>"
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 dbc5b3f72cbb3df64c8c9b287986bba7935a8056 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 62d6607d257a82fbbf10ccefaf03895c583d99d1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 c3f3dfa2bcaa1faea6ae345c9c84bbfae0a3e36e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <ricotz@ubuntu.com>
-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 <cnemo@tutanota.com>"
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 1429995b7be8874933e19605a6e8307750ea38bb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
From cd6c5c8afd30ad03e3aca40d5a5a0758b2e2068a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 f5b2f81455be0c43cbbcb5c08ceab001eadb82c1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/videos"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
From 02a785b9e0a69098a7fc39df2ff9ab8594c74cca Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 1 +
2 files changed, 1 insertion(+), 13 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 <linarcx@riseup.net>"
-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..83258b2978ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (4 preceding siblings ...)
2022-03-11 11:29 ` [PR PATCH] [Updated] " paper42
@ 2022-03-12 15:34 ` paper42
2022-03-13 0:38 ` 0x5c
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-12 15:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages granite6
https://github.com/void-linux/void-packages/pull/36085
granite 6
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36085.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-granite6-36085.patch --]
[-- Type: text/x-diff, Size: 48446 bytes --]
From e34623681ff5935621113d92a0c1d3e3c8ca6332 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 d60e60a87534..5f7c3c94c1a4 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 <cnemo@tutanota.com>"
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 1c625ceb146b4729c51943a9ea7c6a035261e49b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 119912a552edd5200dbe74983dc356884d43d733 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 495b05f33e65b7890a9b6fd68d6e9bd944f18172 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 423f3cfb5abecd866d740b0a3bd85ae710ce918c Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 27a781326aa617f25779b6ea6c171f5fdf1c33bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 cbc10119a068e869340075b6a537c8cb940e6e79 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 99f9c3adc41451b82417d573efa75c5249381abb Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 6656b976881a70d66c05f25c6420f319a93ba8b5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 a3450d960a09d1772868ced324d821e313c77f1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 1d27a9b001f5eb3a0b8f8c82dd0600a9d84bf4f9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 75d64f0cfff1f2eff955c00d49226124e14e4f9b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 74c5615b3f9f167e4c92f7f99f5a3e036b200788 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 9360b05d03367f060e856140ba2d2a46cc909421 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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<NotifierDBus> (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 <admin@en-circle.com>
-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 <orphan@voidlinux.org>"
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 e031f8e9f8d6c59db7a7673c35603565e5022b66 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 f6a0e0c385ef09444c7ae7c134baf0c39e5f98c1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 45 -------------------
srcpkgs/io.elementary.calendar/template | 18 ++++----
2 files changed, 9 insertions(+), 54 deletions(-)
delete mode 100644 srcpkgs/io.elementary.calendar/patches/00-musl.patch
diff --git a/srcpkgs/io.elementary.calendar/patches/00-musl.patch b/srcpkgs/io.elementary.calendar/patches/00-musl.patch
deleted file mode 100644
index f85beca403fa..000000000000
--- a/srcpkgs/io.elementary.calendar/patches/00-musl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-commit c9ba80af072819261a9e24a04a0859b93b5db810
-Author: Cameron Nemo <camerontnorman@gmail.com>
-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 () {
-+#if HAVE_NL_TIME_FIRST_WEEKDAY
- int week_start = Posix.NLTime.FIRST_WEEKDAY.to_string ().data[0];
-+#else
-+ int week_start = 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
---- 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')
-
--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
-
- gresource_calendar = gnome.compile_resources(
- 'gresource_calendar',
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 <cnemo@tutanota.com>"
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 4ac4408d011433df2d322e7a6151f9362538d5e7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <daniel@octaforge.org>
-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..35927b238713 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 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 <cnemo@tutanota.com>"
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 a9f9f0b864102a9a51019ed236f962c0618884a1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 5f7c3c94c1a4..2b4a75ef1a15 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 <cnemo@tutanota.com>"
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 3f1d31b1e6c6898a10c82ee0f9a0426f4fe0c3cc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 052055ea0b4d58f9fd63d42e1cbd4bf25a9df2e6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 4eae0af90d83e3ef097b7f53620564c96a49e7f6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <ricotz@ubuntu.com>
-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 <cnemo@tutanota.com>"
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 ec5d78889063ee183cbd1c1c66f5e38ed0506ae6 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
From 3e2ba5ef9ec534e5394e46bc3094092a66f8647a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 196d7c7350c968511e96372aea680b08033aa7be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/videos"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
From 34471215cee89276432ee0296534518cda827198 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 | 1 +
2 files changed, 1 insertion(+), 13 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 <linarcx@riseup.net>"
-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..83258b2978ab 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (5 preceding siblings ...)
2022-03-12 15:34 ` paper42
@ 2022-03-13 0:38 ` 0x5c
2022-03-13 21:06 ` [PR PATCH] [Updated] " paper42
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: 0x5c @ 2022-03-13 0:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 215 bytes --]
New comment by 0x5c on void-packages repository
https://github.com/void-linux/void-packages/pull/36085#issuecomment-1065992956
Comment:
This would obsolete https://github.com/void-linux/void-packages/pull/34754
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (6 preceding siblings ...)
2022-03-13 0:38 ` 0x5c
@ 2022-03-13 21:06 ` paper42
2022-03-13 21:11 ` paper42
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-13 21:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1199 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages granite6
https://github.com/void-linux/void-packages/pull/36085
granite 6
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36085.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-granite6-36085.patch --]
[-- Type: text/x-diff, Size: 52347 bytes --]
From 39522f900b31bb6a078d516d8b508f368520745b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 <michal@vasilek.cz>
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<NotifierDBus> (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 <admin@en-circle.com>
-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 <orphan@voidlinux.org>"
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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <camerontnorman@gmail.com>
-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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <daniel@octaforge.org>
-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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <ricotz@ubuntu.com>
-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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 <michal@vasilek.cz>
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 <void@uw.anonaddy.com>"
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 <michal@vasilek.cz>
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 <linarcx@riseup.net>"
-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 <chocimier@tlen.pl>"
@@ -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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (7 preceding siblings ...)
2022-03-13 21:06 ` [PR PATCH] [Updated] " paper42
@ 2022-03-13 21:11 ` paper42
2022-03-16 22:59 ` [PR PATCH] [Updated] " paper42
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-13 21:11 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 514 bytes --]
New comment by paper42 on void-packages repository
https://github.com/void-linux/void-packages/pull/36085#issuecomment-1066182907
Comment:
@CameronNemo I had to rebase your patch for Elementary Calendar - 9032015c23b4565a12c772236d63411237c01458, I see you made a PR upstream, could you update it with these changes if you find them appropriate? https://github.com/elementary/calendar/pull/280. I will credit you as the original author of the patch with the next push, I forgot to do that now, sorry about that.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (8 preceding siblings ...)
2022-03-13 21:11 ` paper42
@ 2022-03-16 22:59 ` paper42
2022-03-25 22:20 ` paper42
2022-03-25 22:42 ` [PR PATCH] [Merged]: " paper42
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-16 22:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages granite6
https://github.com/void-linux/void-packages/pull/36085
granite 6
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36085.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-granite6-36085.patch --]
[-- Type: text/x-diff, Size: 52370 bytes --]
From 7257bd9d0f0007e9b16db1b03d8ed94aa900fd9b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 83b5783cb026..5a2bb82a4cb2 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 <cnemo@tutanota.com>"
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 eb7912cb54ec446af38001fdfb6ac5ecbb7217f3 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 26ca6748c6379bd849f0f12811c2708c29411301 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 d22ee0e0dcfc0255c3be70039ed7b8f8c4731cb4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 323cef2b08ece1f92930c8439f51d1ca8034eb79 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 b81e3cdfc3e351fbb9015c81c1016c18063b08ae Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 1f555e75d498f5ea2e24240d509e42d3adb96930 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 db5f219a03a955d9e96800bbf2d90844370ca460 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 64ede25e5e1521560412dc6da8ef0b3ae9d63fc4 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 04585f5bf46189c19b2a4411795a7dac2f6b76c5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 e1a9fe3b2f903e3bd27ea7833755e914aa69bd39 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 c3f5170d0f50bc0287e5ced8d1cd87c63192ba36 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 3ea7dc049993f95d7bfccca714fac39ff6785bcd Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 13/25] switchboard-plug-network: update to 2.4.2.
* build translations
* enable cross builds
---
srcpkgs/switchboard-plug-network/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index 31f640cf25df..382aea7559a0 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,15 +1,14 @@
# 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 <orphan@voidlinux.org>"
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
-nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
+distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz"
+checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971
From 17c9f5c78d4f06d53403bfa5836346d9f0782662 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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<NotifierDBus> (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 <admin@en-circle.com>
-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 <orphan@voidlinux.org>"
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 94be56519ab4d63f66865bb835bd5ca21ca18d5f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 8db8ab8abc32556743ae09726eb0cae9be5da722 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <camerontnorman@gmail.com>
-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 <cnemo@tutanota.com>"
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 94281585fb036b831c0a3f7c768e48f8140b219e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <daniel@octaforge.org>
-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 <cnemo@tutanota.com>"
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 e728404447cca37613d7ce32ed6f4d8b82a7e852 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 5a2bb82a4cb2..447b14677754 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 <cnemo@tutanota.com>"
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 e26b37906d9dc666c625ea52ea77303c5ac1454a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 fc58053effeb6d058de4b10107d20c4d906b3c5b Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 273e4db60d031cf8410f49de74532bb3f1d49ec7 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <ricotz@ubuntu.com>
-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 <cnemo@tutanota.com>"
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 0edb4abd1e377d4d3043f32ffeaa950465f2d517 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
From 2d8f68e992e030846330d6b18169f30bd6cf68c1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 abf25d25b7f5be78f51e4bd82b1a58420151bbbf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/videos"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
From e52e6df629d0db31dd9ba104c2b0afe6b2fb4985 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
-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 6a744198712d..e0162f5ded17 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=65
+revision=66
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -80,6 +80,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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Updated] granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (9 preceding siblings ...)
2022-03-16 22:59 ` [PR PATCH] [Updated] " paper42
@ 2022-03-25 22:20 ` paper42
2022-03-25 22:42 ` [PR PATCH] [Merged]: " paper42
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-25 22:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1204 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages granite6
https://github.com/void-linux/void-packages/pull/36085
granite 6
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/36085.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-granite6-36085.patch --]
[-- Type: text/x-diff, Size: 52375 bytes --]
From f4784462155de4a26024f3508cd984d92e6a42be Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 2d8a8b8b0df3..dd26ddee444b 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 <cnemo@tutanota.com>"
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 b8b5bb6277ae4e985471a0706aacc84f1c698eea Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 c598862b37b6a7dc0b746451e523aa827a973737 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 fc5cc8cb7ca4d7eaee9dad1c49344a96ee801661 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 43bc6d1c65f0e8c18f2e882328aaa16794439358 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 dfc61e2daca803720784ca09a02983e830e2252f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:04 +0100
Subject: [PATCH 06/25] pantheon-agent-polkit: revbump for granite 6
---
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 <orphan@voidlinux.org>"
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 3849d8ff72acb71c876f26aa04dcb4855bdf960a Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 d0145b67990c7daeb5b88ee8d06d7a5fd95ab066 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
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 9af2eeff01638063c483c38e4f93d2e7b70c56a9 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 32779007faa816a73032974baed3ae181ccb2f32 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 e759f9ba2de06b07205f6479824ecfc8a408cc67 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <orphan@voidlinux.org>"
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 2bd16728fe68a0879a7c721556b2d650c14d54f5 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 4fcf4ae0e3139033e67791ac82821f17110a5de0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Thu, 10 Mar 2022 22:08:06 +0100
Subject: [PATCH 13/25] switchboard-plug-network: update to 2.4.2.
* build translations
* enable cross builds
---
srcpkgs/switchboard-plug-network/template | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template
index 31f640cf25df..382aea7559a0 100644
--- a/srcpkgs/switchboard-plug-network/template
+++ b/srcpkgs/switchboard-plug-network/template
@@ -1,15 +1,14 @@
# 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 <orphan@voidlinux.org>"
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
-nocross="https://travis-ci.org/github/void-linux/void-packages/builds/733837363"
+distfiles="https://github.com/elementary/switchboard-plug-network/archive/${version}.tar.gz"
+checksum=190b1f9123bc9ee4120a624ad3de91c0e40a141cb19b8eb7ec74d3c39f008971
From 5afc005cd19d8024b2c0cad2be052e24a43c3eb0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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<NotifierDBus> (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 <admin@en-circle.com>
-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 <orphan@voidlinux.org>"
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 0013dbb30d6211338125628a6e7fa7e0008442bf Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 1328d41ad148367871dae8b472fe807e620ba804 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <camerontnorman@gmail.com>
-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 <cnemo@tutanota.com>"
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 e9a3e11d5a982997bbeaca3d98c402c8b37b34ac Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <daniel@octaforge.org>
-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 <cnemo@tutanota.com>"
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 5e61941f184b00f7b78b23a4adb0332820ed4a24 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 dd26ddee444b..ffcc843af85c 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 <cnemo@tutanota.com>"
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 144223a290fb880a0f8ef76e2d0f4885813cc061 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 06633faa17253c15ba53637f949b0f304bc7b60f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 19fac41dfa540f0a9dbbf61800e6d8fd190f4644 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <ricotz@ubuntu.com>
-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 <cnemo@tutanota.com>"
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 1d002e906898e8008dc84438ae4ac25d517bd25f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/stylesheet"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=3bc37723daf4ce0b7c9ce4c125ef0055affe8d6654981388ec87d4a23a1ae0ec
+checksum=b8432a0a06944065a35eadf582043022a174d5ffa88bc0ee4e86b969688ed23e
From 5ab1544df7c74a537cb088e25a0c8cdbd7293e1f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <cnemo@tutanota.com>"
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 c6624d2b8b691ef5635095e6c820335633ca7019 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <void@uw.anonaddy.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/elementary/videos"
distfiles="${homepage}/archive/${version}.tar.gz"
-checksum=47946d6b285e2ff1eb86a654de0a6a268eebcf8dfa6ba733dd025b5d37fdad8a
+checksum=09c5db6433e4f6d570950609ff1d95a86df2179e7a65677a1e14c0549bbceba6
From 05153794c5604b844f6d5644c35a035ee3e0942d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
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 <linarcx@riseup.net>"
-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 30fa0d2cce34..3681d35207a9 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=66
+revision=67
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -80,6 +80,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
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PR PATCH] [Merged]: granite 6
2022-03-10 23:30 [PR PATCH] granite 6 paper42
` (10 preceding siblings ...)
2022-03-25 22:20 ` paper42
@ 2022-03-25 22:42 ` paper42
11 siblings, 0 replies; 13+ messages in thread
From: paper42 @ 2022-03-25 22:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1047 bytes --]
There's a merged pull request on the void-packages repository
granite 6
https://github.com/void-linux/void-packages/pull/36085
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 13+ messages in thread