The attached patch updates calibre to 0.7.52. Also, let me know if you want me to take over maintainership.
Responsible Changed From-To: freebsd-ports-bugs->stas Over to maintainer.
> +- if islinux: > ++ if True or islinux: I don't think such changes are right. This won't allow to integrate patches back to the main repo, you're essentially making it FreeBSD-only software. There's a special variable added in other patches (isfreebsd), please use it if you want to check if you're running on FreeBSD. Also, it makes a lot of sense to send your patch upstream. Thanks! -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments
On Thu, 31 Mar 2011 13:44:47 -0700, Stanislav Sedov wrote: >> +- if islinux: ++ if True or islinux: > > I don't think such changes are right. This won't allow to integrate > patches back to the main repo, you're essentially making it FreeBSD-only > software. > > There's a special variable added in other patches (isfreebsd), please use > it if you want to check if you're running on FreeBSD. > > Also, it makes a lot of sense to send your patch upstream. > > Thanks! Thanks for the feedback. I had picked these up from another thread that said they were going to send these upstream but hadn't seen that committed yet. This patch does indeed make this a FreeBSD only software but as this is a port for FreeBSD that didn't seem to be an issue. I do agree style wise that the isfreebsd would be better though. Other than that, do you have any other things you need me to fix? Rusty Nejdl
On Thu, 31 Mar 2011 15:51:46 -0500 Rusty Nejdl <rnejdl@ringofsaturn.com> mentioned: > > Thanks for the > feedback. I had picked these up from another thread that said they were > going to send these upstream but hadn't seen that committed yet. This > patch does indeed make this a FreeBSD only software but as this is a > port for FreeBSD that didn't seem to be an issue. I do agree style wise > that the isfreebsd would be better though. Other than that, do you have > any other things you need me to fix? > No, otherwise it looks fine by me. I didn't tested it yet, however. I'll look into this ASAP. -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments
On Sat, 02 Apr 2011 12:39:00 -0500, Rusty Nejdl wrote: > On Thu, 31 Mar 2011 15:22:31 -0700, Stanislav Sedov wrote: > >> On Thu, 31 Mar 2011 15:51:46 -0500 >> Rusty Nejdl mentioned: >> >>> Thanks for the feedback. I had picked these up from another thread that said they were going to send these upstream but hadn't seen that committed yet. This patch does indeed make this a FreeBSD only software but as this is a port for FreeBSD that didn't seem to be an issue. I do agree style wise that the isfreebsd would be better though. Other than that, do you have any other things you need me to fix? >> >> No, otherwise it looks fine by me. I didn't tested it yet, however. >> I'll look into this ASAP. > > Stan, > > I've updated the diff and am including it as an attachment. Additionally, I submitted two of our three patches upstream to include in the mainline source: > > https://bugs.launchpad.net/calibre/+bug/748475 > > Rusty Nejdl The patches have been accepted and committed upstream: Fixed in branch lp:calibre. The fix will be in the next release. calibre is usually released every Friday. status fixreleased ** Changed in: calibre Status: New => Fix Released -- You received this bug notification because you are a direct subscriber of the bug. https://bugs.launchpad.net/bugs/748475 [2]  Links: ------ [1] mailto:rnejdl@ringofsaturn.com [2] https://bugs.launchpad.net/bugs/748475
Stas, Let me know if you need anything from me. I believe I have cleaned up the patches nicely, getting them committed upstream, and have a cleanly compiling port. Thanks! Rusty Nejdl
On Mon, 2 May 2011 00:01:11 -0700, Stanislav Sedov wrote: > On Sun, 01 May 2011 16:07:31 -0500 > Rusty Nejdl <rnejdl@ringofsaturn.com> mentioned: >> >> Hmm, I didn't think I would run into a situation where someone >> didn't >> have a desktop installed. X11 forwarding is slowly dying too so I >> am >> not sure how normal this situation is. That being said, we still >> should >> fail better than this. Do you get this error when you are >> installing or >> when you are running the program? > > I'm getting this error during the install stage, when it's trying to > install the "system" menu items. > > It's not like I have no desktop installed -- it's just I'm not using > Gnome/KDE. And it expects to find a "standard" menu of some kind... > > What about just disabling this stuff for now? The menu item, that > is. Stanislav, Looking at this further, I am not sure how you are getting this error as this port pulls in, on install, the necessary port, devel/xdg-utils. Anyways, here's another diff to take this to 0.7.59 and also does not have this error. I removed xdg-utils and it got pulled in and installed without error. I would really love it if we could get this committed. Calibre has a release every other week so we are quite behind. Sincerely, Rusty Nejdl
On Mon, 2 May 2011 18:40:13 GMT Rusty Nejdl <rnejdl@ringofsaturn.com> mentioned: > > Stanislav, > > Looking at this further, I am not sure how you are getting this error > as this port pulls in, on install, the necessary port, devel/xdg-utils. > Anyways, here's another diff to take this to 0.7.59 and also does not > have this error. I removed xdg-utils and it got pulled in and installed > without error. If you look into my log, this is a error returned from the Gnome xdg-utils. The menu install app from this suite is unable to install a menu entry as there's no menu, and fails. > > I would really love it if we could get this committed. Calibre has a > release every other week so we are quite behind. > Can you please resend the last diff inline in email, or just send it to me directly? It seems that GNATS is having problems with base64. Thanks! -- Stanislav Sedov ST4096-RIPE () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments
Here's the latest calibre patch to go to 0.8. Hopefully this will work for you and we can update this. Rusty Nejdl
stas 2011-05-15 08:46:34 UTC FreeBSD ports repository Modified files: deskutils/calibre Makefile distinfo pkg-plist deskutils/calibre/files patch-src_calibre_devices_scanner.py Added files: deskutils/calibre/files patch-setup_install.py patch-src_calibre_utils_help2man.py Log: - Update calibre to 0.8.1. - Pass maintainership to submitter. PR: ports/156091 (based on) Submitted by: Rusty Nejdl <rnejdl@ringofsaturn.com> Revision Changes Path 1.15 +25 -9 ports/deskutils/calibre/Makefile 1.7 +2 -2 ports/deskutils/calibre/distinfo 1.3 +11 -0 ports/deskutils/calibre/files/patch-setup_install.py (new) 1.2 +7 -6 ports/deskutils/calibre/files/patch-src_calibre_devices_scanner.py 1.3 +18 -0 ports/deskutils/calibre/files/patch-src_calibre_utils_help2man.py (new) 1.7 +445 -1020 ports/deskutils/calibre/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"
State Changed From-To: open->closed Committed, with changes. Thanks!