Date: Tue, 14 Jan 2020 08:51:55 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r522996 - in head/audio/csoundqt: . files Message-ID: <202001140851.00E8pthi041439@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Tue Jan 14 08:51:55 2020 New Revision: 522996 URL: https://svnweb.freebsd.org/changeset/ports/522996 Log: audio/csoundqt: Update 0.9.5 -> 0.9.7-rc1-4 Reported by: portscout Added: head/audio/csoundqt/pkg-plist (contents, props changed) Modified: head/audio/csoundqt/Makefile head/audio/csoundqt/distinfo head/audio/csoundqt/files/patch-qcs.pro head/audio/csoundqt/files/patch-src_qutecsound.cpp Modified: head/audio/csoundqt/Makefile ============================================================================== --- head/audio/csoundqt/Makefile Tue Jan 14 08:31:09 2020 (r522995) +++ head/audio/csoundqt/Makefile Tue Jan 14 08:51:55 2020 (r522996) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= CsoundQt -DISTVERSION= 0.9.5 -PORTREVISION= 3 +DISTVERSION= 0.9.7-rc1-4 +DISTVERSIONSUFFIX= -g81e704f2 CATEGORIES= audio MAINTAINER= yuri@FreeBSD.org @@ -15,24 +15,17 @@ LIB_DEPENDS= libcsound64.so:audio/csound USES= compiler:c++11-lib desktop-file-utils gl gmake qmake qt:5 shared-mime-info USE_GITHUB= yes -USE_QT= concurrent core declarative gui network printsupport widgets xml buildtools_build +USE_QT= concurrent core declarative gui network printsupport webchannel webkit widgets xml buildtools_build USE_GL= gl QMAKE_ARGS= CONFIG+="CSOUND_API_INCLUDE_DIR=${LOCALBASE}/include/csound CSOUND_LIBRARY_DIR=${LOCALBASE}/lib build64" \ INSTALL_DIR=${PREFIX} SHARE_DIR=${PREFIX}/share \ qcs.pro -PLIST_FILES= bin/${PORTNAME}-d-cs6 \ - bin/csoundqt \ - share/applications/${PORTNAME}.desktop \ - share/icons/hicolor/128x128/mimetypes/csound.png \ - share/icons/hicolor/scalable/apps/qtcs.svg \ - share/mime/packages/x-csound-csd.xml \ - share/mime/packages/x-csound-orc.xml \ - share/mime/packages/x-csound-sco.xml - OPTIONS_DEFINE= EXAMPLES +DATADIR= ${PREFIX}/share/${PORTNAME:tl} + PORTEXAMPLES= * post-patch: @@ -40,7 +33,6 @@ post-patch: post-install: @${MV} ${STAGEDIR}${DATADIR}/Examples ${STAGEDIR}${EXAMPLESDIR} - @${RMDIR} ${STAGEDIR}${DATADIR} @${STRIP_CMD} ${STAGEDIR}${LOCALBASE}/bin/${PORTNAME}-d-cs6 .include <bsd.port.mk> Modified: head/audio/csoundqt/distinfo ============================================================================== --- head/audio/csoundqt/distinfo Tue Jan 14 08:31:09 2020 (r522995) +++ head/audio/csoundqt/distinfo Tue Jan 14 08:51:55 2020 (r522996) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542489209 -SHA256 (CsoundQt-CsoundQt-0.9.5_GH0.tar.gz) = adf9c48be719226ec553cc67019b191d1730f6643ee41ce2996cd3a88dd12eab -SIZE (CsoundQt-CsoundQt-0.9.5_GH0.tar.gz) = 64382619 +TIMESTAMP = 1578989603 +SHA256 (CsoundQt-CsoundQt-0.9.7-rc1-4-g81e704f2_GH0.tar.gz) = 195c1a06667be29190769806d387b9c8e2dcdd1bcd622a7ac2dc220ea47a55a4 +SIZE (CsoundQt-CsoundQt-0.9.7-rc1-4-g81e704f2_GH0.tar.gz) = 66169107 Modified: head/audio/csoundqt/files/patch-qcs.pro ============================================================================== --- head/audio/csoundqt/files/patch-qcs.pro Tue Jan 14 08:31:09 2020 (r522995) +++ head/audio/csoundqt/files/patch-qcs.pro Tue Jan 14 08:51:55 2020 (r522996) @@ -1,18 +1,11 @@ ---- qcs.pro.orig 2018-11-18 08:13:18 UTC +--- qcs.pro.orig 2020-01-13 20:37:47 UTC +++ qcs.pro -@@ -187,13 +187,13 @@ unix:!macx { - desktop.path=$$SHARE_DIR/applications - desktop.files=CsoundQt.desktop - -- icon.path=$$SHARE_DIR/icons # not sure in fact, if /usr/share/icons is enough or better to put into hicolor... -+ icon.path=$$SHARE_DIR/icons/hicolor/scalable/apps/ # not sure in fact, if /usr/share/icons is enough or better to put into hicolor... - icon.files=images/qtcs.svg - - mimetypes.path=$$INSTALL_DIR # in some reason path must be set to create install target in Makefile - mimetypes.commands = cd $$PWD/mime-types/; ./add_csound_mimetypes.sh $(INSTALL_ROOT)/$$INSTALL_DIR - -- examples.path = $$SHARE_DIR/qutecsound/ -+ examples.path = $$SHARE_DIR/CsoundQt/ - examples.files = src/Examples - - INSTALLS += target desktop icon mimetypes examples +@@ -245,7 +245,7 @@ unix:!macx { + #appImage.commands = cd $$OUT_PWD/$$DESTDIR/; ln -sf $$TARGET csoundqt + appImage.commands += export VERSION=0.9.7-beta; export QML_SOURCES_PATHS=$$PWD/src/QML; + #TODO: kas dekstop failis vaja seada käivitatav $$TARGETiks või siis bianry oleks csounqt. praegu nimetan käsitisi ümber AppDir/usr/bin juures +- appImage.commands += linuxdeploy --appdir AppDir --executable=$$TARGET --desktop-file=$$PWD/csoundqt.desktop -i $$PWD/images/csoundqt.svg --plugin=qt # --output appimage ++ #appImage.commands += linuxdeploy --appdir AppDir --executable=$$TARGET --desktop-file=$$PWD/csoundqt.desktop -i $$PWD/images/csoundqt.svg --plugin=qt # --output appimage + # move and remove what necessary here: + # appImage.commands += linuxdeploy --appdir AppDir --output appimage + #INSTALLS += appImage Modified: head/audio/csoundqt/files/patch-src_qutecsound.cpp ============================================================================== --- head/audio/csoundqt/files/patch-src_qutecsound.cpp Tue Jan 14 08:31:09 2020 (r522995) +++ head/audio/csoundqt/files/patch-src_qutecsound.cpp Tue Jan 14 08:51:55 2020 (r522996) @@ -1,6 +1,6 @@ ---- src/qutecsound.cpp.orig 2017-11-19 10:59:36 UTC +--- src/qutecsound.cpp.orig 2020-01-12 07:45:31 UTC +++ src/qutecsound.cpp -@@ -267,6 +267,9 @@ CsoundQt::CsoundQt(QStringList fileNames +@@ -279,6 +279,9 @@ CsoundQt::CsoundQt(QStringList fileNames) #ifdef Q_OS_LINUX possibleDirectories << "/usr/share/doc/csound-manual/html/" << "/usr/share/doc/csound-doc/html/"; #endif @@ -10,7 +10,7 @@ #ifdef Q_OS_WIN QString programFilesPath = QDir::fromNativeSeparators(getenv("PROGRAMFILES")); QString programFilesPathx86 = QDir::fromNativeSeparators(getenv("PROGRAMFILES(X86)")); -@@ -1255,6 +1258,8 @@ void CsoundQt::createApp() +@@ -1299,6 +1302,8 @@ void CsoundQt::createApp() #ifdef USE_DOUBLE #ifdef Q_OS_LINUX #endif @@ -19,7 +19,7 @@ #ifdef Q_OS_SOLARIS #endif #ifdef Q_OS_WIN32 -@@ -1267,6 +1272,8 @@ void CsoundQt::createApp() +@@ -1311,6 +1316,8 @@ void CsoundQt::createApp() #ifdef Q_OS_LINUX #endif @@ -28,7 +28,7 @@ #ifdef Q_OS_SOLARS #endif #ifdef Q_OS_WIN32 -@@ -1314,10 +1321,10 @@ void CsoundQt::createApp() +@@ -1358,10 +1365,10 @@ void CsoundQt::createApp() wizard.setField("targetDir", appDir); if (m_options->sdkDir.isEmpty()) { // No sdk, wizard.setField("customPaths", true); @@ -42,7 +42,7 @@ } #endif #ifdef Q_OS_WIN32 -@@ -1810,6 +1817,9 @@ void CsoundQt::runInTerm(bool realtime) +@@ -1899,6 +1906,9 @@ void CsoundQt::runInTerm(bool realtime) #ifdef Q_OS_LINUX options = "-e " + scriptFileName; #endif @@ -52,7 +52,7 @@ #ifdef Q_OS_SOLARIS options = "-e " + scriptFileName; #endif -@@ -2797,6 +2807,9 @@ void CsoundQt::runUtility(QString flags) +@@ -2896,6 +2906,9 @@ void CsoundQt::runUtility(QString flags) #ifdef Q_OS_LINUX options = "-e " + SCRIPT_NAME; #endif @@ -62,20 +62,18 @@ #ifdef Q_OS_SOLARIS options = "-e " + SCRIPT_NAME; #endif -@@ -3911,10 +3924,10 @@ QString CsoundQt::getExamplePath(QString +@@ -4024,8 +4037,8 @@ QString CsoundQt::getExamplePath(QString dir) examplePath = qApp->applicationDirPath() + "/../Resources/" + dir; qDebug() << examplePath; #endif -#ifdef Q_OS_LINUX +- examplePath = QString(); //qApp->applicationDirPath() + "/Examples/" + dir; +#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) - examplePath = qApp->applicationDirPath() + "/Examples/" + dir; - if (!QDir(examplePath).exists()) { -- examplePath = qApp->applicationDirPath() + "/../src/Examples/" + dir; -+ examplePath = qApp->applicationDirPath() + "/../share/examples/CsoundQt/" + dir; - } - if (!QDir(examplePath).exists()) { // for out of tree builds - examplePath = qApp->applicationDirPath() + "/../../csoundqt/src/Examples/" + dir; -@@ -4380,7 +4393,7 @@ void CsoundQt::fillFileMenu() ++ examplePath = qApp->applicationDirPath() + "/../share/examples/CsoundQt/" + dir; + QStringList possiblePaths; + possiblePaths << qApp->applicationDirPath() + "/Examples/" << "~/.local/share/csoundqt/Examples/" + << "/usr/share/csoundqt/Examples/" << qApp->applicationDirPath() + "/../src/Examples/" +@@ -4507,7 +4520,7 @@ void CsoundQt::fillFileMenu() templatePath = qApp->applicationDirPath() + "/../templates/"; qDebug() << templatePath; #endif @@ -84,13 +82,13 @@ templatePath = qApp->applicationDirPath() + "/templates/"; if (!QDir(templatePath).exists()) { templatePath = qApp->applicationDirPath() + "/../templates/"; -@@ -5058,6 +5071,9 @@ int CsoundQt::execute(QString executable - #ifdef Q_OS_LINUX - QString commandLine = "\"" + executable + "\" " + options; +@@ -5196,6 +5209,9 @@ int CsoundQt::execute(QString executable, QString opti + QString commandLine = "open -a \"" + executable + "\" " + options; #endif -+#ifdef Q_OS_FREEBSD + #ifdef Q_OS_LINUX + QString commandLine = "\"" + executable + "\" " + options; +#endif - #ifdef Q_OS_HAIKU ++#ifdef Q_OS_FREEBSD QString commandLine = "\"" + executable + "\" " + options; #endif + #ifdef Q_OS_HAIKU Added: head/audio/csoundqt/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/csoundqt/pkg-plist Tue Jan 14 08:51:55 2020 (r522996) @@ -0,0 +1,13 @@ +bin/CsoundQt-d-cs6 +bin/csoundqt +share/applications/csoundqt.desktop +%%DATADIR%%/templates/csound+html-template.csd +%%DATADIR%%/templates/csoundqt-or-webcsound-template.html +%%DATADIR%%/templates/simple.csd +share/icons/hicolor/128x128/mimetypes/csound.png +share/icons/hicolor/scalable/apps/csoundqt.svg +share/mime/packages/x-csound-csd.xml +share/mime/packages/x-csound-inc.xml +share/mime/packages/x-csound-orc.xml +share/mime/packages/x-csound-sco.xml +share/mime/packages/x-csound-udo.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001140851.00E8pthi041439>