cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream rolled up a new version of trayapp, coping with recent

Browse Source 
disklabel changes. The eject.c patch isn't needed anymore.
This commit is contained in:
zhuk 2015-11-17 22:52:06 +00:00
parent 3869751e49
commit a0f6c05d02
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sysutils/tray-app/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.5 2015/10/26 19:44:06 zhuk Exp $
# $OpenBSD: Makefile,v 1.6 2015/11/17 22:52:06 zhuk Exp $
ONLY_FOR_ARCHS= ${APM_ARCHS}
COMMENT= small utilities for X11 system tray: eject, battery, mixer
DISTNAME= tray-app-0.3
REVISION= 2
DISTNAME= tray-app-0.3.1
CATEGORIES= sysutils x11

4
sysutils/tray-app/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (tray-app-0.3.tar.gz) = /YXvEpTApDMs6Do7XVOiAx/xqcejWyjqRjzrmiuX/PU=
SIZE (tray-app-0.3.tar.gz) = 15020
SHA256 (tray-app-0.3.1.tar.gz) = E8VQAVw7i9WVaP0oti5fmNtJxAFX7HZ8rwMqD7z3Ak8=
SIZE (tray-app-0.3.1.tar.gz) = 15291

22
sysutils/tray-app/patches/patch-eject_eject_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-eject_eject_c,v 1.2 2015/10/26 19:57:45 zhuk Exp $
Unbreak after d_un removal in sys/disklabel.h.
--- eject/eject.c.orig Mon Mar 12 09:46:04 2012
+++ eject/eject.c Mon Oct 26 20:56:19 2015
@@ -197,12 +197,12 @@ disklabel2names(struct disklabel *dl, char *name)
size_t i, k;
k = 0;
- for (i = 0; i < sizeof(dl->d_un.un_d_packname); i++)
- if (!isspace(dl->d_un.un_d_packname[i]))
+ for (i = 0; i < sizeof(dl->d_packname); i++)
+ if (!isspace(dl->d_packname[i]))
break;
- if (i < sizeof(dl->d_un.un_d_packname)) {
- k = sizeof(dl->d_un.un_d_packname) - i;
- memcpy(name, dl->d_un.un_d_packname + i, k);
+ if (i < sizeof(dl->d_packname)) {
+ k = sizeof(dl->d_packname) - i;
+ memcpy(name, dl->d_packname + i, k);
for (i = k; i > 0; i--) {
if (!isspace(name[i - 1]) && name[i - 1] != '\0')
break;