granite 6

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
@@ -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

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"

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"

srcpkgs/granite/template

@@ -1,18 +1,18 @@
 # 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"
 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}"

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}"

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(

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

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

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

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

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?