Bug 158798 - [update] mail/sylpheed3 -> 3.1.1
Summary: [update] mail/sylpheed3 -> 3.1.1
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Oliver Lehmann
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-07-11 10:10 UTC by Emanuel Haupt
Modified: 2011-07-27 06:51 UTC (History)
0 users

See Also:


Attachments
sylpheed.patch (1.59 KB, patch)
2011-07-11 10:10 UTC, Emanuel Haupt
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Emanuel Haupt freebsd_committer freebsd_triage 2011-07-11 10:10:09 UTC
The following patch updates mail/sylpheed3 to 3.1.1.

IMHO it's time to remove the GTK+ version (mail/sylpheed) and move
mail/sylpheed3 to mail/sylpheed.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2011-07-11 10:10:20 UTC
Responsible Changed
From-To: freebsd-ports-bugs->oliver

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 Emanuel Haupt freebsd_committer freebsd_triage 2011-07-11 14:23:37 UTC
Oliver, I just found out that the keyboard shortcut for sending has been changed from CTRL-RETURN to SHIFT-CREL-E. While the old shortcut might have had serious foot shooting potential I was using this shortcut since the dawn of time and have therefore asked the author to change it either back or make it configurable. For now please consider the following version which adds an option (default off) to restore the original shortcut.

--- sylpheed.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/sylpheed3/Makefile,v
retrieving revision 1.178
diff -u -r1.178 Makefile
--- Makefile	19 Feb 2011 20:00:00 -0000	1.178
+++ Makefile	11 Jul 2011 13:18:34 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sylpheed
-PORTVERSION=	3.1.0
+PORTVERSION=	3.1.1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/  \
 		CRITICAL
@@ -41,7 +41,8 @@
 		LDAP		"Enable LDAP support." off \
 		SSL		"Enable OpenSSL support." on \
 		GTKSPELL	"Enable Spell checking support" on \
-		ONIGURUMA	"Enable Oniguruma support" off
+		ONIGURUMA	"Enable Oniguruma support" off \
+		OLDSHORTCUT	"Restore old keyboard shortcut for sending" off
 
 .include <bsd.port.pre.mk>
 
@@ -97,6 +98,10 @@
 CONFIGURE_ARGS+=--disable-oniguruma
 .endif
 
+.if defined(WITH_OLDSHORTCUT)
+EXTRA_PATCHES+=	${FILESDIR}/extrapatch-src__compose.c
+.endif
+
 MAKEFILES=	Makefile.in ac/Makefile.in faq/Makefile.in faq/de/Makefile.in \
 		faq/en/Makefile.in faq/es/Makefile.in faq/fr/Makefile.in \
 		faq/it/Makefile.in manual/Makefile.in manual/en/Makefile.in \
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/mail/sylpheed3/distinfo,v
retrieving revision 1.117
diff -u -r1.117 distinfo
--- distinfo	19 Feb 2011 10:14:21 -0000	1.117
+++ distinfo	11 Jul 2011 13:18:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (sylpheed-3.1.0.tar.bz2) = c176aa5c8f46b5f8fba6ee7d903f2687e9ddf5d5f4124da0bcee87c365d01b2b
-SIZE (sylpheed-3.1.0.tar.bz2) = 3130795
+SHA256 (sylpheed-3.1.1.tar.bz2) = c4801601013326dcf53512552f8a903dc7289aa56ae9bd7e28e103c5aae19b9f
+SIZE (sylpheed-3.1.1.tar.bz2) = 3234408
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/mail/sylpheed3/pkg-plist,v
retrieving revision 1.43
diff -u -r1.43 pkg-plist
--- pkg-plist	19 Feb 2011 10:14:21 -0000	1.43
+++ pkg-plist	11 Jul 2011 13:18:34 -0000
@@ -133,6 +133,7 @@
 share/locale/el/LC_MESSAGES/sylpheed.mo
 share/locale/es/LC_MESSAGES/sylpheed.mo
 share/locale/et/LC_MESSAGES/sylpheed.mo
+share/locale/fi/LC_MESSAGES/sylpheed.mo
 share/locale/fr/LC_MESSAGES/sylpheed.mo
 share/locale/gl/LC_MESSAGES/sylpheed.mo
 share/locale/hr/LC_MESSAGES/sylpheed.mo
Index: files/extrapatch-src__compose.c
===================================================================
RCS file: files/extrapatch-src__compose.c
diff -N files/extrapatch-src__compose.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/extrapatch-src__compose.c	11 Jul 2011 13:18:34 -0000
@@ -0,0 +1,11 @@
+--- ./src/compose.c.orig	2011-07-11 14:49:37.000000000 +0200
++++ ./src/compose.c	2011-07-11 14:50:12.000000000 +0200
+@@ -576,7 +576,7 @@
+ static GtkItemFactoryEntry compose_entries[] =
+ {
+ 	{N_("/_File"),				NULL, NULL, 0, "<Branch>"},
+-	{N_("/_File/_Send"),			"<shift><control>E",
++	{N_("/_File/_Send"),			"<control>Return",
+ 						compose_send_cb, 0, NULL},
+ 	{N_("/_File/Send _later"),		"<shift><control>S",
+ 						compose_send_later_cb,  0, NULL},
--- sylpheed.patch ends here ---
Comment 3 Emanuel Haupt 2011-07-11 20:19:22 UTC
OK, turns out you can just add the following line to
~/.sylpheed-2.0/menurc in order to restore the old shortcut:

--- ~/.sylpheed-2.0/menurc config statement begins here ---
(gtk_accel_path "<Compose>/File/Send" "<Control>Return")
--- ~/.sylpheed-2.0/menurc config statement ends here ---
Comment 4 dfilter service freebsd_committer freebsd_triage 2011-07-26 09:51:05 UTC
ehaupt      2011-07-26 08:50:51 UTC

  FreeBSD ports repository

  Modified files:
    mail/sylpheed3       Makefile distinfo pkg-plist 
  Log:
  Update to 3.1.1
  
  PR:             158798
  Approved by:    oliver (maintainer timeout; 15 days)
  
  Revision  Changes    Path
  1.180     +1 -1      ports/mail/sylpheed3/Makefile
  1.118     +2 -2      ports/mail/sylpheed3/distinfo
  1.44      +1 -0      ports/mail/sylpheed3/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 5 Oliver Lehmann freebsd_committer freebsd_triage 2011-07-27 06:50:53 UTC
State Changed
From-To: open->closed

was committed by the originator