From 66adb94861c9131057414071e20a79f5d282eac1 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 21 Oct 2023 10:16:56 +0200 Subject: [PATCH] dia: Update to 0.97.0.r2562.gbd551bb25 patch got merged upstream now --- mingw-w64-dia/0001-fix-lib-path.patch | 11 ----------- mingw-w64-dia/PKGBUILD | 11 ++++------- 2 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 mingw-w64-dia/0001-fix-lib-path.patch diff --git a/mingw-w64-dia/0001-fix-lib-path.patch b/mingw-w64-dia/0001-fix-lib-path.patch deleted file mode 100644 index f42e5c6a0ec2b..0000000000000 --- a/mingw-w64-dia/0001-fix-lib-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dia/lib/dia_dirs.c.orig 2023-09-24 22:34:17.435312000 +0200 -+++ dia/lib/dia_dirs.c 2023-09-24 22:34:27.268390400 +0200 -@@ -88,7 +88,7 @@ - { - #ifdef G_OS_WIN32 - char *sLoc = g_win32_get_package_installation_directory_of_module (NULL); -- char *returnPath = g_build_filename (sLoc, "dia", NULL); -+ char *returnPath = g_build_filename (sLoc, "lib", "dia", NULL); - - g_clear_pointer (&sLoc, g_free); - diff --git a/mingw-w64-dia/PKGBUILD b/mingw-w64-dia/PKGBUILD index 45b9b6586228c..d0b3b521691fb 100644 --- a/mingw-w64-dia/PKGBUILD +++ b/mingw-w64-dia/PKGBUILD @@ -3,7 +3,7 @@ _realname=dia pkgbase=mingw-w64-${_realname} pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}") -pkgver=0.97.0.r2562.gbd551bb25 +pkgver=0.97.0.r2573.gdd3dd5de5 pkgrel=1 pkgdesc="A gtk+ based diagram creation program" arch=('any') @@ -27,11 +27,9 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-meson" "${MINGW_PACKAGE_PREFIX}-desktop-file-utils" "${MINGW_PACKAGE_PREFIX}-gtk-update-icon-cache" "git") -_commit="bd551bb2558dcc89bc0bf7b4dd85b38cd85ad322" -source=("${_realname}"::"git+https://gitlab.gnome.org/GNOME/dia.git#commit=${_commit}" - "0001-fix-lib-path.patch") -sha256sums=('SKIP' - '8d113f6ebbe609497c6d2eaa6c3c6d620002440d86dda676e0f6d9e1566643e5') +_commit="dd3dd5de5ebda6fb815b5f8bf0708693b534d91c" +source=("${_realname}"::"git+https://gitlab.gnome.org/GNOME/dia.git#commit=${_commit}") +sha256sums=('SKIP') pkgver() { cd "${_realname}" @@ -42,7 +40,6 @@ pkgver() { prepare() { cd "${_realname}" - patch -Np1 -i "${srcdir}/0001-fix-lib-path.patch" } build() {