Re: [kde-freebsd] [SVN Commit] area51/QT/devel/qt5-assistant

[Schaich Alonso]

On Wed, 23 Mar 2016 07:56:55 +0100
Ralf Nolden  wrote:

> Am Mittwoch, 23. März 2016, 07:05:21 schrieb Ralf Nolden:
>  
> > > Hi
> > > 
> > > Sorry it took me so long to reply.
> > > 
> > > Wouldn't it be more straightforward to add a dependency on qt5-help for
> > > assistant?
> > 
> Looking at the HEAD Makefile, there is already a dependency on qt5-help, so 
> nothing to do here. You'd just need to revert on your area51 commit.
> 
> -- 
> Kind regards,
> 
> Ralf Nolden
> 

Done in r12162

Alonso


pgpUCXe6ukKHh.pgp
Description: PGP signature
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

[kde-freebsd] [SVN Commit] area51/QT/devel/qt5-assistant

[Alonso Schaich]

SVN commit 12162 by aschai:

Revert 12128

Data/Documentation files installed by qt5-assisitant after 12128 conflict
with those installed by qt5-help.



 M  +2 -8  Makefile  
 M  +0 -31 pkg-plist  


___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Re: [kde-freebsd] [SVN Commit] area51/QT/devel/qt5-assistant

[Ralf Nolden]

Am Mittwoch, 23. März 2016, 07:05:21 schrieb Ralf Nolden:
 
> > Hi
> > 
> > Sorry it took me so long to reply.
> > 
> > Wouldn't it be more straightforward to add a dependency on qt5-help for
> > assistant?
> 
Looking at the HEAD Makefile, there is already a dependency on qt5-help, so 
nothing to do here. You'd just need to revert on your area51 commit.

-- 
Kind regards,

Ralf Nolden

___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

Re: [kde-freebsd] [SVN Commit] area51/QT/devel/qt5-assistant

[Ralf Nolden]

Am Samstag, 19. März 2016, 01:44:46 schrieb Alonso Schaich:
> SVN commit 12128 by aschai:
> 
> Generate and install docs
> 
> Obtained from:Ralf Nolden (nol...@kde.org)
> 
> 
>  M  +8 -2  Makefile
>  M  +31 -0 pkg-plist

Alonso,

could you revert this one for now ? This won't work in the long run.

I did a test this morning with qdoc: generate the docs to qdoc when building 
it (and while at it, generate qmake etc. from qtbase as well and package it).

That failed if qt5-help isn't installed due to the qhelpgenerator packaged 
there that creates the help files :(

So, I think in the end we're back to building the docs for Qt in a qt5-doc 
package. I'll look if I find a cleaner solution to the previous attempt.

The qtcreator doc generation needs that dependeny to qthelp too, so I updated 
the diff, please change that on your commit too.


> 
> 
> ___
> kde-freebsd mailing list
> kde-freebsd@kde.org
> https://mail.kde.org/mailman/listinfo/kde-freebsd
> See also http://freebsd.kde.org/ for latest information

-- 
Kind regards,

Ralf Nolden
Index: Makefile
===
--- Makefile	(Revision 411379)
+++ Makefile	(Arbeitskopie)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qtcreator
-DISTVERSION=	3.6.0
+DISTVERSION=	3.6.1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
 DISTNAME=	qt-creator-opensource-src-${DISTVERSION}
@@ -15,7 +15,7 @@
 USES=		qmake:outsource compiler:c++11-lib
 USE_QT5=	buildtools concurrent core declarative designer gui linguist network\
 		qml quick quickcontrols script script sql svg webkit widgets xml\
-		xmlpatterns
+		xmlpatterns qdoc help assistant
 
 # Enforce installation to ${PREFIX}.
 QMAKE_ARGS+=	QTC_PREFIX=${PREFIX}
@@ -33,7 +33,14 @@
 ${WRKSRC}/share/qtcreator/debugger/dumper.py
 	${REINPLACE_CMD} -e 's|/usr/bin/ant|${LOCALBASE}/bin/ant|' \
 ${WRKSRC}/src/plugins/android/androidsettingswidget.cpp
-	${REINPLACE_CMD} -e '/unix:LIBS += -ldl/d' \
+	${REINPLACE_CMD} -e '/unix:!openbsd: LIBS += -ldl/d' \
 ${WRKSRC}/src/libs/sqlite/sqlite-lib.pri
+post-build:
+	cd ${BUILD_WRKSRC};\
+	${MAKE_CMD} docs
 
+post-install:
+	cd ${BUILD_WRKSRC};\
+	${MAKE_CMD} INSTALL_ROOT=${STAGEDIR} install_docs
+
 .include 
Index: distinfo
===
--- distinfo	(Revision 411379)
+++ distinfo	(Arbeitskopie)
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-creator-opensource-src-3.6.0.tar.gz) = b130104963053e21f227b08009545894af33df495445a8651843bad4b52a1dec
-SIZE (KDE/qt-creator-opensource-src-3.6.0.tar.gz) = 23127195
+SHA256 (KDE/qt-creator-opensource-src-3.6.1.tar.gz) = e53611f80332cd1d171a9b91f8467b6182186cbec6b4a9301f32367368f15de2
+SIZE (KDE/qt-creator-opensource-src-3.6.1.tar.gz) = 23144233
Index: pkg-plist
===
--- pkg-plist	(Revision 411379)
+++ pkg-plist	(Arbeitskopie)
@@ -66,11 +66,11 @@
 lib/qtcreator/libqbscore.so
 lib/qtcreator/libqbscore.so.1
 lib/qtcreator/libqbscore.so.1.4
-lib/qtcreator/libqbscore.so.1.4.4
+lib/qtcreator/libqbscore.so.1.4.5
 lib/qtcreator/libqbsqtprofilesetup.so
 lib/qtcreator/libqbsqtprofilesetup.so.1
 lib/qtcreator/libqbsqtprofilesetup.so.1.4
-lib/qtcreator/libqbsqtprofilesetup.so.1.4.4
+lib/qtcreator/libqbsqtprofilesetup.so.1.4.5
 lib/qtcreator/plugins/libAnalyzerBase.so
 lib/qtcreator/plugins/libAndroid.so
 lib/qtcreator/plugins/libAutotoolsProjectManager.so
@@ -136,6 +136,8 @@
 libexec/qtcreator/qtcreator_process_stub
 libexec/qtcreator/qtpromaker
 libexec/qtcreator/sdktool
+%%PORTDOCSDOCSDIR%%/qtcreator-dev.qch
+%%PORTDOCSDOCSDIR%%/qtcreator.qch
 share/icons/hicolor/128x128/apps/QtProject-qtcreator.png
 share/icons/hicolor/16x16/apps/QtProject-qtcreator.png
 share/icons/hicolor/24x24/apps/QtProject-qtcreator.png
___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

[kde-freebsd] [SVN Commit] area51/QT/devel/qt5-assistant

[Alonso Schaich]

SVN commit 12128 by aschai:

Generate and install docs

Obtained from:  Ralf Nolden (nol...@kde.org)


 M  +8 -2  Makefile  
 M  +31 -0 pkg-plist  


___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information

[kde-freebsd] [SVN Commit] area51/QT/devel/qt5-assistant

[Max Brazhnikov]

SVN commit 10020 by makc:

devel/qt5-assistant: add run dependency on sqlite3 plugin

 M  +1 -1  Makefile  


___
kde-freebsd mailing list
kde-freebsd@kde.org
https://mail.kde.org/mailman/listinfo/kde-freebsd
See also http://freebsd.kde.org/ for latest information