Date: Tue, 8 Jan 2013 15:33:50 +0100 (CET) From: Guido Falsi <mad@madpilot.net> To: FreeBSD-gnats-submit@freebsd.org Cc: rnejdl@ringofsaturn.com Subject: ports/175136: [PATCH] deskutils/calibre update to 0.9.11 and fix build on CURRENT/clang Message-ID: <3YgbZ65Cnhz4s@micro.madpilot.net> Resent-Message-ID: <201301081450.r08Eo02R092385@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 175136 >Category: ports >Synopsis: [PATCH] deskutils/calibre update to 0.9.11 and fix build on CURRENT/clang >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Jan 08 14:50:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Guido Falsi >Release: FreeBSD 9.1-STABLE amd64 >Organization: none >Environment: System: FreeBSD micro.madpilot.net 9.1-STABLE FreeBSD 9.1-STABLE #18 r244955: Wed Jan 2 10:46:21 CET 2013 root@micro.madpilot.net:/usr/obj/usr/src/sys/MICRO amd64 >Description: 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. >How-To-Repeat: >Fix: Index: Makefile =================================================================== --- Makefile (revision 310090) +++ Makefile (working copy) @@ -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}/ Index: distinfo =================================================================== --- distinfo (revision 310090) +++ distinfo (working copy) @@ -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 Index: files/patch-setup_extensions.py =================================================================== --- files/patch-setup_extensions.py (revision 0) +++ files/patch-setup_extensions.py (working copy) @@ -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 Index: pkg-plist =================================================================== --- pkg-plist (revision 310090) +++ pkg-plist (working copy) @@ -414,7 +414,11 @@ 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/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 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3YgbZ65Cnhz4s>