From stas@310.ru  Thu Jul  6 19:51:16 2006
Return-Path: <stas@310.ru>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 23F2A16A4DF
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  6 Jul 2006 19:51:13 +0000 (UTC)
	(envelope-from stas@310.ru)
Received: from com1.ht-systems.ru (com1.ht-systems.ru [83.97.104.204])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 40BD043D4C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  6 Jul 2006 19:51:10 +0000 (GMT)
	(envelope-from stas@310.ru)
Received: from [213.87.72.70] (helo=fonon.realnet)
	by com1.ht-systems.ru with esmtpa (Exim 4.62)
	(envelope-from <stas@310.ru>)
	id 1FyZqu-0000wr-EL
	for FreeBSD-gnats-submit@freebsd.org; Thu, 06 Jul 2006 23:49:39 +0400
Received: from fonon.realnet (localhost [127.0.0.1])
	by fonon.realnet (8.13.6/8.13.6) with ESMTP id k66JoVas041453
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 6 Jul 2006 23:50:35 +0400 (MSD)
	(envelope-from stas@fonon.realnet)
Received: (from stas@localhost)
	by fonon.realnet (8.13.6/8.13.6/Submit) id k66JKd8e014237;
	Thu, 6 Jul 2006 23:20:39 +0400 (MSD)
	(envelope-from stas)
Message-Id: <200607061920.k66JKd8e014237@fonon.realnet>
Date: Thu, 6 Jul 2006 23:20:39 +0400 (MSD)
From: Stanislav Sedov <ssedov@mbsd.msk.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE] x11/e17-module-calendar doesn't compile
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         99855
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] x11/e17-module-calendar doesn't compile
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    itetcu
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 06 20:00:38 GMT 2006
>Closed-Date:    Fri Jul 07 18:36:57 GMT 2006
>Last-Modified:  Fri Jul 07 18:36:57 GMT 2006
>Originator:     Stanislav Sedov
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006 root@fonon.realnet:/work/src/fbsd-cur/src/sys/i386/compile/FONON i386


	
>Description:
	Make it work with recent snapshot of e17.

	Note: additional patchfile have been added.
>How-To-Repeat:
	
>Fix:

	

--- cal.diff begins here ---
diff -ruN e17-module-calendar.orig/Makefile e17-module-calendar/Makefile
--- e17-module-calendar.orig/Makefile	Thu Jul  6 23:10:55 2006
+++ e17-module-calendar/Makefile	Thu Jul  6 23:11:16 2006
@@ -7,6 +7,7 @@
 
 PORTNAME=	calendar
 PORTVERSION=	23062006
+PORTREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://mbsd.msk.ru/dist/
 PKGNAMEPREFIX=	e17-module-
diff -ruN e17-module-calendar.orig/files/patch-src::e_mod_main.c e17-module-calendar/files/patch-src::e_mod_main.c
--- e17-module-calendar.orig/files/patch-src::e_mod_main.c	Thu Jan  1 03:00:00 1970
+++ e17-module-calendar/files/patch-src::e_mod_main.c	Thu Jul  6 23:14:02 2006
@@ -0,0 +1,20 @@
+--- src/e_mod_main.c.orig	Thu Jul  6 23:11:37 2006
++++ src/e_mod_main.c	Thu Jul  6 23:13:48 2006
+@@ -47,7 +47,7 @@
+       

+      {
+         

e_error_dialog_show 
+-           ("Module API Error", 
"Error initializing Module: calendar\n" 
++           (module, "Module API Error", 
"Error initializing Module: calendar\n" 
+             "It requires a minimum module API version of: %i.\n" 
+             "The module API advertized by Enlightenment is: %i.\n" 
+             "Aborting module.", 
E_MODULE_API_VERSION, module->api->version);
+@@ -102,7 +102,7 @@
+ EAPI int 
+ e_modapi_about(E_Module *module) 
+ {
+-   

e_error_dialog_show(D_("Enlightenment calendar Module"), 

D_("A simple module to give E17 a desktop calendar "));
++   

e_error_dialog_show(module, D_("Enlightenment calendar Module"), 

D_("A simple module to give E17 a desktop calendar "));
+    

return 1;
+ 

}
+ 

--- cal.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->itetcu 
Responsible-Changed-By: itetcu 
Responsible-Changed-When: Thu Jul 6 20:26:16 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99855 
State-Changed-From-To: open->feedback 
State-Changed-By: itetcu 
State-Changed-When: Thu Jul 6 21:43:22 UTC 2006 
State-Changed-Why:  
Patch doesn't apply, please check, upload it somewhere and pass me the 
link. 

Hmm...  The next patch looks like a unified diff to me...  The text 
leading up to this was: -------------------------- |diff -ruN 
e17-module-calendar.orig/files/patch-src::e_mod_main.c 
e17-module-calendar/files/patch-src::e_mod_main.c |--- 
e17-module-calendar.orig/files/patch-src::e_mod_main.c     Thu Jan  1 
03:00:00 1970 |+++ e17-module-calendar/files/patch-src::e_mod_main.c 
Thu Jul  6 23:14:02 2006 -------------------------- (Creating file 
patch-src::e_mod_main.c...) Patching file patch-src::e_mod_main.c using 
Plan A...  patch: **** malformed patch at line 24: 


http://www.freebsd.org/cgi/query-pr.cgi?pr=99855 

From: Stanislav Sedov <stas@310.ru>
To: Ion-Mihai Tetcu <itetcu@FreeBSD.org>, bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/99855: [MAINTAINER UPDATE] x11/e17-module-calendar
 doesn't compile
Date: Fri, 7 Jul 2006 13:18:14 +0400

 =EE=C1 Thu, 6 Jul 2006 21:44:17 GMT
 Ion-Mihai Tetcu <itetcu@FreeBSD.org> =DA=C1=D0=C9=D3=C1=CE=CF:
 
 > Synopsis: [MAINTAINER UPDATE] x11/e17-module-calendar doesn't compile
 >=20
 > State-Changed-From-To: open->feedback
 > State-Changed-By: itetcu
 > State-Changed-When: Thu Jul 6 21:43:22 UTC 2006
 > State-Changed-Why:=20
 > Patch doesn't apply, please check, upload it somewhere and pass me the
 > link.
 >=20
 > Hmm...  The next patch looks like a unified diff to me...  The text
 > leading up to this was: -------------------------- |diff -ruN
 > e17-module-calendar.orig/files/patch-src::e_mod_main.c
 > e17-module-calendar/files/patch-src::e_mod_main.c |---
 > e17-module-calendar.orig/files/patch-src::e_mod_main.c     Thu Jan  1
 > 03:00:00 1970 |+++ e17-module-calendar/files/patch-src::e_mod_main.c
 > Thu Jul  6 23:14:02 2006 -------------------------- (Creating file
 > patch-src::e_mod_main.c...) Patching file patch-src::e_mod_main.c
 > using Plan A...  patch: **** malformed patch at line 24:
 >=20
 >=20
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=3D99855
 >=20
 >=20
 
 Looks strange...
 
 There are some special symbols (0x0d) in the patch, for original source
 file uses MSDOS formatting. They might be stripped during transfer.
 
 Either way there is a patch:
 http://mbsd.msk.ru/cal1.diff
 
 I've modified patchname according to portlint wishes (I was using '::'
 as delimiters since original filename had contained underscores
 already). It was time when freebsd ports were using such delimiters
 as well.=20
 
State-Changed-From-To: feedback->open 
State-Changed-By: itetcu 
State-Changed-When: Fri Jul 7 09:31:58 UTC 2006 
State-Changed-Why:  
New patch available. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=99855 
State-Changed-From-To: open->closed 
State-Changed-By: itetcu 
State-Changed-When: Fri Jul 7 18:36:56 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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