From 43c9a275df0c66eeb148f5e2d7871069d14a0015 Mon Sep 17 00:00:00 2001 From: Matthew T Hoare Date: Mon, 11 Apr 2022 11:35:20 +0100 Subject: [PATCH] testing/dk: upgrade to 1.6.0 --- testing/dk/APKBUILD | 12 +++++------- testing/dk/fix-musl.patch | 15 --------------- 2 files changed, 5 insertions(+), 22 deletions(-) delete mode 100644 testing/dk/fix-musl.patch diff --git a/testing/dk/APKBUILD b/testing/dk/APKBUILD index d8b03653eb8..ed60dcbb646 100644 --- a/testing/dk/APKBUILD +++ b/testing/dk/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Matthew T Hoare # Maintainer: Matthew T Hoare pkgname=dk -pkgver=1.2 -pkgrel=1 +pkgver=1.6 +pkgrel=0 pkgdesc="tiling window manager taking inspiration from dwm, bspwm, and xmonad" url="https://bitbucket.org/natemaia/dk" arch="all" @@ -12,9 +12,8 @@ options="!check" # no tests install="$pkgname.post-install" subpackages="$pkgname-doc" source="$pkgname-$pkgver.tar.gz::https://bitbucket.org/natemaia/dk/get/v$pkgver.tar.gz - dk.desktop - fix-musl.patch" -builddir="$srcdir"/natemaia-dk-f2a77537d71a + dk.desktop" +builddir="$srcdir"/natemaia-dk-9d5cec90f346 build() { make PREFIX=/usr @@ -27,7 +26,6 @@ package() { } sha512sums=" -18601b8f503e3d888f27c5a05ecfb6e50118fb8926ee361335d07f3d14d4f136c95d0ed79cd99053c4af0008dad01fe04b7354bde70bb1c30e78cd12b3afdca1 dk-1.2.tar.gz +73b312aa57562778c2a4dfc0abef7abc8726b8e3d3b0ce9e650ad219e00669e8e9de499d5aa7a7e0e0f38d5329ed2679978664ce1693fb24db6a51489aa645c3 dk-1.6.tar.gz 4d8e8e44b39b47621f9643708b6376178131495fde2b6a8c13d00f9f293f6b4c5adfba8f5000ce3588c86187fb4545f5f26e04b6837ac43e844b11ec28b199cb dk.desktop -2539ec93a2b295f743419e3cbfac8d14f04d51c997d7fa26c730ec33e85e017e863eb63adc9c90f4ab5bfb48b1560799964bd568ba5172013991087fc9e22913 fix-musl.patch " diff --git a/testing/dk/fix-musl.patch b/testing/dk/fix-musl.patch deleted file mode 100644 index 39ff1bed7d3..00000000000 --- a/testing/dk/fix-musl.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/dk.h -+++ b/src/dk.h -@@ -17,8 +17,10 @@ - #endif - - #ifndef NAN -- #if __GNUC_PREREQ (3, 3) -- #define NAN (__builtin_nanf("")) -+ #if defined(__GLIBC__) -+ #if __GNUC_PREREQ (3, 3) -+ #define NAN (__builtin_nanf("")) -+ #endif - #else - #define NAN (0.0f / 0.0f) - #endif