From 511cd42f380a09ab99c287b4e8bcadbcde7fdf06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:26 +0700 Subject: [PATCH 01/33] atril: update to 1.28.0. --- srcpkgs/atril-dvi | 1 + srcpkgs/atril/template | 22 +++++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) create mode 120000 srcpkgs/atril-dvi diff --git a/srcpkgs/atril-dvi b/srcpkgs/atril-dvi new file mode 120000 index 00000000000000..49b36336be9fc7 --- /dev/null +++ b/srcpkgs/atril-dvi @@ -0,0 +1 @@ +atril \ No newline at end of file diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template index 57ed642270b2ae..cc91b77f57ef0e 100644 --- a/srcpkgs/atril/template +++ b/srcpkgs/atril/template @@ -1,16 +1,17 @@ # Template file for 'atril' pkgname=atril -version=1.26.2 +version=1.28.0 revision=1 build_style=gnu-configure build_helper="gir" -configure_args="--disable-schemas-compile --enable-djvu --enable-synctex=no +configure_args="--disable-schemas-compile --enable-djvu --enable-synctex --enable-dvi --enable-t1lib --enable-pixbuf --enable-comics --enable-xps --disable-static $(vopt_enable gir introspection)" -hostmakedepends="glib-devel intltool itstool pkg-config +hostmakedepends="glib-devel intltool itstool pkg-config libxml2 perl-XML-Parser yelp-tools mate-common $(vopt_if gir 'gobject-introspection')" makedepends="djvulibre-devel libSM-devel libcaja-devel libgxps-devel - libnotify-devel libsecret-devel libspectre-devel + libnotify-devel libsecret-devel libspectre-devel texlive-devel cairo-devel + libglib-devel gtk+3-devel libxml2-devel zlib-devel tiff-devel libarchive-devel mate-desktop-devel mate-icon-theme poppler-glib-devel libwebkit2gtk41-devel" depends="dbus mate-desktop mate-icon-theme" short_desc="Simply a document viewer for MATE" @@ -19,9 +20,8 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/atril/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/atril-${version}.tar.xz" -checksum=c305b9d5f5713f42626aee0382091303422b3d71a56ddd65932ccdb23c7ce926 -make_check=no # needs dogtail - +checksum=ced4725f6e9b71c4ea63676bfc3cc3be09d29dba08aa7a7ab97964e0b4355162 +make_check=no # dogtail build_options="gir" build_options_default="gir" @@ -43,3 +43,11 @@ libatril-devel_package() { vmove usr/share/gtk-doc } } + +atril-dvi_package() { + short_desc+=" - DVI format support" + pkg_install() { + vmove usr/lib/atril/3/backends/dvidocument.atril-backend + vmove usr/lib/atril/3/backends/libdvidocument.so + } +} From f44a118ad139b9c24d8d91ff78663f3c4aed8f16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:26 +0700 Subject: [PATCH 02/33] caja-dropbox: update to 1.28.0. --- srcpkgs/caja-dropbox/template | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/srcpkgs/caja-dropbox/template b/srcpkgs/caja-dropbox/template index 0beb6967905f50..fbb926e34aa7ba 100644 --- a/srcpkgs/caja-dropbox/template +++ b/srcpkgs/caja-dropbox/template @@ -1,11 +1,11 @@ # Template file for 'caja-dropbox' pkgname=caja-dropbox -version=1.26.0 +version=1.28.0 revision=1 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="autoconf-archive gettext-devel libtool pkg-config - python3-docutils python3-gobject gdk-pixbuf-devel which mate-common" +hostmakedepends="gettext pkg-config python3-docutils python3-gobject + gdk-pixbuf" makedepends="libcaja-devel glib-devel gtk+3-devel python3-gobject-devel" depends="caja" short_desc="Dropbox extension for Caja file manager" @@ -14,10 +14,13 @@ license="CC-BY-ND-3.0, GPL-3.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/caja-dropbox/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=9693d0c3426822d5b549e2241cd2b8a0ed552d4eebf2c87fa522e82b3fc8849b +checksum=b74c38a994254bd3cf7cbc712bc2ec7516a0ca942aa6578526cdbd6aa6201963 -pre_configure() { - NOCONFIGURE=1 ./autogen.sh +post_patch() { + if [ "$CROSS_BUILD" ]; then + vsed -i 's/man_MANS =.*/man_MANS =/' \ + Makefile.am Makefile.in + fi } post_install() { From 9f1734e6fb2b92312461ad8382f8d7d07abea362 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:26 +0700 Subject: [PATCH 03/33] caja-extensions: update to 1.28.0. --- srcpkgs/caja-av | 1 + .../patches/1-gtk-radio-button-id.patch | 24 ---- .../patches/2-sendto-gupnp-1.6.patch | 132 ------------------ .../caja-extensions/patches/3-xattr-mtp.patch | 58 -------- srcpkgs/caja-extensions/template | 31 ++-- 5 files changed, 22 insertions(+), 224 deletions(-) create mode 120000 srcpkgs/caja-av delete mode 100644 srcpkgs/caja-extensions/patches/1-gtk-radio-button-id.patch delete mode 100644 srcpkgs/caja-extensions/patches/2-sendto-gupnp-1.6.patch delete mode 100644 srcpkgs/caja-extensions/patches/3-xattr-mtp.patch diff --git a/srcpkgs/caja-av b/srcpkgs/caja-av new file mode 120000 index 00000000000000..9c237ae5529d21 --- /dev/null +++ b/srcpkgs/caja-av @@ -0,0 +1 @@ +caja-extensions \ No newline at end of file diff --git a/srcpkgs/caja-extensions/patches/1-gtk-radio-button-id.patch b/srcpkgs/caja-extensions/patches/1-gtk-radio-button-id.patch deleted file mode 100644 index 0304c76793bc17..00000000000000 --- a/srcpkgs/caja-extensions/patches/1-gtk-radio-button-id.patch +++ /dev/null @@ -1,24 +0,0 @@ -From dac72f1d7b4ab1f24bdc64bd2b3f96bd0e30e489 Mon Sep 17 00:00:00 2001 -From: David Henry -Date: Fri, 18 Nov 2022 22:28:01 +0000 -Subject: [PATCH] Fix missing GtkRadioButton id - -Add missing id to custom scale radio button referenced in caja-image-resizer.c -This fixes issue #104. ---- - image-converter/caja-image-resize.ui | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/image-converter/caja-image-resize.ui b/image-converter/caja-image-resize.ui -index 5fe0ea35..f3bcbce4 100644 ---- a/image-converter/caja-image-resize.ui -+++ b/image-converter/caja-image-resize.ui -@@ -183,7 +183,7 @@ - False - 8 - -- -+ - Scale: - True - True diff --git a/srcpkgs/caja-extensions/patches/2-sendto-gupnp-1.6.patch b/srcpkgs/caja-extensions/patches/2-sendto-gupnp-1.6.patch deleted file mode 100644 index 9e454bb0dea045..00000000000000 --- a/srcpkgs/caja-extensions/patches/2-sendto-gupnp-1.6.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 652e145d2c5e2a9658eed7a665fe5a295503940b Mon Sep 17 00:00:00 2001 -From: Xiaotian Wu -Date: Mon, 16 Oct 2023 10:42:27 +0800 -Subject: [PATCH] sendto: require gupnp-1.6 - ---- - configure.ac | 6 ++--- - sendto/plugins/upnp/upnp.c | 48 ++++++++++++++++++++++---------------- - 2 files changed, 30 insertions(+), 24 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a6c506c..5fedb4b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -100,7 +100,7 @@ if test "x$enable_sendto" = "xyes"; then - GTHREAD_REQUIRED=2.6.0 - DBUS_REQUIRED=1.0 - DBUS_GLIB_REQUIRED=0.60 -- GUPNP_REQUIRED=0.13 -+ GUPNP_REQUIRED=1.6 - PKG_CHECK_MODULES(SENDTO, - glib-2.0 >= $GLIB_REQUIRED - gthread-2.0 >= $GTHREAD_REQUIRED -@@ -214,9 +214,7 @@ if test "x$enable_sendto" = "xyes"; then - fi - ;; - upnp) -- PKG_CHECK_MODULES(UPNP, gupnp-1.2 >= $GUPNP_REQUIRED, -- enable_upnp=yes AC_DEFINE([HAS_GUPNP_VERSION_1_2], 1, ["Version is at least 1.2"]), enable_upnp=no) -- PKG_CHECK_MODULES(UPNP, gupnp-1.0 >= $GUPNP_REQUIRED, -+ PKG_CHECK_MODULES(UPNP, gupnp-1.6 >= $GUPNP_REQUIRED, - enable_upnp=yes, enable_upnp=no) - if test "${enable_upnp}" != "yes" ; then - sendto_plugin_error_or_ignore "you need gupnp installed to build the upnp plugin" -diff --git a/sendto/plugins/upnp/upnp.c b/sendto/plugins/upnp/upnp.c -index 7b6775b..b770e37 100644 ---- a/sendto/plugins/upnp/upnp.c -+++ b/sendto/plugins/upnp/upnp.c -@@ -87,25 +87,37 @@ check_required_actions (GUPnPServiceIntrospection *introspection) - } - - static void --get_introspection_cb (GUPnPServiceInfo *service_info, -- GUPnPServiceIntrospection *introspection, const GError *error, -- gpointer user_data) -+get_introspection_cb (GObject *source_object, -+ GAsyncResult *res, -+ gpointer user_data) - { - GUPnPDeviceInfo *device_info; - gchar *name; - const gchar *udn, *interface; - GtkTreeIter iter; - GUPnPContext *context; -+ GError *error = NULL; - - device_info = GUPNP_DEVICE_INFO (user_data); - -- if (introspection != NULL) { -- /* If introspection is available, make sure required actions -- * are implemented. -- */ -- if (!check_required_actions (introspection)) -- goto error; -- } -+ GUPnPServiceIntrospection *introspection = -+ gupnp_service_info_introspect_finish (GUPNP_SERVICE_INFO (GUPNP_SERVICE_INFO (source_object)), -+ res, -+ &error); -+ if (error) { -+ g_warning ("Failed to create introspection for '%s': %s", -+ gupnp_service_info_get_udn (GUPNP_SERVICE_INFO (source_object)), -+ error->message); -+ g_clear_error (&error); -+ goto error; -+ } -+ -+ /* If introspection is available, make sure required actions -+ * are implemented. -+ */ -+ if (!check_required_actions (introspection)) { -+ goto error; -+ } - - udn = gupnp_device_info_get_udn (device_info); - if (G_UNLIKELY (udn == NULL)) -@@ -129,10 +141,8 @@ get_introspection_cb (GUPnPServiceInfo *service_info, - -1); - - g_free (name); -- -+ g_object_unref (introspection); - error: -- /* We don't need the proxy objects anymore */ -- g_object_unref (service_info); - g_object_ref (device_info); - } - -@@ -148,9 +158,10 @@ device_proxy_available_cb (GUPnPControlPoint *cp, - return; - } - -- gupnp_service_info_get_introspection_async (info, -- get_introspection_cb, -- g_object_ref (proxy)); -+ gupnp_service_info_introspect_async (info, -+ NULL, -+ get_introspection_cb, -+ g_object_ref (proxy)); - } - - static void -@@ -211,11 +222,7 @@ init (NstPlugin *plugin) - return FALSE; - g_free (upload_cmd); - --#ifdef HAS_GUPNP_VERSION_1_2 - context_manager = gupnp_context_manager_create (0); --#else -- context_manager = gupnp_context_manager_new (NULL, 0); --#endif - g_assert (context_manager != NULL); - g_signal_connect (context_manager, "context-available", - G_CALLBACK (on_context_available), NULL); -@@ -275,6 +282,7 @@ send_files (NstPlugin *plugin, - g_ptr_array_add (argv, "15"); /* discovery timeout (seconds) */ - g_ptr_array_add (argv, "-e"); - g_ptr_array_add (argv, interface); -+ g_ptr_array_add (argv, "-u"); - g_ptr_array_add (argv, udn); - for (l = file_list ; l; l=l->next) { - gchar *file_path; diff --git a/srcpkgs/caja-extensions/patches/3-xattr-mtp.patch b/srcpkgs/caja-extensions/patches/3-xattr-mtp.patch deleted file mode 100644 index d4f2441c26d202..00000000000000 --- a/srcpkgs/caja-extensions/patches/3-xattr-mtp.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 91cc4665e9d707fd1015fb5c952816d13ef37693 Mon Sep 17 00:00:00 2001 -From: Goffredo Baroncelli -Date: Sun, 6 Nov 2022 16:17:04 +0100 -Subject: [PATCH] xattr-tags-extension: avoid check xattr for mtp:// and - gphoto2:// - -Some protocols (like mtp://), doesn't support xattr. In this -case avoid to check the xattr-tags to not have -poor performance. - -This patch blacklist mtp:// and gphoto2://. ---- - xattr-tags/caja-xattr-tags-extension.c | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/xattr-tags/caja-xattr-tags-extension.c b/xattr-tags/caja-xattr-tags-extension.c -index a3c8993..ab6450d 100644 ---- a/xattr-tags/caja-xattr-tags-extension.c -+++ b/xattr-tags/caja-xattr-tags-extension.c -@@ -50,6 +50,16 @@ typedef struct { - GClosure *update_complete; - } CajaXattrTagsHandle; - -+/* List of protocols that don't support xattr retriving, -+ * so we can skip it safetely -+ */ -+static gchar *protocols_blacklist[] = { -+ "mtp://", -+ "gphoto2://", -+ -+ NULL -+}; -+ - /* Stolen code: why they didn't expose it!? - * file: glocalfileinfo.c - * function: hex_unescape_string -@@ -107,8 +117,21 @@ static gchar *caja_xattr_tags_get_xdg_tags(CajaFileInfo *file) - gchar *tags = NULL, *uri; - GFile *location; - GFileInfo *info; -+ int i; - - uri = caja_file_info_get_activation_uri (file); -+ for (i = 0 ; protocols_blacklist[i] ; i++) { -+ int l = strlen(protocols_blacklist[i]); -+ -+ if (strlen(uri) < l) -+ continue; -+ if (strncasecmp(uri, protocols_blacklist[i], l)) -+ continue; -+ -+ g_free (uri); -+ return NULL; -+ } -+ - location = g_file_new_for_uri (uri); - info = g_file_query_info (location, - G_FILE_ATTRIBUTE_XATTR_XDG_TAGS, diff --git a/srcpkgs/caja-extensions/template b/srcpkgs/caja-extensions/template index bdb208810c4ad2..2ce814578f8cd3 100644 --- a/srcpkgs/caja-extensions/template +++ b/srcpkgs/caja-extensions/template @@ -1,12 +1,12 @@ # Template file for 'caja-extensions' pkgname=caja-extensions -version=1.26.1 -revision=3 +version=1.28.0 +revision=1 build_style=gnu-configure configure_args="--disable-gksu --disable-static" -hostmakedepends="pkg-config intltool glib-devel libxml2 - automake gettext-devel-tools libtool gtk-doc" -makedepends="libcaja-devel mate-desktop-devel dbus-glib-devel gupnp-devel" +hostmakedepends="pkg-config intltool glib-devel libxml2 gettext" +makedepends="libcaja-devel mate-desktop-devel dbus-glib-devel gupnp-devel + gst-plugins-base1-devel totem-devel gtk+3-devel dbus-devel" depends="caja" short_desc="Extensions for the MATE Caja file manager" maintainer="skmpz " @@ -14,11 +14,7 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/caja-extensions/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=589c19e3fa10242d6239a5ccb9585598436a56ebe94d2eb2a50b5950cce1d520 - -pre_configure() { - autoreconf -fi -} +checksum=d2986c5e0740835fe271cfbd5823eeeaf03291af1763203f4700abb8109e3175 post_install() { rm -rf ${DESTDIR}/usr/include @@ -31,6 +27,7 @@ caja-image-converter_package() { depends="caja-extensions ImageMagick" pkg_install() { vmove usr/lib/caja/extensions-2.0/libcaja-image-converter.so + vmove usr/share/caja/extensions/libcaja-image-converter.caja-extension } } @@ -39,6 +36,7 @@ caja-open-terminal_package() { depends="caja-extensions" pkg_install() { vmove usr/lib/caja/extensions-2.0/libcaja-open-terminal.so + vmove usr/share/caja/extensions/libcaja-open-terminal.caja-extension vmove usr/share/glib-2.0/schemas/org.mate.caja-open-terminal.gschema.xml } } @@ -50,6 +48,7 @@ caja-sendto_package() { vmove usr/bin/caja-sendto vmove usr/lib/caja-sendto vmove usr/lib/caja/extensions-2.0/libcaja-sendto.so + vmove usr/share/caja/extensions/libcaja-sendto.caja-extension vmove usr/share/glib-2.0/schemas/org.mate.Caja.Sendto.gschema.xml vmove usr/share/man/man1/caja-sendto.1 } @@ -60,6 +59,7 @@ caja-share_package() { depends="caja-extensions samba" pkg_install() { vmove usr/lib/caja/extensions-2.0/libcaja-share.so + vmove usr/share/caja/extensions/libcaja-share.caja-extension vmove usr/share/caja-extensions/share-dialog.ui } } @@ -69,6 +69,7 @@ caja-wallpaper_package() { depends="caja-extensions" pkg_install() { vmove usr/lib/caja/extensions-2.0/libcaja-wallpaper.so + vmove usr/share/caja/extensions/libcaja-wallpaper.caja-extension } } @@ -77,5 +78,15 @@ caja-xattr-tags_package() { depends="caja-extensions" pkg_install() { vmove usr/lib/caja/extensions-2.0/libcaja-xattr-tags.so + vmove usr/share/caja/extensions/libcaja-xattr-tags.caja-extension + } +} + +caja-av_package() { + short_desc="Caja extension to see audio/video properties" + depends="caja-extensions" + pkg_install() { + vmove usr/lib/caja/extensions-2.0/libcaja-av.so + vmove usr/share/caja/extensions/libcaja-av.caja-extension } } From 34e629bafcd05a582dc902abf16504aabfb09132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:26 +0700 Subject: [PATCH 04/33] caja: update to 1.28.0. --- srcpkgs/caja/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/caja/template b/srcpkgs/caja/template index 52598da3c9a6d8..07f25cedad1d53 100644 --- a/srcpkgs/caja/template +++ b/srcpkgs/caja/template @@ -1,15 +1,19 @@ # Template file for 'caja' pkgname=caja -version=1.26.3 +version=1.28.0 revision=1 build_style=gnu-configure build_helper="gir" # self-check only check for eel in make check, requires Xorg server configure_args="--disable-static --disable-packagekit --disable-schemas-compile - --disable-update-mimedb --disable-self-check $(vopt_enable gir introspection) + --disable-update-mimedb --disable-self-check --enable-wayland + $(vopt_enable gir introspection) ac_cv_lib_selinux_is_selinux_enabled=no ac_cv_strftime_extensions=yes" -hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config" +hostmakedepends="glib-devel gobject-introspection intltool itstool pkg-config + wayland-devel" makedepends="exempi-devel gvfs-devel libXt-devel libexif-devel libnotify-devel + gdk-pixbuf-devel libglib-devel pango-devel gtk+3-devel libxml2-devel + libexif-devel gtk-layer-shell-devel wayland-devel libX11-devel mate-desktop-devel" depends="dbus gvfs mate-desktop mate-icon-theme" short_desc="MATE shell and file manager" @@ -18,7 +22,7 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/caja/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/caja-${version}.tar.xz" -checksum=813edf08a36f995ec3c1504131ff8afbbd021f6e1586643fe5dced5e73e5790d +checksum=1e3014ce1455817ec2ef74d09efdfb6835d8a372ed9a16efb5919ef7b821957a build_options="gir" build_options_default="gir" From 93641a81f1b15796c0091b7fd3124369a87d5d52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:26 +0700 Subject: [PATCH 05/33] eom: update to 1.28.0. --- srcpkgs/eom/template | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/srcpkgs/eom/template b/srcpkgs/eom/template index 9e7184b988710e..d74606b4a1dd4e 100644 --- a/srcpkgs/eom/template +++ b/srcpkgs/eom/template @@ -1,21 +1,25 @@ # Template file for 'eom' pkgname=eom -version=1.26.1 +version=1.28.0 revision=1 build_style=gnu-configure build_helper="gir" -configure_args="--disable-schemas-compile --enable-introspection" -hostmakedepends="dbus-glib-devel mate-common" +configure_args="--disable-schemas-compile --enable-introspection + --enable-thumbnailer" +hostmakedepends="glib-devel gettext gdk-pixbuf itstool pkg-config + gobject-introspection" makedepends="dbus-glib-devel exempi-devel libexif-devel libpeas-devel - librsvg-devel mate-desktop-devel mate-icon-theme" -depends="dbus mate-icon-theme" + lcms2-devel libjpeg-turbo-devel libxml2-devel libmagick-devel libX11-devel + gtk+3-devel libglib-devel gdk-pixbuf-devel shared-mime-info zlib-devel + libgirepository-devel librsvg-devel mate-desktop-devel mate-icon-theme" +depends="dbus mate-icon-theme gdk-pixbuf" short_desc="MATE image viewer" maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/eom/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/eom-${version}.tar.xz" -checksum=b5251229494f7e6c62e09fb211e43308df4f074c551ba0a233dc2cd6864b9960 +checksum=9a01cab2995a1a8c7258c865eae5f182ed4730c44672afdc3a07e423edd53abc eom-devel_package() { short_desc+=" - development files" From a22fecd4acbd079a71d5b660e89d132a2c9d3aa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:26 +0700 Subject: [PATCH 06/33] libmatekbd: update to 1.28.0. --- common/shlibs | 4 ++-- srcpkgs/libmatekbd/template | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/common/shlibs b/common/shlibs index b8a530a4fe219e..fc4bc590557ff7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1771,9 +1771,9 @@ libmate-desktop-2.so.17 mate-desktop-1.8.0_1 libmarco-private.so.2 libmarco-1.22.2_1 libmate-menu.so.2 mate-menus-1.8.0_1 libcaja-extension.so.1 libcaja-1.8.1_1 -libmatekbd.so.4 libmatekbd-1.8.0_1 +libmatekbd.so.6 libmatekbd-1.28.0_1 +libmatekbdui.so.6 libmatekbd-1.28.0_1 libmatemixer.so.0 libmatemixer-1.10.0_1 -libmatekbdui.so.4 libmatekbd-1.8.0_1 libmate-window-settings.so.1 libmate-control-center-1.8.1_1 libmateweather.so.1 libmateweather-1.8.0_1 libmate-panel-applet-4.so.1 libmate-panel-1.8.0_1 diff --git a/srcpkgs/libmatekbd/template b/srcpkgs/libmatekbd/template index fa3915c27e983b..4af16c818d9a2f 100644 --- a/srcpkgs/libmatekbd/template +++ b/srcpkgs/libmatekbd/template @@ -1,12 +1,13 @@ # Template file for 'libmatekbd' pkgname=libmatekbd -version=1.26.1 +version=1.28.0 revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static $(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool itstool glib-devel gobject-introspection" -makedepends="libICE-devel gtk+3-devel libxklavier-devel iso-codes" +hostmakedepends="pkg-config intltool itstool glib-devel libxml2 + gobject-introspection iso-codes" +makedepends="libICE-devel libglib-devel gtk+3-devel libxklavier-devel iso-codes" depends="dconf iso-codes" short_desc="MATE keyboard library" maintainer="skmpz " @@ -14,7 +15,7 @@ license="LGPL-2.1-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/libmatekbd/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/libmatekbd-${version}.tar.xz" -checksum=63938d91252945eeea88fd8374d1231bd83d02cd965c6bba17c185edb397bced +checksum=5d2e58483c2b23d33503d24c88f8b90a28cc0189d7e4001b3e273a604f6fe80e build_options="gir" build_options_default="gir" From b64bac12dc411b4c192b3610d37385053239a82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 07/33] libmatemixer: update to 1.28.0. --- srcpkgs/libmatemixer/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/libmatemixer/template b/srcpkgs/libmatemixer/template index aa5b765440624c..28c514d52ea125 100644 --- a/srcpkgs/libmatemixer/template +++ b/srcpkgs/libmatemixer/template @@ -1,18 +1,19 @@ # Template file for 'libmatemixer' pkgname=libmatemixer -version=1.26.1 +version=1.28.0 revision=1 build_style=gnu-configure -configure_args="--disable-static" -hostmakedepends="mate-common pkg-config intltool itstool" -makedepends="libglib-devel alsa-lib-devel pulseaudio-devel" +configure_args="--disable-static --enable-pulseaudio --enable-alsa + --enable-udev" +hostmakedepends="pkg-config gettext" +makedepends="libglib-devel alsa-lib-devel pulseaudio-devel eudev-libudev-devel" short_desc="MATE mixer library" maintainer="skmpz " license="LGPL-2.1-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/libmatemixer/master/NEWS" distfiles="http://pub.mate-desktop.org/releases/${version%.*}/libmatemixer-${version}.tar.xz" -checksum=4960f59a6b9faf82a01d4a4b8cc260b4868dd991efd4a9b17b5d0a15a1d3a1ae +checksum=5d73b922397f60688e3c9530eb532bce46c30e262db1b5352fa32c40d870a0c7 libmatemixer-devel_package() { short_desc+=" - development files" From d9217e73f1dc683f6de0429b5bd61d4263676ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 08/33] libmateweather: update to 1.28.0. --- .../libmateweather/patches/libsoup-3.0.patch | 595 ++++++++++++++++++ srcpkgs/libmateweather/template | 13 +- 2 files changed, 604 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/libmateweather/patches/libsoup-3.0.patch diff --git a/srcpkgs/libmateweather/patches/libsoup-3.0.patch b/srcpkgs/libmateweather/patches/libsoup-3.0.patch new file mode 100644 index 00000000000000..84061ac342d7ff --- /dev/null +++ b/srcpkgs/libmateweather/patches/libsoup-3.0.patch @@ -0,0 +1,595 @@ +From 97cd9b061ad9b75568af3737f7e4a1dd4bed9c1a Mon Sep 17 00:00:00 2001 +From: Đoàn Trần Công Danh +Date: Mon, 4 Mar 2024 23:47:37 +0700 +Subject: [PATCH] Port to libsoup-3.0 + +--- + .build.yml | 10 ++-- + configure.ac | 6 ++- + libmateweather/mateweather-uninstalled.pc.in | 2 +- + libmateweather/mateweather.pc.in | 2 +- + libmateweather/weather-bom.c | 36 ++++++++----- + libmateweather/weather-iwin.c | 37 ++++++++----- + libmateweather/weather-met.c | 34 ++++++++---- + libmateweather/weather-metar.c | 57 ++++++++++++++------ + libmateweather/weather-priv.h | 6 ++- + libmateweather/weather-wx.c | 53 +++++++++--------- + libmateweather/weather.c | 7 +-- + 11 files changed, 157 insertions(+), 93 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 133108e..d9fcf9c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -8,6 +8,7 @@ AC_CONFIG_AUX_DIR([build-aux]) + AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-xz tar-ustar check-news]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + ++AC_USE_SYSTEM_EXTENSIONS + # Before making a release, the LT_VERSION string should be modified. + # The string is of the form C:R:A. + # - If interfaces have been changed or added, but binary compatibility has +@@ -23,7 +24,7 @@ AC_CANONICAL_HOST + + GLIB_REQUIRED=2.56.0 + GTK_REQUIRED=3.22.0 +-LIBSOUP_REQUIRED=2.34.0 ++LIBSOUP_REQUIRED=3.0.0 + GIO_REQUIRED=2.25.0 + LIBXML_REQUIRED=2.6.0 + +@@ -65,7 +66,7 @@ dnl -- Check for libxml (required) ------------------------------------------ + PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= $LIBXML_REQUIRED) + + dnl -- check for libsoup (required) ----------------------------------------- +-PKG_CHECK_MODULES(LIBSOUP, [libsoup-2.4 >= $LIBSOUP_REQUIRED]) ++PKG_CHECK_MODULES(LIBSOUP, [libsoup-3.0 >= $LIBSOUP_REQUIRED]) + + dnl -- check for gio (required) ----------------------------------------- + PKG_CHECK_MODULES(GIO, +@@ -100,6 +101,7 @@ AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec, + [AC_MSG_ERROR([No regex library found])])]) + AC_SUBST(REGEX_LIBS) + ++AC_CHECK_FUNC(memmem,[],[AC_MSG_ERROR([memmem is required])]) + + dnl *************************************************************************** + dnl *** Check for presence of tm.tm_gmtoff on the system *** +diff --git a/libmateweather/mateweather-uninstalled.pc.in b/libmateweather/mateweather-uninstalled.pc.in +index 03e7461..c692842 100644 +--- a/libmateweather/mateweather-uninstalled.pc.in ++++ b/libmateweather/mateweather-uninstalled.pc.in +@@ -8,6 +8,6 @@ Name: MateWeather + Description: MateWeather shared library + Version: @VERSION@ + Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-3.0 gio-2.0 +-Requires.private: libxml-2.0 libsoup-2.4 ++Requires.private: libxml-2.0 libsoup-3.0 + Libs: ${pc_top_builddir}/${pcfiledir}/libmateweather.la + Cflags: -I${pc_top_builddir}/${pcfiledir}/.. +diff --git a/libmateweather/mateweather.pc.in b/libmateweather/mateweather.pc.in +index a617c33..bea024d 100644 +--- a/libmateweather/mateweather.pc.in ++++ b/libmateweather/mateweather.pc.in +@@ -8,7 +8,7 @@ Name: MateWeather + Description: MateWeather shared library + Version: @VERSION@ + Requires: glib-2.0 gobject-2.0 gdk-pixbuf-2.0 gtk+-3.0 gio-2.0 +-Requires.private: libxml-2.0 libsoup-2.4 ++Requires.private: libxml-2.0 libsoup-3.0 + Libs: -L${libdir} -lmateweather + Libs.private: -lm + Cflags: -I${includedir} +diff --git a/libmateweather/weather-bom.c b/libmateweather/weather-bom.c +index 47b2d0b..f5c7a87 100644 +--- a/libmateweather/weather-bom.c ++++ b/libmateweather/weather-bom.c +@@ -27,34 +27,45 @@ + #include "weather-priv.h" + + static void +-bom_finish (SoupSession *session, SoupMessage *msg, gpointer data) ++bom_finish (GObject *source, GAsyncResult *result, gpointer data) + { + char *p, *rp; + WeatherInfo *info = (WeatherInfo *)data; ++ GError *error = NULL; ++ GBytes *bytes; ++ const char *response_body = NULL; ++ gsize len = 0; + + g_return_if_fail (info != NULL); + +- if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { +- g_warning ("Failed to get BOM forecast data: %d %s.\n", +- msg->status_code, msg->reason_phrase); +- request_done (info, FALSE); +- return; ++ bytes = soup_session_send_and_read_finish (SOUP_SESSION(source), ++ result, &error); ++ ++ if (error != NULL) { ++ g_warning ("Failed to get BOM forecast data: %s.\n", error->message); ++ request_done (info, error); ++ g_error_free (error); ++ return; + } + +- p = strstr (msg->response_body->data, "Forecast for the rest"); ++ response_body = g_bytes_get_data (bytes, &len); ++ ++ p = xstrnstr (response_body, len, "Forecast for the rest"); + if (p != NULL) { +- rp = strstr (p, "The next routine forecast will be issued"); ++ rp = xstrnstr (p, len - (p - response_body), ++ "The next routine forecast will be issued"); + if (rp == NULL) +- info->forecast = g_strdup (p); ++ info->forecast = g_strndup (p, len - (p - response_body)); + else + info->forecast = g_strndup (p, rp - p); + } + + if (info->forecast == NULL) +- info->forecast = g_strdup (msg->response_body->data); ++ info->forecast = g_strndup (response_body, len); + ++ g_bytes_unref (bytes); + g_print ("%s\n", info->forecast); +- request_done (info, TRUE); ++ request_done (info, NULL); + } + + void +@@ -70,7 +81,8 @@ bom_start_open (WeatherInfo *info) + loc->zone + 1); + + msg = soup_message_new ("GET", url); +- soup_session_queue_message (info->session, msg, bom_finish, info); ++ soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT, ++ NULL, bom_finish, info); + g_free (url); + + info->requests_pending++; +diff --git a/libmateweather/weather-iwin.c b/libmateweather/weather-iwin.c +index 9f7ff38..b1dc1ff 100644 +--- a/libmateweather/weather-iwin.c ++++ b/libmateweather/weather-iwin.c +@@ -93,7 +93,7 @@ hasAttr (xmlNode *node, const char *attr_name, const char *attr_value) + } + + static GSList * +-parseForecastXml (const char *buff, WeatherInfo *master_info) ++parseForecastXml (const char *buff, gsize len, WeatherInfo *master_info) + { + GSList *res = NULL; + xmlDocPtr doc; +@@ -107,7 +107,7 @@ parseForecastXml (const char *buff, WeatherInfo *master_info) + #define XC (const xmlChar *) + #define isElem(_node,_name) g_str_equal ((const char *)_node->name, _name) + +- doc = xmlParseMemory (buff, strlen (buff)); ++ doc = xmlParseMemory (buff, len); + if (!doc) + return NULL; + +@@ -380,26 +380,36 @@ parseForecastXml (const char *buff, WeatherInfo *master_info) + } + + static void +-iwin_finish (SoupSession *session, SoupMessage *msg, gpointer data) ++iwin_finish (GObject *source, GAsyncResult *result, gpointer data) + { + WeatherInfo *info = (WeatherInfo *)data; ++ GError *error = NULL; ++ GBytes *bytes; ++ const char *response_body = NULL; ++ gsize len = 0; + + g_return_if_fail (info != NULL); + +- if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { ++ bytes = soup_session_send_and_read_finish (SOUP_SESSION(source), ++ result, &error); ++ ++ if (error != NULL) { + /* forecast data is not really interesting anyway ;) */ +- g_warning ("Failed to get IWIN forecast data: %d %s\n", +- msg->status_code, msg->reason_phrase); +- request_done (info, FALSE); ++ g_warning ("Failed to get IWIN forecast data: %s\n", ++ error->message); ++ request_done (info, error); ++ g_error_free (error); + return; + } + ++ response_body = g_bytes_get_data (bytes, &len); + if (info->forecast_type == FORECAST_LIST) +- info->forecast_list = parseForecastXml (msg->response_body->data, info); ++ info->forecast_list = parseForecastXml (response_body, len, info); + else +- info->forecast = formatWeatherMsg (g_strdup (msg->response_body->data)); ++ info->forecast = formatWeatherMsg (g_strndup (response_body, len)); + +- request_done (info, TRUE); ++ g_bytes_unref (bytes); ++ request_done (info, NULL); + } + + /* Get forecast into newly alloc'ed string */ +@@ -439,7 +449,9 @@ iwin_start_open (WeatherInfo *info) + + msg = soup_message_new ("GET", url); + g_free (url); +- soup_session_queue_message (info->session, msg, iwin_finish, info); ++ soup_session_send_and_read_async (info->session, msg, ++ G_PRIORITY_DEFAULT, ++ NULL, iwin_finish, info); + + info->requests_pending++; + } +@@ -470,7 +482,8 @@ iwin_start_open (WeatherInfo *info) + + msg = soup_message_new ("GET", url); + g_free (url); +- soup_session_queue_message (info->session, msg, iwin_finish, info); ++ soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT, ++ NULL, iwin_finish, info); + + info->requests_pending++; + } +diff --git a/libmateweather/weather-met.c b/libmateweather/weather-met.c +index 164e9f2..7022abb 100644 +--- a/libmateweather/weather-met.c ++++ b/libmateweather/weather-met.c +@@ -119,19 +119,20 @@ met_reprocess (char *x, int len) + */ + + static gchar * +-met_parse (const gchar *meto) ++met_parse (const gchar *meto, gsize len) + { + gchar *p; + gchar *rp; + gchar *r = g_strdup ("Met Office Forecast\n"); + gchar *t; ++ const gchar *end = meto + len; + + g_return_val_if_fail (meto != NULL, r); + +- p = strstr (meto, "Summary: "); ++ p = xstrnstr (meto, len, "Summary: "); + g_return_val_if_fail (p != NULL, r); + +- rp = strstr (p, "Text issued at:"); ++ rp = xstrnstr (p, end - p, "Text issued at:"); + g_return_val_if_fail (rp != NULL, r); + + p += 13; +@@ -143,21 +144,31 @@ met_parse (const gchar *meto) + } + + static void +-met_finish (SoupSession *session, SoupMessage *msg, gpointer data) ++met_finish (GObject *source, GAsyncResult *result, gpointer data) + { + WeatherInfo *info = (WeatherInfo *)data; ++ GError *error = NULL; ++ GBytes *bytes; ++ const char *response_body = NULL; ++ gsize len = 0; + + g_return_if_fail (info != NULL); + +- if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { +- g_warning ("Failed to get Met Office forecast data: %d %s.\n", +- msg->status_code, msg->reason_phrase); +- request_done (info, FALSE); ++ bytes = soup_session_send_and_read_finish (SOUP_SESSION(source), ++ result, &error); ++ ++ if (error != NULL) { ++ g_warning ("Failed to get Met Office forecast data: %s.\n", ++ error->message); ++ request_done (info, error); ++ g_error_free (error); + return; + } + +- info->forecast = met_parse (msg->response_body->data); +- request_done (info, TRUE); ++ response_body = g_bytes_get_data (bytes, &len); ++ info->forecast = met_parse (response_body, len); ++ g_bytes_unref (bytes); ++ request_done (info, NULL); + } + + void +@@ -171,7 +182,8 @@ metoffice_start_open (WeatherInfo *info) + url = g_strdup_printf ("http://www.metoffice.gov.uk/weather/europe/uk/%s.html", loc->zone + 1); + + msg = soup_message_new ("GET", url); +- soup_session_queue_message (info->session, msg, met_finish, info); ++ soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT, ++ NULL, met_finish, info); + g_free (url); + + info->requests_pending++; +diff --git a/libmateweather/weather-metar.c b/libmateweather/weather-metar.c +index 7bc24fc..d85188b 100644 +--- a/libmateweather/weather-metar.c ++++ b/libmateweather/weather-metar.c +@@ -486,43 +486,60 @@ metar_parse (gchar *metar, WeatherInfo *info) + } + + static void +-metar_finish (SoupSession *session, SoupMessage *msg, gpointer data) ++metar_finish (GObject *source, GAsyncResult *result, gpointer data) + { + WeatherInfo *info = (WeatherInfo *)data; + WeatherLocation *loc; +- const gchar *p, *endtag; ++ const gchar *p, *end, *endtag; + gchar *searchkey, *metar; + gboolean success = FALSE; ++ GError *error = NULL; ++ GBytes *bytes; ++ const char *response_body = NULL; ++ gsize len = 0; + + g_return_if_fail (info != NULL); + +- if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { +- if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) ++ bytes = soup_session_send_and_read_finish (SOUP_SESSION(source), ++ result, &error); ++ ++ if (error != NULL) { ++ /* https://libsoup.org/libsoup-3.0/migrating-from-libsoup-2.html#status-codes-no-longer-used-for-internal-errors */ ++ switch (error->code) { ++ case SOUP_SESSION_ERROR_PARSING: ++ case SOUP_SESSION_ERROR_ENCODING: ++ case SOUP_SESSION_ERROR_TOO_MANY_REDIRECTS: + info->network_error = TRUE; +- else { +- /* Translators: %d is an error code, and %s the error string */ +- g_warning (_("Failed to get METAR data: %d %s.\n"), +- msg->status_code, msg->reason_phrase); ++ break; ++ default: ++ break; + } +- request_done (info, FALSE); ++ g_warning (_("Failed to get METAR data: %s.\n"), ++ error->message); ++ request_done (info, error); ++ g_error_free (error); + return; + } + + loc = info->location; + + searchkey = g_strdup_printf ("%s", loc->code); +- p = strstr (msg->response_body->data, searchkey); +- g_free (searchkey); ++ ++ response_body = g_bytes_get_data (bytes, &len); ++ end = response_body + len; ++ ++ p = xstrnstr (response_body, len, searchkey); + if (p) { + p += WEATHER_LOCATION_CODE_LEN + 11; + endtag = strstr (p, ""); ++ endtag = xstrnstr (p, end - p, ""); + if (endtag) + metar = g_strndup (p, endtag - p); + else +- metar = g_strdup (p); ++ metar = g_strndup (p, end - p); + success = metar_parse (metar, info); + g_free (metar); +- } else if (!strstr (msg->response_body->data, "aviationweather.gov")) { ++ } else if (!xstrnstr (response_body, len, "aviationweather.gov")) { + /* The response doesn't even seem to have come from NOAA... + * most likely it is a wifi hotspot login page. Call that a + * network error. +@@ -531,7 +548,8 @@ metar_finish (SoupSession *session, SoupMessage *msg, gpointer data) + } + + info->valid = success; +- request_done (info, TRUE); ++ request_done (info, NULL); ++ g_bytes_unref(bytes); + } + + /* Read current conditions and fill in info structure */ +@@ -540,6 +558,7 @@ metar_start_open (WeatherInfo *info) + { + WeatherLocation *loc; + SoupMessage *msg; ++ char *query; + + g_return_if_fail (info != NULL); + info->valid = info->network_error = FALSE; +@@ -549,8 +568,7 @@ metar_start_open (WeatherInfo *info) + return; + } + +- msg = soup_form_request_new ( +- "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php", ++ query = soup_form_encode ( + "dataSource", "metars", + "requestType", "retrieve", + "format", "xml", +@@ -559,7 +577,12 @@ metar_start_open (WeatherInfo *info) + "fields", "raw_text", + "stationString", loc->code, + NULL); +- soup_session_queue_message (info->session, msg, metar_finish, info); ++ msg = soup_message_new_from_encoded_form ( ++ "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php", ++ query); ++ g_free(query); ++ soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT, ++ NULL, metar_finish, info); + + info->requests_pending++; + } +diff --git a/libmateweather/weather-priv.h b/libmateweather/weather-priv.h +index 817f13c..03cdcbd 100644 +--- a/libmateweather/weather-priv.h ++++ b/libmateweather/weather-priv.h +@@ -21,6 +21,7 @@ + + #include "config.h" + ++#include + #include + #include + #include +@@ -34,6 +35,8 @@ const char *mateweather_dpgettext (const char *context, const char *str) G_GNUC_ + #define _(str) (mateweather_gettext (str)) + #define C_(context, str) (mateweather_dpgettext (context, str)) + #define N_(str) (str) ++#define xstrnstr(haystack, hlen, needle) \ ++ memmem(haystack, hlen, needle, strlen(needle)) + + #define WEATHER_LOCATION_CODE_LEN 4 + +@@ -95,7 +98,6 @@ struct _WeatherInfo { + GSList *forecast_list; /* list of WeatherInfo* for the forecast, NULL if not available */ + gchar *radar_buffer; + gchar *radar_url; +- GdkPixbufLoader *radar_loader; + GdkPixbufAnimation *radar; + SoupSession *session; + gint requests_pending; +@@ -167,7 +169,7 @@ gboolean metar_parse (gchar *metar, + + gboolean requests_init (WeatherInfo *info); + void request_done (WeatherInfo *info, +- gboolean ok); ++ GError *error); + + void ecl2equ (gdouble t, + gdouble eclipLon, +diff --git a/libmateweather/weather-wx.c b/libmateweather/weather-wx.c +index e29cecc..11f7336 100644 +--- a/libmateweather/weather-wx.c ++++ b/libmateweather/weather-wx.c +@@ -25,48 +25,51 @@ + #include "weather-priv.h" + + static void +-wx_finish (SoupSession *session, SoupMessage *msg, gpointer data) ++wx_finish (GObject *source, GAsyncResult *result, gpointer data) + { + WeatherInfo *info = (WeatherInfo *)data; + GdkPixbufAnimation *animation; ++ GError *error = NULL; + + g_return_if_fail (info != NULL); + +- if (!SOUP_STATUS_IS_SUCCESSFUL (msg->status_code)) { +- g_warning ("Failed to get radar map image: %d %s.\n", +- msg->status_code, msg->reason_phrase); +- g_object_unref (info->radar_loader); +- request_done (info, FALSE); +- return; +- } ++ animation = gdk_pixbuf_animation_new_from_stream_finish (result, &error); + +- gdk_pixbuf_loader_close (info->radar_loader, NULL); +- animation = gdk_pixbuf_loader_get_animation (info->radar_loader); ++ if (error != NULL) { ++ g_warning ("Failed to get radar map image: %s.\n", error->message); ++ request_done (info, error); ++ g_error_free (error); ++ return; ++ } + if (animation != NULL) { +- if (info->radar) +- g_object_unref (info->radar); +- info->radar = animation; +- g_object_ref (info->radar); ++ if (info->radar) ++ g_object_unref (info->radar); ++ info->radar = animation; ++ g_object_ref (info->radar); + } +- g_object_unref (info->radar_loader); + +- request_done (info, TRUE); ++ request_done (info, NULL); + } + + static void +-wx_got_chunk (SoupMessage *msg, SoupBuffer *chunk, gpointer data) ++wx_got_chunk (GObject *source, GAsyncResult *result, gpointer data) + { + WeatherInfo *info = (WeatherInfo *)data; + GError *error = NULL; ++ GInputStream *istream; + + g_return_if_fail (info != NULL); + +- gdk_pixbuf_loader_write (info->radar_loader, (guchar *)chunk->data, +- chunk->length, &error); +- if (error) { +- g_print ("%s \n", error->message); +- g_error_free (error); ++ istream = soup_session_send_finish (SOUP_SESSION (source), result, &error); ++ ++ if (error != NULL) { ++ g_warning ("Failed to get radar map image: %s.\n", error->message); ++ g_error_free (error); ++ request_done (info, error); ++ return; + } ++ ++ gdk_pixbuf_animation_new_from_stream_async (istream, NULL, wx_finish, data); + } + + /* Get radar map and into newly allocated pixmap */ +@@ -79,7 +82,6 @@ wx_start_open (WeatherInfo *info) + + g_return_if_fail (info != NULL); + info->radar = NULL; +- info->radar_loader = gdk_pixbuf_loader_new (); + loc = info->location; + g_return_if_fail (loc != NULL); + +@@ -98,9 +100,8 @@ wx_start_open (WeatherInfo *info) + return; + } + +- g_signal_connect (msg, "got-chunk", G_CALLBACK (wx_got_chunk), info); +- soup_message_body_set_accumulate (msg->response_body, FALSE); +- soup_session_queue_message (info->session, msg, wx_finish, info); ++ soup_session_send_async (info->session, msg, G_PRIORITY_DEFAULT, NULL, ++ wx_got_chunk, info); + g_free (url); + + info->requests_pending++; +diff --git a/libmateweather/weather.c b/libmateweather/weather.c +index 86453fc..1d7533a 100644 +--- a/libmateweather/weather.c ++++ b/libmateweather/weather.c +@@ -348,12 +348,13 @@ requests_init (WeatherInfo *info) + return TRUE; + } + +-void request_done (WeatherInfo *info, gboolean ok) ++void request_done (WeatherInfo *info, GError *error) + { +- if (ok) { ++ if (error == NULL) { + (void) calc_sun (info); + info->moonValid = info->valid && calc_moon (info); +- } ++ } else if (error->code == G_IO_ERROR_CANCELLED) ++ return; /* Caused by soup_session_abort */ + if (!--info->requests_pending) + info->finish_cb (info, info->cb_data); + } diff --git a/srcpkgs/libmateweather/template b/srcpkgs/libmateweather/template index 657882dea3994c..f1f8d1de6e0f63 100644 --- a/srcpkgs/libmateweather/template +++ b/srcpkgs/libmateweather/template @@ -1,12 +1,13 @@ # Template file for 'libmateweather' pkgname=libmateweather -version=1.26.3 +version=1.28.0 revision=1 build_style=gnu-configure configure_args="--disable-static --enable-locations-compression --with-zoneinfo-dir=/usr/share/zoneinfo" -hostmakedepends="pkg-config intltool itstool glib-devel" -makedepends="gtk+3-devel libsoup-devel" +hostmakedepends="pkg-config intltool itstool glib-devel gettext automake + mate-common autoconf-archive" +makedepends="gtk+3-devel libxml2-devel libglib-devel libsoup3-devel" depends="dconf" short_desc="Provides access to weather information from the Internet for MATE" maintainer="skmpz " @@ -14,7 +15,11 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/libmateweather/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/libmateweather-${version}.tar.xz" -checksum=5e6cd24418847cb45acf17da5b435a7131cb4ec2acff68e828f342a1bf13ef4a +checksum=554373deb5b393b9d84b275dd2ca66c9a4a2d0e6ec92044fab8aa53e3032d2b5 + +pre_configure() { + autoreconf -fi +} libmateweather-devel_package() { short_desc+=" - development files" From a7cc85dc9be8a560191dcbffb3da403d3946fc37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 09/33] marco: update to 1.28.1. --- srcpkgs/marco/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/marco/template b/srcpkgs/marco/template index 8323c01f9dcbee..bc7b8578f23f93 100644 --- a/srcpkgs/marco/template +++ b/srcpkgs/marco/template @@ -1,12 +1,13 @@ # Template file for 'marco' pkgname=marco -version=1.26.2 +version=1.28.1 revision=1 -build_style=gnu-configure -configure_args="--disable-static --enable-startup-notification --disable-schemas-compile" -hostmakedepends="gdk-pixbuf-devel zenity pkg-config itstool intltool" -makedepends="libXt-devel libcanberra-devel libgtop-devel - libnotify-devel mate-desktop-devel libXpresent-devel libXres-devel" +build_style=meson +hostmakedepends="gdk-pixbuf-devel zenity pkg-config gettext glib-devel" +makedepends="libcanberra-devel libgtop-devel libSM-devel libXcursor-devel + startup-notification-devel libX11-devel pango-devel gtk+3-devel libglib-devel + libXcomposite-devel libXrender-devel libXrandr-devel libXinerama-devel + mate-desktop-devel libXpresent-devel libXres-devel" depends="zenity" short_desc="Window manager for MATE" maintainer="skmpz " @@ -14,7 +15,8 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/marco/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/marco-${version}.tar.xz" -checksum=12f1a254fe1072f0304884711e089a5682780a011593402ed38de6b9480e07a3 +checksum=2496e5e40ee980cd6849493ac3e0f8fd0dec8b81c674da8d9ba19a577f0ac2e1 +make_check=no # timeout libmarco_package() { short_desc+=" - runtime library" From 40d42f18cc6be951b292e82c9af5f7fd3ded66fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 10/33] mate-applets: update to 1.28.0. --- srcpkgs/mate-applets/template | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mate-applets/template b/srcpkgs/mate-applets/template index bd7eb085bfafda..8997ce928ac9c6 100644 --- a/srcpkgs/mate-applets/template +++ b/srcpkgs/mate-applets/template @@ -1,14 +1,15 @@ # Template file for 'mate-applets' pkgname=mate-applets -version=1.26.1 +version=1.28.0 revision=1 build_style=gnu-configure -configure_args="--disable-static --enable-ipv6" -hostmakedepends="glib-devel intltool itstool libxslt pkg-config polkit" -makedepends="NetworkManager-devel gtksourceview-devel libSM-devel libgtop-devel +configure_args="--disable-static --enable-ipv6 --libexecdir=/usr/libexec/mate" +hostmakedepends="glib-devel itstool intltool pkg-config polkit libxml2" +makedepends="gtksourceview4-devel libgtop-devel xorgproto + libglib-devel gtk+3-devel dbus-glib-devel gucharmap-devel libxml2-devel libmate-panel-devel libmateweather-devel libnotify-devel libwnck-devel mate-desktop-devel mate-icon-theme mate-settings-daemon-devel polkit-devel - upower-devel wireless_tools-devel libnl3-devel" + upower-devel libnl3-devel" depends="mate-icon-theme" short_desc="Applets for MATE panel" maintainer="skmpz " @@ -16,7 +17,7 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-applets/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3ab8f61db376dc333ce4c18722c63a07fab3e8e1272b7e0e097ad4597b17c2c2 +checksum=1b6bef6bd5d326fb9dc828ff910e4b1b9294b4660c311dc1c90310fd9c356686 replaces="mate-applets-data>=0" case "$XBPS_TARGET_MACHINE" in From 4af58d39277f21b03cd36059bbc6f0f8f68f7f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 11/33] mate-backgrounds: update to 1.28.0. --- srcpkgs/mate-backgrounds/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-backgrounds/template b/srcpkgs/mate-backgrounds/template index c33b9cb4db5c4b..7a3ac235ed6ca3 100644 --- a/srcpkgs/mate-backgrounds/template +++ b/srcpkgs/mate-backgrounds/template @@ -1,13 +1,13 @@ # Template file for 'mate-backgrounds' pkgname=mate-backgrounds -version=1.26.0 +version=1.28.0 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool itstool" +hostmakedepends="pkg-config gettext" short_desc="Background images and data for MATE" maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-backgrounds/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0dc9127224ae1573301cfa0aaa6c6262827072d2bf6e5c67c9e1aae19f85e90c +checksum=50d1afd02486bd07ac22a5a6b6efa3031148f0d48a82e488d909ad57003a6943 From bcda2b10efc450f5bd8cc028f8b3b3854d2a99c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 12/33] mate-calc: update to 1.28.0. --- srcpkgs/mate-calc/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mate-calc/template b/srcpkgs/mate-calc/template index e45ee7e9c3383f..188a8b06138809 100644 --- a/srcpkgs/mate-calc/template +++ b/srcpkgs/mate-calc/template @@ -1,14 +1,14 @@ # Template file for 'mate-calc' pkgname=mate-calc -version=1.26.0 +version=1.28.0 revision=1 build_style=gnu-configure -hostmakedepends="glib-devel intltool itstool pkg-config" -makedepends="gtk+3-devel mpfr-devel libmpc-devel" +hostmakedepends="glib-devel itstool gettext pkg-config libxml2" +makedepends="gtk+3-devel libglib-devel mpfr-devel libmpc-devel libxml2-devel" short_desc="MATE Calculator" maintainer="Álvaro Castillo " license="GPL-2.0-or-later" homepage="https://mate-desktop.org/" changelog="https://raw.githubusercontent.com/mate-desktop/mate-calc/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7eb826801dda5d7b070e41d9e831df2ad24459be6c96fe9c0506c21e1374ad55 +checksum=804b125d1e2864b1e74af816da9b2ab8b19472b9af974437ee7355ada5e628f5 From 47cee3dbf21d5ab8b2aaa44968538280e3b18c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 13/33] mate-control-center: update to 1.28.0. --- srcpkgs/libmate-control-center | 1 - srcpkgs/libmate-control-center-devel | 1 - srcpkgs/mate-control-center/template | 37 +++++++++++----------------- 3 files changed, 14 insertions(+), 25 deletions(-) delete mode 120000 srcpkgs/libmate-control-center delete mode 120000 srcpkgs/libmate-control-center-devel diff --git a/srcpkgs/libmate-control-center b/srcpkgs/libmate-control-center deleted file mode 120000 index 45e42050de6bfc..00000000000000 --- a/srcpkgs/libmate-control-center +++ /dev/null @@ -1 +0,0 @@ -mate-control-center \ No newline at end of file diff --git a/srcpkgs/libmate-control-center-devel b/srcpkgs/libmate-control-center-devel deleted file mode 120000 index 45e42050de6bfc..00000000000000 --- a/srcpkgs/libmate-control-center-devel +++ /dev/null @@ -1 +0,0 @@ -mate-control-center \ No newline at end of file diff --git a/srcpkgs/mate-control-center/template b/srcpkgs/mate-control-center/template index bcd986ab0c8fa5..deacca44348409 100644 --- a/srcpkgs/mate-control-center/template +++ b/srcpkgs/mate-control-center/template @@ -1,13 +1,16 @@ # Template file for 'mate-control-center' pkgname=mate-control-center -version=1.26.1 -revision=2 +version=1.28.0 +revision=1 build_style=gnu-configure -configure_args="--disable-static --disable-schemas-compile --disable-update-mimedb" -hostmakedepends="dbus-glib-devel desktop-file-utils glib-devel intltool itstool pkg-config" +configure_args="--disable-static --disable-schemas-compile + --disable-update-mimedb" +hostmakedepends="dbus-glib-devel desktop-file-utils glib-devel itstool + pkg-config gettext" makedepends="dbus-glib-devel desktop-file-utils libXScrnSaver-devel libXt-devel - libcanberra-devel libgtop-devel libmarco-devel + libcanberra-devel libgtop-devel libmarco-devel udisks2-devel elogind-devel libmatekbd-devel librsvg-devel mate-desktop-devel mate-menus-devel + libayatana-appindicator-devel libxml2-devel dconf-devel accountsservice-devel mate-settings-daemon-devel polkit-devel" depends="marco mate-icon-theme mate-settings-daemon" short_desc="Control Center for MATE" @@ -16,25 +19,13 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-control-center/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-control-center-${version}.tar.xz" -checksum=e05f492a3b657aa56fc58f7cf71bc8c80df8e25351fde4db4f523ab8db5b5608 +checksum=ebf2c704fd5248dc2f9836ff29028869ef29d5054907cc615734b6383a7914bc +replaces="libmate-control-center<=1.27.0_1 libmate-control-center-devel<=1.27.0_1" -post_install() { - rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache -} - -libmate-control-center_package() { - short_desc+=" - runtime library" - pkg_install() { - vmove usr/lib/*.so.* - } +pre_configure() { + sed -i 's/"systemd/"libsystemd/' configure } -libmate-control-center-devel_package() { - short_desc+=" - development files" - depends="librsvg-devel mate-desktop-devel mate-menus-devel ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/*.so - vmove usr/lib/pkgconfig - } +post_install() { + rm -f ${DESTDIR}/usr/share/applications/mimeinfo.cache } From f52bde99da1e3349657207b739247564f7a9fd43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 14/33] mate-desktop: update to 1.28.1. --- srcpkgs/mate-desktop/template | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/srcpkgs/mate-desktop/template b/srcpkgs/mate-desktop/template index 5a032d00e3cfc8..56462474a9fae1 100644 --- a/srcpkgs/mate-desktop/template +++ b/srcpkgs/mate-desktop/template @@ -1,12 +1,13 @@ # Template file for 'mate-desktop' pkgname=mate-desktop -version=1.26.2 +version=1.28.1 revision=1 -build_style=gnu-configure +build_style=meson build_helper="gir" -configure_args="--disable-static --disable-schemas-compile $(vopt_enable gir introspection)" -hostmakedepends="pkg-config intltool itstool glib-devel librsvg-utils" -makedepends="gtk+3-devel dconf-devel libXrandr-devel startup-notification-devel" +configure_args="$(vopt_bool gir introspection) -Dstartup-notification=enabled" +hostmakedepends="pkg-config gettext glib-devel librsvg-utils iso-codes" +makedepends="gtk+3-devel dconf-devel libXrandr-devel startup-notification-devel + iso-codes gdk-pixbuf-devel libglib-devel" depends="dconf hicolor-icon-theme dejavu-fonts-ttf" short_desc="Library with common API for various MATE modules" maintainer="skmpz " @@ -14,7 +15,8 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-desktop/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-desktop-${version}.tar.xz" -checksum=5ed03f7c52d7b7ece49ca1e736aa766aefeb5c639eab3e68c7090c530d02376a +checksum=71ed1bcf775e2cbba4d80a73c33c795d3864e6ce429a37eed875885ac86b206e +make_check=no # only abi check, failure # Package build options build_options="gir" @@ -27,7 +29,6 @@ mate-desktop-devel_package() { vmove usr/include vmove usr/lib/*.so vmove usr/lib/pkgconfig - vmove usr/share/gtk-doc if [ "$build_option_gir" ]; then vmove usr/share/gir-1.0 fi From 3056f15f0d2a5b7539985144ad03c0b3cd570d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:27 +0700 Subject: [PATCH 15/33] mate-icon-theme: update to 1.28.0. --- srcpkgs/mate-icon-theme/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mate-icon-theme/template b/srcpkgs/mate-icon-theme/template index 42973b71275c24..b5735d5c8f981e 100644 --- a/srcpkgs/mate-icon-theme/template +++ b/srcpkgs/mate-icon-theme/template @@ -1,10 +1,9 @@ # Template file for 'mate-icon-theme' pkgname=mate-icon-theme -version=1.26.0 +version=1.28.0 revision=1 build_style=gnu-configure -hostmakedepends="pkg-config intltool itstool icon-naming-utils" -makedepends="icon-naming-utils" +hostmakedepends="pkg-config gettext icon-naming-utils" depends="gtk-update-icon-cache hicolor-icon-theme" short_desc="MATE icon theme" maintainer="skmpz " @@ -12,8 +11,8 @@ license="CC-BY-SA-3.0" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-icon-theme/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=41f50436d57f425e54fd9557541be77fb291e03aacd55f7991c042e84a290a5a +checksum=94d6079060ca5df74542921de4eea38b7d02d07561c919356d95de876f9a6d3a -post_install() { - rm -f ${DESTDIR}/usr/share/icons/mate/icon-theme.cache +pre_configure() { + PKG_CONFIG=/usr/bin/pkg-config } From 130bda1e7de0ae937ed67dc2e645cfb4132e9deb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 16/33] mate-indicator-applet: update to 1.28.0. --- srcpkgs/mate-indicator-applet/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mate-indicator-applet/template b/srcpkgs/mate-indicator-applet/template index e3331d8afdebac..9b9904a76e7c24 100644 --- a/srcpkgs/mate-indicator-applet/template +++ b/srcpkgs/mate-indicator-applet/template @@ -1,10 +1,10 @@ # Template file for 'mate-indicator-applet' pkgname=mate-indicator-applet -version=1.26.0 -revision=2 +version=1.28.0 +revision=1 build_style=gnu-configure configure_args="--disable-static" -hostmakedepends="pkg-config gettext intltool" +hostmakedepends="pkg-config gettext" makedepends="gtk+3-devel libX11-devel libmate-panel-devel libayatana-indicator-devel" short_desc="MATE applet to display information from various applications" @@ -13,4 +13,4 @@ license="GPL-3.0-or-later, LGPL-2.1-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-indicator-applet/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=e4fbfbede0e58ff7503ead66a3e044ca0f3411a4fd9b552d66e2293a5c828e90 +checksum=ceb3d703970a3e558d7cd7df0b1c2171e3af752a25495aced2e222c1e9ad49cd From 9a38ea3e5f17a064f5e96bad58ab5a6d7508bb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 17/33] mate-media: update to 1.28.1. --- srcpkgs/mate-media/template | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mate-media/template b/srcpkgs/mate-media/template index e6bbb7edbca73d..63c3e58488e16d 100644 --- a/srcpkgs/mate-media/template +++ b/srcpkgs/mate-media/template @@ -1,11 +1,13 @@ # Template file for 'mate-media' pkgname=mate-media -version=1.26.2 +version=1.28.1 revision=1 -build_style=gnu-configure -configure_args="--disable-static" -hostmakedepends="pkg-config intltool glib-devel" -makedepends="libcanberra-devel mate-desktop-devel libmatemixer-devel libmate-panel-devel" +build_style=meson +configure_args="-Dwayland=$(vopt_if wayland yes no) $(vopt_bool wayland in-process)" +hostmakedepends="pkg-config gettext glib-devel $(vopt_if wayland wayland-devel)" +makedepends="libcanberra-devel mate-desktop-devel libmatemixer-devel libmate-panel-devel + gtk+3-devel libglib-devel libxml2-devel + $(vopt_if wayland 'gtk-layer-shell-devel wayland-devel')" depends="sound-theme-freedesktop" short_desc="MATE Media Tools" maintainer="skmpz " @@ -13,4 +15,7 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-media/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-media-${version}.tar.xz" -checksum=af46639574cc388513089ca10bb141ffc3e6d1ac33e730e4208db5759642850f +checksum=bcdc102e22f63f55e63166d5c708e91c113570e6a30a874345a88609e83a9912 + +build_options="wayland" +build_options_default="wayland" From a10d6f2432fbfd05b5158a8283d6164c03277d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 18/33] mate-menus: update to 1.28.0. --- srcpkgs/mate-menus/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-menus/template b/srcpkgs/mate-menus/template index 8f06681ccafcae..29b5e1f5f08c0b 100644 --- a/srcpkgs/mate-menus/template +++ b/srcpkgs/mate-menus/template @@ -1,6 +1,6 @@ # Template file for 'mate-menus' pkgname=mate-menus -version=1.26.1 +version=1.28.0 revision=1 build_style=gnu-configure build_helper="gir" @@ -13,7 +13,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-menus/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-menus-${version}.tar.xz" -checksum=458d599ae5b650c7d21740f9fe954c4a838be45ed62ab40e20e306faf5dd1d8c +checksum=cf40c75c7d6f0aad1d4969828fc62025c6222bc6a84f0bb9d6ead7e45970508d build_options="gir" build_options_default="gir" From 77deb9f3abfc812eac285afd7b7a60b06cf4b71b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 19/33] mate-notification-daemon: update to 1.28.0. --- srcpkgs/mate-notification-daemon/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mate-notification-daemon/template b/srcpkgs/mate-notification-daemon/template index 1268553d9f2b8e..179484c6ae6a67 100644 --- a/srcpkgs/mate-notification-daemon/template +++ b/srcpkgs/mate-notification-daemon/template @@ -1,10 +1,10 @@ # Template file for 'mate-notification-daemon' pkgname=mate-notification-daemon -version=1.26.1 +version=1.28.0 revision=1 build_style=gnu-configure configure_args="--disable-static --disable-schemas-compile --enable-wayland" -hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel libxml2" +hostmakedepends="pkg-config gettext glib-devel dbus-glib-devel libxml2" makedepends="libnotify-devel dbus-glib-devel libwnck-devel libcanberra-devel mate-desktop-devel libmate-panel-devel gtk-layer-shell-devel" depends="dconf hicolor-icon-theme desktop-file-utils" @@ -14,4 +14,4 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-notification-daemon/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-notification-daemon-${version}.tar.xz" -checksum=0eae9296c48a3c71fd56f1931961f92d29e45a045fe5f1a05f83c7400c319924 +checksum=a4310348ead866cbcb9b4c463f4d265cc6a96a1a782a9411a08b23bd65dbb2e0 From 0bdc85e8b362f9cd787277148c075a688592c27d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 20/33] mate-panel: update to 1.28.0. --- srcpkgs/mate-panel/template | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/srcpkgs/mate-panel/template b/srcpkgs/mate-panel/template index 872c9d41b54256..a378708267464d 100644 --- a/srcpkgs/mate-panel/template +++ b/srcpkgs/mate-panel/template @@ -1,27 +1,30 @@ # Template file for 'mate-panel' pkgname=mate-panel -version=1.26.4 +version=1.28.0 revision=1 build_style=gnu-configure build_helper="gir" -configure_args="--disable-static --disable-schemas-compile --enable-wayland +configure_args="--disable-static --disable-schemas-compile + --libexecdir=/usr/libexec/mate + $(vopt_enable wayland) $(vopt_enable gir introspection)" hostmakedepends="glib-devel intltool itstool pkg-config - $(vopt_if gir 'gobject-introspection')" + $(vopt_if wayland wayland-devel) $(vopt_if gir 'gobject-introspection')" makedepends="dbus-glib-devel libSM-devel libcaja-devel libcanberra-devel libmarco-devel libmateweather-devel librsvg-devel libwnck-devel - mate-desktop-devel mate-menus-devel wayland-devel gtk-layer-shell-devel" -depends="caja marco mate-session-manager" + mate-desktop-devel mate-menus-devel + $(vopt_if wayland 'wayland-devel gtk-layer-shell-devel')" +depends="caja marco mate-session-manager dconf-editor" short_desc="MATE Panel" maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-panel/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-panel-${version}.tar.xz" -checksum=2070f9d515657e5ddcda0d87ef729713dba9cb7b2ad06223bd674a21cc6b3daf +checksum=b3bd04a094d0eb5bd7dc3380ef6f0c49d9a9d5209733d7ccd7b46d066a208cba -build_options="gir" -build_options_default="gir" +build_options="gir wayland" +build_options_default="gir wayland" libmate-panel_package() { short_desc+=" - runtime library" From 31d33c5c45840f4675f0b4fc83227839e929c225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 21/33] mate-polkit: update to 1.28.1. --- srcpkgs/mate-polkit/template | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mate-polkit/template b/srcpkgs/mate-polkit/template index 2b280357154190..706b2d03f17e88 100644 --- a/srcpkgs/mate-polkit/template +++ b/srcpkgs/mate-polkit/template @@ -1,15 +1,14 @@ # Template file for 'mate-polkit' pkgname=mate-polkit -version=1.26.1 +version=1.28.1 revision=1 -build_style=gnu-configure -configure_args="--disable-static" -hostmakedepends="pkg-config intltool" -makedepends="gtk+3-devel polkit-devel" +build_style=meson +hostmakedepends="pkg-config gettext" +makedepends="gtk+3-devel libglib-devel polkit-devel" short_desc="PolicyKit integration for the MATE desktop" maintainer="skmpz " license="LGPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-polkit/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-polkit-${version}.tar.xz" -checksum=f5b7b0b5dfc53302c40403245998eb9121af3f50e71666a09ab73bb254520357 +checksum=350a1dd0a8ed6a2c9c183cff2a21f394299e968fcc6ae2e8c93c565dae604ae8 From 19bf385fa098136da6398662b137cc599cedd9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 22/33] mate-power-manager: update to 1.28.1. --- srcpkgs/mate-power-manager/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/mate-power-manager/template b/srcpkgs/mate-power-manager/template index d405fbd4861f53..1955a2f495ba93 100644 --- a/srcpkgs/mate-power-manager/template +++ b/srcpkgs/mate-power-manager/template @@ -1,17 +1,19 @@ # Template file for 'mate-power-manager' pkgname=mate-power-manager -version=1.26.1 +version=1.28.1 revision=1 -build_style=gnu-configure -configure_args="--disable-schemas-compile" -hostmakedepends="pkg-config intltool itstool libtool glib-devel dbus-glib-devel polkit" -makedepends="libcanberra-devel libgnome-keyring-devel libmate-panel-devel - libnotify-devel upower-devel libsecret-devel" +build_style=meson +hostmakedepends="pkg-config itstool gettext glib-devel dbus-glib-devel polkit" +makedepends="libcanberra-devel libmate-panel-devel gtk+3-devel libglib-devel + libXrandr-devel xorgproto libX11-devel libXext-devel dbus-devel dbus-glib-devel + cairo-devel libnotify-devel upower-devel libsecret-devel mate-desktop-devel" depends="dconf upower" +checkdepends="xvfb-run" short_desc="Power management tool for the MATE desktop" maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-power-manager/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-power-manager-${version}.tar.xz" -checksum=20cd9d22ed04babf98bb50e71a0ec5d78a8a476287723278f87da76cabfb1042 +checksum=8ebdcb74b607e868336ba9a8146cdef8f97bce535c2b0cb3bf650c58f71eee21 +make_check_pre="xvfb-run" From f519dfea9a5b12a5643d0a3e2404e5e55d0249c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 23/33] mate-screensaver: update to 1.28.0. --- srcpkgs/mate-screensaver/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mate-screensaver/template b/srcpkgs/mate-screensaver/template index 794904b229ab88..961b0f47283364 100644 --- a/srcpkgs/mate-screensaver/template +++ b/srcpkgs/mate-screensaver/template @@ -1,13 +1,13 @@ # Template file for 'mate-screensaver' pkgname=mate-screensaver -version=1.26.2 +version=1.28.0 revision=1 build_style=gnu-configure configure_args="--without-console-kit --without-systemd --with-elogind" -hostmakedepends="pkg-config intltool itstool glib-devel" +hostmakedepends="pkg-config gettext itstool glib-devel" makedepends="dbus-glib-devel libnotify-devel libXScrnSaver-devel libmatekbd-devel mate-menus-devel mate-desktop-devel pam-devel -elogind-devel" + elogind-devel" depends="mate-desktop mate-session-manager" short_desc="Screensaver for MATE" maintainer="skmpz " @@ -15,7 +15,7 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-screensaver/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-screensaver-${version}.tar.xz" -checksum=da9700ce24145bd55d24927eecfe6d31d0a52eae86e563b2c65054b356a5ff7e +checksum=6a0f24a8f84a2f95e10114ab53e63fd4aca688a55fdc503ed650e0a410e3ea70 post_install() { vinstall ${FILESDIR}/${pkgname}.pam 644 etc/pam.d ${pkgname} From 1f252841e9f4a4c270a5cfde74cd0657e8e8a395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:28 +0700 Subject: [PATCH 24/33] mate-sensors-applet: update to 1.28.0. --- srcpkgs/mate-sensors-applet/template | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mate-sensors-applet/template b/srcpkgs/mate-sensors-applet/template index 3ddf97ba9b230c..7025a370f252da 100644 --- a/srcpkgs/mate-sensors-applet/template +++ b/srcpkgs/mate-sensors-applet/template @@ -1,12 +1,13 @@ # Template file for 'mate-sensors-applet' pkgname=mate-sensors-applet -version=1.26.0 +version=1.28.0 revision=1 build_style=gnu-configure configure_args="--disable-schemas-compile --disable-static" -hostmakedepends="dbus-glib-devel glib-devel intltool itstool libxslt pkg-config" -makedepends="dbus-glib-devel libatasmart-devel libmate-panel-devel - libnotify-devel libsensors-devel" +hostmakedepends="dbus-glib-devel glib-devel itstool gettext libxml2 libxslt + pkg-config" +makedepends="dbus-glib-devel libatasmart-devel libmate-panel-devel cairo-devel + libnotify-devel libsensors-devel libglib-devel" depends="dconf" short_desc="Sensors applet for MATE" maintainer="skmpz " @@ -14,4 +15,4 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-sensors-applet/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4c437c3ff04488543e2cf0c4627fe265c48b4ad8f4946fd9de9845edc0c82968 +checksum=d465366682af8feb8618283c9789e8b70db6fd17ca8fa950ac6f710102315a81 From 4dc62f031f6cfa06b806971db5b5677f0fabc653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 25/33] mate-session-manager: update to 1.28.0. --- srcpkgs/mate-session-manager/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mate-session-manager/template b/srcpkgs/mate-session-manager/template index 31c4ab6a7264c4..8bef2d0d53bea6 100644 --- a/srcpkgs/mate-session-manager/template +++ b/srcpkgs/mate-session-manager/template @@ -1,15 +1,17 @@ # Template file for 'mate-session-manager' pkgname=mate-session-manager -version=1.26.1 +version=1.28.0 revision=1 build_style=gnu-configure configure_args="--disable-static --with-elogind --without-systemd" -hostmakedepends="pkg-config intltool glib-devel dbus-glib-devel elogind-devel" -makedepends="gtk+3-devel dbus-glib-devel libSM-devel libXtst-devel" +hostmakedepends="pkg-config gettext glib-devel dbus-glib-devel elogind-devel" +makedepends="gtk+3-devel dbus-glib-devel libSM-devel libXtst-devel + libX11-devel libSM-devel libICE-devel libXext-devel libXau-devel + libXcomposite-devel libglvnd-devel libglib-devel libepoxy-devel xtrans" short_desc="MATE Session Manager" maintainer="skmpz " license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-session-manager/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-session-manager-${version}.tar.xz" -checksum=5b8c7d6441fd9c293c863882ab67a7493c53cdf64eab27c094575f423ebd4278 +checksum=d32ce4595ba1da65290777203f2bc82bd973b214a3a04080a1ef5c68990a2d7b From 31d1b4037f9a035cbf8441a8c964301bc30b6e53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 26/33] mate-settings-daemon: update to 1.28.0. --- srcpkgs/mate-settings-daemon/template | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/srcpkgs/mate-settings-daemon/template b/srcpkgs/mate-settings-daemon/template index 5fe930198a59c8..b983e69f21d575 100644 --- a/srcpkgs/mate-settings-daemon/template +++ b/srcpkgs/mate-settings-daemon/template @@ -1,20 +1,22 @@ # Template file for 'mate-settings-daemon' pkgname=mate-settings-daemon -version=1.26.1 -revision=3 +version=1.28.0 +revision=1 build_style=gnu-configure -configure_args="--disable-static --disable-schemas-compile --enable-polkit --enable-pulse" -hostmakedepends="dbus-glib-devel glib-devel intltool itstool pkg-config polkit" -makedepends="dbus-glib-devel libXt-devel libcanberra-devel +configure_args="--disable-static --disable-schemas-compile --enable-polkit + --enable-pulse" +hostmakedepends="dbus-glib-devel glib-devel gettext pkg-config polkit" +makedepends="dbus-glib-devel libXt-devel libcanberra-devel dconf-devel libmatekbd-devel libmatemixer-devel libnotify-devel mate-desktop-devel nss-devel - polkit-devel" + at-spi2-core-devel libXext-devel libX11-devel libXi-devel fontconfig-devel + xorgproto pulseaudio-devel polkit-devel" short_desc="MATE Settings daemon (pulseaudio)" maintainer="skmpz " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-settings-daemon/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-settings-daemon-${version}.tar.xz" -checksum=697ea65b542921c2b766145292d268d3009cc2da8316d2a7869869055e4b1859 +checksum=4ed7cdadaaa4c99efffc0282b8411703bb76e072c41c4b57989f8c5b40611a3a mate-settings-daemon-devel_package() { depends="${sourcepkg}-${version}_${revision} dbus-glib-devel" From c499e4f6e0e6e4f8015a61abe821f1b3440fba4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 27/33] mate-system-monitor: update to 1.28.1. --- srcpkgs/mate-system-monitor/template | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mate-system-monitor/template b/srcpkgs/mate-system-monitor/template index a699f4afceeba2..4118400ecb7809 100644 --- a/srcpkgs/mate-system-monitor/template +++ b/srcpkgs/mate-system-monitor/template @@ -1,11 +1,11 @@ # Template file for 'mate-system-monitor' pkgname=mate-system-monitor -version=1.26.2 +version=1.28.1 revision=1 -build_style=gnu-configure -configure_args="--disable-static --disable-schemas-compile" -hostmakedepends="glib-devel intltool itstool pkg-config polkit" -makedepends="dbus-glib-devel gtkmm-devel libgtop-devel librsvg-devel libwnck-devel" +build_style=meson +hostmakedepends="glib-devel gettext itstool pkg-config polkit" +makedepends="dbus-glib-devel gtkmm-devel libgtop-devel librsvg-devel + elogind-devel gtk+3-devel libglib-devel libxml2-devel" depends="dbus mate-icon-theme" short_desc="MATE system monitor" maintainer="skmpz " @@ -13,4 +13,4 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-system-monitor/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-system-monitor-${version}.tar.xz" -checksum=be6d97dec68f5f36bde12f8acaf1ac5642d239a5d24161a82fff5064f4502544 +checksum=42d663d6b90fb5361ebc13f6547983d6f1e2ac75dc2ae4f1cac6ea6329965a25 From 00fa79ff26d32341d59719628028f21695802bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 28/33] mate-terminal: update to 1.28.1. --- srcpkgs/mate-terminal/template | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/srcpkgs/mate-terminal/template b/srcpkgs/mate-terminal/template index f6a2aea7c3531d..0ab31df53d1ca8 100644 --- a/srcpkgs/mate-terminal/template +++ b/srcpkgs/mate-terminal/template @@ -1,10 +1,11 @@ # Template file for 'mate-terminal' pkgname=mate-terminal -version=1.26.1 +version=1.28.1 revision=1 build_style=gnu-configure -hostmakedepends="glib-devel intltool itstool pkg-config" -makedepends="libSM-devel vte3-devel dconf-devel" +hostmakedepends="glib-devel itstool gettext pkg-config libxml2" +makedepends="libSM-devel vte3-devel dconf-devel libglib-devel gtk+3-devel + libICE-devel" depends="dbus mate-desktop" short_desc="MATE Terminal Emulator" maintainer="skmpz " @@ -12,4 +13,4 @@ license="GPL-3.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-terminal/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-terminal-${version}.tar.xz" -checksum=7c130206f0b47887e8c9274e73f8c19fae511134572869a7c23111b789e1e1d0 +checksum=f135eb1a9e2ae22798ecb2dc1914fdb4cfd774e6bb65c0152be37cc6c9469e92 From 5766d716ded51f7c5eac6285e25a2294ab8f1e18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 29/33] mate-user-guide: update to 1.28.0. --- srcpkgs/mate-user-guide/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/mate-user-guide/template b/srcpkgs/mate-user-guide/template index 65b0f400d6819d..02500cfbe62ba9 100644 --- a/srcpkgs/mate-user-guide/template +++ b/srcpkgs/mate-user-guide/template @@ -1,6 +1,6 @@ # Template file for 'mate-user-guide' pkgname=mate-user-guide -version=1.26.2 +version=1.28.0 revision=1 build_style=gnu-configure hostmakedepends="pkg-config intltool itstool" @@ -10,4 +10,4 @@ license="GFDL-1.1-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-user-guide/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-user-guide-${version}.tar.xz" -checksum=4d32b6e3564ac8f4eaab2b15482df7f9769750df8811abed837d0a2e7ee3808b +checksum=53ef0814f506544614ed61ab7be5221cc8d3a9f14f7ef9698c90fe7e46014b9e From 9f5424c98a8e9fd619c0fe648951bd6361d98dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 30/33] mate-utils: update to 1.28.0. --- srcpkgs/mate-utils/template | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/srcpkgs/mate-utils/template b/srcpkgs/mate-utils/template index d49e93747baccc..5932d97f3501f1 100644 --- a/srcpkgs/mate-utils/template +++ b/srcpkgs/mate-utils/template @@ -1,12 +1,16 @@ # Template file for 'mate-utils' pkgname=mate-utils -version=1.26.1 +version=1.28.0 revision=1 build_style=gnu-configure -configure_args="--disable-static --disable-schemas-compile" -hostmakedepends="pkg-config intltool itstool glib-devel librsvg-utils inkscape" -makedepends="gtk+3-devel libSM-devel zlib-devel libcanberra-devel - libgtop-devel libmate-panel-devel udisks2-devel" +configure_args="--disable-static --disable-schemas-compile --enable-ipv6 + GTK_LAYER_SHELL_REQUIRED_VERSION=0 GDK_WAYLAND_REQUIRED_VERSION=0 + $(vopt_enable wayland) $(vopt_enable wayland in-process)" +hostmakedepends="pkg-config intltool itstool glib-devel librsvg-utils + inkscape libxml2 $(vopt_if wayland wayland-devel)" +makedepends="gtk+3-devel libSM-devel libICE-devel zlib-devel libcanberra-devel + libXext-devel libX11-devel libgtop-devel libmate-panel-devel udisks2-devel + mate-desktop-devel $(vopt_if wayland 'wayland-devel gtk-layer-shell-devel')" depends="desktop-file-utils" short_desc="Common utilities for the MATE desktop" maintainer="skmpz " @@ -14,7 +18,10 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mate-utils/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mate-utils-${version}.tar.xz" -checksum=2f53475b1a0991dd5a93d9dda58fca4e416f259253586d94a5b1108f12370620 +checksum=58449d7a0d1d900ff03b78ca9f7e98c21e97f47fc26bee7ff1c61834f22f88d3 + +build_options="wayland" +build_options_default="wayland" post_install() { rm -r ${DESTDIR}/usr/include From 25f16a894fa00ab3688885209d3715460baa897e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 31/33] mozo: update to 1.28.0. --- srcpkgs/mozo/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/mozo/template b/srcpkgs/mozo/template index a01ea928f66881..09e2ff28abbdd2 100644 --- a/srcpkgs/mozo/template +++ b/srcpkgs/mozo/template @@ -1,9 +1,9 @@ # Template file for 'mozo' pkgname=mozo -version=1.26.2 -revision=2 -build_style=gnu-configure -hostmakedepends="intltool itstool pkg-config" +version=1.28.0 +revision=1 +build_style=meson +hostmakedepends="pkg-config gettext" makedepends="glib-devel mate-menus-devel python3-gobject-devel" depends="desktop-file-utils gtk+3 mate-menus python3-gobject" short_desc="MATE menu editing tool" @@ -12,4 +12,4 @@ license="LGPL-2.1-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/mozo/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/mozo-${version}.tar.xz" -checksum=472c482e0ef2fb1629e61e17daaa1a487f64392b029849dc9a4082afb38bc9ee +checksum=fe98984ffd6aa8c36d0594bcefdba03de39b42d41e007251680384f3cef44924 From f2a76503466cee42775568dc356ffe00909e4de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 32/33] pluma: update to 1.28.0. --- srcpkgs/pluma/patches/python-3.12.patch | 41 +++++++++++++++++++++++++ srcpkgs/pluma/template | 12 ++++---- 2 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/pluma/patches/python-3.12.patch diff --git a/srcpkgs/pluma/patches/python-3.12.patch b/srcpkgs/pluma/patches/python-3.12.patch new file mode 100644 index 00000000000000..2f16bb14c45e96 --- /dev/null +++ b/srcpkgs/pluma/patches/python-3.12.patch @@ -0,0 +1,41 @@ +diff --git a/plugins/externaltools/tools/library.py b/plugins/externaltools/tools/library.py +index ed66e26..0eb4e12 100755 +--- a/plugins/externaltools/tools/library.py ++++ b/plugins/externaltools/tools/library.py +@@ -197,7 +197,7 @@ class ToolDirectory(object): + + + class Tool(object): +- RE_KEY = re.compile('^([a-zA-Z_][a-zA-Z0-9_.\-]*)(\[([a-zA-Z_@]+)\])?$') ++ RE_KEY = re.compile(r'^([a-zA-Z_][a-zA-Z0-9_.\-]*)(\[([a-zA-Z_@]+)\])?$') + + def __init__(self, parent, filename=None): + super(Tool, self).__init__() +diff --git a/plugins/snippets/snippets/Document.py b/plugins/snippets/snippets/Document.py +index 1c2960b..65c4b43 100644 +--- a/plugins/snippets/snippets/Document.py ++++ b/plugins/snippets/snippets/Document.py +@@ -827,8 +827,8 @@ class Document: + return components + + def relative_path(self, first, second, mime): +- prot1 = re.match('(^[a-z]+:\/\/|\/)(.*)', first) +- prot2 = re.match('(^[a-z]+:\/\/|\/)(.*)', second) ++ prot1 = re.match(r'(^[a-z]+:\/\/|\/)(.*)', first) ++ prot2 = re.match(r'(^[a-z]+:\/\/|\/)(.*)', second) + + if not prot1 or not prot2: + return second +diff --git a/plugins/snippets/snippets/SubstitutionParser.py b/plugins/snippets/snippets/SubstitutionParser.py +index e6b4647..a03382b 100644 +--- a/plugins/snippets/snippets/SubstitutionParser.py ++++ b/plugins/snippets/snippets/SubstitutionParser.py +@@ -159,7 +159,7 @@ class SubstitutionParser: + return match.group(1), tokens[match.end():] + + def _condition_value(self, tokens): +- match = re.match('\\\\?%s\s*' % self.REG_GROUP, tokens) ++ match = re.match('\\\\?%s\\s*' % self.REG_GROUP, tokens) + + if not match: + return None, tokens diff --git a/srcpkgs/pluma/template b/srcpkgs/pluma/template index 3c8905b0b43ee0..6a3c237fde663e 100644 --- a/srcpkgs/pluma/template +++ b/srcpkgs/pluma/template @@ -1,14 +1,14 @@ # Template file for 'pluma' pkgname=pluma -version=1.26.1 -revision=2 +version=1.28.0 +revision=1 build_style=gnu-configure build_helper=gir pycompile_dirs="usr/lib/pluma/plugins" -hostmakedepends="python3 python3-setuptools gobject-introspection mate-common - automake libtool" +hostmakedepends="python3 python3-setuptools gobject-introspection iso-codes + pkg-config itstool glib-devel gettext perl" makedepends="enchant2-devel gtksourceview4-devel iso-codes libSM-devel - libpeas-devel mate-desktop-devel" + libpeas-devel mate-desktop-devel gtk+3-devel libglib-devel libICE-devel" depends="desktop-file-utils iso-codes zenity mate-desktop" short_desc="Powerful text editor for MATE" maintainer="skmpz " @@ -16,7 +16,7 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/pluma/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/pluma-${version}.tar.xz" -checksum=5959ece3d7118e106659f64d202d0ed1763ad10bbbba5d2acd8cbfba2e3994f1 +checksum=aa8adf9589345093a50e30b27ede4a78a2421d1727c27f465fc87c435965a1d4 python_version=3 make_check=no # needs gsettings-schemas and gvfs-mount From b0b40ccb97dc8131273dc0fe32312e11eb8a7437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Mon, 4 Mar 2024 23:44:29 +0700 Subject: [PATCH 33/33] engrampa: update to 1.28.1. --- srcpkgs/engrampa/patches/zstd-mime-type.patch | 184 ------------------ srcpkgs/engrampa/template | 16 +- 2 files changed, 5 insertions(+), 195 deletions(-) delete mode 100644 srcpkgs/engrampa/patches/zstd-mime-type.patch diff --git a/srcpkgs/engrampa/patches/zstd-mime-type.patch b/srcpkgs/engrampa/patches/zstd-mime-type.patch deleted file mode 100644 index 75e2f5a1629d7f..00000000000000 --- a/srcpkgs/engrampa/patches/zstd-mime-type.patch +++ /dev/null @@ -1,184 +0,0 @@ -diff --git a/caja/caja-engrampa.c b/caja/caja-engrampa.c -index ad89608..d4019ec 100644 ---- a/caja/caja-engrampa.c -+++ b/caja/caja-engrampa.c -@@ -195,7 +195,8 @@ static struct { - { "application/x-zip", TRUE }, - { "application/x-zip-compressed", TRUE }, - { "application/x-zoo", TRUE }, -- { ZSTD_MIME_TYPE, TRUE }, -+ { "application/zstd", TRUE }, -+ { "application/x-zstd", TRUE }, - { "application/x-zstd-compressed-tar", TRUE }, - { "application/zip", TRUE }, - { "multipart/x-zip", TRUE }, -diff --git a/configure.ac b/configure.ac -index 5d03e6b..6305854 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -148,7 +148,6 @@ AC_ARG_ENABLE([magic], - AS_HELP_STRING([--enable-magic], [use libmagic to detect file type]),, - [enable_magic=no]) - --zstd_mime_type="application/zstd" - if test x"$enable_magic" = x"yes" ; then - save_LIBS="$LIBS" - LIBS="$LIBS -lmagic" -@@ -161,47 +160,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); } - [AC_MSG_RESULT([no]) - AC_MSG_ERROR([libmagic is needed for magic])]) - -- dnl ******************************************* -- dnl This check can be removed with file >= 5.38 -- dnl ******************************************* -- AC_MSG_CHECKING([for zstd mime type]) -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include --#include --#include ]], -- [[ -- FILE *fptr; -- char *test_file = "test.zst"; -- char *default_mime_type = "application/zstd"; -- int status = 0; -- if ((fptr = fopen (test_file,"wb")) == NULL) { -- status = 1; -- } else { -- const unsigned char data[5] = "\x28\xb5\x2f\xfd\0"; -- int i; -- for (i = 0; i < strlen (data); i++) -- fwrite (&data[i], 1, 1, fptr); -- fclose (fptr); -- magic_t magic_cookie = magic_open (MAGIC_MIME_TYPE); -- if (magic_cookie == NULL) { -- status = 1; -- } else { -- if (magic_load (magic_cookie, NULL) != 0) { -- status = 1; -- } else { -- const char *mime = magic_file (magic_cookie, test_file); -- status = (strcmp (default_mime_type, mime) == 0); -- } -- magic_close(magic_cookie); -- } -- remove (test_file); -- } -- return status;]])], -- [zstd_mime_type="application/x-zstd"], -- [zstd_mime_type="application/zstd"] -- ) -- AC_MSG_RESULT($zstd_mime_type) -- dnl ******************************************* -- - LIBS="$save_LIBS" - - MAGIC_CFLAGS= -@@ -214,9 +172,6 @@ int main () { magic_t m = magic_open(MAGIC_NONE); } - fi - - AM_CONDITIONAL(ENABLE_MAGIC, test x"$enable_magic" != x"no") --ZSTD_MIME_TYPE="$zstd_mime_type" --AC_SUBST(ZSTD_MIME_TYPE) --AC_DEFINE_UNQUOTED(ZSTD_MIME_TYPE, "$zstd_mime_type", [define zstd mime type]) - - AC_ARG_VAR([CPIO], [Path to the `cpio` command]) - AC_PATH_PROGS(CPIO, gcpio cpio, cpio) -diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in -index c23c8ab..6d8c511 100644 ---- a/data/engrampa.desktop.in.in -+++ b/data/engrampa.desktop.in.in -@@ -11,7 +11,7 @@ Type=Application - Icon=engrampa - # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! - Categories=GTK;Utility;Archiving;Compression; --MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;@ZSTD_MIME_TYPE@;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed; -+MimeType=application/epub+zip;application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arc;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-source-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zstd;application/x-zstd;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed; - # Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! - Keywords=MATE;archive;manager;compression; - X-MATE-DocPath=engrampa/engrampa.xml -diff --git a/src/fr-command-cfile.c b/src/fr-command-cfile.c -index a914abe..93f641f 100644 ---- a/src/fr-command-cfile.c -+++ b/src/fr-command-cfile.c -@@ -301,7 +301,8 @@ fr_command_cfile_add (FrCommand *comm, - compressed_filename = g_strconcat (filename, ".rz", NULL); - } - -- else if (is_mime_type (comm->mime_type, ZSTD_MIME_TYPE)) { -+ else if (is_mime_type (comm->mime_type, "application/zstd") -+ || is_mime_type (comm->mime_type, "application/x-zstd")) { - fr_process_begin_command (comm->process, "zstd"); - fr_process_set_working_dir (comm->process, temp_dir); - fr_process_add_arg (comm->process, filename); -@@ -446,7 +447,8 @@ fr_command_cfile_extract (FrCommand *comm, - fr_process_end_command (comm->process); - } - -- else if (is_mime_type (comm->mime_type, ZSTD_MIME_TYPE)) { -+ else if (is_mime_type (comm->mime_type, "application/zstd") -+ || is_mime_type (comm->mime_type, "application/x-zstd")) { - fr_process_begin_command (comm->process, "zstd"); - fr_process_add_arg (comm->process, "-f"); - fr_process_add_arg (comm->process, "-d"); -@@ -515,7 +517,8 @@ fr_command_cfile_test (FrCommand *comm) - else if (is_mime_type (comm->mime_type, "application/x-lzop")) { - compress_cmd = "lzop"; - } -- else if (is_mime_type (comm->mime_type, ZSTD_MIME_TYPE)) { -+ else if (is_mime_type (comm->mime_type, "application/zstd") -+ || is_mime_type (comm->mime_type, "application/x-zstd")) { - compress_cmd = "zstd"; - fr_process_begin_command (comm->process, compress_cmd); - fr_process_add_arg (comm->process, "-v"); -@@ -542,7 +545,8 @@ const char *cfile_mime_type[] = { "application/x-gzip", - "application/x-lzop", - "application/x-rzip", - "application/x-xz", -- ZSTD_MIME_TYPE, -+ "application/zstd", -+ "application/x-zstd", - NULL }; - - -@@ -599,7 +603,8 @@ fr_command_cfile_get_capabilities (FrCommand *comm, - if (is_program_available ("rzip", check_command)) - capabilities |= FR_COMMAND_CAN_READ_WRITE; - } -- else if (is_mime_type (mime_type, ZSTD_MIME_TYPE)) { -+ else if (is_mime_type (mime_type, "application/zstd") -+ || is_mime_type (mime_type, "application/x-zstd")) { - if (is_program_available ("zstd", check_command)) - capabilities |= FR_COMMAND_CAN_READ_WRITE; - } -@@ -642,7 +647,8 @@ fr_command_cfile_get_packages (FrCommand *comm, - return PACKAGES ("lzop"); - else if (is_mime_type (mime_type, "application/x-rzip")) - return PACKAGES ("rzip"); -- else if (is_mime_type (mime_type, ZSTD_MIME_TYPE)) -+ else if (is_mime_type (mime_type, "application/zstd") -+ || is_mime_type (mime_type, "application/x-zstd")) - return PACKAGES ("zstd"); - - return NULL; -diff --git a/src/fr-init.c b/src/fr-init.c -index 7d7b313..57dfc40 100644 ---- a/src/fr-init.c -+++ b/src/fr-init.c -@@ -110,7 +110,8 @@ FrMimeTypeDescription mime_type_desc[] = { - { "application/x-xz", ".xz", N_("Xz compressed file"), 0 }, - { "application/x-xz-compressed-tar", ".tar.xz", N_("Tar compressed with xz"), 0 }, - { "application/x-zoo", ".zoo", N_("Zoo"), 0 }, -- { ZSTD_MIME_TYPE, ".zst", N_("Zstandard compressed file"), 0 }, -+ { "application/zstd", ".zst", N_("Zstandard compressed file"), 0 }, -+ { "application/x-zstd", ".zst", N_("Zstandard compressed file"), 0 }, - { "application/x-zstd-compressed-tar", ".tar.zst", N_("Tar compressed with zstd"), 0 }, - { "application/zip", ".zip", N_("Zip"), 0 }, - { NULL, NULL, NULL, 0 } -@@ -185,7 +186,7 @@ FrExtensionType file_ext_type[] = { - { ".Z", "application/x-compress" }, - { ".zip", "application/zip" }, - { ".zoo", "application/x-zoo" }, -- { ".zst", ZSTD_MIME_TYPE }, -+ { ".zst", "application/zstd" }, - { NULL, NULL } - }; - diff --git a/srcpkgs/engrampa/template b/srcpkgs/engrampa/template index b99fb16a0032cb..38a4e2a1c00c3c 100644 --- a/srcpkgs/engrampa/template +++ b/srcpkgs/engrampa/template @@ -1,14 +1,12 @@ # Template file for 'engrampa' pkgname=engrampa -version=1.26.1 +version=1.28.1 revision=1 build_style=gnu-configure -configure_args="--enable-magic --disable-schemas-compile --disable-packagekit - --disable-static" -hostmakedepends="glib-devel intltool itstool pkg-config cpio automake - gettext-devel tar libtool mate-common autoconf-archive" +configure_args="--enable-magic --disable-packagekit CPIO=/usr/bin/cpio" +hostmakedepends="glib-devel intltool itstool pkg-config gettext" makedepends="file-devel gtk+3-devel json-glib-devel libSM-devel libarchive-devel - libcaja-devel" + libcaja-devel libglib-devel libICE-devel" depends="desktop-file-utils cpio" short_desc="Archive manipulator for MATE" maintainer="skmpz " @@ -16,8 +14,4 @@ license="GPL-2.0-or-later" homepage="https://mate-desktop.org" changelog="https://raw.githubusercontent.com/mate-desktop/engrampa/master/NEWS" distfiles="https://pub.mate-desktop.org/releases/${version%.*}/engrampa-${version}.tar.xz" -checksum=f0224107a7a4e9ea6309c9e78aa5faac802c4cf72a49ac283aa9e7ae1e8a6c4a - -pre_configure() { - autoreconf -fi -} +checksum=9c5c4c9bcf8b08eeaa8f275538d24b4c955089d58aec0331e89c02b84d85386a