From owner-svn-ports-head@freebsd.org Thu Jan 10 21:04:11 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 642A414989D2; Thu, 10 Jan 2019 21:04:11 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0327E6E5DA; Thu, 10 Jan 2019 21:04:11 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DC1179B10; Thu, 10 Jan 2019 21:04:10 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0AL4All051471; Thu, 10 Jan 2019 21:04:10 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0AL4AAb051469; Thu, 10 Jan 2019 21:04:10 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201901102104.x0AL4AAb051469@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Thu, 10 Jan 2019 21:04:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r489899 - in head/audio/musescore: . files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: in head/audio/musescore: . files X-SVN-Commit-Revision: 489899 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 0327E6E5DA X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.977,0]; NEURAL_HAM_LONG(-1.00)[-0.998,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Jan 2019 21:04:11 -0000 Author: adridg Date: Thu Jan 10 21:04:10 2019 New Revision: 489899 URL: https://svnweb.freebsd.org/changeset/ports/489899 Log: Fix the audio/musescore update. - add missing patch file - change WebEngine to an option, unbreak (hopefully the code is ok) on aarch64 and ppc64 Should have mentioned that the release notes for 3.0.0 are at https://musescore.org/en/handbook/developers-handbook/release-notes/release-notes-musescore-3 But that, plus the versions 2.2, 2.2.1, 2.3, 2.3.1 and 2.3.2 that were skipped in ports are too many to summarize here. PR: 234801 Added: head/audio/musescore/files/patch-mscore_CMakeLists.txt (contents, props changed) Modified: head/audio/musescore/Makefile Modified: head/audio/musescore/Makefile ============================================================================== --- head/audio/musescore/Makefile Thu Jan 10 21:02:08 2019 (r489898) +++ head/audio/musescore/Makefile Thu Jan 10 21:04:10 2019 (r489899) @@ -3,6 +3,7 @@ PORTNAME= musescore DISTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= audio MASTER_SITES= http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${DISTVERSION}/ DISTNAME= MuseScore-${DISTVERSION} @@ -26,18 +27,24 @@ LIB_DEPENDS= libmp3lame.so:audio/lame \ USES= cmake compiler:c++11-lib desktop-file-utils \ pkgconfig qt:5 shared-mime-info zip USE_QT= core declarative gui widgets opengl concurrent designer help network \ - scripttools svg sql printsupport testlib webengine \ + scripttools svg sql printsupport testlib \ xml xmlpatterns \ buildtools_build linguisttools_build qmake_build uitools_build ALL_TARGET= lrelease manpages all INSTALLS_ICONS= yes -CMAKE_ARGS+= -DUSE_SYSTEM_FREETYPE="ON" -DBUILD_PORTMIDI=OFF +CMAKE_ARGS+= -DUSE_SYSTEM_FREETYPE="ON" \ + -DBUILD_PORTMIDI=OFF \ + -DBUILD_PCH=OFF DATADIR= ${PREFIX}/share/mscore-${PORTVERSION:R} -OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO OCR +OPTIONS_DEFINE= ALSA JACK PORTAUDIO PULSEAUDIO OCR WEBENGINE OPTIONS_DEFAULT= PORTAUDIO +OPTIONS_DEFAULT_amd64= WEBENGINE +OPTIONS_DEFAULT_i386= WEBENGINE + OCR_DESC= Optical Character Recognition +WEBENGINE_DESC= Use WebEngine in the welcome panel ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CMAKE_BOOL= BUILD_ALSA @@ -48,6 +55,8 @@ PORTAUDIO_CMAKE_BOOL= BUILD_PORTAUDIO PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio PULSEAUDIO_CMAKE_BOOL= BUILD_PULSEAUDIO OCR_CMAKE_BOOL= OCR +WEBENGINE_USE= qt=webengine +WEBENGINE_CMAKE_BOOL= BUILD_WEBENGINE .include Added: head/audio/musescore/files/patch-mscore_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/musescore/files/patch-mscore_CMakeLists.txt Thu Jan 10 21:04:10 2019 (r489899) @@ -0,0 +1,22 @@ +Editorialize. What are they thinking? + +--- mscore/CMakeLists.txt.orig 2019-01-10 20:08:02 UTC ++++ mscore/CMakeLists.txt +@@ -661,7 +661,7 @@ else (MINGW) + + if ( NOT MSVC ) + ## install qwebengine core +- if (NOT APPLE AND USE_WEBENGINE) ++ if (YOU_CANT_SERIOUSLY_SUGGEST_TO_COPY_WEBENGINE_EXECUTABLES_AROUND) + install(FILES + ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess + DESTINATION bin +@@ -674,7 +674,7 @@ else (MINGW) + ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales + DESTINATION lib/qt5/translations + ) +- endif(NOT APPLE AND USE_WEBENGINE) ++ endif(YOU_CANT_SERIOUSLY_SUGGEST_TO_COPY_WEBENGINE_EXECUTABLES_AROUND) + + target_link_libraries(mscore + ${ALSA_LIB}