From danfe@FreeBSD.org Fri Aug 18 16:42:45 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1381216A4DE for ; Fri, 18 Aug 2006 16:42:45 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from ru.asempra.com (ru.asempra.com [80.64.83.7]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38C9143D46 for ; Fri, 18 Aug 2006 16:42:43 +0000 (GMT) (envelope-from danfe@FreeBSD.org) Received: from stan.asempra.local (stan.asempra.local [192.168.33.20]) by ru.asempra.com (8.12.11.20060308/8.12.10) with ESMTP id k7IGgaVH022339 for ; Fri, 18 Aug 2006 23:42:42 +0700 Message-Id: <1155919298.30314@stan.asempra.local> Date: Fri, 18 Aug 2006 23:41:38 +0700 From: "Alexey Dokuchaev" To: "FreeBSD gnats submit" Subject: Improvements over deskutils/logjam X-Send-Pr-Version: gtk-send-pr 0.4.7 X-GNATS-Notify: >Number: 102237 >Category: ports >Synopsis: Improvements over deskutils/logjam >Confidential: no >Severity: non-critical >Priority: low >Responsible: novel >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Aug 18 16:50:15 GMT 2006 >Closed-Date: Sat Apr 21 18:26:24 GMT 2007 >Last-Modified: Sat Apr 21 18:26:24 GMT 2007 >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 + .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 - .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 --- 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, "" }, { N_("/Insert/_Link..."), "L", menu_make_link }, -{ N_("/Insert/_Image..."), NULL, menu_insert_image }, +{ N_("/Insert/_Image..."), "P", menu_insert_image }, { N_("/Insert/_Journal Link..."), "L", menu_make_journal_link }, { N_("/Insert/lj-_cut..."), "X", menu_ljcut, 0, NULL }, --- patch-src-menu.c ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->novel Responsible-Changed-By: edwin Responsible-Changed-When: Fri Aug 18 16:50:35 UTC 2006 Responsible-Changed-Why: Over to maintainer http://www.freebsd.org/cgi/query-pr.cgi?pr=102237 From: Roman Bogorodskiy To: bug-followup@FreeBSD.org, danfe@FreeBSD.org Cc: Subject: Re: ports/102237: Improvements over deskutils/logjam Date: Sat, 19 Aug 2006 12:50:17 +0000 --HcAYCG3uE/tztfnV Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, My comments: - I don't agree with your COMMENT change. Livejournal.com is not the only service running livejournal software (e.g. deadjournal.com, lj.rossia.org run it and several others), so the original comment is correct. - I don't want to use OPTIONS for my ports - I don't see any point in BEEPMP knob. If you're using BMP and don't care about extra xmms dependency, you could compile logjam with WITH_XMMS and it _will_ work with BMP. If you want to avoid xmms/gtk12 dependencies, you could compile it without xmms support and use some external command to fetch current music (I use self-written audio/bmp-htmlplaylist, e.g. "bmp-htmlplaylist -c") Additional patches look good, I will add them after some review. Thanks, Roman Bogorodskiy --HcAYCG3uE/tztfnV Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (FreeBSD) iQCVAwUBROcJCYB0WzgdqspGAQIhzQP+JYtEjmlsQte1vtGq59m6rOwT2oCop9Cg iMVIop9gA9mPV4ffs++b5bLa3bF5P6UtYPlBpt9uXtcQmK2KQ6N2fPwMbmyAC6Qe 2P/RvkLS+m19r4C54qFTlQaLnnteRJmJiU3eJUmVtsic7qzIGSwdbJiHbwFs7m8U ENvGl2/0c5E= =zMUb -----END PGP SIGNATURE----- --HcAYCG3uE/tztfnV-- From: Alexey Dokuchaev To: Roman Bogorodskiy Cc: bug-followup@FreeBSD.org Subject: Re: ports/102237: Improvements over deskutils/logjam Date: Sun, 20 Aug 2006 09:38:18 +0000 On Sat, Aug 19, 2006 at 12:50:17PM +0000, Roman Bogorodskiy wrote: > Hi, > > My comments: > > - I don't agree with your COMMENT change. Livejournal.com is not > the only service running livejournal software (e.g. deadjournal.com, > lj.rossia.org run it and several others), so the original comment > is correct. OK, fair enough. > - I don't want to use OPTIONS for my ports What's wrong with OPTIONS framework? It seems all rough edges were taken care of pretty long time ago. > - I don't see any point in BEEPMP knob. If you're using BMP and don't > care about extra xmms dependency, you could compile logjam with > WITH_XMMS and it _will_ work with BMP. If you want to avoid xmms/gtk12 > dependencies, you could compile it without xmms support and use some > external command to fetch current music (I use self-written > audio/bmp-htmlplaylist, e.g. "bmp-htmlplaylist -c") In current form, it pulls `multimedia/xmms' as additional dependency if I want music detection. And I don't want to have xmms being installed, especially when I have BMP installed as my only music player. The knob point seems pretty valid to me, since it does not break anything, and simplifies things for people that have no XMMS bits instated (or do not want them being installed) on their boxes. Without this knob, we're essentially forcing our users to come up with some work-around to avoid dependency, such as writing extra scripts, hacking on port's Makefile and sources, etc. Not everyone likes writing extra code; I assume most of us prefer to read through the Makefile (better yet, select stuff via OPTIONS, but you don't like them for some reason) and simply type "make install -DFOO" to get software installed with wanted functionality. I understand that this knob is probably useless to you, but if it does not break current order of things, I don't see why not to commit it. Thanks. ./danfe From: Roman Bogorodskiy To: Alexey Dokuchaev Cc: bug-followup@FreeBSD.org Subject: Re: ports/102237: Improvements over deskutils/logjam Date: Sat, 19 Aug 2006 14:00:17 +0000 --8GpibOaaTibBMecb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Alexey Dokuchaev wrote: > In current form, it pulls `multimedia/xmms' as additional dependency if > I want music detection. And I don't want to have xmms being installed, > especially when I have BMP installed as my only music player. The knob > point seems pretty valid to me, since it does not break anything, and > simplifies things for people that have no XMMS bits instated (or do not > want them being installed) on their boxes. Without this knob, we're > essentially forcing our users to come up with some work-around to avoid > dependency, such as writing extra scripts, hacking on port's Makefile > and sources, etc. Not everyone likes writing extra code; I assume most > of us prefer to read through the Makefile (better yet, select stuff via > OPTIONS, but you don't like them for some reason) and simply type "make > install -DFOO" to get software installed with wanted functionality. I > understand that this knob is probably useless to you, but if it does not > break current order of things, I don't see why not to commit it. Because this is hackish to define both -DWITH_XMMS -DWITH_BEEPMP to get BMP support. If you could rework your patch so it was possible to specify only -DWITH_BMP to get BMP, it would be great. PS It's not quite obvious to me why the mainstream developers cannot add BMP support, while the patch exists for about two years now: http://community.livejournal.com/logjam_dev/24832.html OTOH, bmp is legacy now, so people probably should care more about BMPx [1] and audacious. [1] And I wrote a patch for it, but it wasn't accepted as well: http://community.livejournal.com/logjam_dev/31732.html Roman Bogorodskiy --8GpibOaaTibBMecb Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.4 (FreeBSD) iQCVAwUBROcZcYB0WzgdqspGAQINjgQAuHj7XOc7umg2KXZ0t8JY9TEzeqGb5MIQ XO+WKdYHytSNYhm2J4k7vqiijJrcrvp/lLwPqGhdum2JhIDvdk3Y3YPpbXcxfErh xv3Vh7j8WvPaUlP/MnxZ8wloUoPuU6JWtmUgPx3gBgKliSNVxAGEGnqczomin/3L kGaEkpJdy/E= =Yx/A -----END PGP SIGNATURE----- --8GpibOaaTibBMecb-- From: Alexey Dokuchaev To: Roman Bogorodskiy Cc: bug-followup@FreeBSD.org Subject: Re: ports/102237: Improvements over deskutils/logjam Date: Sun, 20 Aug 2006 11:02:45 +0000 On Sat, Aug 19, 2006 at 02:00:17PM +0000, Roman Bogorodskiy wrote: > Alexey Dokuchaev wrote: > > > In current form, it pulls `multimedia/xmms' as additional dependency if > > I want music detection. And I don't want to have xmms being installed, > > especially when I have BMP installed as my only music player. The knob > > point seems pretty valid to me, since it does not break anything, and > > simplifies things for people that have no XMMS bits instated (or do not > > want them being installed) on their boxes. Without this knob, we're > > essentially forcing our users to come up with some work-around to avoid > > dependency, such as writing extra scripts, hacking on port's Makefile > > and sources, etc. Not everyone likes writing extra code; I assume most > > of us prefer to read through the Makefile (better yet, select stuff via > > OPTIONS, but you don't like them for some reason) and simply type "make > > install -DFOO" to get software installed with wanted functionality. I > > understand that this knob is probably useless to you, but if it does not > > break current order of things, I don't see why not to commit it. > > Because this is hackish to define both -DWITH_XMMS -DWITH_BEEPMP to get > BMP support. If you could rework your patch so it was possible to > specify only -DWITH_BMP to get BMP, it would be great. OK, I will work on it. ./danfe > > PS It's not quite obvious to me why the mainstream developers cannot add > BMP support, while the patch exists for about two years now: > > http://community.livejournal.com/logjam_dev/24832.html > > OTOH, bmp is legacy now, so people probably should care more about BMPx > [1] and audacious. > > [1] And I wrote a patch for it, but it wasn't accepted as well: > http://community.livejournal.com/logjam_dev/31732.html > > Roman Bogorodskiy State-Changed-From-To: open->feedback State-Changed-By: novel State-Changed-When: Tue Aug 29 11:58:19 UTC 2006 State-Changed-Why: Asked to rework the patch. http://www.freebsd.org/cgi/query-pr.cgi?pr=102237 State-Changed-From-To: feedback->closed State-Changed-By: novel State-Changed-When: Sat Apr 21 18:26:07 UTC 2007 State-Changed-Why: No progress since the last year. http://www.freebsd.org/cgi/query-pr.cgi?pr=102237 >Unformatted: