svn commit: r378248 - in head/deskutils/calibre: . files
Guido Falsi
madpilot at FreeBSD.org
Sun Feb 1 15:46:06 UTC 2015
Author: madpilot
Date: Sun Feb 1 15:46:04 2015
New Revision: 378248
URL: https://svnweb.freebsd.org/changeset/ports/378248
QAT: https://qat.redports.org/buildarchive/r378248/
Log:
- Enable the qt_hack component. It requires private qt headers, so
add a depend on extracting those from the qt4-gui port [1]
- While here, strip binaries
PR: 197218 [1]
Submitted by: yuri at rawbw.com
Deleted:
head/deskutils/calibre/files/patch-calibre_constants.py
Modified:
head/deskutils/calibre/Makefile
head/deskutils/calibre/files/patch-setup_extensions.py
head/deskutils/calibre/pkg-plist
Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile Sun Feb 1 15:45:44 2015 (r378247)
+++ head/deskutils/calibre/Makefile Sun Feb 1 15:46:04 2015 (r378248)
@@ -3,7 +3,7 @@
PORTNAME= calibre
PORTVERSION= 1.48.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
@@ -25,7 +25,8 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}si
${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
- ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
+ ${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
+ ${NONEXISTENT}:${PORTSDIR}/x11-toolkits/qt4-gui:patch
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils \
${PYTHON_PKGNAMEPREFIX}cssutils>=0.9.9:${PORTSDIR}/www/py-cssutils \
${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \
@@ -70,8 +71,14 @@ MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/incl
XDG_DATA_DIRS=${STAGEDIR}${PREFIX}/share \
XDG_CONFIG_HOME=${WRKDIR}/xdg-config
+.include <bsd.port.pre.mk>
+
+QTGUI_WRKSRC!= cd ${PORTSDIR}/x11-toolkits/qt4-gui && ${MAKE} -V WRKSRC
+
post-patch:
@${FIND} ${WRKSRC}/resources/content_server -name "*.orig" -delete
+ @${REINPLACE_CMD} -e "/^qt_private_inc =/s|\[]|[ '${QTGUI_WRKSRC}/include/QtGui', '${QTGUI_WRKSRC}/include/QtCore' ]|" \
+ ${WRKSRC}/setup/build_environment.py
do-build:
@${MKDIR} ${WRKDIR}/calibre-config ${WRKDIR}/xdg-config
@@ -88,5 +95,6 @@ do-install:
${PYSETUP} install --prefix ${PREFIX} \
--staging-root ${STAGEDIR}${PREFIX})
@${RM} ${STAGEDIR}${PREFIX}/bin/calibre-uninstall
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/calibre/calibre/plugins/*
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Modified: head/deskutils/calibre/files/patch-setup_extensions.py
==============================================================================
--- head/deskutils/calibre/files/patch-setup_extensions.py Sun Feb 1 15:45:44 2015 (r378247)
+++ head/deskutils/calibre/files/patch-setup_extensions.py Sun Feb 1 15:46:04 2015 (r378248)
@@ -1,19 +1,5 @@
--- setup/extensions.py.orig 2013-11-22 10:29:37.000000000 -0600
+++ setup/extensions.py 2013-11-22 10:30:39.000000000 -0600
-@@ -187,13 +187,6 @@
- sip_files=['calibre/gui2/progress_indicator/QProgressIndicator.sip']
- ),
-
-- Extension('qt_hack',
-- ['calibre/ebooks/pdf/render/qt_hack.cpp'],
-- inc_dirs=qt_private_inc + ['calibre/ebooks/pdf/render', 'qt-harfbuzz/src'],
-- headers=['calibre/ebooks/pdf/render/qt_hack.h'],
-- sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
-- ),
--
- Extension('unrar',
- ['unrar/%s.cpp'%(x.partition('.')[0]) for x in '''
- rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o
@@ -496,8 +489,9 @@
pro = textwrap.dedent('''
Modified: head/deskutils/calibre/pkg-plist
==============================================================================
--- head/deskutils/calibre/pkg-plist Sun Feb 1 15:45:44 2015 (r378247)
+++ head/deskutils/calibre/pkg-plist Sun Feb 1 15:46:04 2015 (r378248)
@@ -1126,6 +1126,7 @@ lib/calibre/calibre/plugins/msdes.so
lib/calibre/calibre/plugins/pictureflow.so
lib/calibre/calibre/plugins/podofo.so
lib/calibre/calibre/plugins/progress_indicator.so
+lib/calibre/calibre/plugins/qt_hack.so
lib/calibre/calibre/plugins/speedup.so
lib/calibre/calibre/plugins/sqlite_custom.so
lib/calibre/calibre/plugins/tokenizer.so
More information about the svn-ports-head
mailing list