From 62a41dd37e0097e7549da65d0f3ae1b320ffa89d Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:09:18 +0100 Subject: [PATCH 01/23] granite: update to 6.2.0. --- common/shlibs | 2 +- srcpkgs/granite/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index e1a175684656..a08a9a06d222 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1187,7 +1187,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..abeea449646e 100644 --- a/srcpkgs/granite/template +++ b/srcpkgs/granite/template @@ -1,6 +1,6 @@ # Template file for 'granite' pkgname=granite -version=5.5.0 +version=6.2.0 revision=1 build_style=meson build_helper="gir" @@ -12,7 +12,7 @@ maintainer="Cameron Nemo " license="LGPL-3.0-or-later" homepage="https://github.com/elementary/granite" distfiles="https://github.com/elementary/granite/archive/${version}.tar.gz" -checksum=0c376520c7d462fca05213a14970ee1075fea4a78062a33b47529e2647cd5557 +checksum=067d31445da9808a802fca523630c3e4b84d2d7c78ae547ced017cb7f3b9c6b5 granite-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" From 2d4b14be82450a05b73dbd893139860eb65e5b6a Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 02/23] Minder: rebuild against libgranite.so.6 --- srcpkgs/Minder/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/Minder/template b/srcpkgs/Minder/template index 2022aca4548d..b1a98883e8c3 100644 --- a/srcpkgs/Minder/template +++ b/srcpkgs/Minder/template @@ -1,7 +1,7 @@ # Template file for 'Minder' pkgname=Minder version=1.13.1 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config glib-devel vala" makedepends="cairo-devel granite-devel gtk+3-devel libxml2-devel libgee08-devel From 4d392baafbd9904a52274785bc0947229a9d946e Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 03/23] bookworm: rebuild against libgranite.so.6 --- srcpkgs/bookworm/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/bookworm/template b/srcpkgs/bookworm/template index 3e319fb786d9..43b76394d308 100644 --- a/srcpkgs/bookworm/template +++ b/srcpkgs/bookworm/template @@ -1,7 +1,7 @@ # Template file for 'bookworm' pkgname=bookworm version=1.1.2 -revision=4 +revision=5 build_style=meson hostmakedepends="pkg-config glib-devel vala" makedepends="gtk+3-devel libgee08-devel granite-devel From 10f121447ffb3b3bafbc72af46c380eadf63d5c8 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 04/23] giti: rebuild against libgranite.so.6 --- srcpkgs/giti/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/giti/template b/srcpkgs/giti/template index e3c8663fa536..d1a43dc3b7f4 100644 --- a/srcpkgs/giti/template +++ b/srcpkgs/giti/template @@ -1,7 +1,7 @@ # Template file for 'giti' pkgname=giti version=1.0.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config vala gettext" makedepends="gtk+3-devel libgit2-glib-devel libgee08-devel granite-devel" From 7ff167c5448cdaac5ce75bdbd859037f7b1bc9dd Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 05/23] io.elementary.calculator: rebuild against libgranite.so.6 --- srcpkgs/io.elementary.calculator/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.calculator/template b/srcpkgs/io.elementary.calculator/template index 56abf698403b..9b2774a14f46 100644 --- a/srcpkgs/io.elementary.calculator/template +++ b/srcpkgs/io.elementary.calculator/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.calculator' pkgname=io.elementary.calculator version=1.6.0 -revision=2 +revision=3 wrksrc="calculator-${version}" build_style=meson hostmakedepends="intltool pkg-config vala desktop-file-utils AppStream" From 2e3eeada7fecba2f9887b9eac46a97ef333e0b8c Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 06/23] io.elementary.calendar: rebuild against libgranite.so.6 --- srcpkgs/io.elementary.calendar/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.calendar/template b/srcpkgs/io.elementary.calendar/template index 7ff446f97d15..a5ea019353a0 100644 --- a/srcpkgs/io.elementary.calendar/template +++ b/srcpkgs/io.elementary.calendar/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.calendar' pkgname=io.elementary.calendar version=5.0 -revision=5 +revision=6 _git_commit=46346e48b53e9d3d59d9f567b622532338f50f32 wrksrc="calendar-${_git_commit}" build_style=meson From de28dffabf6e4a6d1482f8bc79e3a0a43673ede2 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 07/23] io.elementary.code: rebuild against libgranite.so.6 --- srcpkgs/io.elementary.code/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.code/template b/srcpkgs/io.elementary.code/template index 66de4b50be05..05d84cc39c9f 100644 --- a/srcpkgs/io.elementary.code/template +++ b/srcpkgs/io.elementary.code/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.code' pkgname=io.elementary.code version=3.4.1 -revision=4 +revision=5 wrksrc="code-${version}" build_style=meson hostmakedepends="pkg-config vala intltool glib-devel" From b6a240d96edd4a5c29d179c0613420d324d320dc Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 08/23] io.elementary.files: rebuild against libgranite.so.6 --- srcpkgs/io.elementary.files/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.files/template b/srcpkgs/io.elementary.files/template index cb0643a02449..99231acb5048 100644 --- a/srcpkgs/io.elementary.files/template +++ b/srcpkgs/io.elementary.files/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.files' pkgname=io.elementary.files version=4.5.0 -revision=1 +revision=2 wrksrc="files-${version}" build_style=meson configure_args="-Dwith-unity=disabled" From 465d0e8339394a120c493cc70dcd6a583137f6a2 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 09/23] io.elementary.music: rebuild against libgranite.so.6 --- srcpkgs/io.elementary.music/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.music/template b/srcpkgs/io.elementary.music/template index de6ae0f94d90..53076fad5f1e 100644 --- a/srcpkgs/io.elementary.music/template +++ b/srcpkgs/io.elementary.music/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.music' pkgname=io.elementary.music version=5.0.5 -revision=1 +revision=2 wrksrc="music-${version}" build_style=meson configure_args="-Dbuild-plugins=true -Dplugins=audioplayer,cdrom,ipod" From 7a74cac80c377ed1be57a337cc9486bf30ebad6a Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 10/23] io.elementary.photos: rebuild against libgranite.so.6 --- srcpkgs/io.elementary.photos/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.photos/template b/srcpkgs/io.elementary.photos/template index 81c1734164ba..ca4e4c8b7b15 100644 --- a/srcpkgs/io.elementary.photos/template +++ b/srcpkgs/io.elementary.photos/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.photos' pkgname=io.elementary.photos version=2.7.0 -revision=2 +revision=3 wrksrc="photos-${version}" build_style=meson configure_args="-Dlibunity=false" From db44a12ec38c6d8414a2e51c2de8be21e8b0c49d Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:47 +0100 Subject: [PATCH 11/23] io.elementary.terminal: rebuild against libgranite.so.6 --- srcpkgs/io.elementary.terminal/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.terminal/template b/srcpkgs/io.elementary.terminal/template index 2aba6a5b563f..b7d60bfd756d 100644 --- a/srcpkgs/io.elementary.terminal/template +++ b/srcpkgs/io.elementary.terminal/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.terminal' pkgname=io.elementary.terminal version=5.5.2 -revision=1 +revision=2 wrksrc="terminal-${version}" build_style=meson configure_args="-Dubuntu-bionic-patched-vte=false" From e286baa5e1d5088bd1e165979f9dbe3f6d80a30d Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 12/23] io.elementary.videos: rebuild against libgranite.so.6 --- srcpkgs/io.elementary.videos/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/io.elementary.videos/template b/srcpkgs/io.elementary.videos/template index c989ccaf6954..b033a23e766b 100644 --- a/srcpkgs/io.elementary.videos/template +++ b/srcpkgs/io.elementary.videos/template @@ -1,7 +1,7 @@ # Template file for 'io.elementary.videos' pkgname=io.elementary.videos version=2.7.2 -revision=1 +revision=2 wrksrc="videos-${version}" build_style=meson hostmakedepends="intltool pkg-config vala AppStream" From 0a84fa734f92cf091bf50789b0b4a2398727afe8 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 13/23] notes-up: rebuild against libgranite.so.6 --- srcpkgs/notes-up/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/notes-up/template b/srcpkgs/notes-up/template index 481a214cfbc2..f2231f1dacb9 100644 --- a/srcpkgs/notes-up/template +++ b/srcpkgs/notes-up/template @@ -1,7 +1,7 @@ # Template file for 'notes-up' pkgname=notes-up version=2.0.5 -revision=1 +revision=2 wrksrc=Notes-up-${version} build_style=meson hostmakedepends="pkg-config vala gettext glib-devel" From 496bc388a6a5a51a435dadca23705826a9219d1b Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 14/23] nutty: rebuild against libgranite.so.6 --- srcpkgs/nutty/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/nutty/template b/srcpkgs/nutty/template index 37396577835b..b00caa217ce1 100644 --- a/srcpkgs/nutty/template +++ b/srcpkgs/nutty/template @@ -1,7 +1,7 @@ # Template file for 'nutty' pkgname=nutty version=1.1.1 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config vala glib-devel" makedepends="gtk+3-devel libgee08-devel libnotify-devel granite-devel From 159e0ec8cdcf6394015d194b201f4e80bc220725 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 15/23] pantheon-agent-polkit: rebuild against libgranite.so.6 --- srcpkgs/pantheon-agent-polkit/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pantheon-agent-polkit/template b/srcpkgs/pantheon-agent-polkit/template index c2ae95b313e4..1ccf36637d16 100644 --- a/srcpkgs/pantheon-agent-polkit/template +++ b/srcpkgs/pantheon-agent-polkit/template @@ -1,7 +1,7 @@ # 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" makedepends="gtk+3-devel polkit-devel granite-devel" From 9286735231be83e803c325f2c96165d5146e78e3 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 16/23] pantheon-screenshot: rebuild against libgranite.so.6 --- srcpkgs/pantheon-screenshot/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/pantheon-screenshot/template b/srcpkgs/pantheon-screenshot/template index 3492b0c0d49e..52277df77ba8 100644 --- a/srcpkgs/pantheon-screenshot/template +++ b/srcpkgs/pantheon-screenshot/template @@ -1,7 +1,7 @@ # Template file for 'pantheon-screenshot' pkgname=pantheon-screenshot version=1.7.1 -revision=1 +revision=2 wrksrc="screenshot-${version}" build_style=meson hostmakedepends="desktop-file-utils glib-devel intltool pkgconf vala" From 31e8356db3b3ac51ebe79d2ec2e16bb41a0084d1 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 17/23] planner: rebuild against libgranite.so.6 --- srcpkgs/planner/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/planner/template b/srcpkgs/planner/template index 7be79ab4c6ba..6e49039a6346 100644 --- a/srcpkgs/planner/template +++ b/srcpkgs/planner/template @@ -1,7 +1,7 @@ # Template file for 'planner' pkgname=planner version=2.7 -revision=1 +revision=2 build_style=meson build_helper="gir" hostmakedepends="gettext pkg-config vala glib-devel curl" From 6b3b827e7e0c8b0ee05bcd4460ac9a5888780209 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 18/23] quickDocs: rebuild against libgranite.so.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 c401091658b97935ca7c1454d0fa98030849db56 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 19/23] sequeler: rebuild against libgranite.so.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 82c404a55f6bfd631c0569ee92170e7070d40067 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 20/23] switchboard: rebuild against libgranite.so.6 --- srcpkgs/switchboard/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/switchboard/template b/srcpkgs/switchboard/template index ebb706e5d9e5..f5aa0661d3ea 100644 --- a/srcpkgs/switchboard/template +++ b/srcpkgs/switchboard/template @@ -1,7 +1,7 @@ # Template file for 'switchboard' pkgname=switchboard version=2.3.7 -revision=2 +revision=3 build_style=meson hostmakedepends="pkg-config vala gettext" makedepends="granite-devel clutter-gtk-devel gtk+3-devel" From 55f0affdf4a94aaca52cb36e827f070bc9454fdd Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 21/23] switchboard-plug-bluetooth: rebuild against libgranite.so.6 --- srcpkgs/switchboard-plug-bluetooth/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/switchboard-plug-bluetooth/template b/srcpkgs/switchboard-plug-bluetooth/template index 373368918159..181a2dce40da 100644 --- a/srcpkgs/switchboard-plug-bluetooth/template +++ b/srcpkgs/switchboard-plug-bluetooth/template @@ -1,7 +1,7 @@ # Template file for 'switchboard-plug-bluetooth' pkgname=switchboard-plug-bluetooth version=2.3.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config vala" makedepends="switchboard-devel granite-devel gtk+3-devel" From db5d341992ce3d97e45f23dbd7351870fe444bdb Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 22/23] switchboard-plug-network: rebuild against libgranite.so.6 --- srcpkgs/switchboard-plug-network/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/switchboard-plug-network/template b/srcpkgs/switchboard-plug-network/template index 31f640cf25df..cb5955d621c0 100644 --- a/srcpkgs/switchboard-plug-network/template +++ b/srcpkgs/switchboard-plug-network/template @@ -1,7 +1,7 @@ # Template file for 'switchboard-plug-network' pkgname=switchboard-plug-network version=2.3.3 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config vala" makedepends="switchboard-devel granite-devel gtk+3-devel From 4603bb71c82de96c5018dc0b3f4c2d5b7c736cf5 Mon Sep 17 00:00:00 2001 From: Daniel Lewan Date: Wed, 29 Dec 2021 13:41:48 +0100 Subject: [PATCH 23/23] switchboard-plug-printers: rebuild against libgranite.so.6 --- srcpkgs/switchboard-plug-printers/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/switchboard-plug-printers/template b/srcpkgs/switchboard-plug-printers/template index caecd10c886c..c7fe3ca5cb91 100644 --- a/srcpkgs/switchboard-plug-printers/template +++ b/srcpkgs/switchboard-plug-printers/template @@ -1,7 +1,7 @@ # Template file for 'switchboard-plug-printers' pkgname=switchboard-plug-printers version=2.1.6 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config vala intltool" makedepends="switchboard-devel granite-devel gtk+3-devel cups-devel"