I have updated calibre to 0.9.11. Newer versions depend on some QT private header files to be installed which are not installed by the port. This is also a deprecated practice by the QT developers. A fix will have to be worked out for this in the future perhaps. An idea could be taken from here: http://area51.pcbsd.org/trunk/area51/PORTS/devel/qtcreator/Makefile (the part that extracts the QT distribution) I also fixed the port to build with clang on 10-CURRENT. At present it fails to find glib.h and gtk.h on CURRENT when building in the qtcurve/style directory. I fixed the embedded qmake directives to leverage pkgconfig. I think this patch should also be sent upstream.
Maintainer of deskutils/calibre, Please note that PR ports/175136 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/175136 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Responsible Changed From-To: freebsd-ports-bugs->madpilot I'll take it, I'm the submitter. http://www.freebsd.org/cgi/query-pr.cgi?pr=175136 Date: Tue, 08 Jan 2013 08:48:47 -0600
I have a slight correction to the pkg-plist file that had included engine.py two times and so had an error on uninstall. Please commit this when convenient. Thanks! Rusty Nejdl
I have checked you patch, but cannot spot any functional difference from mine. Can you confirm this is the correct patch? Thanks. -- Guido Falsi <mad@madpilot.net>
State Changed From-To: feedback->open Maintainer has approved.
Author: madpilot Date: Wed Jan 16 21:30:42 2013 New Revision: 310526 URL: http://svnweb.freebsd.org/changeset/ports/310526 Log: - Update to 0.9.11 - Fix build with clang by making qmake explicitly search for glib and gtk. PR: ports/175136 Submitted by: myself Approved by: Rusty Nejdl <rnejdl@ringofsaturn.com> (maintainer) Added: head/deskutils/calibre/files/patch-setup_extensions.py (contents, props changed) Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo (contents, props changed) head/deskutils/calibre/pkg-plist (contents, props changed) Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Wed Jan 16 20:51:29 2013 (r310525) +++ head/deskutils/calibre/Makefile Wed Jan 16 21:30:42 2013 (r310526) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 0.9.10 -PORTREVISION= 1 +PORTVERSION= 0.9.11 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Wed Jan 16 20:51:29 2013 (r310525) +++ head/deskutils/calibre/distinfo Wed Jan 16 21:30:42 2013 (r310526) @@ -1,2 +1,2 @@ -SHA256 (calibre-0.9.10.tar.xz) = 4e269320f883a17c6c6d577f7e4947dcda47e73917f297b33e402d4c9da042d9 -SIZE (calibre-0.9.10.tar.xz) = 27775784 +SHA256 (calibre-0.9.11.tar.xz) = e83d62db1f27c46e2865599d3e4c4d1ba8eeca539dee982dd9eb0a213a135a4a +SIZE (calibre-0.9.11.tar.xz) = 27869620 Added: head/deskutils/calibre/files/patch-setup_extensions.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/deskutils/calibre/files/patch-setup_extensions.py Wed Jan 16 21:30:42 2013 (r310526) @@ -0,0 +1,13 @@ +--- setup/extensions.py.orig 2013-01-04 06:02:00.000000000 +0100 ++++ setup/extensions.py 2013-01-05 18:07:03.534921171 +0100 +@@ -492,8 +492,9 @@ + + pro = textwrap.dedent(''' + TEMPLATE = lib +- CONFIG += qt plugin release ++ CONFIG += qt plugin release link_pkgconfig + CONFIG -= embed_manifest_dll ++ PKGCONFIG += glib-2.0 gtk+-2.0 + VERSION = 1.0.0 + DESTDIR = . + TARGET = calibre Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Wed Jan 16 20:51:29 2013 (r310525) +++ head/deskutils/calibre/pkg-plist Wed Jan 16 21:30:42 2013 (r310526) @@ -414,7 +414,11 @@ lib/calibre/calibre/ebooks/pdf/outline_w lib/calibre/calibre/ebooks/pdf/pageoptions.py lib/calibre/calibre/ebooks/pdf/pdftohtml.py lib/calibre/calibre/ebooks/pdf/reflow.py +lib/calibre/calibre/ebooks/pdf/render/__init__.py +lib/calibre/calibre/ebooks/pdf/render/common.py lib/calibre/calibre/ebooks/pdf/render/engine.py +lib/calibre/calibre/ebooks/pdf/render/fonts.py +lib/calibre/calibre/ebooks/pdf/render/serialize.py lib/calibre/calibre/ebooks/pdf/writer.py lib/calibre/calibre/ebooks/pml/__init__.py lib/calibre/calibre/ebooks/pml/pmlconverter.py @@ -1002,6 +1006,7 @@ lib/calibre/calibre/utils/fonts/sfnt/hea lib/calibre/calibre/utils/fonts/sfnt/kern.py lib/calibre/calibre/utils/fonts/sfnt/loca.py lib/calibre/calibre/utils/fonts/sfnt/maxp.py +lib/calibre/calibre/utils/fonts/sfnt/metrics.py lib/calibre/calibre/utils/fonts/sfnt/subset.py lib/calibre/calibre/utils/fonts/utils.py lib/calibre/calibre/utils/fonts/win_fonts.py _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!