Date: Fri, 18 Aug 2006 23:41:38 +0700 From: "Alexey Dokuchaev" <danfe@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/102237: Improvements over deskutils/logjam Message-ID: <1155919298.30314@stan.asempra.local> Resent-Message-ID: <200608181650.k7IGoF62066898@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 102237
>Category: ports
>Synopsis: Improvements over deskutils/logjam
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 18 16:50:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Alexey Dokuchaev
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD 7.0-CURRENT #1: Thu Aug 3 14:51:43 NOVST 2006
root@stan.asempra.local:/usr/obj/usr/src/sys/LITE
>Description:
I've discovered that logjam can be patched a bit to make it even better. Details are here: http://k001.livejournal.com/253678.html. Basically, there're two patches: a small fix of handling backdated entries and keyboard shortcut for image insertion.
The other thing is that music detection can be done with BeepMediaPlayer as easily as with XMMS. I've patched Makefile to teach the port to about BMP.
I've also done one cosmetic change on COMMENT line in Makefile.
Here's approximate commit log message:
- Provide clearer and shorter comment
- Convert to OPTIONS
- Introduce WITH_BEEPMP knob, which tells to use beep-media-player
instead of XMMS (must be defined *with* WITH_XMMS)
- Detect whether `libxmms.so' or `libbeep.so' if installed
- Add two additional patches (backdated entries fix + keyboard shortcut)
If you cannot commit it for some reason, I can do it for you. Thanks.
>How-To-Repeat:
N/A
>Fix:
--- foo begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/deskutils/logjam/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- Makefile 28 May 2006 15:54:07 -0000 1.23
+++ Makefile 18 Aug 2006 16:34:47 -0000
@@ -7,11 +7,12 @@
PORTNAME= logjam
PORTVERSION= 4.5.3
+PORTREVISION= 1
CATEGORIES= deskutils
MASTER_SITES= http://logjam.danga.com/download/
MAINTAINER= novel@FreeBSD.org
-COMMENT= A GTK2 interface to livejournals, ie www.livejournal.com
+COMMENT= A GTK2 client for LiveJournal.com
LIB_DEPENDS= curl.3:${PORTSDIR}/ftp/curl
@@ -27,6 +28,13 @@
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+OPTIONS= GTKSPELL "Enable spell checking" on \
+ SQLITE "Build with SQLite support" off \
+ XMMS "Enable XMMS music detection" off \
+ BEEPMP "Use BeepMP instead of XMMS" off
+
+.include <bsd.port.pre.mk>
+
.ifndef(WITHOUT_GTKSPELL)
LIB_DEPENDS+= gtkspell.0:${PORTSDIR}/textproc/gtkspell
.else
@@ -38,16 +46,27 @@
LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3
.endif
+.if exists(${X11BASE}/lib/libxmms.so)
+WITH_XMMS= yes
+.endif
+
+.if exists(${X11BASE}/lib/libbeep.so)
+WITH_XMMS= yes
+WITH_BEEPMP= yes
+.endif
+
.if defined(WITH_XMMS)
+. if defined(WITH_BEEPMP)
+LIB_DEPENDS+= beep.2:${PORTSDIR}/multimedia/beep-media-player
+. else
LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
+. endif
PLIST_SUB+= WITH_XMMS=""
.else
PLIST_SUB+= WITH_XMMS="@comment "
CONFIGURE_ARGS+= --without-xmms
.endif
-.include <bsd.port.pre.mk>
-
.if ${HAVE_GNOME:Mgtkhtml3}!=""
USE_GNOME+= gtkhtml3
.else
@@ -60,14 +79,13 @@
CONFIGURE_ARGS+= --without-librsvg
.endif
-pre-everything::
- @${ECHO_MSG} ""
- @${ECHO_MSG} "logjam has the following tunable option(s):"
- @${ECHO_MSG} " WITHOUT_GTKSPELL Disable spell checking"
- @${ECHO_MSG} " WITH_XMMS Enable XMMS music detection"
- @${ECHO_MSG} ""
-
post-patch:
@${REINPLACE_CMD} -e 's|libgtkhtml-3.0|libgtkhtml-3.1|g' ${WRKSRC}/configure
+.if defined(WITH_BEEPMP)
+ @${REINPLACE_CMD} -e '22348s|ac_word=$$2|ac_word=pkg-config|' \
+ -e 's|="xmms|="pkg|; s|XMMS_CONFIG -|XMMS_CONFIG bmp -|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e 's|xmmsctrl|bmp/beepctrl|' \
+ ${WRKSRC}/util/xmmsclient/logjam-xmms-client.c
+.endif
.include <bsd.port.post.mk>
--- foo ends here ---
--- patch-protocol-liblivejournal-livejournal-entry.c begins here ---
--- protocol/liblivejournal/livejournal/entry.c.orig Thu Aug 17 01:40:10 2006
+++ protocol/liblivejournal/livejournal/entry.c Thu Aug 17 01:45:24 2006
@@ -610,6 +610,12 @@
else if (g_ascii_strcasecmp(key, "time") == 0) {
if (entry) lj_ljdate_to_tm(val, &entry->time);
}
+ else if (g_ascii_strcasecmp(key, "backdated") == 0) {
+ if (entry && val[0]) {
+ if (g_ascii_strcasecmp(val, "yes") == 0)
+ entry->backdated = TRUE;
+ }
+ }
else return FALSE;
return TRUE;
--- patch-protocol-liblivejournal-livejournal-entry.c ends here ---
--- patch-src-menu.c begins here ---
--- src/menu.c.orig Mon Oct 24 00:11:08 2005
+++ src/menu.c Thu Aug 17 02:01:02 2006
@@ -408,7 +408,7 @@
0, NULL },
{ "/Insert/---", NULL, NULL, 0, "<Separator>" },
{ N_("/Insert/_Link..."), "<ctl>L", menu_make_link },
-{ N_("/Insert/_Image..."), NULL, menu_insert_image },
+{ N_("/Insert/_Image..."), "<ctl><alt>P", menu_insert_image },
{ N_("/Insert/_Journal Link..."), "<ctl><alt>L", menu_make_journal_link },
{ N_("/Insert/lj-_cut..."), "<ctl><alt>X", menu_ljcut, 0, NULL },
--- patch-src-menu.c ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1155919298.30314>