diff options
| author | flz <flz@FreeBSD.org> | 2005-09-23 17:40:35 +0800 |
|---|---|---|
| committer | flz <flz@FreeBSD.org> | 2005-09-23 17:40:35 +0800 |
| commit | 5400fa44b1823ee61ae3be4b7bc57a955c823f4c (patch) | |
| tree | e68e89a1c093f27fbd386075915fc49287f5f7b6 | |
| parent | 9f0884c61f176e084b512c007362948cbbd3a724 (diff) | |
| download | freebsd-ports-gnome-5400fa44b1823ee61ae3be4b7bc57a955c823f4c.tar.gz freebsd-ports-gnome-5400fa44b1823ee61ae3be4b7bc57a955c823f4c.tar.zst freebsd-ports-gnome-5400fa44b1823ee61ae3be4b7bc57a955c823f4c.zip | |
- Remove two patches that should have been gone in latest commit.
Noticed by: pointyhat via kris
| -rw-r--r-- | x11-wm/tinywm/files/patch-Makefile | 17 | ||||
| -rw-r--r-- | x11-wm/tinywm/files/patch-tinywm.c | 44 |
2 files changed, 0 insertions, 61 deletions
diff --git a/x11-wm/tinywm/files/patch-Makefile b/x11-wm/tinywm/files/patch-Makefile deleted file mode 100644 index 013c653deda7..000000000000 --- a/x11-wm/tinywm/files/patch-Makefile +++ /dev/null @@ -1,17 +0,0 @@ - -$FreeBSD$ - ---- Makefile.orig -+++ Makefile -@@ -1,8 +1,8 @@ --X11=/usr/X11R6 --CCOPTS=-Os -pedantic -Wall -std=gnu99 -+PREFIX?=/usr/X11R6 -+CFLAGS?=-Os -pedantic -Wall - - all: -- $(CC) $(CCOPTS) -I$(X11)/include -L$(X11)/lib -lX11 -o tinywm tinywm.c -+ $(CC) $(CFLAGS) -I$(PREFIX)/include -L$(PREFIX)/lib -lX11 -o tinywm tinywm.c - - clean: - rm -f tinywm diff --git a/x11-wm/tinywm/files/patch-tinywm.c b/x11-wm/tinywm/files/patch-tinywm.c deleted file mode 100644 index 9c01ec1ac0cc..000000000000 --- a/x11-wm/tinywm/files/patch-tinywm.c +++ /dev/null @@ -1,44 +0,0 @@ - -$FreeBSD$ - ---- tinywm.c.orig -+++ tinywm.c -@@ -12,12 +12,15 @@ - - int main() - { -+ int xdiff, ydiff; - Display * dpy = XOpenDisplay(0); -+ XWindowAttributes attr; -+ XButtonEvent start; -+ XEvent ev; -+ Window root = DefaultRootWindow(dpy); - - if(!dpy) return 1; - -- Window root = DefaultRootWindow(dpy); -- - XGrabKey(dpy, XKeysymToKeycode(dpy, XStringToKeysym("F1")), Mod1Mask, root, - True, GrabModeAsync, GrabModeAsync); - XGrabButton(dpy, 1, Mod1Mask, root, True, ButtonPressMask, GrabModeAsync, -@@ -25,9 +28,6 @@ - XGrabButton(dpy, 3, Mod1Mask, root, True, ButtonPressMask, GrabModeAsync, - GrabModeAsync, None, None); - -- XWindowAttributes attr; -- XButtonEvent start; -- XEvent ev; - for(;;) - { - XNextEvent(dpy, &ev); -@@ -44,8 +44,8 @@ - else if(ev.type == MotionNotify) - { - while(XCheckTypedEvent(dpy, MotionNotify, &ev)); -- int xdiff = ev.xbutton.x_root - start.x_root; -- int ydiff = ev.xbutton.y_root - start.y_root; -+ xdiff = ev.xbutton.x_root - start.x_root; -+ ydiff = ev.xbutton.y_root - start.y_root; - XMoveResizeWindow(dpy, ev.xmotion.window, - attr.x + (start.button==1 ? xdiff : 0), - attr.y + (start.button==1 ? ydiff : 0), |