mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00
Code Issues Releases Activity

- Update IceWM to version 1.8.0

Browse Source 
- Adapt to strtok_r() behavior on FreeBSD (see
  https://github.com/ice-wm/icewm/issues/23)

Found out via:	www.opennet.ru
This commit is contained in:
Alexey Dokuchaev 2020-08-27 08:11:31 +00:00
parent b544f1eb52
commit 1ef6986041
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=546330
4 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11-wm/icewm/Makefile
View File

@ -2,13 +2,10 @@
# $FreeBSD$
PORTNAME= icewm
PORTVERSION= 1.6.6
PORTVERSION= 1.8.0
CATEGORIES= x11-wm
MASTER_SITES= https://github.com/ice-wm/icewm/releases/download/${PORTVERSION}/
PATCH_SITES= https://github.com/bbidulock/icewm/commit/
PATCHFILES= 32c295c85d22.diff:-p1 f60340768c55.diff:-p1
MAINTAINER= portmaster@bsdforge.com
COMMENT= Window Manager designed for speed, usability and consistency

10
x11-wm/icewm/distinfo
View File

@ -1,7 +1,3 @@
TIMESTAMP = 1590778501
SHA256 (icewm-1.6.6.tar.lz) = 77f512e0bcdc9c6ec8e1a10c822b8238548265babc70dfe4eb76b4520d60c01c
SIZE (icewm-1.6.6.tar.lz) = 1684639
SHA256 (32c295c85d22.diff) = d6801471b14780b34399a7e9ebb75744a4eb3153f97856c1109a81a76d4706c6
SIZE (32c295c85d22.diff) = 304
SHA256 (f60340768c55.diff) = 94178b00d71e9a8e8959247616f8758a9c89f3dc976c9f74022307376854a14a
SIZE (f60340768c55.diff) = 298
TIMESTAMP = 1598315124
SHA256 (icewm-1.8.0.tar.lz) = a71ab11c30f3e5997fdee209f1bc528141e9f6f343c6a37031339491e2db2a87
SIZE (icewm-1.8.0.tar.lz) = 1679913

12
x11-wm/icewm/files/patch-src_misc.cc Normal file
View File

@ -0,0 +1,12 @@
--- src/misc.cc.orig 2020-08-24 22:02:15 UTC
+++ src/misc.cc
@@ -972,7 +972,8 @@ char* path_lookup(const char* name) {
if (env == nullptr)
return nullptr;
- while ((directory = strtok_r(save ? nullptr : env, ":", &save)) != nullptr) {
+ for (directory = strtok_r(env, ":", &save); directory != nullptr;
+ directory = strtok_r(nullptr, ":", &save)) {
size_t length = strlen(directory) + strlen(name) + 3;
filebuf = new char[length];
if (filebuf == nullptr)

37
x11-wm/icewm/pkg-plist
View File

@ -183,6 +183,8 @@ man/man5/icewm-winoptions.5.gz
%%DATADIR%%/taskbar/start.xpm
%%DATADIR%%/taskbar/windows.xpm
%%DATADIR%%/taskbar/xfreeos2.xpm
%%DATADIR%%/themes/CrystalBlue/buttonA.xpm
%%DATADIR%%/themes/CrystalBlue/buttonI.xpm
%%DATADIR%%/themes/CrystalBlue/close.xpm
%%DATADIR%%/themes/CrystalBlue/closeA.xpm
%%DATADIR%%/themes/CrystalBlue/closeO.xpm
@ -265,6 +267,8 @@ man/man5/icewm-winoptions.5.gz
%%DATADIR%%/themes/CrystalBlue/taskbar/taskbuttonminimized.xpm
%%DATADIR%%/themes/CrystalBlue/taskbar/toolbuttonbg.xpm
%%DATADIR%%/themes/CrystalBlue/taskbar/windows.xpm
%%DATADIR%%/themes/CrystalBlue/taskbar/workspacebuttonactive.xpm
%%DATADIR%%/themes/CrystalBlue/taskbar/workspacebuttonbg.xpm
%%DATADIR%%/themes/CrystalBlue/titleAB.xpm
%%DATADIR%%/themes/CrystalBlue/titleAJ.xpm
%%DATADIR%%/themes/CrystalBlue/titleAM.xpm
@ -382,8 +386,6 @@ man/man5/icewm-winoptions.5.gz
%%DATADIR%%/themes/NanoBlue/dframeIT.xpm
%%DATADIR%%/themes/NanoBlue/dframeITL.xpm
%%DATADIR%%/themes/NanoBlue/dframeITR.xpm
%%DATADIR%%/themes/NanoBlue/drameAB.xpm
%%DATADIR%%/themes/NanoBlue/drameATR.xpm
%%DATADIR%%/themes/NanoBlue/eos.jpg
%%DATADIR%%/themes/NanoBlue/expandA.xpm
%%DATADIR%%/themes/NanoBlue/expandI.xpm
@ -404,21 +406,22 @@ man/man5/icewm-winoptions.5.gz
%%DATADIR%%/themes/NanoBlue/frameIT.xpm
%%DATADIR%%/themes/NanoBlue/frameITL.xpm
%%DATADIR%%/themes/NanoBlue/frameITR.xpm
%%DATADIR%%/themes/NanoBlue/icons/IceWM_16x16.png
%%DATADIR%%/themes/NanoBlue/icons/IceWM_32x32.png
%%DATADIR%%/themes/NanoBlue/icons/app_16x16.png
%%DATADIR%%/themes/NanoBlue/icons/firefox_16x16.png
%%DATADIR%%/themes/NanoBlue/icons/firefox_32x32.png
%%DATADIR%%/themes/NanoBlue/icons/folder_16x16.png
%%DATADIR%%/themes/NanoBlue/icons/folder_32x32.png
%%DATADIR%%/themes/NanoBlue/icons/gimp_16x16.png
%%DATADIR%%/themes/NanoBlue/icons/gimp_32x32.png
%%DATADIR%%/themes/NanoBlue/icons/mplayer_16x16.png
%%DATADIR%%/themes/NanoBlue/icons/mplayer_32x32.png
%%DATADIR%%/themes/NanoBlue/icons/thunderbird_16x16.png
%%DATADIR%%/themes/NanoBlue/icons/thunderbird_32x32.png
%%DATADIR%%/themes/NanoBlue/icons/xterm_16x16.png
%%DATADIR%%/themes/NanoBlue/icons/xterm_32x32.png
%%DATADIR%%/themes/NanoBlue/icons/IceWM_16x16.xpm
%%DATADIR%%/themes/NanoBlue/icons/IceWM_32x32.xpm
%%DATADIR%%/themes/NanoBlue/icons/app_16x16.xpm
%%DATADIR%%/themes/NanoBlue/icons/app_32x32.xpm
%%DATADIR%%/themes/NanoBlue/icons/firefox_16x16.xpm
%%DATADIR%%/themes/NanoBlue/icons/firefox_32x32.xpm
%%DATADIR%%/themes/NanoBlue/icons/folder_16x16.xpm
%%DATADIR%%/themes/NanoBlue/icons/folder_32x32.xpm
%%DATADIR%%/themes/NanoBlue/icons/gimp_16x16.xpm
%%DATADIR%%/themes/NanoBlue/icons/gimp_32x32.xpm
%%DATADIR%%/themes/NanoBlue/icons/mplayer_16x16.xpm
%%DATADIR%%/themes/NanoBlue/icons/mplayer_32x32.xpm
%%DATADIR%%/themes/NanoBlue/icons/thunderbird_16x16.xpm
%%DATADIR%%/themes/NanoBlue/icons/thunderbird_32x32.xpm
%%DATADIR%%/themes/NanoBlue/icons/xterm_16x16.xpm
%%DATADIR%%/themes/NanoBlue/icons/xterm_32x32.xpm
%%DATADIR%%/themes/NanoBlue/ledclock/a.xpm
%%DATADIR%%/themes/NanoBlue/ledclock/colon.xpm
%%DATADIR%%/themes/NanoBlue/ledclock/dot.xpm