From bogorodskiy@inbox.ru  Sat Aug 28 03:15:05 2004
Return-Path: <bogorodskiy@inbox.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2B53216A4CF
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Aug 2004 03:15:05 +0000 (GMT)
Received: from mx1.mail.ru (mx1.mail.ru [194.67.23.121])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 48AB643D2D
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 28 Aug 2004 03:15:04 +0000 (GMT)
	(envelope-from bogorodskiy@inbox.ru)
Received: from [194.186.150.79] (port=55990 helo=inbox.ru)
	by mx1.mail.ru with esmtp 
	id 1C0tgD-000Kpc-00
	for FreeBSD-gnats-submit@freebsd.org; Sat, 28 Aug 2004 07:15:02 +0400
Message-Id: <E1C0tgD-000Kpc-00.bogorodskiy-inbox-ru@mx1.mail.ru>
Date: Sat, 28 Aug 2004 07:15:02 +0400
From: Roman Bogorodskiy <bogorodskiy@inbox.ru>
Reply-To: Roman Bogorodskiy <bogorodskiy@inbox.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [ patch ] misc/xosd: update to 2.2.10
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         71066
>Category:       ports
>Synopsis:       [ patch ] misc/xosd: update to 2.2.10
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 28 03:20:25 GMT 2004
>Closed-Date:    Sat Aug 28 07:08:54 GMT 2004
>Last-Modified:  Sat Aug 28 07:08:54 GMT 2004
>Originator:     Roman Bogorodskiy
>Release:        FreeBSD 5.3-BETA1 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.3-BETA1 FreeBSD 5.3-BETA1 #3: Wed Aug 25 10:44:08 MSD 2004 root@lame.novel.ru:/usr/obj/usr/home/novel/current/src/sys/NOVEL i386


>Description:
	- Update to 2.2.10
	- C89 patch was removed (tested with lang/gcc295)
>How-To-Repeat:
>Fix:

diff -ruN xosd.orig/Makefile xosd/Makefile
--- xosd.orig/Makefile	Sat Aug 28 04:34:08 2004
+++ xosd/Makefile	Sat Aug 28 07:02:16 2004
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xosd
-PORTVERSION=	2.2.8
+PORTVERSION=	2.2.10
 CATEGORIES=	misc
 MASTER_SITES=	http://www.ignavus.net/ \
 		${MASTER_SITE_LOCAL}
diff -ruN xosd.orig/distinfo xosd/distinfo
--- xosd.orig/distinfo	Sat Aug 28 04:34:08 2004
+++ xosd/distinfo	Sat Aug 28 07:03:47 2004
@@ -1,2 +1,2 @@
-MD5 (xosd-2.2.8.tar.bz2) = 85b00f6609603139855775d6213980cb
-SIZE (xosd-2.2.8.tar.bz2) = 281156
+MD5 (xosd-2.2.10.tar.bz2) = 2a598c1e9f940830d04167c48845758c
+SIZE (xosd-2.2.10.tar.bz2) = 285927
diff -ruN xosd.orig/files/patch-xosd.c xosd/files/patch-xosd.c
--- xosd.orig/files/patch-xosd.c	Sat Aug 28 04:34:08 2004
+++ xosd/files/patch-xosd.c	Thu Jan  1 03:00:00 1970
@@ -1,29 +0,0 @@
---- src/libxosd/xosd.c.orig	Sun Jul  4 15:29:06 2004
-+++ src/libxosd/xosd.c	Tue Jul 13 22:05:03 2004
-@@ -272,7 +272,7 @@
- {
-   int x = 10;
-   int y = osd->line_height * line;
--  int i;
-+  int i, draw_line_bitmap;
-   xosd_line *l = &osd->lines[line];
-   assert(osd);
-   FUNCTION_START;
-@@ -352,7 +352,7 @@
- 
-     if (osd->outline_offset) {
-       XSetForeground(osd->display, osd->gc, osd->outline_pixel);
--      int draw_line_bitmap = !(osd->fill_mask & FILL_OUTLINE);
-+      draw_line_bitmap = !(osd->fill_mask & FILL_OUTLINE);
- 
-       for (i = 1; i <= osd->outline_offset; i++) {
-         draw_with_mask(osd, l, x + i, y, i - osd->extent->y,
-@@ -432,7 +432,7 @@
-   FUNCTION_START;
-   DEBUG("event thread started");
-   assert(osd);
--  usleep(500);
-+  usleep(100000);
- 
-   while (!osd->done) {
-     // DEBUG("checking window event");
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: krion 
State-Changed-When: Sat Aug 28 07:08:48 GMT 2004 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=71066 
>Unformatted:
