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

update x11/fvwm3 to 1.0.6a

Browse Source 
Diff from Michael (maintainer), thanks!  wantlib tweaks by me.
Changelog: https://github.com/fvwmorg/fvwm3/releases/tag/1.0.6
This commit is contained in:
op 2023-01-22 12:11:26 +00:00
parent a8993ce1d5
commit 12d8d3169b
6 changed files with 5 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/fvwm3/Makefile
View File

@ -1,8 +1,7 @@
COMMENT= multiple virtual desktop window manager
VERSION= 1.0.5
VERSION= 1.0.6a
DISTNAME= fvwm3-${VERSION}
REVISION= 1
CATEGORIES= x11
@ -17,7 +16,7 @@ PERMIT_PACKAGE= Yes
WANTLIB += ICE SM X11 Xcursor Xext Xft Xrandr Xpm Xrender
WANTLIB += c cairo curses fontconfig freetype gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png
WANTLIB += readline rsvg-2 z event_core event_extra
WANTLIB += readline rsvg-2 event_core event_extra
MASTER_SITES= https://github.com/fvwmorg/fvwm3/releases/download/${VERSION}/

4
x11/fvwm3/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (fvwm3-1.0.5.tar.gz) = xBp+rxy968vMf/x3O7JcwHh5+840KWM90FhOjryLEBQ=
SIZE (fvwm3-1.0.5.tar.gz) = 4538262
SHA256 (fvwm3-1.0.6a.tar.gz) = RmWmYTPgcLeRkXsHlMxt9rdUZ56+kTBxhCfbZHm7W2g=
SIZE (fvwm3-1.0.6a.tar.gz) = 4538100

18
x11/fvwm3/patches/patch-fvwm_ewmh_c
View File

@ -1,18 +0,0 @@
cast clock_t to long long and use %lld to print it, backport of
https://github.com/fvwmorg/fvwm3/pull/719
Index: fvwm/ewmh.c
--- fvwm/ewmh.c.orig
+++ fvwm/ewmh.c
@@ -285,9 +285,9 @@ static void EWMH_DLOG(char *msg, ...)
time_taken = time_val - prev_time;
prev_time = time_val;
sprintf(
- buffer, "%.2d:%.2d:%.2d %6ld",
+ buffer, "%.2d:%.2d:%.2d %6lld",
t_ptr->tm_hour, t_ptr->tm_min, t_ptr->tm_sec,
- time_taken);
+ (long long)time_taken);
fvwm_debug(__func__, "EWMH DEBUG: ");
va_start(args,msg);

11
x11/fvwm3/patches/patch-modules_FvwmIconMan_x_c
View File

@ -1,11 +0,0 @@
Index: modules/FvwmIconMan/x.c
--- modules/FvwmIconMan/x.c.orig
+++ modules/FvwmIconMan/x.c
@@ -741,6 +741,7 @@ void X_init_manager (int man_id)
if (man->geometry_str) {
fscreen_scr_arg arg;
arg.mouse_ev = NULL;
+ arg.name = NULL;
geometry_mask = FScreenParseGeometryWithScreen(
man->geometry_str, &man->geometry.x, &man->geometry.y,

14
x11/fvwm3/patches/patch-modules_FvwmScript_Instructions_c
View File

@ -1,14 +0,0 @@
fix time_t cast, backport of https://github.com/fvwmorg/fvwm3/pull/719
Index: modules/FvwmScript/Instructions.c
--- modules/FvwmScript/Instructions.c.orig
+++ modules/FvwmScript/Instructions.c
@@ -669,7 +669,7 @@ static char *GetTime (int *NbArg,long *TabArg)
str = fxcalloc(20, sizeof(char));
t = time(NULL);
- sprintf(str,"%ld",(long)t-x11base->BeginTime);
+ sprintf(str,"%lld",(long long)t-x11base->BeginTime);
return str;
}

3
x11/fvwm3/pkg/PLIST
View File

@ -1,6 +1,5 @@
bin/FvwmCommand3
@bin bin/fvwm3
bin/fvwm3-config
bin/fvwm3-convert-2.6
bin/fvwm3-menu-desktop
bin/fvwm3-menu-directory
@ -64,7 +63,6 @@ share/fvwm3/FvwmScript-ScreenDump
share/fvwm3/FvwmScript-ScreenSetup
share/fvwm3/FvwmScript-WidgetDemo
share/fvwm3/default-config/
share/fvwm3/default-config/.stalonetrayrc
share/fvwm3/default-config/config
share/fvwm3/default-config/images/
share/fvwm3/default-config/images/background/
@ -105,6 +103,7 @@ share/fvwm3/default-config/images/icons/win/stays.png
share/fvwm3/default-config/images/icons/win/sticky.png
share/fvwm3/default-config/images/icons/win/title.png
share/fvwm3/default-config/images/icons/win/top.png
share/fvwm3/default-config/stalonetrayrc
share/fvwm3/fvwm-menu-desktop-config.fpl
share/fvwm3/fvwm-script-ComExample.pl
share/fvwm3/locale/