From jbq@anyware-tech.com  Fri Apr  7 17:25:50 2006
Return-Path: <jbq@anyware-tech.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id EFB7316A407;
	Fri,  7 Apr 2006 17:25:49 +0000 (UTC)
	(envelope-from jbq@anyware-tech.com)
Received: from caraldi.com (195-13-58-165.oxyd.net [195.13.58.165])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 12FFF43D49;
	Fri,  7 Apr 2006 17:25:48 +0000 (GMT)
	(envelope-from jbq@anyware-tech.com)
Received: from vision.anyware (10.21.96-84.rev.gaoland.net [84.96.21.10])
	by caraldi.com (Postfix) with ESMTP id EA944610A;
	Fri,  7 Apr 2006 19:25:47 +0200 (CEST)
Received: by vision.anyware (Postfix, from userid 1021)
	id C8E816179; Fri,  7 Apr 2006 19:25:49 +0200 (CEST)
Message-Id: <20060407172549.C8E816179@vision.anyware>
Date: Fri,  7 Apr 2006 19:25:49 +0200 (CEST)
From: Jean-Baptiste Quenot <jbq@caraldi.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: gnome@freebsd.org
Subject: Takeover maintainership and integrate patches to deskutils/drivel
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         95484
>Category:       ports
>Synopsis:       Takeover maintainership and integrate patches to deskutils/drivel
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 07 17:30:12 GMT 2006
>Closed-Date:    Fri May 12 13:08:17 GMT 2006
>Last-Modified:  Fri May 12 13:08:17 GMT 2006
>Originator:     Jean-Baptiste Quenot
>Release:        FreeBSD 5.5-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD vision.anyware 5.5-PRERELEASE FreeBSD 5.5-PRERELEASE #1: Thu Mar 9 19:20:53 CET 2006 jbq@vision.anyware:/usr/obj/usr/src/sys/VISION i386
>Description:
This patch integrates a number of valuable user-submitted patches that are not
yet applied upstreams, see http://mail.gnome.org/archives/drivel-list/2006-March/msg00006.html

I propose to acquire maintainership because the actual maintainer does not
reply to my email.

This update also changes the package comment and description in order to more
accurately reflect that drivel is a multi-protocol blog client, not only a
LiveJournal client.
>How-To-Repeat:
>Fix:
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/deskutils/drivel/Makefile ./Makefile
--- /usr/ports/deskutils/drivel/Makefile	Fri Feb 24 00:01:43 2006
+++ ./Makefile	Thu Apr  6 10:31:38 2006
@@ -12,8 +12,8 @@
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	kwm@FreeBSD.org
-COMMENT=	The Gnome livejournal client
+MAINTAINER=	jbq@caraldi.com
+COMMENT=	Blog editor for Gnome
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/deskutils/drivel/files/patch-show-options ./files/patch-show-options
--- /usr/ports/deskutils/drivel/files/patch-show-options	Thu Jan  1 01:00:00 1970
+++ ./files/patch-show-options	Fri Apr  7 19:14:13 2006
@@ -0,0 +1,64 @@
+--- src/journal.c.orig	25 Jun 2005 16:19:28 -0000	1.127
++++ src/journal.c	8 Mar 2006 13:18:06 -0000
+@@ -1401,6 +1401,16 @@
+ 	return;
+ }
+ 
++static void
++journal_set_expander(DrivelClient *dc, gboolean state)
++{
++	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
++	if (state)
++		gtk_label_set_text_with_mnemonic(GTK_LABEL(dc->journal_more_options), _("Hide _options"));
++	else
++		gtk_label_set_text_with_mnemonic(GTK_LABEL(dc->journal_more_options), _("Show more _options"));
++}
++
+ /* display the default items for a blank journal entry and set the sensitivity
+    of the widgets appropriately */
+ 
+@@ -1482,7 +1492,7 @@
+ 			
+ 	/* set the expander state */
+ 	state = gconf_client_get_bool (dc->client, dc->gconf->expander_open, NULL);
+-	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
++	journal_set_expander (dc,state);
+ 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (dc->menu_view_options), state);
+ 	
+ 	/* enable/disable highlighting */
+@@ -1753,7 +1763,7 @@
+ 	value = gconf_entry_get_value (entry);
+ 	state = gconf_value_get_bool (value);
+ 	
+-	gtk_expander_set_expanded (GTK_EXPANDER (dc->journal_expander), state);
++	journal_set_expander (dc,state);
+ 	gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (dc->menu_view_options), state);
+ 	
+ 	return;
+@@ -3399,7 +3409,7 @@
+ 		{ "Strike", GTK_STOCK_STRIKETHROUGH, NULL, NULL, NULL, G_CALLBACK (strikethrough_cb) },
+ 		{ "Super", NULL, N_("Supe_rscript"), NULL, NULL, G_CALLBACK (superscript_cb) },
+ 		{ "Sub", NULL, N_("Subs_cript"), NULL, NULL, G_CALLBACK (subscript_cb) },
+-		{ "List", NULL, N_("L_ist"), NULL, NULL, G_CALLBACK (list_cb) },
++		{ "List", NULL, N_("Lis_t"), NULL, NULL, G_CALLBACK (list_cb) },
+ 		{ "ListItem", NULL, N_("List Ite_m"), NULL, NULL, G_CALLBACK (listitem_cb) },
+ 		{ "Indent", NULL, N_("I_ndent"), NULL, NULL, G_CALLBACK (blockquote_cb) },
+ 		{ "InsertLink", "drivel-insert-link", N_("Insert _Link..."), NULL, N_("Create a link to a web page, livejournal user, or a long journal entry"), G_CALLBACK (insert_link_cb) },
+@@ -3675,6 +3685,7 @@
+ 	
+ 	/* options expander */
+ 	dc->journal_expander = glade_xml_get_widget (xml, "more_options");
++	dc->journal_more_options = glade_xml_get_widget (xml, "more_options_label");
+ 
+ 	/* buttons */
+ 	help_button = glade_xml_get_widget (xml, "help_button");
+--- src/drivel.h.orig	30 Aug 2005 17:46:18 -0000	1.56
++++ src/drivel.h	8 Mar 2006 13:18:06 -0000
+@@ -215,6 +215,7 @@
+ 	GtkWidget *journal_text;
+ 	GtkWidget *journal_security;
+ 	GtkWidget *journal_expander;
++	GtkWidget *journal_more_options;
+ 	GtkWidget *journal_picture;
+ 	GtkWidget *journal_comment;
+ 	GtkWidget *journal_autoformat;
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/deskutils/drivel/files/patch-src-blog_lj ./files/patch-src-blog_lj
--- /usr/ports/deskutils/drivel/files/patch-src-blog_lj	Thu Jan  1 01:00:00 1970
+++ ./files/patch-src-blog_lj	Fri Apr  7 19:14:40 2006
@@ -0,0 +1,47 @@
+--- src/blog_lj.c.orig	25 Jun 2005 16:19:28 -0000	1.27
++++ src/blog_lj.c	28 Feb 2006 16:41:41 -0000
+@@ -826,6 +826,11 @@
+ 		
+ 		for (j = 0; j < prop_count; j++)
+ 		{
++			g_snprintf (key, 32, "prop_%d_itemid", j + 1);
++			mesg = drivel_request_value_lookup (dr, key);
++			if (strcmp(mesg,itemid[i])!=0)
++				continue;
++
+ 			g_snprintf (key, 32, "prop_%d_name", j + 1);
+ 			mesg = drivel_request_value_lookup (dr, key);
+ 
+@@ -869,28 +874,28 @@
+ 			{
+ 				prop = journal_prop_new ();
+ 				prop->name = g_strdup ("music");
+-				prop->value = g_strdup (picture[i]);
++				prop->value = g_strdup (music[i]);
+ 				g_array_append_val (entry->properties, prop);
+ 			}
+ 			if (mood[i])
+ 			{
+ 				prop = journal_prop_new ();
+ 				prop->name = g_strdup ("mood");
+-				prop->value = g_strdup (picture[i]);
++				prop->value = g_strdup (mood[i]);
+ 				g_array_append_val (entry->properties, prop);
+ 			}
+ 			if (comments[i])
+ 			{
+ 				prop = journal_prop_new ();
+ 				prop->name = g_strdup ("comments");
+-				prop->value = g_strdup (picture[i]);
++				prop->value = g_strdup (comments[i]);
+ 				g_array_append_val (entry->properties, prop);
+ 			}
+ 			if (autoformat[i])
+ 			{
+ 				prop = journal_prop_new ();
+ 				prop->name = g_strdup ("autoformat");
+-				prop->value = g_strdup (picture[i]);
++				prop->value = g_strdup (autoformat[i]);
+ 				g_array_append_val (entry->properties, prop);
+ 			}
+ 			prop = journal_prop_new ();
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/deskutils/drivel/files/patch-src-main ./files/patch-src-main
--- /usr/ports/deskutils/drivel/files/patch-src-main	Thu Jan  1 01:00:00 1970
+++ ./files/patch-src-main	Fri Apr  7 19:14:25 2006
@@ -0,0 +1,11 @@
+--- src/main.c.orig	30 Aug 2005 17:46:19 -0000	1.60
++++ src/main.c	6 Mar 2006 17:05:44 -0000
+@@ -253,7 +253,7 @@
+ 	{
+ 		c = g_utf8_get_char_validated (p, -1);
+ 
+-		if (!g_unichar_isalnum (c) && c != '_' && c!= '-')
++		if (!g_unichar_isalnum (c) && c != '_' && c!= '-' && c!='@' && c!='.')
+ 		{
+ 			retval = FALSE;
+ 			break;
diff --ignore-matching-lines=\$FreeBSD.*\$ --exclude=.*.sw* --exclude=.svn --exclude=work --exclude=admin -ruN /usr/ports/deskutils/drivel/pkg-descr ./pkg-descr
--- /usr/ports/deskutils/drivel/pkg-descr	Fri Sep  3 05:54:43 2004
+++ ./pkg-descr	Thu Apr  6 10:31:38 2006
@@ -1,7 +1,15 @@
-Drivel the livejournal client for Gnome. 
+Drivel is a GNOME client for working with online journals, also known as
+weblogs or simply blogs. It retains a simple and elegant design while providing
+many powerful features, including:
 
-Its purpose is to retain a simple and elegant design while providing the
-same level of functionality as the offical LiveJournal clients. Drivel also
-integrates tightly with the GNOME Desktop technologies.
+    * Support for LiveJournal, Blogger, MovableType, Advogato, and Atom
+      journals (systems based off these are also supported, including WordPress
+      and Drupal)
+    * The ability to post, edit, delete, and view recent entries
+    * Integrated spellchecking and HTML syntax highlighting
+    * Offline composition and editing
+    * Automatic recovery in the event of a crash
+    * Journal system extensions, including LiveJournal security groups and
+      MovableType categories
 
 WWW: http://www.dropline.net/drivel/
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->kwm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Fri Apr 7 17:32:10 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

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

Adding to audit trail from misfiled PR ports/95493:

Date: Fri, 7 Apr 2006 23:38:25 +0200
From: Jean-Yves Lefort <jylefort@FreeBSD.org>
 
 > +COMMENT=	Blog editor for Gnome
 
 "GNOME", not "Gnome".
 
Adding to audit trail from misfiled PR ports/95577:

Date: Mon, 10 Apr 2006 10:54:40 +0200
From: Jean-Baptiste Quenot <jbq@caraldi.com>
 
 > "GNOME", not "Gnome".
 
 No problem, if you think it makes a difference, please go ahead ;-)
 -- 
      Jean-Baptiste Quenot
 aka  John Banana Qwerty
 http://caraldi.com/jbq/

From: Jean-Baptiste Quenot <jbq@caraldi.com>
To: Jean-Yves Lefort <jylefort@FreeBSD.org>
Cc: FreeBSD-gnats-submit@freebsd.org
Subject: Re: ports/95484: Takeover maintainership and integrate patches to deskutils/drivel
Date: Mon, 10 Apr 2006 19:29:30 +0200

 * Jean-Yves Lefort:
 
 > "GNOME", not "Gnome".
 
 No problem, if you think it makes a difference, please go ahead ;-)
 -- 
      Jean-Baptiste Quenot
 aka  John Banana Qwerty
 http://caraldi.com/jbq/
Responsible-Changed-From-To: kwm->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Fri Apr 14 23:28:27 UTC 2006 
Responsible-Changed-Why:  
Maintainer was reset. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=95484 
State-Changed-From-To: open->closed 
State-Changed-By: anray 
State-Changed-When: Fri May 12 13:08:16 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

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