svn commit: r327527 - in head: sysutils/disktool/files x11-toolkits/slingshot/files x11-toolkits/xview-clients x11-toolkits/xview/files x11/props x11/props/files
Cy Schubert
cy at FreeBSD.org
Wed Sep 18 07:07:14 UTC 2013
Author: cy
Date: Wed Sep 18 07:07:08 2013
New Revision: 327527
URL: http://svnweb.freebsd.org/changeset/ports/327527
Log:
Fix xview family builds under 10-CURRENT.
Flags xview-clients MAKE_JOBS_UNSAFE.
Added:
head/x11-toolkits/slingshot/files/patch-examples-grip-puzzdemo.c (contents, props changed)
head/x11-toolkits/slingshot/files/patch-examples-tree-tlstool.c (contents, props changed)
head/x11-toolkits/slingshot/files/patch-src-array.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-client.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-selection.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-slots.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-winbutton.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-wingframe.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-winipane.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-winnofoc.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-winpane.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-winpinmenu.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-winpush.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-winresize.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-olwm-winroot.c (contents, props changed)
head/x11-toolkits/xview/files/patch-clients-props-props.c (contents, props changed)
head/x11-toolkits/xview/files/patch-lib-libxview-window-windowutil.c (contents, props changed)
Modified:
head/sysutils/disktool/files/patch-disktool.c
head/x11-toolkits/xview-clients/Makefile
head/x11-toolkits/xview/files/patch-clients+clock+clock.c
head/x11-toolkits/xview/files/patch-clients+olwm+st.c
head/x11-toolkits/xview/files/patch-clients+olwm+winframe.c
head/x11-toolkits/xview/files/patch-clients-textedit-textedit.c
head/x11/props/Makefile
head/x11/props/files/patch-ac
Modified: head/sysutils/disktool/files/patch-disktool.c
==============================================================================
--- head/sysutils/disktool/files/patch-disktool.c Wed Sep 18 07:04:11 2013 (r327526)
+++ head/sysutils/disktool/files/patch-disktool.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -1,5 +1,5 @@
---- disktool.c.orig Fri Oct 28 14:10:55 2005
-+++ disktool.c Fri Oct 28 14:13:09 2005
+--- disktool.c.orig 1998-04-17 15:32:43.000000000 -0700
++++ disktool.c 2013-09-17 09:15:50.943959620 -0700
@@ -168,9 +168,9 @@
}
@@ -13,3 +13,57 @@
{
/* Return number of kilobytes given the number of blocks and the block size.
This isn't quite trivial because a 32 bit signed long integer could easily
+@@ -361,7 +361,7 @@
+ Panel_item item;
+ Event *event;
+ {
+- return;
++ return 0;
+ }
+
+ /* ========================================================================*/
+@@ -376,7 +376,7 @@
+ timer.it_interval.tv_sec = xv_get(inc_item, PANEL_VALUE);
+ notify_set_itimer_func(frame, get_values,
+ ITIMER_REAL, &timer, NULL);
+- return;
++ return 0;
+ }
+ /* ========================================================================*/
+ int
+@@ -397,7 +397,7 @@
+ xv_get(thresh_item, PANEL_VALUE)/1000, NULL);
+ xv_set(thresh_item, PANEL_MAX_VALUE, 3000, NULL);
+ }
+- return;
++ return 0;
+ }
+
+ /* ========================================================================*/
+@@ -488,7 +488,7 @@
+ thresh[curr_item] = xv_get(thresh_item, PANEL_VALUE);
+ get_values();
+ reposition_widgets();
+- return;
++ return 0;
+ }
+
+ /* ========================================================================*/
+@@ -507,7 +507,7 @@
+ }
+ get_values();
+ reposition_widgets();
+- return;
++ return 0;
+ }
+
+ /* ========================================================================*/
+@@ -517,7 +517,7 @@
+ int value;
+ Event *event;
+ {
+- return;
++ return 0;
+ }
+
+ /* ========================================================================*/
Added: head/x11-toolkits/slingshot/files/patch-examples-grip-puzzdemo.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/slingshot/files/patch-examples-grip-puzzdemo.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,11 @@
+--- examples/grip/puzzdemo.c.orig 1993-10-25 16:39:39.000000000 -0700
++++ examples/grip/puzzdemo.c 2013-09-17 08:44:03.422374693 -0700
+@@ -628,7 +628,7 @@
+ for (x=0; x< N_HORI; x++)
+ if(xv_get(puzzle_tile, ARRAY_TILE_POSITION, x, y) !=
+ get_solved_piece(x, y))
+- return;
++ return 0;
+ xv_set(frame,
+ FRAME_LEFT_FOOTER, "Congratulations!",
+ NULL);
Added: head/x11-toolkits/slingshot/files/patch-examples-tree-tlstool.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/slingshot/files/patch-examples-tree-tlstool.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,11 @@
+--- examples/tree/tlstool.c.orig 1993-10-25 16:41:38.000000000 -0700
++++ examples/tree/tlstool.c 2013-09-17 08:46:29.022495738 -0700
+@@ -346,7 +346,7 @@
+ new_path = (char*) xv_get(item, PANEL_VALUE);
+
+ if((!new_path) || (!*new_path))
+- return;
++ return 0;
+
+ directory = strrchr(new_path, '/');
+
Added: head/x11-toolkits/slingshot/files/patch-src-array.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/slingshot/files/patch-src-array.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,33 @@
+--- src/array.c.orig 1993-10-25 11:41:21.000000000 -0700
++++ src/array.c 2013-09-17 08:42:27.922294229 -0700
+@@ -712,10 +712,10 @@
+ int previously_unmanaged;
+
+ if(!child)
+- return;
++ return 0;
+ layout_data = get_layout_data(child);
+ if(!layout_data)
+- return;
++ return 0;
+
+ previously_unmanaged = FLAG_IS_SET(layout_data->cflags, CF_UNMANAGED);
+
+@@ -729,7 +729,7 @@
+ array_tile_unmanage_child(ainfo, child);
+ array_tile_shrink(array_tile, child);
+ rectobj_repaint_rect(child, NULL, TRUE);
+- return;
++ return 0;
+ }
+ layout_data->column = column;
+ }
+@@ -739,7 +739,7 @@
+ array_tile_unmanage_child(ainfo, child);
+ array_tile_shrink(array_tile, child);
+ rectobj_repaint_rect(child, NULL, TRUE);
+- return;
++ return 0;
+ }
+ layout_data->row = row;
+ }
Modified: head/x11-toolkits/xview-clients/Makefile
==============================================================================
--- head/x11-toolkits/xview-clients/Makefile Wed Sep 18 07:04:11 2013 (r327526)
+++ head/x11-toolkits/xview-clients/Makefile Wed Sep 18 07:07:08 2013 (r327527)
@@ -17,6 +17,7 @@ COMMENT= OpenLook applications and man p
CONFLICTS= props-1.0
+MAKE_JOBS_UNSAFE= yes
PATCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:patch
CONFIGURE_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/xview:configure
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
Modified: head/x11-toolkits/xview/files/patch-clients+clock+clock.c
==============================================================================
--- head/x11-toolkits/xview/files/patch-clients+clock+clock.c Wed Sep 18 07:04:11 2013 (r327526)
+++ head/x11-toolkits/xview/files/patch-clients+clock+clock.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -1,5 +1,5 @@
--- clients/clock/clock.c.orig 2005-03-28 06:39:35.000000000 -0800
-+++ clients/clock/clock.c 2012-02-02 15:08:00.272944648 -0800
++++ clients/clock/clock.c 2013-09-17 22:46:52.832852384 -0700
@@ -147,6 +147,10 @@
static Notify_value analog_timer_expired();
static Notify_value icon_timer_expired();
@@ -20,6 +20,24 @@
struct tm *tm;
/* resize the remote images */
+@@ -535,7 +539,7 @@
+
+ if (initializing) {
+ initializing = 0;
+- return;
++ return 0;
+ }
+ c = (Clock) xv_get (canvas, XV_KEY_DATA, key, 0);
+ cwidth = (int) xv_get (canvas, XV_WIDTH, 0);
+@@ -744,7 +748,7 @@
+ pw = c->pw;
+ w = d->hands.width;
+ angle1 = d->hands.angle1;
+- if (angle1==-1) return;
++ if (angle1==-1) return 0;
+ angle2 = d->hands.angle2;
+
+ fromrim = (FROMRIM*w)/128;
@@ -1043,7 +1047,7 @@
Pixwin *pw;
Rectlist *area;
@@ -29,3 +47,36 @@
Font_string_dims size;
struct tm *tm;
Clock c;
+@@ -1386,12 +1390,12 @@
+ }
+ backup_values(o);
+ xv_set(o->frame, XV_SHOW, FALSE, 0);
+- return;
++ return 0;
+ }
+ backup_values(o);
+ clock_repaint_proc (c->canvas, c->pw, NULL);
+ xv_set(o->frame, XV_SHOW, FALSE, 0);
+- return;
++ return 0;
+ }
+ clock_repaint_proc (c->canvas, c->pw, NULL);
+ backup_values(o);
+@@ -1862,7 +1866,7 @@
+ {
+ int i, spacing, startAt, fontWidth, windowWidth;
+
+- if (c==NULL) return;
++ if (c==NULL) return 0;
+ fontWidth = c-> display-> fontWidth;
+ windowWidth = (int) xv_get (c->canvas, XV_WIDTH, 0);
+ spacing = (1.0/8.0) * fontWidth;
+@@ -1879,7 +1883,7 @@
+ int i, width, height, nbnds = 1, npts[1], npts2[1];
+ ClockDisplay d;
+
+- if (c==NULL) return;
++ if (c==NULL) return 0;
+ npts[0] = 4;
+ npts2[0] = 6;
+ d = c-> display;
Modified: head/x11-toolkits/xview/files/patch-clients+olwm+st.c
==============================================================================
--- head/x11-toolkits/xview/files/patch-clients+olwm+st.c Wed Sep 18 07:04:11 2013 (r327526)
+++ head/x11-toolkits/xview/files/patch-clients+olwm+st.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -1,5 +1,5 @@
---- clients/olwm/st.c.orig Sat Mar 25 22:22:56 2006
-+++ clients/olwm/st.c Sat Mar 25 22:23:59 2006
+--- clients/olwm/st.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/st.c 2013-09-17 23:23:11.632099936 -0700
@@ -34,6 +34,8 @@
(table->hash == ST_NUMHASH) ? ((int) (key) % table->num_bins) :\
(*table->hash)((key), table->num_bins))
@@ -9,3 +9,12 @@
st_table *st_init_table_with_params(compare, hash, size, density, grow_factor,
reorder_flag)
int (*compare)();
+@@ -329,7 +331,7 @@
+ ptr = ptr->next;
+ break;
+ case ST_STOP:
+- return;
++ return 0;
+ case ST_DELETE:
+ tmp = ptr;
+ if (last == nil(st_table_entry)) {
Modified: head/x11-toolkits/xview/files/patch-clients+olwm+winframe.c
==============================================================================
--- head/x11-toolkits/xview/files/patch-clients+olwm+winframe.c Wed Sep 18 07:04:11 2013 (r327526)
+++ head/x11-toolkits/xview/files/patch-clients+olwm+winframe.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -1,5 +1,5 @@
---- clients/olwm/winframe.c.orig 2007-08-03 15:14:08.000000000 +0200
-+++ clients/olwm/winframe.c 2007-08-03 15:15:06.000000000 +0200
+--- clients/olwm/winframe.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winframe.c 2013-09-17 23:01:57.600816158 -0700
@@ -29,6 +29,7 @@
#include "globals.h"
#include "error.h"
@@ -8,3 +8,12 @@
/***************************************************************************
* global data
+@@ -461,7 +462,7 @@
+ {
+ /* ignore events caused by grabs */
+ if (event->xcrossing.mode != NotifyNormal)
+- return;
++ return 0;
+
+ if (event->xcrossing.detail != NotifyInferior)
+ frameInfo->pointerIsWarped = False;
Added: head/x11-toolkits/xview/files/patch-clients-olwm-client.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-client.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,30 @@
+--- clients/olwm/client.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/client.c 2013-09-17 22:50:16.981049021 -0700
+@@ -250,7 +250,7 @@
+ Client *cli;
+ {
+ if (!DoingWindowState)
+- return;
++ return 0;
+
+ /*
+ * If the client has specified the window state then interpret it.
+@@ -281,15 +281,15 @@
+ OLWindowState winState;
+
+ if (!DoingWindowState)
+- return;
++ return 0;
+
+ if (cli->framewin == NULL)
+- return;
++ return 0;
+
+ pane = PANEWINOFCLIENT(cli);
+
+ if (!PropGetOLWindowState(cli->dpy,pane,&winState))
+- return;
++ return 0;
+
+ if (cli->windowState == NULL)
+ cli->windowState = MemNew(OLWindowState);
Added: head/x11-toolkits/xview/files/patch-clients-olwm-selection.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-selection.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,18 @@
+--- clients/olwm/selection.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/selection.c 2013-09-17 22:55:40.832118661 -0700
+@@ -316,13 +316,13 @@
+ XSetSelectionOwner(cli->dpy, XA_PRIMARY,
+ NoFocusWin, timestamp);
+ if (NoFocusWin != XGetSelectionOwner(cli->dpy, XA_PRIMARY))
+- return;
++ return 0;
+ } else {
+ /* First look to see if window is already listed. */
+ for(tc = ListEnum(&l); tc != NULL; tc = ListEnum(&l))
+ {
+ if (tc == cli)
+- return;
++ return 0;
+ }
+ }
+
Added: head/x11-toolkits/xview/files/patch-clients-olwm-slots.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-slots.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,20 @@
+--- clients/olwm/slots.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/slots.c 2013-09-17 22:57:38.862493883 -0700
+@@ -449,7 +449,7 @@
+
+ if (winicon->iconslot == NULL)
+ {
+- return;
++ return 0;
+ }
+
+ incrRegion(iconGrid,winicon->iconslot,-1);
+@@ -539,7 +539,7 @@
+ for (ima = 0; ima<iconGrid->maslots; ima++)
+ for (imi = 0; imi<iconGrid->mislots; imi++)
+ OCCUPANCY(iconGrid,ima,imi)=0;
+- return;
++ return 0;
+ }
+
+ /* partition existing icons */
Added: head/x11-toolkits/xview/files/patch-clients-olwm-winbutton.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-winbutton.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,47 @@
+--- clients/olwm/winbutton.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winbutton.c 2013-09-17 23:00:34.703056428 -0700
+@@ -89,7 +89,7 @@
+
+ if (winInfo->ignore) {
+ FrameAllowEvents(cli, event->xbutton.time);
+- return;
++ return 0;
+ }
+
+ switch (a) {
+@@ -117,7 +117,7 @@
+
+ default:
+ FrameAllowEvents(cli, event->xbutton.time);
+- return;
++ return 0;
+ }
+ }
+
+@@ -141,7 +141,7 @@
+ FrameAllowEvents(cli, event->xbutton.time);
+
+ if (!AllButtonsUp(event))
+- return;
++ return 0;
+
+ XUngrabPointer(dpy, CurrentTime);
+
+@@ -154,7 +154,7 @@
+ }
+
+ if (!in_windowmark(winInfo,x,y) || currentAction != ACTION_SELECT) {
+- return;
++ return 0;
+ }
+
+ if (! winInfo->ignore) {
+@@ -186,7 +186,7 @@
+ Graphics_info *gisNormal = WinGI(winInfo,NORMAL_GINFO);
+
+ if (!event->xmotion.same_screen || currentAction != ACTION_SELECT)
+- return;
++ return 0;
+
+ x = event->xmotion.x;
+ y = event->xmotion.y;
Added: head/x11-toolkits/xview/files/patch-clients-olwm-wingframe.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-wingframe.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,31 @@
+--- clients/olwm/wingframe.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/wingframe.c 2013-09-17 23:03:37.471110388 -0700
+@@ -270,7 +270,7 @@
+ Client *cli = frameInfo->core.client;
+
+ if (!AllButtonsUp(event))
+- return;
++ return 0;
+
+ #define bevent (event->xbutton)
+
+@@ -337,16 +337,16 @@
+ /* We get this only after a Select press */
+ if (hadSelect == False) /* watch for erroneous motions */
+ {
+- return;
++ return 0;
+ }
+
+ if (!event->xmotion.same_screen)
+- return;
++ return 0;
+
+ /* See if we have moved more than the threshold amount. */
+ if ((ABS(event->xmotion.x - buttonPressX) < GRV.MoveThreshold) &&
+ (ABS(event->xmotion.y - buttonPressY) < GRV.MoveThreshold))
+- return;
++ return 0;
+
+ (WinFunc(frameInfo,fcore.selectDrag))(dpy, event, frameInfo, &lastSelectPress);
+
Added: head/x11-toolkits/xview/files/patch-clients-olwm-winipane.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-winipane.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,11 @@
+--- clients/olwm/winipane.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winipane.c 2013-09-17 23:04:46.971315127 -0700
+@@ -70,7 +70,7 @@
+ XGCValues gcv;
+
+ if (winInfo->iconClientWindow)
+- return;
++ return 0;
+
+ XFillRectangle(dpy, pane, WinGC(winInfo,WORKSPACE_GC),
+ 0, 0, winInfo->core.width, winInfo->core.height);
Added: head/x11-toolkits/xview/files/patch-clients-olwm-winnofoc.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-winnofoc.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,11 @@
+--- clients/olwm/winnofoc.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winnofoc.c 2013-09-17 23:05:56.531520358 -0700
+@@ -219,7 +219,7 @@
+ XEvent dummy;
+
+ if (FindModifierMask(event->xkey.keycode) != 0)
+- return;
++ return 0;
+
+ XSync(dpy,0);
+ /*
Added: head/x11-toolkits/xview/files/patch-clients-olwm-winpane.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-winpane.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,11 @@
+--- clients/olwm/winpane.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winpane.c 2013-09-17 23:07:20.091766948 -0700
+@@ -162,7 +162,7 @@
+ /* it's a ShapeNotify event */
+ se = (XShapeEvent *) event;
+ if (se->kind != ShapeBounding)
+- return;
++ return 0;
+ cli = winInfo->core.client;
+ cli->isShaped = se->shaped;
+
Added: head/x11-toolkits/xview/files/patch-clients-olwm-winpinmenu.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-winpinmenu.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,20 @@
+--- clients/olwm/winpinmenu.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winpinmenu.c 2013-09-17 23:08:47.322025297 -0700
+@@ -87,7 +87,7 @@
+ WinPinMenu *winInfo;
+ {
+ if (! StartMenuGrabs(dpy, winInfo))
+- return;
++ return 0;
+
+ MenuMakeFirst(winInfo->menuInfo, afterMenuShow, winInfo);
+
+@@ -105,7 +105,7 @@
+
+ if (MenuHandleKeyEvent(dpy, event, winInfo, winInfo)) {
+ if (! StartMenuGrabs(dpy, winInfo))
+- return;
++ return 0;
+ }
+ }
+
Added: head/x11-toolkits/xview/files/patch-clients-olwm-winpush.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-winpush.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,23 @@
+--- clients/olwm/winpush.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winpush.c 2013-09-17 23:10:09.212267675 -0700
+@@ -100,7 +100,7 @@
+ {
+ FrameAllowEvents(winInfo->core.client, event->xbutton.time);
+ if (!AllButtonsUp(event))
+- return;
++ return 0;
+
+ /*
+ * If pushpinStateAfterPress equals the current pin state, we know
+@@ -128,9 +128,9 @@
+ Graphics_info *gisNormal = WinGI(winInfo,NORMAL_GINFO);
+
+ if (!event->xmotion.same_screen)
+- return;
++ return 0;
+ if (currentAction != ACTION_SELECT && currentAction != ACTION_ADJUST)
+- return;
++ return 0;
+
+ /* When the user moves the cursor off the pushpin
+ * while s/he has the button down we should pull
Added: head/x11-toolkits/xview/files/patch-clients-olwm-winresize.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-winresize.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,11 @@
+--- clients/olwm/winresize.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winresize.c 2013-09-17 23:11:13.342458132 -0700
+@@ -78,7 +78,7 @@
+
+ if (ResolveMouseBinding(dpy, event, ignoremask) != ACTION_SELECT) {
+ FrameAllowEvents(winInfo->core.client, event->xbutton.time);
+- return;
++ return 0;
+ }
+
+ /* draw depressed corner */
Added: head/x11-toolkits/xview/files/patch-clients-olwm-winroot.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-olwm-winroot.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,59 @@
+--- clients/olwm/winroot.c.orig 2005-03-28 06:39:46.000000000 -0800
++++ clients/olwm/winroot.c 2013-09-17 23:12:58.282771195 -0700
+@@ -189,7 +189,7 @@
+ WinRoot *winInfo;
+ {
+ if (pEvent->xcrossing.detail == NotifyNonlinearVirtual)
+- return;
++ return 0;
+
+ ColorWindowCrossing(dpy, pEvent, winInfo);
+
+@@ -283,7 +283,7 @@
+ int (*selectFunc)();
+
+ if (!pEvent->xmotion.same_screen)
+- return;
++ return 0;
+
+ /* If the user hasn't moved more than the threshold
+ * amount, break out of here. REMIND Also, if we get a
+@@ -296,9 +296,9 @@
+ GRV.MoveThreshold) &&
+ (ABS(pEvent->xmotion.y - winInfo->buttonPressEvent.xbutton.y) <
+ GRV.MoveThreshold))
+- return;
++ return 0;
+ if (pEvent->xmotion.state == 0)
+- return;
++ return 0;
+
+ /*
+ * On Select: Clear existing selected clients and add new ones
+@@ -335,7 +335,7 @@
+ WinRoot *winInfo;
+ {
+ if (!AllButtonsUp(pEvent))
+- return;
++ return 0;
+
+ /*
+ * This only happens if we did NOT get a motion notify
+@@ -384,7 +384,7 @@
+ pEvent->xbutton.time)))
+ {
+ PropagatePressEventToChild(dpy, pEvent, child);
+- return;
++ return 0;
+ }
+
+ /*
+@@ -453,7 +453,7 @@
+ if ((pEvent->xproperty.atom != XA_RESOURCE_MANAGER)
+ || (pEvent->xproperty.state != PropertyNewValue))
+ {
+- return;
++ return 0;
+ }
+
+ UpdateGlobals(dpy);
Added: head/x11-toolkits/xview/files/patch-clients-props-props.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-clients-props-props.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,20 @@
+--- clients/props/props.c.orig 2005-03-28 06:39:19.000000000 -0800
++++ clients/props/props.c 2013-09-17 23:14:50.153104437 -0700
+@@ -717,7 +717,7 @@
+ int factory = !(int) xv_get(panel_item, PANEL_VALUE);
+
+ if (factory == showing_factory)
+- return;
++ return 0;
+
+ if (factory) {
+ if (!saved_defaults[0]) {
+@@ -751,7 +751,7 @@
+ int width;
+
+ if (panel_group[which_panel] == current_panel)
+- return;
++ return 0;
+
+ /* Show requested panel */
+ xv_set(current_panel, XV_SHOW, FALSE, NULL);
Modified: head/x11-toolkits/xview/files/patch-clients-textedit-textedit.c
==============================================================================
--- head/x11-toolkits/xview/files/patch-clients-textedit-textedit.c Wed Sep 18 07:04:11 2013 (r327526)
+++ head/x11-toolkits/xview/files/patch-clients-textedit-textedit.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -1,5 +1,5 @@
---- clients/textedit/textedit.c.orig 2012-02-07 19:59:37.568483244 -0800
-+++ clients/textedit/textedit.c 2012-02-07 20:27:31.078772400 -0800
+--- clients/textedit/textedit.c.orig 2005-03-28 06:39:35.000000000 -0800
++++ clients/textedit/textedit.c 2013-09-17 23:16:22.050879918 -0700
@@ -12,7 +12,7 @@
*/
@@ -18,6 +18,15 @@
char *sprintf();
#endif
void frame_cmdline_help();
+@@ -257,7 +257,7 @@
+ char *attr_string;
+
+ if (handling_signal)
+- return;
++ return 0;
+ icon_text[0] = '\0';
+ ptr = icon_text;
+ for (attrs = attributes; *attrs; attrs = attr_next(attrs)) {
@@ -824,10 +824,10 @@
* Setup signal handlers.
*/
Added: head/x11-toolkits/xview/files/patch-lib-libxview-window-windowutil.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-toolkits/xview/files/patch-lib-libxview-window-windowutil.c Wed Sep 18 07:07:08 2013 (r327527)
@@ -0,0 +1,11 @@
+--- lib/libxview/window/windowutil.c.orig 2013-09-17 22:36:32.330750964 -0700
++++ lib/libxview/window/windowutil.c 2013-09-17 22:38:48.691209544 -0700
+@@ -767,7 +767,7 @@
+
+ adjust_rect_obj(num_elems, this_sw, rect_obj_list, parent_width, parent_height);
+ window_outer_to_innerrect(&(rect_obj_list[this_sw]),
+- rect_obj_list[this_sw].new_rect);
++ &(rect_obj_list[this_sw].new_rect));
+ }
+ }
+
Modified: head/x11/props/Makefile
==============================================================================
--- head/x11/props/Makefile Wed Sep 18 07:04:11 2013 (r327526)
+++ head/x11/props/Makefile Wed Sep 18 07:07:08 2013 (r327527)
@@ -16,6 +16,7 @@ CONFLICTS= xview-clients-3.2.1.4.19*
LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview
+MAKE_JOBS_UNSAFE= yes
WRKSRC= ${WRKDIR}/props
USES= imake
USE_XORG= x11 xext
Modified: head/x11/props/files/patch-ac
==============================================================================
--- head/x11/props/files/patch-ac Wed Sep 18 07:04:11 2013 (r327526)
+++ head/x11/props/files/patch-ac Wed Sep 18 07:07:08 2013 (r327527)
@@ -1,5 +1,23 @@
---- props.c.orig Sun Nov 9 01:18:50 1997
-+++ props.c Sun Nov 9 01:24:50 1997
+--- props.c.orig 1997-11-08 17:18:50.000000000 -0800
++++ props.c 2013-09-17 23:33:43.311493251 -0700
+@@ -718,7 +718,7 @@
+ int factory = !(int) xv_get(panel_item, PANEL_VALUE);
+
+ if (factory == showing_factory)
+- return;
++ return 0;
+
+ if (factory) {
+ if (!saved_defaults[0]) {
+@@ -752,7 +752,7 @@
+ int width;
+
+ if (panel_group[which_panel] == current_panel)
+- return;
++ return 0;
+
+ /* Show requested panel */
+ xv_set(current_panel, XV_SHOW, FALSE, NULL);
@@ -816,7 +816,7 @@
else
{
More information about the svn-ports-head
mailing list