Merge pull request msys2#11478 from kmilos/libnotify-0.7.9

libnotify: update to 0.7.9, enable clangarm64

Author: jeremyd2019

mingw-w64-libnotify/PKGBUILD

@@ -4,57 +4,63 @@
 _realname=libnotify
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=0.7.8
-pkgrel=4
+pkgver=0.7.9
+pkgrel=1
 pkgdesc="Desktop notification library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url="https://developer.gnome.org/notification-spec/"
-license=('LGPL')
+license=('spdx:LGPL-2.1')
 depends=("${MINGW_PACKAGE_PREFIX}-gdk-pixbuf2"
          "${MINGW_PACKAGE_PREFIX}-glib2")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gtk3"
-             "${MINGW_PACKAGE_PREFIX}-meson"
              "${MINGW_PACKAGE_PREFIX}-gtk-doc"
+             "${MINGW_PACKAGE_PREFIX}-libxslt"
              "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
+             "${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-ninja"
              "${MINGW_PACKAGE_PREFIX}-pkg-config"
              "${MINGW_PACKAGE_PREFIX}-cc")
 source=("https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}-${pkgver}.tar.xz"
-        "meson-check-version-script.patch::https://gitlab.gnome.org/GNOME/libnotify/-/commit/55eb692.patch"
         "test-fix.patch"
-        "fix-gtk-doc.patch")
-sha256sums=('69209e0b663776a00c7b6c0e560302a8dbf66b2551d55616304f240bba66e18c'
-            '201bcda9dc3e1323686494578b5283eb204a8ee8c20120d5651abc505f241d12'
+        "fix-gtk-doc.patch"
+        "fix-realpath.patch")
+sha256sums=('66c0517ed16df7af258e83208faaf5069727dfd66995c4bbc51c16954d674761'
             '185e7885512106172627525a4ec1fc18c2f95844f733e49cece325874a55f8e6'
-            '690f8bd32e6aa4828bc93d2d9a8cba4870c96fa7af248a64f8ab505d8389af4d')
+            '690f8bd32e6aa4828bc93d2d9a8cba4870c96fa7af248a64f8ab505d8389af4d'
+            '4303fc94907937b38da92b1e1f497b86e64ffdffe5e87034ccc2c7a973e13f9a')
 
 prepare() {
   cd $srcdir/${_realname}-${pkgver}
 
-  patch -p1 -i ${srcdir}/meson-check-version-script.patch
   patch -p1 -i ${srcdir}/test-fix.patch
   patch -p1 -i ${srcdir}/fix-gtk-doc.patch
+  patch -p1 -i ${srcdir}/fix-realpath.patch
 }
 
 build() {
   cd "${srcdir}"/${_realname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  [[ -d "${srcdir}"/build-${MSYSTEM} ]] && rm -rf "${srcdir}"/build-${MSYSTEM}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
 
   MSYS2_ARG_CONV_EXCL="--prefix=" \
-  ${MINGW_PREFIX}/bin/meson \
-    --prefix="${MINGW_PREFIX}" \
-    --buildtype=plain \
-    -Dintrospection=enabled \
-    -Ddocbook_docs=disabled \
-    -Dgtk_doc=true \
-    "../${_realname}-${pkgver}"
-
-  ninja
+    ${MINGW_PREFIX}/bin/meson \
+      --prefix="${MINGW_PREFIX}" \
+      --buildtype=plain \
+      -Dtests=false \
+      -Dintrospection=enabled \
+      -Dman=true \
+      -Dgtk_doc=true \
+      -Ddocbook_docs=disabled \
+      "../${_realname}-${pkgver}"
+
+  meson compile
 }
 
 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}/build-${MSYSTEM}"
+
+  DESTDIR="${pkgdir}" meson install
 
-  DESTDIR="${pkgdir}" ninja install
+  install -Dm644 "${srcdir}/${_realname}-${pkgver}/COPYING" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/COPYING"
 }

mingw-w64-libnotify/fix-realpath.patch

@@ -0,0 +1,20 @@
+diff -Naur libnotify-0.7.9.orig/libnotify/notification.c libnotify-0.7.9/libnotify/notification.c
+--- libnotify-0.7.9.orig/libnotify/notification.c	2020-02-26 20:07:28.392563800 +0100
++++ libnotify-0.7.9/libnotify/notification.c	2022-04-13 11:15:41.995249600 +0200
+@@ -28,6 +28,7 @@
+ #include "notify.h"
+ #include "internal.h"
+ 
++#include <stdlib.h>
+ 
+ /**
+  * SECTION:notification
+@@ -442,7 +443,7 @@
+                 if (base_path && base_path[0] == G_DIR_SEPARATOR) {
+                         path_filename = g_strdup (base_path);
+                 } else {
+-                        path_filename = realpath (base_path, NULL);
++                        path_filename = _fullpath (base_path, NULL, _MAX_PATH);
+                 }
+         }
+