-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add dependencies on librsvg-devel, libao-devel, libsndfile-devel, and alsa-lib-devel to enable building of icesound and enable SVG icons. Install icewmtray because 'make install' does not. Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
- Loading branch information
Showing
2 changed files
with
59 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
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); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,25 @@ | ||
# Template file for 'icewm' | ||
pkgname=icewm | ||
version=1.5.3 | ||
version=1.5.4 | ||
revision=1 | ||
build_style=cmake | ||
configure_args="-DENABLE_LTO=ON -DCONFIG_LIBRSVG=ON | ||
-DCONFIG_EXTERNAL_TRAY=ON -DENABLE_ALSA=ON" | ||
hostmakedepends="asciidoc gettext-devel libtool mkfontdir pkg-config" | ||
makedepends="libXrandr-devel libXft-devel libSM-devel libXinerama-devel | ||
gdk-pixbuf-devel libXpm-devel" | ||
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" | ||
depends="shared-mime-info" | ||
short_desc="Window Manager designed for speed, usability, and consistency" | ||
maintainer="Juan RP <xtraeme@voidlinux.org>" | ||
license="LGPL-2.0-or-later" | ||
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=98d0b59a75c86aa4272b5855f602ae8692ff6b748a703b8ee54b2abac45e5afb | ||
checksum=895c81d6672a3eaa91c76a0807ea8fea6789b8a3c8626635f1c11d7c5ca059ea | ||
|
||
# No c++ warnings for 'One Defintion Rules' and make sure LTO goes ok | ||
CXXFLAGS="-Wno-odr -fno-strict-aliasing" | ||
|
||
post_install() { | ||
# icewmtray is not installed by 'make install' | ||
vbin build/icewmtray | ||
} |
5e8cb56
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops! I missed that one - thank you.