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

wmdate: fix with the new libdockapp update

Browse Source 
OK sthen@
This commit is contained in:
cwen 2021-02-04 11:35:56 +00:00
parent 9b6854cd9e
commit a2c28bd9b3
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11/wmdate/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2019/07/12 20:51:24 sthen Exp $
# $OpenBSD: Makefile,v 1.24 2021/02/04 11:35:56 cwen Exp $
COMMENT= wm-dockapp; shows the current date
DISTNAME= wmdate-0.7
REVISION= 3
REVISION= 4
CATEGORIES= x11 x11/windowmaker
# BSD
@ -11,7 +11,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= X11 Xau Xdmcp Xext Xpm c dockapp
LIB_DEPENDS= devel/libdockapp
LIB_DEPENDS= devel/libdockapp>=0.7.3
NO_TEST= Yes
CONFIGURE_STYLE= imake noman

9
x11/wmdate/patches/patch-Imakefile
View File

@ -1,6 +1,7 @@
$OpenBSD: patch-Imakefile,v 1.1.1.1 2001/01/16 22:10:15 naddy Exp $
--- Imakefile.orig Mon May 17 22:36:35 1999
+++ Imakefile Tue Jan 16 16:41:43 2001
$OpenBSD: patch-Imakefile,v 1.2 2021/02/04 11:35:56 cwen Exp $
Index: Imakefile
--- Imakefile.orig
+++ Imakefile
@@ -89,8 +89,7 @@ XCOMM
MASTERXPM = xpm/$(MASTER_XPM).xpm
@ -11,7 +12,7 @@ $OpenBSD: patch-Imakefile,v 1.1.1.1 2001/01/16 22:10:15 naddy Exp $
-L. \
-ldockapp \
-lXpm -lXext -lX11
@@ -132,7 +131,7 @@ XCOMM ----------------------------------
@@ -132,7 +131,7 @@ XCOMM ---------------------------------------
XCOMM Create Makefile
XCOMM ---------------------------------------

26
x11/wmdate/patches/patch-wmdate_c
View File

@ -1,9 +1,25 @@
$OpenBSD: patch-wmdate_c,v 1.1.1.1 2001/01/16 22:10:16 naddy Exp $
--- wmdate.c.orig Mon May 17 22:25:23 1999
+++ wmdate.c Tue Jan 16 16:35:36 2001
@@ -95,7 +95,7 @@ main (int argc, char *argv[])
$OpenBSD: patch-wmdate_c,v 1.2 2021/02/04 11:35:56 cwen Exp $
Hunk #1: fix with libdockapp>=0.7
Index: wmdate.c
--- wmdate.c.orig
+++ wmdate.c
@@ -39,7 +39,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF S
#include <X11/extensions/shape.h>
#include <time.h>
-#include <dockapp.h>
+#include <libdockapp/dockapp.h>
#include "config.h"
#include "geometry.h"
@@ -93,9 +93,9 @@ main (int argc, char *argv[])
Pixmap disp; /* Pixmap that is actually displayed */
unsigned long fore_pix, back_pix;
int old_day;
unsigned int w=183, h=84;
- unsigned int w=183, h=84;
+ unsigned short w=183, h=84;
- DAParseArguments(argc, argv, options, 4, DESCRIPTION, VERSION);
+ DAParseArguments(argc, argv, options, 3, DESCRIPTION, VERSION);