pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/xcompmgr Correct XCOMPMGR_DEFS defines in Makefile...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e1d4cb027651
branches: trunk
changeset: 538677:e1d4cb027651
user: bjs <bjs%pkgsrc.org@localhost>
date: Sat Feb 16 07:18:45 2008 +0000
description:
Correct XCOMPMGR_DEFS defines in Makefile to reflect reality, and comment
them out as we'll go with the defaults for now. Also, add a patch
from GIT to fix a resource leak. Bump rev.
diffstat:
x11/xcompmgr/Makefile | 16 ++++++++--------
x11/xcompmgr/distinfo | 4 ++--
x11/xcompmgr/patches/patch-aa | 40 ++++++++++++++++++++++++++--------------
3 files changed, 36 insertions(+), 24 deletions(-)
diffs (169 lines):
diff -r ce01998a94f7 -r e1d4cb027651 x11/xcompmgr/Makefile
--- a/x11/xcompmgr/Makefile Sat Feb 16 05:25:57 2008 +0000
+++ b/x11/xcompmgr/Makefile Sat Feb 16 07:18:45 2008 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2007/12/19 05:43:30 bjs Exp $
+# $NetBSD: Makefile,v 1.22 2008/02/16 07:18:45 bjs Exp $
#
DISTNAME= xcompmgr-1.1.3
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= x11
MASTER_SITES= http://xapps.freedesktop.org/release/
@@ -19,12 +19,12 @@
### XXX You may play around with these if you like; they're simply
### the #defines from xcompmgr.c placed here for your convenience.
#
-XCOMPMGR_DEFS+= -DREPAINT_MONITOR=0 # default: 0 (?)
-XCOMPMGR_DEFS+= -DCAN_DO_USABLE=1 # default: 0 (damage notification)
-XCOMPMGR_DEFS+= -DDEBUG_REPAINT=0 # default: 0 (debugging)
-XCOMPMGR_DEFS+= -DDEBUG_REPAINT=0 # default: 0 (debugging)
-XCOMPMGR_DEFS+= -DSHADOWS=1 # default: 1 (shadow support)
-XCOMPMGR_DEFS+= -DSHARP_SHADOW=0 # default 0 (?)
+#XCOMPMGR_DEFS+= -DCAN_DO_USABLE=0 # default: 0 (damage notification)
+#XCOMPMGR_DEFS+= -DMONITOR_REPAINT=0 # default: 0 (?)
+#XCOMPMGR_DEFS+= -DDEBUG_REPAINT=0 # default: 0 (debugging)
+#XCOMPMGR_DEFS+= -DDEBUG_EVENTS=0 # default: 0 (debugging)
+#XCOMPMGR_DEFS+= -DSHADOWS=1 # default: 1 (shadow support)
+#XCOMPMGR_DEFS+= -DSHARP_SHADOW=0 # default 0 (?)
CPPFLAGS+= ${XCOMPMGR_DEFS}
diff -r ce01998a94f7 -r e1d4cb027651 x11/xcompmgr/distinfo
--- a/x11/xcompmgr/distinfo Sat Feb 16 05:25:57 2008 +0000
+++ b/x11/xcompmgr/distinfo Sat Feb 16 07:18:45 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2007/12/19 05:43:30 bjs Exp $
+$NetBSD: distinfo,v 1.6 2008/02/16 07:18:45 bjs Exp $
SHA1 (xcompmgr-1.1.3.tar.gz) = d7600dbec8fe812f5a46772c67731dca83c7bf83
RMD160 (xcompmgr-1.1.3.tar.gz) = 65c7c045a0c1361b0dfa346cdc73439ad0db0f2c
Size (xcompmgr-1.1.3.tar.gz) = 79840 bytes
-SHA1 (patch-aa) = 1f12076c066922363b65744263605c257b1911e4
+SHA1 (patch-aa) = 1d09f7575372509157f17b56be891176123bec88
diff -r ce01998a94f7 -r e1d4cb027651 x11/xcompmgr/patches/patch-aa
--- a/x11/xcompmgr/patches/patch-aa Sat Feb 16 05:25:57 2008 +0000
+++ b/x11/xcompmgr/patches/patch-aa Sat Feb 16 07:18:45 2008 +0000
@@ -1,5 +1,5 @@
-$NetBSD: patch-aa,v 1.1 2007/12/19 05:43:30 bjs Exp $
-
+--- xcompmgr.c.orig 2005-10-06 20:08:02.000000000 -0400
++++ xcompmgr.c 2008-02-16 02:10:37.000000000 -0500
--- xcompmgr.c.orig 2005-10-06 20:08:02.000000000 -0400
+++ xcompmgr.c
@@ -36,6 +36,13 @@
@@ -66,7 +66,7 @@
+
+ while (next)
{
-+ fade *f = next;
++ fade *f = next;
win *w = f->w;
next = f->next;
f->cur += f->step * steps;
@@ -147,11 +147,23 @@
if (w->id == id)
{
- if (!gone)
-+ if (gone)
++ if (gone)
finish_unmap_win (dpy, w);
*prev = w->next;
if (w->picture)
-@@ -1734,7 +1754,7 @@ static int
+@@ -1618,6 +1638,11 @@ finish_destroy_win (Display *dpy, Window
+ XRenderFreePicture (dpy, w->shadowPict);
+ w->shadowPict = None;
+ }
++ if (w->shadow)
++ {
++ XRenderFreePicture (dpy, w->shadow);
++ w->shadow = None;
++ }
+ if (w->damage != None)
+ {
+ set_ignore (dpy, NextRequest (dpy));
+@@ -1734,7 +1759,7 @@ static int
error (Display *dpy, XErrorEvent *ev)
{
int o;
@@ -160,7 +172,7 @@
if (should_ignore (dpy, ev->serial))
return 0;
-@@ -1766,7 +1786,7 @@ error (Display *dpy, XErrorEvent *ev)
+@@ -1766,7 +1791,7 @@ error (Display *dpy, XErrorEvent *ev)
default: break;
}
@@ -169,7 +181,7 @@
ev->error_code, ev->request_code, ev->minor_code, ev->serial);
/* abort (); this is just annoying to most people */
-@@ -1781,7 +1801,7 @@ expose_root (Display *dpy, Window root,
+@@ -1781,7 +1806,7 @@ expose_root (Display *dpy, Window root,
add_damage (dpy, region);
}
@@ -178,7 +190,7 @@
static int
ev_serial (XEvent *ev)
{
-@@ -1790,7 +1810,6 @@ ev_serial (XEvent *ev)
+@@ -1790,7 +1815,6 @@ ev_serial (XEvent *ev)
return NextRequest (ev->xany.display);
}
@@ -186,7 +198,7 @@
static char *
ev_name (XEvent *ev)
{
-@@ -1834,11 +1853,12 @@ ev_window (XEvent *ev)
+@@ -1834,11 +1858,12 @@ ev_window (XEvent *ev)
return 0;
}
}
@@ -200,7 +212,7 @@
fprintf (stderr, "usage: %s [options]\n", program);
fprintf (stderr, "Options\n");
fprintf (stderr, " -d display\n Specifies which display should be managed.\n");
-@@ -1861,15 +1881,21 @@ usage (char *program)
+@@ -1861,15 +1886,21 @@ usage (char *program)
}
static void
@@ -223,7 +235,7 @@
}
int
-@@ -1878,19 +1904,13 @@ main (int argc, char **argv)
+@@ -1878,19 +1909,13 @@ main (int argc, char **argv)
XEvent ev;
Window root_return, parent_return;
Window *children;
@@ -243,7 +255,7 @@
int p;
int composite_major, composite_minor;
char *display = 0;
-@@ -1999,7 +2019,7 @@ main (int argc, char **argv)
+@@ -1999,7 +2024,7 @@ main (int argc, char **argv)
exit (1);
}
@@ -252,12 +264,12 @@
/* get atoms */
opacityAtom = XInternAtom (dpy, OPACITY_PROP, False);
-@@ -2071,7 +2091,7 @@ main (int argc, char **argv)
+@@ -2071,7 +2096,7 @@ main (int argc, char **argv)
}
XNextEvent (dpy, &ev);
- if (ev.type & 0x7f != KeymapNotify)
-+ if ((ev.type & 0x7f) != KeymapNotify)
++ if ((ev.type & 0x7f) != KeymapNotify)
discard_ignore (dpy, ev.xany.serial);
#if DEBUG_EVENTS
printf ("event %10.10s serial 0x%08x window 0x%08x\n",
Home |
Main Index |
Thread Index |
Old Index