evolution stack: update to 3.60.2 + folks 0.15.12, gnome-contacts, pidgin musl fix

common/shlibs

@@ -572,10 +572,10 @@ libicalss.so.3 libical-3.0.4_1
 libicalss_cxx.so.3 libical-3.0.4_1
 libicalvcal.so.3 libical-3.0.4_1
 libical-glib.so.3 libical-3.0.4_1
-libcamel-1.2.so.64 evolution-data-server-3.46.0_1
+libcamel-1.2.so.67 evolution-data-server-3.60.2_1
 libebackend-1.2.so.11 evolution-data-server-3.46.0_1
 libebook-1.2.so.21 evolution-data-server-3.46.0_1
-libebook-contacts-1.2.so.4 evolution-data-server-3.46.0_1
+libebook-contacts-1.2.so.5 evolution-data-server-3.60.2_1
 libecal-2.0.so.3 evolution-data-server-3.52.0_1
 libedata-book-1.2.so.27 evolution-data-server-3.46.0_1
 libedataserver-1.2.so.27 evolution-data-server-3.46.0_1

srcpkgs/evolution-data-server/template

@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
-version=3.56.2
-revision=4
+version=3.60.2
+revision=1
 build_style=cmake
 build_helper="gir qemu"
 configure_args=" -DSYSCONF_INSTALL_DIR=/etc
@@ -19,22 +19,19 @@ short_desc="Centralized access to appointments and contacts"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-only"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-48/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution-data-server/-/raw/gnome-50/NEWS"
 distfiles="${GNOME_SITE}/evolution-data-server/${version%.*}/evolution-data-server-${version}.tar.xz"
-checksum=df4ec29950f29a76eac6fbe0f814c48d2cef7d3fdb905002a4a883dd761ce93c
+checksum=2084dbdac396371b365d504c1ff45866ba8dca2f1252e5da1d3d9c33abdc1286
 make_check=ci-skip # flaky in CI
-
 build_options="gir"
 build_options_default="gir"
-
 pre_build() {
 	# Only affect g-ir-scanner, which is fine
 	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/camel"
 	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/libebackend"
 	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/libedataserver"
 	LDFLAGS+=" -Wl,--rpath-link=$wrksrc/build/src/private"
 }
-
 evolution-data-server-devel_package() {
 	depends="sqlite-devel mit-krb5-devel nss-devel nspr-devel libical-devel
 		libsecret-devel libglib-devel libsoup3-devel gtk4-devel libxml2-devel

srcpkgs/evolution-ews/template

@@ -1,6 +1,6 @@
 # Template file for 'evolution-ews'
 pkgname=evolution-ews
-version=3.56.2
+version=3.60.2
 revision=1
 build_style=cmake
 configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution"
@@ -13,4 +13,4 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
 changelog="https://gitlab.gnome.org/GNOME/evolution-ews/-/raw/gnome-48/NEWS"
 distfiles="${GNOME_SITE}/evolution-ews/${version%.*}/evolution-ews-${version}.tar.xz"
-checksum=1eb7eccf94c6b8618d6b45c3202350209db567c489108adc20233c4d19f8f28f
+checksum=940205818f6988411457ddf5804d210f3515c26e33415debd8fbb2731b1daf2b

srcpkgs/evolution/template

@@ -1,12 +1,11 @@
 # Template file for 'evolution'
 pkgname=evolution
-version=3.56.2
-revision=2
+version=3.60.2
+revision=1
 build_style=cmake
 build_helper="qemu"
 configure_args="-DSYSCONF_INSTALL_DIR=/etc
- -DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF
- -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
+ -DENABLE_AUTOAR=OFF -DENABLE_TEXT_HIGHLIGHT=OFF -DENABLE_PST_IMPORT=OFF
  -DENABLE_WEATHER=ON -DWITH_ENCHANT_VERSION=2"
 hostmakedepends="intltool itstool pkg-config glib-devel"
 makedepends="NetworkManager-devel clutter-gtk-devel enchant2-devel
@@ -18,13 +17,12 @@ short_desc="Integrated mail, addressbook and calendaring for GNOME"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later"
 homepage="https://wiki.gnome.org/Apps/Evolution"
-changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-48/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/evolution/-/raw/gnome-50/NEWS"
 distfiles="${GNOME_SITE}/evolution/${version%.*}/evolution-${version}.tar.xz"
-checksum=7dfdc9aeb2dab326dabfdc1f8577c4ecc123a12da0012f8c64a726065a3c0b2b
+checksum=218a49fa5068155dbdbd35a30d10a2f237c72465fb1d0e0aa78889f039c2ed8f
 shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so
  libevolution-mail.so libevolution-shell.so libevolution-mail-formatter.so
  libevolution-mail-composer.so"
-
 evolution-devel_package() {
 	depends="libwebkit2gtk41-devel gtk+3-devel libglib-devel evolution-data-server-devel
 	 ${sourcepkg}>=${version}_${revision}"

srcpkgs/folks/template

@@ -1,6 +1,6 @@
 # Template file for 'folks'
 pkgname=folks
-version=0.15.9
+version=0.15.12
 revision=1
 build_style=meson
 build_helper="gir"
@@ -17,7 +17,7 @@ license="LGPL-2.1-or-later"
 homepage="https://wiki.gnome.org/Projects/Folks"
 changelog="https://gitlab.gnome.org/GNOME/folks/-/raw/master/NEWS"
 distfiles="${GNOME_SITE}/folks/${version%.*}/folks-${version}.tar.xz"
-checksum=2311b37355c351f33f163fdc394874a22a0a0682c319493d6d8a6e420711415f
+checksum=21f44e2bdabb1ee7f8e41bb996d10ac7daf35c78c498177db0c00f580a20a914
 make_check_pre="dbus-run-session"
 # FIXME: test failures with glib 2.80
 # https://gitlab.gnome.org/GNOME/folks/-/issues/140

srcpkgs/gnome-contacts/template

@@ -1,7 +1,7 @@
 # Template file for 'gnome-contacts'
 pkgname=gnome-contacts
 version=50.0
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="blueprint-compiler desktop-file-utils docbook-xsl gettext glib-devel gtk4-update-icon-cache gobject-introspection libxslt pkg-config vala"
 makedepends="evolution-data-server-devel folks-devel glycin-devel glycin-gtk4-devel

srcpkgs/pidgin/patches/getopt-musl.patch

@@ -0,0 +1,40 @@
+--- a/finch/getopt.h
++++ b/finch/getopt.h
+@@ -108,7 +108,7 @@
+    errors, only prototype getopt for the GNU C library.  */
+ extern int getopt (int argc, char *const *argv, const char *shortopts);
+ #else /* not __GNU_LIBRARY__ */
+-extern int getopt ();
++extern int getopt (int, char *const *, const char *);
+ #endif /* not __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ 		        const struct option *longopts, int *longind);
+@@ -122,7 +122,7 @@
+ 		             const struct option *longopts, int *longind,
+ 			     int long_only);
+ #else /* not __STDC__ */
+-extern int getopt ();
++extern int getopt (int, char *const *, const char *);
+ extern int getopt_long ();
+ extern int getopt_long_only ();
+
+--- a/pidgin/getopt.h
++++ b/pidgin/getopt.h
+@@ -108,7 +108,7 @@
+    errors, only prototype getopt for the GNU C library.  */
+ extern int getopt (int argc, char *const *argv, const char *shortopts);
+ #else /* not __GNU_LIBRARY__ */
+-extern int getopt ();
++extern int getopt (int, char *const *, const char *);
+ #endif /* not __GNU_LIBRARY__ */
+ extern int getopt_long (int argc, char *const *argv, const char *shortopts,
+ 		        const struct option *longopts, int *longind);
+@@ -122,7 +122,7 @@
+ 		             const struct option *longopts, int *longind,
+ 			     int long_only);
+ #else /* not __STDC__ */
+-extern int getopt ();
++extern int getopt (int, char *const *, const char *);
+ extern int getopt_long ();
+ extern int getopt_long_only ();
+

srcpkgs/pidgin/template

@@ -1,7 +1,7 @@
 # Template file for 'pidgin'
 pkgname=pidgin
 version=2.14.14
-revision=1
+revision=3
 build_style=gnu-configure
 configure_args="--disable-schemas-install --disable-meanwhile
  --enable-cyrus-sasl --disable-doxygen --enable-nm --enable-vv