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

better compilation and regen.

Browse Source
This commit is contained in:
fgsch 2005-07-22 19:32:17 +00:00
parent ecdc8972fb
commit 44b92bab88
5 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
x11/skippy/patches/patch-Makefile
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.1.1.1 2004/10/15 18:50:18 fgsch Exp $
--- Makefile.orig Wed Oct 13 16:47:20 2004
+++ Makefile Wed Oct 13 16:47:38 2004
$OpenBSD: patch-Makefile,v 1.2 2005/07/22 19:32:17 fgsch Exp $
--- Makefile.orig Wed May 19 18:23:50 2004
+++ Makefile Wed Jul 13 16:34:00 2005
@@ -1,7 +1,7 @@
PREFIX = /usr/local
BINDIR = ${PREFIX}/bin
@ -10,11 +10,20 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2004/10/15 18:50:18 fgsch Exp $
CFLAGS += -I${X11PREFIX}/include `imlib2-config --cflags` `pkg-config xft --cflags` -g -pedantic -Wall
LDFLAGS += -L${X11PREFIX}/lib -lX11 -lm `imlib2-config --libs` `pkg-config xft --libs`
@@ -21,7 +21,7 @@ HEADERS = skippy.h wm.h dlist.h mainwin.
@@ -17,11 +17,15 @@ EXESUFFIX =
SOURCES = skippy.c wm.c dlist.c mainwin.c clientwin.c layout.c focus.c config.c tooltip.c
HEADERS = skippy.h wm.h dlist.h mainwin.h clientwin.h layout.h focus.h config.h tooltip.h
+OBJECTS = ${SOURCES:.c=.o}
all: skippy${EXESUFFIX}
skippy${EXESUFFIX}: Makefile ${SOURCES} ${HEADERS}
-skippy${EXESUFFIX}: Makefile ${SOURCES} ${HEADERS}
- gcc ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDFLAGS}
+.c.o:
+ ${CC} ${CFLAGS} -c $<
+
+skippy${EXESUFFIX}: Makefile ${OBJECTS} ${HEADERS}
+ ${CC} ${CFLAGS} -o skippy${EXESUFFIX} ${SOURCES} ${LDFLAGS}
clean:

10
x11/skippy/patches/patch-clientwin_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-clientwin_c,v 1.1 2005/03/22 20:29:44 matthieu Exp $
--- clientwin.c.orig Sat Jan 22 16:10:02 2005
+++ clientwin.c Sat Jan 22 16:10:51 2005
@@ -33,7 +33,7 @@
$OpenBSD: patch-clientwin_c,v 1.2 2005/07/22 19:32:17 fgsch Exp $
--- clientwin.c.orig Wed May 19 18:23:49 2004
+++ clientwin.c Wed Jul 13 16:43:40 2005
@@ -33,7 +33,7 @@ int
clientwin_validate_func(dlist *l, void *data)
{
ClientWin *cw = (ClientWin *)l->data;
@ -10,7 +10,7 @@ $OpenBSD: patch-clientwin_c,v 1.1 2005/03/22 20:29:44 matthieu Exp $
w_desktop = wm_get_window_desktop(cw->mainwin->dpy, cw->client.window);
#ifdef XINERAMA
@@ -43,7 +43,7 @@
@@ -43,7 +43,7 @@ clientwin_validate_func(dlist *l, void *
return 0;
#endif

8
x11/skippy/patches/patch-skippy_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-skippy_c,v 1.1 2005/03/22 20:29:44 matthieu Exp $
--- skippy.c.orig Sat Jan 22 16:11:17 2005
+++ skippy.c Sat Jan 22 16:11:33 2005
@@ -72,7 +72,7 @@
$OpenBSD: patch-skippy_c,v 1.2 2005/07/22 19:32:17 fgsch Exp $
--- skippy.c.orig Wed May 19 18:23:49 2004
+++ skippy.c Wed Jul 13 16:43:40 2005
@@ -72,7 +72,7 @@ skippy_run(MainWin *mw, dlist *clients,
int die = 0;
dlist *iter, *tmp;
Window dummy_w, *tree_windows;

22
x11/skippy/patches/patch-wm_c
View File

@ -1,6 +1,6 @@
--- wm.c.orig Wed May 19 23:23:49 2004
+++ wm.c Sat Jan 22 16:14:40 2005
@@ -258,7 +258,7 @@
--- wm.c.orig Wed May 19 18:23:49 2004
+++ wm.c Wed Jul 13 16:43:40 2005
@@ -258,7 +258,7 @@ wm_get_stack(Display *dpy)
return 0;
for(i = 0; i < items_read; i++)
@ -9,7 +9,7 @@
XFree(data);
@@ -293,10 +293,10 @@
@@ -293,10 +293,10 @@ wm_get_root_pmap(Display *dpy)
return rootpmap;
}
@ -22,7 +22,7 @@
unsigned char *data;
int status, real_format;
Atom real_type;
@@ -309,7 +309,7 @@
@@ -309,7 +309,7 @@ wm_get_current_desktop(Display *dpy)
if(status != Success)
return 0;
if(items_read)
@ -31,7 +31,7 @@
XFree(data);
return desktop;
@@ -479,7 +479,7 @@
@@ -479,7 +479,7 @@ wm_validate_window(Display *dpy, Window
return result;
} else {
@ -40,7 +40,7 @@
status = XGetWindowProperty(dpy, win, _WIN_STATE,
0L, 1L, False, XA_CARDINAL, &real_type, &real_format,
@@ -490,7 +490,7 @@
@@ -490,7 +490,7 @@ wm_validate_window(Display *dpy, Window
XFree(data);
return 0;
}
@ -49,7 +49,7 @@
WIN_STATE_SHADED |
WIN_STATE_HIDDEN);
if(attr)
@@ -510,7 +510,7 @@
@@ -510,7 +510,7 @@ wm_validate_window(Display *dpy, Window
XFree(data);
return 1; /* If there's no _WIN_HINTS, assume it's 0, thus valid */
}
@ -58,7 +58,7 @@
if(attr & WIN_HINTS_SKIP_TASKBAR)
result = 0;
XFree(data);
@@ -520,14 +520,14 @@
@@ -520,14 +520,14 @@ wm_validate_window(Display *dpy, Window
}
}
@ -75,7 +75,7 @@
if(WM_PERSONALITY == WM_PERSONALITY_GNOME)
{
@@ -537,7 +537,7 @@
@@ -537,7 +537,7 @@ wm_get_window_desktop(Display *dpy, Wind
if(status == Success)
{
if(items_read)
@ -84,7 +84,7 @@
XFree(data);
@@ -555,7 +555,7 @@
@@ -555,7 +555,7 @@ wm_get_window_desktop(Display *dpy, Wind
return wm_get_current_desktop(dpy);
if(items_read)

8
x11/skippy/patches/patch-wm_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-wm_h,v 1.1 2005/03/22 20:29:44 matthieu Exp $
--- wm.h.orig Sat Jan 22 16:09:11 2005
+++ wm.h Sat Jan 22 16:09:11 2005
@@ -66,12 +66,12 @@
$OpenBSD: patch-wm_h,v 1.2 2005/07/22 19:32:17 fgsch Exp $
--- wm.h.orig Wed May 19 18:23:50 2004
+++ wm.h Wed Jul 13 16:43:40 2005
@@ -66,12 +66,12 @@ char wm_check(Display *dpy);
void wm_use_netwm_fullscreen(Bool b);
dlist *wm_get_stack(Display *dpy);
Pixmap wm_get_root_pmap(Display *dpy);