Re: [PR PATCH] [Updated] icewm: update to 1.6.2

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

There is an updated pull request by mobinmob against master on the void-packages repository

https://github.com/mobinmob/void-packages icewm-upd
https://github.com/void-linux/void-packages/pull/14615

icewm: update to 1.6.2


A patch file from https://github.com/void-linux/void-packages/pull/14615.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-icewm-upd-14615.patch --]
[-- Type: text/x-diff, Size: 3753 bytes --]

From 7591c8d67c531eddf0ab98b14664791f8881cb71 Mon Sep 17 00:00:00 2001
From: mobinmob <mobinmob@disroot.org>
Date: Fri, 20 Sep 2019 21:49:10 +0300
Subject: [PATCH] icewm: update to 1.6.2

---
 srcpkgs/icewm/patches/use-NULL.patch | 45 ----------------------------
 srcpkgs/icewm/template               | 22 ++++++++++----
 2 files changed, 16 insertions(+), 51 deletions(-)
 delete mode 100644 srcpkgs/icewm/patches/use-NULL.patch

diff --git a/srcpkgs/icewm/patches/use-NULL.patch b/srcpkgs/icewm/patches/use-NULL.patch
deleted file mode 100644
index 855c1a446c6..00000000000
--- a/srcpkgs/icewm/patches/use-NULL.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-For unknown reasons g++ complains about these usages
-of 'nullptr' being unknown and suggests to use 'fileptr'
-instead, which of course is wrong.
-Use the C way of describing a null pointer as NULL for now.
-
---- src/wmconfig.cc	2019-05-07 12:15:34.814033408 +0200
-+++ src/wmconfig.cc	2019-05-07 12:17:38.655028470 +0200
-@@ -50,7 +50,7 @@
-     if (!append) {
-         for (long i = 0; i < workspaceCount; i++) {
-             delete[] workspaceNames[i];
--            workspaceNames[i] = nullptr;
-+            workspaceNames[i] = NULL;
-         }
-         workspaceCount = 0;
-     }
---- src/icewmhint.cc	2019-04-23 22:12:00.000000000 +0200
-+++ src/icewmhint.cc	2019-05-07 12:19:35.440023813 +0200
-@@ -32,7 +32,7 @@
-     Hinter() :
-         display(XOpenDisplay(NULL))
-     {
--        if (display == nullptr)
-+        if (display == NULL)
-             die(1,  _("Can't open display: %s. "
-                       "X must be running and $DISPLAY set."),
-                     XDisplayName(NULL));
-@@ -52,7 +52,7 @@
-             size += 1 + strlen(args[i]);
- 
-         unsigned char *hint = new unsigned char [size];
--        if (hint == nullptr)
-+        if (hint == NULL)
-             die(1, _("Out of memory (len=%d)."), int(size));
- 
-         size_t copy = 0;
-@@ -79,7 +79,7 @@
- 
-     char** arg = &argv[1];
-     for (; arg < &argv[argc] && **arg == '-'; ++arg) {
--        char* value = nullptr;
-+        char* value = NULL;
-         if (GetArgument(value, "d", "display", arg, argv + argc)) {
-             setenv("DISPLAY", value, True);
-         }
diff --git a/srcpkgs/icewm/template b/srcpkgs/icewm/template
index 70a445f4874..a011b4a8d7d 100644
--- a/srcpkgs/icewm/template
+++ b/srcpkgs/icewm/template
@@ -1,19 +1,29 @@
 # Template file for 'icewm'
 pkgname=icewm
-version=1.5.4
-revision=3
+version=1.6.2
+revision=1
 build_style=cmake
 configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON -DENABLE_ALSA=ON -DCFGDIR=/etc/icewm"
 hostmakedepends="asciidoc gettext-devel libtool mkfontdir perl pkg-config"
 makedepends="libSM-devel libXft-devel libXinerama-devel libXpm-devel
- libXrandr-devel libao-devel librsvg-devel libsndfile-devel"
+ libXrandr-devel libao-devel librsvg-devel libsndfile-devel libXcomposite-devel fribidi-devel"
 depends="shared-mime-info"
 short_desc="Window Manager designed for speed, usability, and consistency"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="https://github.com/bbidulock/icewm"
-distfiles="https://github.com/ice-wm/icewm/releases/download/${version}/icewm-${version}.tar.xz"
-checksum=895c81d6672a3eaa91c76a0807ea8fea6789b8a3c8626635f1c11d7c5ca059ea
+homepage="https://ice-wm.org/"
+distfiles="https://github.com/ice-wm/icewm/archive/${version}.tar.gz"
+checksum=1008c17caa7d69a0bd29e5122efee278c99f0082b4c02b1e2a45c188ea9396dc
 
 # No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok
 CXXFLAGS="-Wno-odr -fno-strict-aliasing"
+
+
+if [ "$CROSS_BUILD" ]; then
+	makedepends+=" libXdamage-devel"
+fi
+
+
+pre_install() {
+	cp lib/IceWM.jpg build/lib/IceWM.jpg
+}