diff options
| author | makc <makc@FreeBSD.org> | 2012-05-25 01:53:50 +0000 |
|---|---|---|
| committer | makc <makc@FreeBSD.org> | 2012-05-25 01:53:50 +0000 |
| commit | 0dbf83df38efae6bb8f7f00e0a6aee65ba73ffeb (patch) | |
| tree | db4a24442f2934d5cc8d785113370bc145921d6f | |
| parent | d1ec5ccdf1541df05cb9a3a4e75b923949cf9a5d (diff) | |
| download | FreeBSD-ports-0dbf83df38efae6bb8f7f00e0a6aee65ba73ffeb.zip FreeBSD-ports-0dbf83df38efae6bb8f7f00e0a6aee65ba73ffeb.tar.gz | |
Update KDE related ports:
databases/akonadi to 1.7.2
devel/libdbusmenu-qt to 0.9.2
devel/qtscriptgenerator to 0.2.0
multimedia/phonon to 4.6.0
multimedia/phonon-gstreamer to 4.6.0
multimedia/phonon-vlc to 0.5.0
sysutils/qzeitgeist to 0.8.0
31 files changed, 308 insertions, 277 deletions
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile index b3d13de..8b389ea 100644 --- a/databases/akonadi/Makefile +++ b/databases/akonadi/Makefile @@ -5,20 +5,19 @@ # $FreeBSD$ PORTNAME= akonadi -PORTVERSION= 1.6.2 +PORTVERSION= 1.7.2 CATEGORIES= databases kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTNAME}/src/ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Storage server for kdepim +COMMENT= Storage server for KDE-Pim LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/lgpl-license -LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs \ - soprano.4:${PORTSDIR}/textproc/soprano +LIB_DEPENDS= boost_thread:${PORTSDIR}/devel/boost-libs # Let process generate meaningful backtrace on core dump. LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt @@ -27,30 +26,31 @@ USE_BZIP2= yes USE_QT_VER= 4 QT_COMPONENTS= corelib network qtestlib dbus gui sql \ qmake_build moc_build rcc_build uic_build -USE_KDE4= kdeprefix kdehier automoc4 sharedmime +USE_KDE4= kdehier kdeprefix sharedmime automoc4 soprano KDE4_BUILDENV= yes CMAKE_ARGS+= -DAKONADI_BUILD_TESTS:BOOL=FALSE \ -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=TRUE \ -DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include" -MAKE_JOBS_SAFE= yes +MAKE_JOBS_UNSAFE= yes PLIST_SUB+= QT_PREFIX=${QT_PREFIX} -OPTIONS= PGSQL "Enable PostgreSQL backend" off \ - SQLITE "Enable SQLite backend (unused in KDE)" off -# MYSQL "Enable MySQL backend" on +OPTIONS= MYSQL "Install MySQL plugin and server (recommended)" on \ + PGSQL "Install PostgreSQL plugin" off \ + SQLITE "Enable SQLite backend (unused)" off .include <bsd.port.options.mk> -# Should we enable this option, remember to make SQLite non-optional. -#.ifndef(WITHOUT_MYSQL) +.ifndef(WITHOUT_MYSQL) USE_MYSQL= server QT_COMPONENTS+= sql-mysql_run -#.else -#CMAKE_ARGS+= -DDATABASE_BACKEND:STRING="SQLITE" -#.endif +.endif .ifdef(WITH_PGSQL) +# Do not add a dependency on PostgreSQL server as someone preferring +# it over MySQL might like to use some advanced configuration like a +# remote server. +#USE_PGSQL= server QT_COMPONENTS+= sql-pgsql_run .endif @@ -70,7 +70,7 @@ post-patch: ${PATCH_WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e '/find_program/ s|mysqld|mysqld_safe ${LOCALBASE}/bin|g' \ ${PATCH_WRKSRC}/server/CMakeLists.txt - # Prevent updating mime during build. + # Prevent updating MIME during build. ${REINPLACE_CMD} -e '/^update_xdg_mimetypes/ d; /SharedMimeInfo/ d' \ ${PATCH_WRKSRC}/CMakeLists.txt diff --git a/databases/akonadi/distinfo b/databases/akonadi/distinfo index 4b23ffb..3689167 100644 --- a/databases/akonadi/distinfo +++ b/databases/akonadi/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/akonadi-1.6.2.tar.bz2) = 29e5cffbc806b30ded70ba486e71a2aaf0e7b9ea1a798881b2e9bf25535b1696 -SIZE (KDE/akonadi-1.6.2.tar.bz2) = 211347 +SHA256 (KDE/akonadi-1.7.2.tar.bz2) = 4b7217a847c6859a529f07bf456127dab4aac69694982ca449a80da510832b1f +SIZE (KDE/akonadi-1.7.2.tar.bz2) = 210944 diff --git a/databases/akonadi/files/patch-server__src__nepomuk__queryserviceclient.h b/databases/akonadi/files/patch-server__src__nepomuk__queryserviceclient.h new file mode 100644 index 0000000..6340f9a --- /dev/null +++ b/databases/akonadi/files/patch-server__src__nepomuk__queryserviceclient.h @@ -0,0 +1,28 @@ +commit 1ce93440f9dbfcd01a3f4c11119f120e82a7dfb2 +Author: Christophe Giboudeaux <cgiboudeaux@gmx.com> +Date: Sat Jan 21 18:29:43 2012 +0100 + + Build with Clang. + +diff --git a/server/src/nepomuk/queryserviceclient.h b/server/src/nepomuk/queryserviceclient.h +index a0e7517..3c551a0 100644 +--- ./server/src/nepomuk/queryserviceclient.h ++++ ./server/src/nepomuk/queryserviceclient.h +@@ -78,7 +78,7 @@ namespace Nepomuk { + * + * \sa QueryParser + */ +- bool query( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() ); ++ bool query(const QString& query, const QHash<QString, QString> &encodedRps = ( QHash<QString, QString>() ) ); + + /** + * Start a query using the Nepomuk user query language. +@@ -96,7 +96,7 @@ namespace Nepomuk { + * + * \sa query(const QString&), close() + */ +- bool blockingQuery( const QString& query, const QHash<QString, QString> &encodedRps = QHash<QString, QString>() ); ++ bool blockingQuery( const QString& query, const QHash<QString, QString> &encodedRps = ( QHash<QString, QString>() ) ); + + /** + * Close the client, thus stop to monitor the query diff --git a/databases/akonadi/pkg-descr b/databases/akonadi/pkg-descr index 8fd6377..ffe6753 100644 --- a/databases/akonadi/pkg-descr +++ b/databases/akonadi/pkg-descr @@ -1,25 +1,6 @@ -Akonadi - The PIM Storage Service +The Akonadi framework is responsible for providing applications with a +centralized database to store, index and retrieve the user's personal +information. This includes the user's emails, contacts, calendars, +events, journals, alarms, notes, etc. - * Common PIM data cache - o Type agnostic design - o Extensible - o Generic offline access, change recording and replay - o Generic conflict detection and resolution - o Resources are groupable by profile - o Items composed of independently retrievable multiple parts - o Zero-copy retrieval possible - - * Concurrent access allows background activity independent of UI client - o Syncing mail, calendar, addressbooks to remote servers - o Syncing with mobile devices - o Permits semantic desktop infrastructure to access PIM data - o Archiving - o Indexing - o Out-of-process search - * Multi-process design - o Crash isolation - o Large items can't block whole system - o Linkage by IPC allows proprietary components - o Thin client installations can share components for scalability - -WWW: http://pim.kde.org/akonadi/ +WWW: http://pim.kde.org/akonadi diff --git a/databases/akonadi/pkg-plist b/databases/akonadi/pkg-plist index 68c3570..31176ca 100644 --- a/databases/akonadi/pkg-plist +++ b/databases/akonadi/pkg-plist @@ -17,7 +17,7 @@ lib/cmake/Akonadi/AkonadiTargetsWithPrefix-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/Akonadi/AkonadiTargetsWithPrefix.cmake lib/libakonadiprotocolinternals.so lib/libakonadiprotocolinternals.so.1 -lib/libakonadiprotocolinternals.so.1.6.2 +lib/libakonadiprotocolinternals.so.1.7.2 libdata/pkgconfig/akonadi.pc share/config/akonadi/mysql-global-mobile.conf share/config/akonadi/mysql-global.conf diff --git a/devel/libdbusmenu-qt/Makefile b/devel/libdbusmenu-qt/Makefile index 9e1e970..0abd5b5 100644 --- a/devel/libdbusmenu-qt/Makefile +++ b/devel/libdbusmenu-qt/Makefile @@ -6,7 +6,7 @@ # PORTNAME= libdbusmenu-qt -PORTVERSION= 0.9.0 +PORTVERSION= 0.9.2 CATEGORIES= devel MASTER_SITES= http://launchpad.net/${PORTNAME}/trunk/${PORTVERSION}/+download/ diff --git a/devel/libdbusmenu-qt/distinfo b/devel/libdbusmenu-qt/distinfo index 8caac0d..8660a6d 100644 --- a/devel/libdbusmenu-qt/distinfo +++ b/devel/libdbusmenu-qt/distinfo @@ -1,2 +1,2 @@ -SHA256 (libdbusmenu-qt-0.9.0.tar.bz2) = 071d8215c17999cdef8f8361964b45e135edf96c955d6618f4ebf1eac662b175 -SIZE (libdbusmenu-qt-0.9.0.tar.bz2) = 37153 +SHA256 (libdbusmenu-qt-0.9.2.tar.bz2) = ae6c1cb6da3c683aefed39df3e859537a31d80caa04f3023315ff09e5e8919ec +SIZE (libdbusmenu-qt-0.9.2.tar.bz2) = 37882 diff --git a/devel/libdbusmenu-qt/files/patch-dbusmenu-qt.pc.in b/devel/libdbusmenu-qt/files/patch-dbusmenu-qt.pc.in deleted file mode 100644 index 60ac2e4..0000000 --- a/devel/libdbusmenu-qt/files/patch-dbusmenu-qt.pc.in +++ /dev/null @@ -1,10 +0,0 @@ ---- ./dbusmenu-qt.pc.in.orig 2010-09-23 10:08:35.000000000 +0000 -+++ ./dbusmenu-qt.pc.in 2010-11-12 14:49:39.000000000 +0000 -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ - exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=@CMAKE_INSTALL_PREFIX@/lib -+libdir=@CMAKE_INSTALL_PREFIX@/lib@LIB_SUFFIX@ - includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-qt - - Name: libdbusmenu-qt diff --git a/devel/qtscriptgenerator/Makefile b/devel/qtscriptgenerator/Makefile index 1080963..42ecf18 100644 --- a/devel/qtscriptgenerator/Makefile +++ b/devel/qtscriptgenerator/Makefile @@ -5,20 +5,16 @@ # $FreeBSD$ PORTNAME= qtscriptgenerator -PORTVERSION= 0.1.0.20101126 +PORTVERSION= 0.2.0 CATEGORIES= devel -#MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} -MASTER_SITES= ${MASTER_SITE_LOCAL} \ - http://ns.ael.ru/~fluffy.khv/distfiles/ -MASTER_SITE_SUBDIR= fluffy +MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} DISTNAME= ${PORTNAME}-src-${PORTVERSION} MAINTAINER= syncer@gmail.com -COMMENT= Qt Script Generator is a tool that generates Qt bindings for Qt Script +COMMENT= Tool that generates Qt bindings for Qt Script OPTIONS= PHONON "Build Phonon support" on -USE_GMAKE= yes USE_QT_VER= 4 QT_COMPONENTS= corelib declarative designer doc help help-tools gui \ iconengines imageformats inputmethods linguist network \ @@ -26,13 +22,13 @@ QT_COMPONENTS= corelib declarative designer doc help help-tools gui \ qt3support qtestlib qvfb script scripttools \ sql svg webkit xml xmlpatterns xmlpatterns-tool \ qmake_build moc_build rcc_build uic_build -HAS_CONFIGURE= yes +USE_GMAKE= yes +MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes -INSTALL_QT_PLUGINS_DIR= ${PREFIX}/lib/qt4/plugins/ .include <bsd.port.options.mk> -.if defined(WITH_PHONON) +.if !defined(WITHOUT_PHONON) QT_COMPONENTS+= phonon PLIST_SUB+= PHONON="" .else @@ -41,22 +37,31 @@ PLIST_SUB+= PHONON="@comment " .endif do-configure: - @cd ${WRKSRC}/generator/ && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} -unix PREFIX=${PREFIX} generator.pro + @cd ${WRKSRC}/generator && \ + ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \ + PREFIX=${PREFIX} \ + generator.pro do-build: @echo "---> Building generator" - @cd ${WRKSRC}/generator && ${GMAKE} && ${SETENV} ${CONFIGURE_ENV} \ - ./generator --include-paths=${PREFIX}/include/:${PREFIX}/include/qt4/ - @echo "---> Configure generated files" - @cd ${WRKSRC}/qtbindings && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} PREFIX=${PREFIX} INCLUDEPATH+=${PREFIX}/include/qt4/phonon \ - LIBS+=-L${PREFIX}/lib qtbindings.pro + @cd ${WRKSRC}/generator && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} && \ + ${SETENV} ${CONFIGURE_ENV} ./generator \ + --include-paths=${PREFIX}/include/:${PREFIX}/include/qt4/ + @echo "---> Configuring generated files" + @cd ${WRKSRC}/qtbindings && \ + ${SETENV} ${CONFIGURE_ENV} ${QMAKE} \ + PREFIX=${PREFIX} \ + INCLUDEPATH+=${PREFIX}/include/qt4/phonon \ + LIBS+=-L${PREFIX}/lib \ + qtbindings.pro @echo "---> Building generated files" - @cd ${WRKSRC}/qtbindings && ${SETENV} ${MAKE_ENV} && ${GMAKE} + @cd ${WRKSRC}/qtbindings && \ + ${SETENV} ${MAKE_ENV} ${GMAKE} ${_MAKE_JOBS} do-install: - ${MKDIR} ${INSTALL_QT_PLUGINS_DIR}/script - cd ${WRKSRC}/plugins/script/ && ${COPYTREE_SHARE} \* ${INSTALL_QT_PLUGINS_DIR}/script + ${MKDIR} ${PREFIX}/${QT_PLUGINDIR_REL}/script + cd ${WRKSRC}/plugins/script && \ + ${COPYTREE_SHARE} \* ${PREFIX}/${QT_PLUGINDIR_REL}/script .include <bsd.port.mk> diff --git a/devel/qtscriptgenerator/distinfo b/devel/qtscriptgenerator/distinfo index 5088c09..fdb451f 100644 --- a/devel/qtscriptgenerator/distinfo +++ b/devel/qtscriptgenerator/distinfo @@ -1,2 +1,2 @@ -SHA256 (qtscriptgenerator-src-0.1.0.20101126.tar.gz) = e859e59eba4ead81d958792392a5ea16ce3807d933b3b56c0cfe6a00e1850608 -SIZE (qtscriptgenerator-src-0.1.0.20101126.tar.gz) = 371765 +SHA256 (qtscriptgenerator-src-0.2.0.tar.gz) = 895feb274470b9272264c7a141e5bd7f90c92e95d37f346f5f95a352541c8e69 +SIZE (qtscriptgenerator-src-0.2.0.tar.gz) = 379776 diff --git a/devel/qtscriptgenerator/files/patch-qtscript_masterinclude.h b/devel/qtscriptgenerator/files/patch-qtscript_masterinclude.h index d7b46bc..5ce7265 100644 --- a/devel/qtscriptgenerator/files/patch-qtscript_masterinclude.h +++ b/devel/qtscriptgenerator/files/patch-qtscript_masterinclude.h @@ -1,9 +1,13 @@ -diff -up ./generator/qtscript_masterinclude.h.kde_phonon ./generator/qtscript_masterinclude.h ---- ./generator/qtscript_masterinclude.h.kde_phonon 2010-10-26 02:53:53.000000000 -0500 -+++ ./generator/qtscript_masterinclude.h 2010-12-11 17:00:08.456338081 -0600 -@@ -58,7 +58,7 @@ +--- ./generator/qtscript_masterinclude.h.orig 2012-01-23 03:30:03.000000000 -0800 ++++ ./generator/qtscript_masterinclude.h 2012-04-24 04:41:24.458404620 -0700 +@@ -53,12 +53,10 @@ + # include <QtXmlPatterns/QtXmlPatterns> #endif +-#ifndef QT_NO_WEBKIT + # include <QtWebKit/QtWebKit> +-#endif + #ifndef QT_NO_PHONON -# include <phonon/phonon> +# include <phonon/phononnamespace.h> diff --git a/devel/qtscriptgenerator/pkg-descr b/devel/qtscriptgenerator/pkg-descr index 254f751..81685d9 100644 --- a/devel/qtscriptgenerator/pkg-descr +++ b/devel/qtscriptgenerator/pkg-descr @@ -1,10 +1,5 @@ -Qt Script Generator is a tool that generates Qt bindings for Qt Script. -With the generated bindings you get access to substantial portions -of the Qt API from within Qt Script. - -Qt is a cross-platform application framework for desktop and embedded -development. It includes an intuitive API and a rich C++ class -library, integrated tools for GUI development and internationalization, -and support for Java? and C++ development. +Qt Script Generator is a tool that generates Qt bindings for Qt +Script. With the generated bindings you get access to substantial +portions of the Qt API from within Qt Script. WWW: http://qtscriptgenerator.googlecode.com diff --git a/devel/qtscriptgenerator/pkg-plist b/devel/qtscriptgenerator/pkg-plist index a09e8c6..41fbb13 100644 --- a/devel/qtscriptgenerator/pkg-plist +++ b/devel/qtscriptgenerator/pkg-plist @@ -1,45 +1,46 @@ -lib/qt4/plugins/script/libqtscript_core.so -lib/qt4/plugins/script/libqtscript_core.so.1 -lib/qt4/plugins/script/libqtscript_core.so.1.0 -lib/qt4/plugins/script/libqtscript_core.so.1.0.0 -lib/qt4/plugins/script/libqtscript_gui.so -lib/qt4/plugins/script/libqtscript_gui.so.1 -lib/qt4/plugins/script/libqtscript_gui.so.1.0 -lib/qt4/plugins/script/libqtscript_gui.so.1.0.0 -lib/qt4/plugins/script/libqtscript_network.so -lib/qt4/plugins/script/libqtscript_network.so.1 -lib/qt4/plugins/script/libqtscript_network.so.1.0 -lib/qt4/plugins/script/libqtscript_network.so.1.0.0 -lib/qt4/plugins/script/libqtscript_opengl.so -lib/qt4/plugins/script/libqtscript_opengl.so.1 -lib/qt4/plugins/script/libqtscript_opengl.so.1.0 -lib/qt4/plugins/script/libqtscript_opengl.so.1.0.0 -%%PHONON%%lib/qt4/plugins/script/libqtscript_phonon.so -%%PHONON%%lib/qt4/plugins/script/libqtscript_phonon.so.1 -%%PHONON%%lib/qt4/plugins/script/libqtscript_phonon.so.1.0 -%%PHONON%%lib/qt4/plugins/script/libqtscript_phonon.so.1.0.0 -lib/qt4/plugins/script/libqtscript_sql.so -lib/qt4/plugins/script/libqtscript_sql.so.1 -lib/qt4/plugins/script/libqtscript_sql.so.1.0 -lib/qt4/plugins/script/libqtscript_sql.so.1.0.0 -lib/qt4/plugins/script/libqtscript_svg.so -lib/qt4/plugins/script/libqtscript_svg.so.1 -lib/qt4/plugins/script/libqtscript_svg.so.1.0 -lib/qt4/plugins/script/libqtscript_svg.so.1.0.0 -lib/qt4/plugins/script/libqtscript_uitools.so -lib/qt4/plugins/script/libqtscript_uitools.so.1 -lib/qt4/plugins/script/libqtscript_uitools.so.1.0 -lib/qt4/plugins/script/libqtscript_uitools.so.1.0.0 -lib/qt4/plugins/script/libqtscript_webkit.so -lib/qt4/plugins/script/libqtscript_webkit.so.1 -lib/qt4/plugins/script/libqtscript_webkit.so.1.0 -lib/qt4/plugins/script/libqtscript_webkit.so.1.0.0 -lib/qt4/plugins/script/libqtscript_xml.so -lib/qt4/plugins/script/libqtscript_xml.so.1 -lib/qt4/plugins/script/libqtscript_xml.so.1.0 -lib/qt4/plugins/script/libqtscript_xml.so.1.0.0 -lib/qt4/plugins/script/libqtscript_xmlpatterns.so -lib/qt4/plugins/script/libqtscript_xmlpatterns.so.1 -lib/qt4/plugins/script/libqtscript_xmlpatterns.so.1.0 -lib/qt4/plugins/script/libqtscript_xmlpatterns.so.1.0.0 -@dirrm lib/qt4/plugins/script/ +%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_core.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_gui.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_network.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_opengl.so.1.0.0 +%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so +%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1 +%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1.0 +%%PHONON%%%%QT_PLUGINDIR_REL%%/script/libqtscript_phonon.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_sql.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_svg.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_uitools.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_webkit.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_xml.so.1.0.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so +%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1 +%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1.0 +%%QT_PLUGINDIR_REL%%/script/libqtscript_xmlpatterns.so.1.0.0 +@dirrm %%QT_PLUGINDIR_REL%%/script +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile index 97d8722..a8ed9fc 100644 --- a/multimedia/phonon-gstreamer/Makefile +++ b/multimedia/phonon-gstreamer/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.5.1 +PORTVERSION= 4.6.0 CATEGORIES= multimedia kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src @@ -23,25 +23,20 @@ CONFLICTS= qt4-phonon-gst-4* PHONON_BRANCH= stable +USE_GL= gl USE_GNOME= glib20 libxml2 USE_GSTREAMER= yes USE_KDE4= kdehier kdeprefix automoc4 USE_QT_VER= 4 -QT_COMPONENTS= gui opengl phonon xml \ +QT_COMPONENTS= gui phonon xml \ qmake_build moc_build rcc_build uic_build USE_XORG= x11 -USE_BZIP2= yes +USE_XZ= yes USE_CMAKE= yes MAKE_JOBS_SAFE= yes PLIST_SUB+= QT_PREFIX=${QT_PREFIX} -# FIXME: Remove this in the next release; phonon-gstreamer does not -# depend on ALSA anymore. -# Explicitly disable ALSA, see for details: -# http://mail.kde.org/pipermail/kde-freebsd/2010-March/008015.html -CMAKE_ARGS+= -DWITH_Alsa:BOOL=OFF - .if defined(WITH_QT_PHONON) IGNORE= conflicts with Qt 4 Phonon. Please, deinstall qt4-phonon-gst and unset WITH_QT_PHONON to continue .endif diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo index 2b0541b..d25a307 100644 --- a/multimedia/phonon-gstreamer/distinfo +++ b/multimedia/phonon-gstreamer/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/phonon-backend-gstreamer-4.5.1.tar.bz2) = 62326ce7c64810eec8f42245a1f1880ce10d0a3b8976318ad516091f419ba38e -SIZE (KDE/phonon-backend-gstreamer-4.5.1.tar.bz2) = 90211 +SHA256 (KDE/phonon-backend-gstreamer-4.6.0.tar.xz) = 5bd4e00c75d86b21fa364458b72b3603bbb85d8f06361b7ba9e422595b68932f +SIZE (KDE/phonon-backend-gstreamer-4.6.0.tar.xz) = 70912 diff --git a/multimedia/phonon-gstreamer/pkg-descr b/multimedia/phonon-gstreamer/pkg-descr index e91edea..8c51d42 100644 --- a/multimedia/phonon-gstreamer/pkg-descr +++ b/multimedia/phonon-gstreamer/pkg-descr @@ -1,4 +1,4 @@ -Phonon is the multimedia framework for KDE 4. +Phonon is the multimedia framework for KDE Software Compilation 4. This port provides the GStreamer backend. -WWW: http://phonon.kde.org +WWW: http://phonon.kde.org diff --git a/multimedia/phonon-gstreamer/pkg-plist b/multimedia/phonon-gstreamer/pkg-plist index 8d4842f..0df6520 100644 --- a/multimedia/phonon-gstreamer/pkg-plist +++ b/multimedia/phonon-gstreamer/pkg-plist @@ -11,3 +11,4 @@ share/kde4/services/phononbackends/gstreamer.desktop @cwd %%QT_PREFIX%% %%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_gstreamer.so @dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/multimedia/phonon-vlc/Makefile b/multimedia/phonon-vlc/Makefile index 0446ee0..3871666 100644 --- a/multimedia/phonon-vlc/Makefile +++ b/multimedia/phonon-vlc/Makefile @@ -6,27 +6,30 @@ # PORTNAME= phonon -PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTVERSION= 0.5.0 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION} +MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTNAME}-backend${PKGNAMESUFFIX}/${PORTVERSION}/src PKGNAMESUFFIX= -vlc DISTNAME= ${PORTNAME}-backend${PKGNAMESUFFIX}-${PORTVERSION} DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= The VLC backend for Phonon +COMMENT= VLC backend for Phonon + +# Required in order to avoid conflicts with multimedia/phonon. +LATEST_LINK= ${PORTNAME}${PKGNAMESUFFIX} LIB_DEPENDS= vlc.7:${PORTSDIR}/multimedia/vlc PHONON_BRANCH= stable -USE_BZIP2= yes -USE_CMAKE= yes -USE_KDE4= kdehier automoc4 kdeprefix + +USE_KDE4= kdehier kdeprefix automoc4 USE_QT_VER= 4 -QT_COMPONENTS= dbus phonon \ +QT_COMPONENTS= gui phonon \ qmake_build moc_build rcc_build uic_build +USE_XZ= yes +USE_CMAKE= yes MAKE_JOBS_SAFE= yes PLIST_SUB+= QT_PREFIX=${QT_PREFIX} diff --git a/multimedia/phonon-vlc/distinfo b/multimedia/phonon-vlc/distinfo index 15842b3..129e6dd 100644 --- a/multimedia/phonon-vlc/distinfo +++ b/multimedia/phonon-vlc/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/phonon-backend-vlc-0.4.1.tar.bz2) = 168da93f71ec00b35d006a501f434a50134c51d8f80a8338e340c835d24b2da4 -SIZE (KDE/phonon-backend-vlc-0.4.1.tar.bz2) = 55020 +SHA256 (KDE/phonon-backend-vlc-0.5.0.tar.xz) = 2256fe9fef74bcd165c24ae8e9b606a48264c9193a4a1da6ef0aaa02dad76388 +SIZE (KDE/phonon-backend-vlc-0.5.0.tar.xz) = 51388 diff --git a/multimedia/phonon-vlc/pkg-descr b/multimedia/phonon-vlc/pkg-descr index ecdf218..fa68fdc 100644 --- a/multimedia/phonon-vlc/pkg-descr +++ b/multimedia/phonon-vlc/pkg-descr @@ -1,5 +1,4 @@ -Phonon is multimedia framework for KDE4. -This port provides VLC backend. +Phonon is the multimedia framework for KDE Software Compilation 4. +This port provides the VLC backend. -WWW: http://www.videolan.org -WWW: http://phonon.kde.org +WWW: http://phonon.kde.org diff --git a/multimedia/phonon-vlc/pkg-plist b/multimedia/phonon-vlc/pkg-plist index cb63869..58e577e 100644 --- a/multimedia/phonon-vlc/pkg-plist +++ b/multimedia/phonon-vlc/pkg-plist @@ -5,3 +5,4 @@ share/kde4/services/phononbackends/vlc.desktop @cwd %%QT_PREFIX%% %%QT_PLUGINDIR_REL%%/phonon_backend/libphonon_vlc.so @dirrmtry %%QT_PLUGINDIR_REL%%/phonon_backend +@dirrmtry %%QT_PLUGINDIR_REL%% diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index a71e8a1..3ad49c5 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -5,16 +5,16 @@ # $FreeBSD$ PORTNAME= phonon -PORTVERSION= 4.5.1 +PORTVERSION= 4.6.0 CATEGORIES= multimedia kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${PHONON_BRANCH}/${PORTNAME}/${PORTVERSION}/src/ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org -COMMENT= Multimedia framework for KDE 4 +COMMENT= KDE multimedia framework -LIB_DEPENDS= qzeitgeist.0:${PORTSDIR}/sysutils/qzeitgeist +LIB_DEPENDS= qzeitgeist.1:${PORTSDIR}/sysutils/qzeitgeist CONFLICTS= qt4-phonon-4* @@ -26,6 +26,8 @@ QT_COMPONENTS= dbus gui \ qmake_build moc_build rcc_build uic_build USE_XZ= yes USE_CMAKE= yes +CMAKE_ARGS= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE \ + -DPHONON_NO_PLATFORMPLUGIN:BOOL=TRUE MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes @@ -34,10 +36,8 @@ OPTIONS= PULSEAUDIO "Support playback via PulseAudio" off .include <bsd.port.options.mk> -# FIXME: Enable this option with Qt 4.8 (qt4-webkit does not depend on -# phonon anymore). -# qt4-designer depends on qt4-webkit, hence on phonon. Disable this -# option to avoid a circular dependency. +# qt4-designer depends on phonon. Disable this option to avoid a +# circular dependency. .undef WITH_DESIGNER .ifdef(WITH_DESIGNER) QT_COMPONENTS+= designer @@ -66,20 +66,14 @@ pre-configure: ${REINPLACE_CMD} -e '/phonon.pc/s|pkgconfig|../libdata/pkgconfig|' \ -e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\ ${PATCH_WRKSRC}/CMakeLists.txt - ${REINPLACE_CMD} -e '/add_subdirectory(tests)/ d' \ - ${PATCH_WRKSRC}/${PORTNAME}/experimental/CMakeLists.txt -# FIXME: We need to pass -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=1 -# to install the designer plugin and the Qt .pri file into the -# system-wide Qt directory in the next release. -# Reference: http://commits.kde.org/phonon/664035456f0c9dc85b65c893f431b82118c281c0 post-install: ${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/phonon ${LN} -sf ${PREFIX}/include/phonon ${QT_INCDIR}/Phonon ${LN} -sf ${PREFIX}/include/KDE/Phonon ${PREFIX}/include/phonon/Phonon .for lib in phonon phononexperimental - ${LN} -sf ${PREFIX}/lib/lib${lib}.so.4.5.1 ${QT_LIBDIR}/lib${lib}.so - ${LN} -sf ${PREFIX}/lib/lib${lib}.so.4.5.1 ${QT_LIBDIR}/lib${lib}.so.4 + ${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${QT_LIBDIR}/lib${lib}.so + ${LN} -sf ${PREFIX}/lib/lib${lib}.so.${PORTVERSION} ${QT_LIBDIR}/lib${lib}.so.4 .endfor @${CAT} ${PKGMESSAGE} diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo index f215b20..24e954a 100644 --- a/multimedia/phonon/distinfo +++ b/multimedia/phonon/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/phonon-4.5.1.tar.xz) = 0180f01cb6cae907285adf76e4aece9be33af6a352dc057709e40b7838e2f4c8 -SIZE (KDE/phonon-4.5.1.tar.xz) = 291088 +SHA256 (KDE/phonon-4.6.0.tar.xz) = 2915e7a37c92a0a8237b9e6d2ef67ba8b005ee3529d03991cd3d137f039ba3c4 +SIZE (KDE/phonon-4.6.0.tar.xz) = 280712 diff --git a/multimedia/phonon/files/patch-CMakeLists.txt b/multimedia/phonon/files/patch-CMakeLists.txt deleted file mode 100644 index 9d6f2b7..0000000 --- a/multimedia/phonon/files/patch-CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -commit 353bf15657c9a93138bce7431c5180b25efaede7 -Author: Raphael Kubo da Costa <rakuco@FreeBSD.org> -Date: Mon Nov 14 19:14:02 2011 -0200 - - Fix if() clause the same way 13ec1718 does. - - QT_QTDESIGNER_FOUND should not be expanded, as if it is not found the if - clause will effectively become `if(AND PHONON_BUILD_DESIGNER_PLUGIN)`. - - This was fixed in master by commit 13ec1718, which for some reason has - never made its way to the 4.5 branch. - - CCMAIL: kde-multimedia@kde.org - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7fbb816..71cb14a 100644 ---- ./CMakeLists.txt -+++ ./CMakeLists.txt -@@ -55,9 +55,9 @@ endif(QT_QTDBUS_FOUND) - set(BUILDSYSTEM_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/phonon-buildsystem/) - - add_subdirectory(cmake) --if(${QT_QTDESIGNER_FOUND} AND PHONON_BUILD_DESIGNER_PLUGIN) -+if(QT_QTDESIGNER_FOUND AND PHONON_BUILD_DESIGNER_PLUGIN) - add_subdirectory(designer) --endif(${QT_QTDESIGNER_FOUND} AND PHONON_BUILD_DESIGNER_PLUGIN) -+endif(QT_QTDESIGNER_FOUND AND PHONON_BUILD_DESIGNER_PLUGIN) - add_subdirectory(phonon) - add_subdirectory(includes) - if(PHONON_BUILD_DEMOS) diff --git a/multimedia/phonon/files/patch-phonon__globalconfig.cpp b/multimedia/phonon/files/patch-phonon__globalconfig.cpp deleted file mode 100644 index 627aec6..0000000 --- a/multimedia/phonon/files/patch-phonon__globalconfig.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- ./phonon/globalconfig.cpp.orig 2011-09-09 13:27:00.943109464 +0200 -+++ ./phonon/globalconfig.cpp 2011-09-09 15:22:15.732984584 +0200 -@@ -35,6 +35,8 @@ - #include <QtCore/QList> - #include <QtCore/QVariant> - -+#define QT_NO_PHONON_PLATFORMPLUGIN -+ - QT_BEGIN_NAMESPACE - - namespace Phonon diff --git a/multimedia/phonon/pkg-descr b/multimedia/phonon/pkg-descr index bfb4408..b48921f 100644 --- a/multimedia/phonon/pkg-descr +++ b/multimedia/phonon/pkg-descr @@ -1,4 +1,4 @@ Phonon is the framework responsible for an ubiquitous multimedia -experience in KDE 4. +experience in KDE Software Compilation 4. -WWW: http://phonon.kde.org +WWW: http://phonon.kde.org diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist index 1d78e27..b7d76db 100644 --- a/multimedia/phonon/pkg-plist +++ b/multimedia/phonon/pkg-plist @@ -67,6 +67,7 @@ include/phonon/EffectInterface include/phonon/EffectParameter include/phonon/EffectWidget include/phonon/Global +include/phonon/GlobalDescriptionContainer include/phonon/MediaController include/phonon/MediaNode include/phonon/MediaObject @@ -133,6 +134,7 @@ include/phonon/experimental/videoframe2.h include/phonon/experimental/videowidget.h include/phonon/experimental/visualization.h include/phonon/globalconfig.h +include/phonon/globaldescriptioncontainer.h include/phonon/mediacontroller.h include/phonon/medianode.h include/phonon/mediaobject.h @@ -155,37 +157,50 @@ include/phonon/videowidgetinterface.h include/phonon/volumefadereffect.h include/phonon/volumefaderinterface.h include/phonon/volumeslider.h +lib/cmake/phonon/PhononConfig.cmake +lib/cmake/phonon/PhononConfigVersion.cmake +lib/cmake/phonon/PhononTargets-release.cmake +lib/cmake/phonon/PhononTargets.cmake lib/libphonon.so lib/libphonon.so.4 -lib/libphonon.so.4.5.1 +lib/libphonon.so.4.6.0 lib/libphononexperimental.so lib/libphononexperimental.so.4 -lib/libphononexperimental.so.4.5.1 -%%DESIGNER%%lib/kde4/libphononwidgets.so +lib/libphononexperimental.so.4.6.0 libdata/pkgconfig/phonon.pc share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml -share/phonon-buildsystem/COPYING-CMAKE-SCRIPTS -share/phonon-buildsystem/FindAutomoc4.cmake -share/phonon-buildsystem/FindPackageHandleStandardArgs.cmake -share/phonon-buildsystem/FindPhononInternal.cmake -share/phonon-buildsystem/FindQt4.cmake -share/phonon-buildsystem/MacroEnsureVersion.cmake -share/phonon-buildsystem/MacroLogFeature.cmake -share/phonon-buildsystem/MacroOptionalFindPackage.cmake -share/phonon-buildsystem/MacroPushRequiredVars.cmake -share/phonon-buildsystem/PhononMacros.cmake -share/phonon-buildsystem/cmake_uninstall.cmake.in -@dirrm share/phonon-buildsystem +%%DATADIR%%/buildsystem/COPYING-CMAKE-SCRIPTS +%%DATADIR%%/buildsystem/FindAutomoc4.cmake +%%DATADIR%%/buildsystem/FindPackageHandleStandardArgs.cmake +%%DATADIR%%/buildsystem/FindPhononInternal.cmake +%%DATADIR%%/buildsystem/FindQt4.cmake +%%DATADIR%%/buildsystem/MacroEnsureVersion.cmake +%%DATADIR%%/buildsystem/MacroLogFeature.cmake +%%DATADIR%%/buildsystem/MacroOptionalFindPackage.cmake +%%DATADIR%%/buildsystem/MacroPushRequiredVars.cmake +%%DATADIR%%/buildsystem/PhononMacros.cmake +%%DATADIR%%/buildsystem/Qt4ConfigDependentSettings.cmake +%%DATADIR%%/buildsystem/Qt4Macros.cmake +%%DATADIR%%/buildsystem/cmake_uninstall.cmake.in +@dirrm %%DATADIR%%/buildsystem +@dirrm %%DATADIR%% +@dirrm lib/cmake/phonon +@dirrmtry lib/cmake @dirrm include/phonon/experimental @dirrm include/phonon @dirrm include/KDE/Phonon/Experimental @dirrm include/KDE/Phonon @cwd %%QT_PREFIX%% -%%QT_INCDIR_REL%%/phonon %%QT_INCDIR_REL%%/Phonon +%%QT_INCDIR_REL%%/phonon %%QT_LIBDIR_REL%%/libphonon.so %%QT_LIBDIR_REL%%/libphonon.so.4 %%QT_LIBDIR_REL%%/libphononexperimental.so %%QT_LIBDIR_REL%%/libphononexperimental.so.4 +%%DESIGNER%%%%QT_PLUGINDIR_REL%%/designer/libphononwidgets.so share/qt4/mkspecs/modules/qt_phonon.pri @dirrmtry share/qt4/mkspecs/modules +%%DESIGNER%%@dirrmtry %%QT_PLUGINDIR_REL%%/designer +%%DESIGNER%%@dirrmtry %%QT_PLUGINDIR_REL%% +@dirrmtry %%QT_LIBDIR_REL%% +@dirrmtry %%QT_INCDIR_REL%% diff --git a/sysutils/qzeitgeist/Makefile b/sysutils/qzeitgeist/Makefile index 1b38a77..c050be3 100644 --- a/sysutils/qzeitgeist/Makefile +++ b/sysutils/qzeitgeist/Makefile @@ -6,10 +6,15 @@ # PORTNAME= qzeitgeist -PORTVERSION= 0.7.0 +PORTVERSION= 0.8.0 CATEGORIES= sysutils -MASTER_SITES= http://releases.zeitgeist-project.com/${PORTNAME}/ -DISTNAME= QtZeitgeist-${PORTVERSION} +MASTER_SITES= ${MASTER_SITE_KDE_kde} \ + http://launchpad.net/zeitgeist/${ZEITGEIST_VERSION:R}/${ZEITGEIST_VERSION}/+download/ +MASTER_SITE_SUBDIR= stable/lib${PORTNAME}/${PORTVERSION}/src/ +DISTNAME= lib${PORTNAME}-${PORTVERSION} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:kde \ + zeitgeist-${ZEITGEIST_VERSION}.tar.gz +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= avilla@FreeBSD.org COMMENT= Qt 4 wrapper library around the Zeitgeist D-Bus API @@ -17,15 +22,31 @@ COMMENT= Qt 4 wrapper library around the Zeitgeist D-Bus API LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -USE_BZIP2= yes +BUILD_DEPENDS= rapper:${PORTSDIR}/textproc/raptor2 \ + ${PYTHON_SITELIBDIR}/rdflib/__init__.py:${PORTSDIR}/textproc/py-rdflib + +USE_KDE4= automoc4 +USE_PYTHON_BUILD= yes USE_QT_VER= 4 -QT_COMPONENTS= corelib dbus qtestlib \ +QT_COMPONENTS= dbus declarative qtestlib \ moc_build qmake_build rcc_build uic_build -MAKE_JOBS_SAFE= yes +USE_BZIP2= yes USE_CMAKE= yes +MAKE_JOBS_SAFE= yes USE_LDCONFIG= yes -WRKSRC= ${WRKDIR}/${DISTNAME}-Source +# To be kept in sync with sysutils/zeitgeist. +ZEITGEIST_VERSION= 0.8.2 + +post-extract: + @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} \ + ${_DISTDIR}/zeitgeist-${ZEITGEIST_VERSION}.tar.gz ${EXTRACT_AFTER_ARGS}) + cd ${WRKDIR}/zeitgeist-${ZEITGEIST_VERSION} && \ + ${CP} zeitgeist/datamodel.py \ + extra/ontology/*.trig \ + extra/rdfxml2py \ + extra/PythonSerializer.py \ + ${WRKSRC}/scripts post-patch: ${REINPLACE_CMD} -e '/\.pc/ s|pkgconfig|../libdata/pkgconfig|' \ @@ -34,8 +55,21 @@ post-patch: ${WRKSRC}/CMakeLists.txt \ ${WRKSRC}/src/CMakeLists.txt \ ${WRKSRC}/QZeitgeistConfig.cmake.in + ${REINPLACE_CMD} -e '/import _config/ d' \ + -e 's|_config.datadir, "zeitgeist/ontology/zeitgeist.py"|runpath, "zeitgeist.py"|' \ + ${WRKSRC}/scripts/datamodel.py + ${REINPLACE_CMD} -e 's|zeitgeist.datamodel|datamodel|' \ + ${WRKSRC}/scripts/onto2cpp.py + ${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|g' \ + ${WRKSRC}/scripts/rdfxml2py + +pre-build: + cd ${WRKSRC}/scripts && \ + ${CAT} *.trig | \ + ${LOCALBASE}/bin/rapper -i trig -o rdfxml -I ZeitgeistNamespace - | \ + ./rdfxml2py >> zeitgeist.py post-install: - ${CAT} ${PKGMESSAGE} + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/sysutils/qzeitgeist/distinfo b/sysutils/qzeitgeist/distinfo index c76a46a..c1cb12a 100644 --- a/sysutils/qzeitgeist/distinfo +++ b/sysutils/qzeitgeist/distinfo @@ -1,2 +1,4 @@ -SHA256 (QtZeitgeist-0.7.0.tar.bz2) = 12c3073196ba5ea871759e79bc0a1ecf5a3a20f1d90abd814d2555ff21175d7e -SIZE (QtZeitgeist-0.7.0.tar.bz2) = 31260 +SHA256 (libqzeitgeist-0.8.0.tar.bz2) = 0a8aa980d64549cce93691705807681fd7e3e079a48aee68fc4b2653f17d61ad +SIZE (libqzeitgeist-0.8.0.tar.bz2) = 29459 +SHA256 (zeitgeist-0.8.2.tar.gz) = 6155611ee182f642cc1fe9f8aadc25c7e2942fdef2565b1f29e8388bc4643703 +SIZE (zeitgeist-0.8.2.tar.gz) = 358781 diff --git a/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py b/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py new file mode 100644 index 0000000..ce4b502 --- /dev/null +++ b/sysutils/qzeitgeist/files/patch-scripts__PythonSerializer.py @@ -0,0 +1,13 @@ +--- ./scripts/PythonSerializer.py.orig 2012-04-04 17:46:44.385371264 +0200 ++++ ./scripts/PythonSerializer.py 2012-04-05 00:32:11.175489615 +0200 +@@ -85,8 +85,8 @@ + assert root_type + #TODO: displayname, how are translation handled? on trig level or on python level? + stream.write( +- "Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, +- root_type, symbol, display_name, doc) ++ str("Symbol('%s', parent=%r, uri='%s', display_name='%s', doc='%s', auto_resolve=False)\n" %(name, ++ root_type, symbol, display_name, doc)) + ) + + diff --git a/sysutils/qzeitgeist/pkg-plist b/sysutils/qzeitgeist/pkg-plist index fadd34f..d6e94e6 100644 --- a/sysutils/qzeitgeist/pkg-plist +++ b/sysutils/qzeitgeist/pkg-plist @@ -1,31 +1,42 @@ -include/QtZeitgeist/DataModel/DataSource -include/QtZeitgeist/DataModel/Event -include/QtZeitgeist/DataModel/Subject -include/QtZeitgeist/DataModel/TimeRange -include/QtZeitgeist/DataModel/datasource.h -include/QtZeitgeist/DataModel/event.h -include/QtZeitgeist/DataModel/subject.h -include/QtZeitgeist/DataModel/timerange.h -include/QtZeitgeist/DataSourceRegistry -include/QtZeitgeist/Interpretation -include/QtZeitgeist/Log -include/QtZeitgeist/Manifestation -include/QtZeitgeist/Monitor -include/QtZeitgeist/QtZeitgeist -include/QtZeitgeist/datasourceregistry.h -include/QtZeitgeist/interpretation.h -include/QtZeitgeist/log.h -include/QtZeitgeist/manifestation.h -include/QtZeitgeist/monitor.h -include/QtZeitgeist/qtzeitgeist.h -lib/cmake/qzeitgeist/QZeitgeistConfig.cmake -lib/cmake/qzeitgeist/QZeitgeistExport-%%CMAKE_BUILD_TYPE%%.cmake -lib/cmake/qzeitgeist/QZeitgeistExport.cmake +include/QZeitgeist/DataModel/DataSource +include/QZeitgeist/DataModel/Event +include/QZeitgeist/DataModel/Subject +include/QZeitgeist/DataModel/TimeRange +include/QZeitgeist/DataModel/datasource.h +include/QZeitgeist/DataModel/event.h +include/QZeitgeist/DataModel/subject.h +include/QZeitgeist/DataModel/timerange.h +include/QZeitgeist/DataSourceRegistry +include/QZeitgeist/Interpretation +include/QZeitgeist/Log +include/QZeitgeist/LogModel +include/QZeitgeist/Manifestation +include/QZeitgeist/Monitor +include/QZeitgeist/QZeitgeist +include/QZeitgeist/datasourceregistry.h +include/QZeitgeist/interpretation.h +include/QZeitgeist/log.h +include/QZeitgeist/logmodel.h +include/QZeitgeist/manifestation.h +include/QZeitgeist/monitor.h +include/QZeitgeist/qzeitgeist.h +include/QZeitgeist/qzeitgeist_version.h +include/QZeitgeist/refreshjob.h +lib/cmake/QZeitgeist/QZeitgeistConfig.cmake +lib/cmake/QZeitgeist/QZeitgeistConfigVersion.cmake +lib/cmake/QZeitgeist/QZeitgeistExport-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/QZeitgeist/QZeitgeistExport.cmake lib/libqzeitgeist.so -lib/libqzeitgeist.so.0 -lib/libqzeitgeist.so.0.7 -libdata/pkgconfig/QtZeitgeist.pc -@dirrm lib/cmake/qzeitgeist +lib/libqzeitgeist.so.0.8.0 +lib/libqzeitgeist.so.1 +%%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist/libQZeitgeistDeclarativePlugin.so +%%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist/qmldir +libdata/pkgconfig/QZeitgeist.pc +@dirrm %%QT_LIBDIR_REL%%/imports/org/gnome/zeitgeist +@dirrm %%QT_LIBDIR_REL%%/imports/org/gnome +@dirrmtry %%QT_LIBDIR_REL%%/imports/org +@dirrmtry %%QT_LIBDIR_REL%%/imports +@dirrm lib/cmake/QZeitgeist @dirrmtry lib/cmake -@dirrm include/QtZeitgeist/DataModel -@dirrm include/QtZeitgeist +@dirrm include/QZeitgeist/DataModel +@dirrm include/QZeitgeist |
