icewm: update to 1.6.2
This commit is contained in:
parent
ca7aab9b59
commit
a1ba94af29
2 changed files with 16 additions and 51 deletions
|
@ -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);
|
||||
}
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue