Hi,
as you know qt4-qtconfig can't be installed with kde4, because of qt4/kde4
phonons conflict. The attached patch forces qtconfig and qtdemo ports to use
multimedia/phonon instead of qt4-phonon. It works for qt-4.4.0, qt-4.4.1 and
qt-4.4.2.
If you want to test patch:
cd /usr/ports/misc
patch < /path/to/fix-phonon.diff
cd qt4-qtconfig && make install clean
If there is no problem, the patch will be integrated with qt-4.4.2 ports.
Max
Index: qt4-qtconfig/Makefile
===================================================================
RCS file: /home/kde-freebsd/area51/misc/qt4-qtconfig/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- qt4-qtconfig/Makefile 14 Jul 2008 13:34:07 -0000 1.25
+++ qt4-qtconfig/Makefile 1 Aug 2008 22:08:27 -0000
@@ -16,9 +16,12 @@
MAINTAINER= [EMAIL PROTECTED]
COMMENT= Qt graphical configuration utility
+LIB_DEPENDS= phonon.4:${PORTSDIR}/multimedia/phonon
+
+USE_KDE4= #dummy, we need to know KDE4_PREFIX
USE_QT_VER= 4
QT_COMPONENTS= qmake_build moc_build rcc_build uic_build qt3support corelib \
- gui sql xml phonon phonon-gst
+ gui sql xml
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -49,6 +52,8 @@
${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qtconfig-qt4|g' \
${WRKSRC}/${PORTNAME}.pro
${ECHO_CMD} "INCLUDEPATH+=${EXTRA_INCL}" >> ${WRKSRC}/${PORTNAME}.pro
+#fix linking with phonon
+ ${ECHO_CMD} "LIBS+=-L${KDE4_PREFIX}/lib" >> ${WRKSRC}/${PORTNAME}.pro
${MKDIR} ${WRKSRC}/../../mkspecs
${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
Index: qt4-qtdemo/Makefile
===================================================================
RCS file: /home/kde-freebsd/area51/misc/qt4-qtdemo/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- qt4-qtdemo/Makefile 1 Aug 2008 10:12:29 -0000 1.22
+++ qt4-qtdemo/Makefile 1 Aug 2008 22:08:27 -0000
@@ -18,11 +18,13 @@
MAINTAINER= [EMAIL PROTECTED]
COMMENT= Qt demonstration and example programs
+LIB_DEPENDS= phonon.4:${PORTSDIR}/multimedia/phonon
+
+USE_KDE4= #dummy, we need to know KDE4_PREFIX
USE_QT_VER= 4
QT_COMPONENTS= qmake_build moc_build rcc_build uic_build assistantclient \
corelib designer gui network opengl sql svg qtestlib xml \
- imageformats_run dbus script webkit phonon help assistant_run \
- phonon-gst
+ imageformats_run dbus script webkit help assistant_run
QT_NONSTANDARD= yes
QT_DIST= yes
@@ -48,6 +50,13 @@
${PATCH_WRKSRC}/demos/qtdemo/menumanager.cpp \
${PATCH_WRKSRC}/examples/help/remotecontrol/remotecontrol.cpp \
${PATCH_WRKSRC}/examples/help/simpletextviewer/assistant.cpp
+#fix linking with phonon
+ ${ECHO_CMD} "LIBS+=-L${KDE4_PREFIX}/lib" >> \
+ ${WRKSRC}/mediaplayer/mediaplayer.pro
+ ${ECHO_CMD} "LIBS+=-L${KDE4_PREFIX}/lib" >> \
+ ${WRKSRC}/../examples/phonon/capabilities/capabilities.pro
+ ${ECHO_CMD} "LIBS+=-L${KDE4_PREFIX}/lib" >> \
+ ${WRKSRC}/../examples/phonon/musicplayer/musicplayer.pro
pre-configure:
${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
_______________________________________________
kde-freebsd mailing list
[email protected]
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information
