Maintenance update to 2.0.2

This commit is contained in:
bcallah 2015-08-22 02:47:27 +00:00
parent 71c352797c
commit 4fdcc8b101
6 changed files with 78 additions and 93 deletions

View File

@ -1,16 +1,14 @@
# $OpenBSD: Makefile,v 1.23 2015/05/28 10:17:22 pascal Exp $
# $OpenBSD: Makefile,v 1.24 2015/08/22 02:47:27 bcallah Exp $
BROKEN-hppa = ICE on moc_qtsingleapplication.cxx
BROKEN-powerpc = libmscore/pitchspelling.h:56:42: error: enumerator value -1 is too large for underlying type 'char'
V = 2.0.1
V = 2.0.2
COMMENT = WYSIWYG music notation software (MuseScore)
DISTNAME = MuseScore-${V}
PKGNAME = musescore-${V}
EXTRACT_SUFX = .zip
CATEGORIES = audio x11
REVISION = 0
SHARED_ONLY = Yes
@ -20,12 +18,11 @@ HOMEPAGE = http://musescore.org/
# GPLv2 only
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += Qt5Concurrent Qt5Core Qt5Declarative Qt5Designer Qt5Gui
WANTLIB += Qt5Help Qt5Network Qt5OpenGL Qt5PrintSupport Qt5Qml
WANTLIB += Qt5Quick Qt5QuickWidgets Qt5Script Qt5ScriptTools Qt5Sql
WANTLIB += Qt5Svg Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets
WANTLIB += Qt5Xml Qt5XmlPatterns c m ogg portaudio pthread sndfile
WANTLIB += vorbis vorbisfile z
WANTLIB += Qt5Concurrent Qt5Core Qt5Designer Qt5Gui Qt5Help Qt5Network
WANTLIB += Qt5OpenGL Qt5PrintSupport Qt5Qml Qt5Quick Qt5QuickWidgets
WANTLIB += Qt5Sql Qt5Svg Qt5Test Qt5WebKit Qt5WebKitWidgets Qt5Widgets
WANTLIB += Qt5Xml Qt5XmlPatterns c freetype m ogg portaudio pthread
WANTLIB += sndfile vorbis vorbisfile z
MASTER_SITES = http://ftp.osuosl.org/pub/musescore/releases/MuseScore-${V}/
@ -48,10 +45,4 @@ CONFIGURE_ARGS =-DCMAKE_INSTALL_PREFIX="${PREFIX}" \
NO_TEST = Yes
post-install:
.for i in 1024 128 16 2048 24 32 48 512 64 96
@cd ${PREFIX}/share/icons/hicolor/${i}x${i}/apps \
&& mv musescore-icon-round-${i}.png musescore.png
.endfor
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (MuseScore-2.0.1.zip) = Iiko4oY3CXF7jBKoQHeo7NaOdKxF6RIXyXlba56wQFw=
SIZE (MuseScore-2.0.1.zip) = 47116833
SHA256 (MuseScore-2.0.2.zip) = IdUzmipfoVr28IWlLTSE0uDXruaXkzFQhI0Zum9HZNU=
SIZE (MuseScore-2.0.2.zip) = 47590201

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.2 2015/05/19 13:40:41 bcallah Exp $
--- CMakeLists.txt.orig Mon May 4 12:50:37 2015
+++ CMakeLists.txt Mon May 18 23:49:38 2015
$OpenBSD: patch-CMakeLists_txt,v 1.3 2015/08/22 02:47:27 bcallah Exp $
--- CMakeLists.txt.orig Thu Jul 16 17:02:34 2015
+++ CMakeLists.txt Fri Aug 21 18:42:23 2015
@@ -125,7 +125,7 @@ else (APPLE)
set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
else (MINGW)
@ -10,7 +10,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2015/05/19 13:40:41 bcallah Exp $
endif (MINGW)
endif(APPLE)
@@ -179,11 +179,11 @@ SET(QT_USE_QTHELP TRUE)
@@ -194,11 +194,11 @@ endif (APPLE)
## alsa >= 1.0.0
##
@ -24,7 +24,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2015/05/19 13:40:41 bcallah Exp $
PKGCONFIG (alsa 1.0.0 ALSA_INCDIR ALSA_LIBDIR ALSA_LIB ALSA_CPP )
if (NOT ALSA_INCDIR)
message(FATAL_ERROR "Fatal error: ALSA >= 1.0.0 required")
@@ -192,7 +192,7 @@ else (APPLE OR MINGW)
@@ -207,7 +207,7 @@ else (APPLE OR MINGW)
set (USE_ALSA 1)
set (HAS_MIDI 1)
endif (NOT ALSA_INCDIR)
@ -33,7 +33,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2015/05/19 13:40:41 bcallah Exp $
##
## pulseaudio
@@ -202,8 +202,8 @@ if (APPLE OR MINGW)
@@ -217,8 +217,8 @@ if (APPLE OR MINGW)
set (USE_PULSEAUDIO 0)
else (APPLE OR MINGW)
if (PULSEAUDIO_FOUND)
@ -44,7 +44,16 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2015/05/19 13:40:41 bcallah Exp $
else (PULSEAUDIO_FOUND)
set(USE_PULSEAUDIO 0)
message("Pulseaudio not found.")
@@ -378,11 +378,11 @@ add_custom_command(
@@ -431,7 +431,7 @@ if (NOT MINGW AND NOT APPLE)
)
endif (GZIP_EXECUTABLE AND NOT CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
# install man pages in either compressed or uncompressed form
- install( FILES ${MAN_TARGET} DESTINATION share/man/man1 COMPONENT doc)
+ install( FILES ${MAN_TARGET} DESTINATION man/man1 COMPONENT doc)
# add .MSCZ and .MSCX to MIME database (informs system that filetypes .MSCZ & .MSCX are MuseScore files)
install( FILES ${PROJECT_SOURCE_DIR}/build/musescore.xml DESTINATION share/mime/packages COMPONENT doc)
# Note: must now run "update-mime-database" to apply changes. This is done in the Makefile.
@@ -449,11 +449,11 @@ add_custom_command(
DEPENDS ${PROJECT_SOURCE_DIR}/all.h
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)
@ -59,18 +68,18 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 2015/05/19 13:40:41 bcallah Exp $
precompiled_header(QT_INCLUDES all ${BUILD_PCH})
@@ -456,18 +456,18 @@ include(Packaging)
@@ -528,18 +528,18 @@ include(Packaging)
## custom target for translation generation
##
-add_custom_target(lupdate
+add_custom_target(lupdate-qt5
COMMAND ${PROJECT_SOURCE_DIR}/build/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
- COMMAND ${QT_LUPDATE_EXECUTABLE} -noobsolete ${PROJECT_BINARY_DIR}/mscore.pro
+ COMMAND lupdate-qt5 -noobsolete ${PROJECT_BINARY_DIR}/mscore.pro
- COMMAND ${QT_LUPDATE_EXECUTABLE} ${PROJECT_BINARY_DIR}/mscore.pro
+ COMMAND lupdate-qt5 ${PROJECT_BINARY_DIR}/mscore.pro
COMMAND ${PROJECT_SOURCE_DIR}/build/gen-instruments-projectfile ${PROJECT_SOURCE_DIR}/share/instruments > instruments.pro
- COMMAND ${QT_LUPDATE_EXECUTABLE} -noobsolete ${PROJECT_BINARY_DIR}/instruments.pro
+ COMMAND lupdate-qt5 -noobsolete ${PROJECT_BINARY_DIR}/instruments.pro
- COMMAND ${QT_LUPDATE_EXECUTABLE} ${PROJECT_BINARY_DIR}/instruments.pro
+ COMMAND lupdate-qt5 ${PROJECT_BINARY_DIR}/instruments.pro
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
)

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-build_gen-qt-projectfile,v 1.1 2015/03/23 19:08:52 bcallah Exp $
--- build/gen-qt-projectfile.orig Fri Mar 13 05:24:59 2015
+++ build/gen-qt-projectfile Sat Mar 14 03:01:04 2015
@@ -58,14 +58,14 @@ echo " $1/share/locale/mscore_zh_TW.ts"
$OpenBSD: patch-build_gen-qt-projectfile,v 1.2 2015/08/22 02:47:27 bcallah Exp $
--- build/gen-qt-projectfile.orig Thu Jul 16 17:02:34 2015
+++ build/gen-qt-projectfile Fri Aug 21 17:00:51 2015
@@ -59,14 +59,14 @@ echo " $1/share/locale/mscore_zh_TW.ts"
echo "FORMS = \\"

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-mscore_CMakeLists_txt,v 1.4 2015/03/23 19:08:52 bcallah Exp $
--- mscore/CMakeLists.txt.orig Sat Mar 21 06:32:53 2015
+++ mscore/CMakeLists.txt Sat Mar 21 16:19:37 2015
@@ -462,7 +462,6 @@ else (MINGW)
$OpenBSD: patch-mscore_CMakeLists_txt,v 1.5 2015/08/22 02:47:27 bcallah Exp $
--- mscore/CMakeLists.txt.orig Thu Jul 16 17:02:34 2015
+++ mscore/CMakeLists.txt Fri Aug 21 18:16:55 2015
@@ -474,7 +474,6 @@ else (MINGW)
${ALSA_LIB}
${QT_LIBRARIES}
z
@ -9,7 +9,7 @@ $OpenBSD: patch-mscore_CMakeLists_txt,v 1.4 2015/03/23 19:08:52 bcallah Exp $
pthread
)
if (USE_PORTAUDIO)
@@ -492,15 +491,15 @@ else (MINGW)
@@ -504,15 +503,15 @@ else (MINGW)
endif (USE_PORTMIDI)
target_link_libraries(mscore ${OsxFrameworks})
else (APPLE)
@ -28,21 +28,3 @@ $OpenBSD: patch-mscore_CMakeLists_txt,v 1.4 2015/03/23 19:08:52 bcallah Exp $
endif (NOT APPLE)
if (APPLE)
@@ -514,7 +513,16 @@ else (MINGW)
install (FILES data/musescoreDocument.icns DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME})
else (APPLE)
install( TARGETS mscore RUNTIME DESTINATION bin )
- install( FILES data/mscore.png DESTINATION share/pixmaps)
+ install( FILES ../assets/musescore-icon-round-1024.png DESTINATION share/icons/hicolor/1024x1024/apps)
+ install( FILES ../assets/musescore-icon-round-128.png DESTINATION share/icons/hicolor/128x128/apps)
+ install( FILES ../assets/musescore-icon-round-16.png DESTINATION share/icons/hicolor/16x16/apps)
+ install( FILES ../assets/musescore-icon-round-2048.png DESTINATION share/icons/hicolor/2048x2048/apps)
+ install( FILES ../assets/musescore-icon-round-24.png DESTINATION share/icons/hicolor/24x24/apps)
+ install( FILES ../assets/musescore-icon-round-32.png DESTINATION share/icons/hicolor/32x32/apps)
+ install( FILES ../assets/musescore-icon-round-48.png DESTINATION share/icons/hicolor/48x48/apps)
+ install( FILES ../assets/musescore-icon-round-512.png DESTINATION share/icons/hicolor/512x512/apps)
+ install( FILES ../assets/musescore-icon-round-64.png DESTINATION share/icons/hicolor/64x64/apps)
+ install( FILES ../assets/musescore-icon-round-96.png DESTINATION share/icons/hicolor/96x96/apps)
endif (APPLE)
endif (MINGW)

View File

@ -1,21 +1,19 @@
@comment $OpenBSD: PLIST,v 1.6 2015/05/19 13:40:41 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.7 2015/08/22 02:47:27 bcallah Exp $
@conflict mscore-*
@bin bin/mscore
@man man/man1/mscore.1
share/applications/mscore.desktop
share/icons/hicolor/1024x1024/
share/icons/hicolor/1024x1024/apps/
share/icons/hicolor/1024x1024/apps/musescore.png
share/icons/hicolor/128x128/apps/musescore.png
share/icons/hicolor/16x16/apps/musescore.png
share/icons/hicolor/2048x2048/
share/icons/hicolor/2048x2048/apps/
share/icons/hicolor/2048x2048/apps/musescore.png
share/icons/hicolor/24x24/apps/musescore.png
share/icons/hicolor/32x32/apps/musescore.png
share/icons/hicolor/48x48/apps/musescore.png
share/icons/hicolor/512x512/apps/musescore.png
share/icons/hicolor/64x64/apps/musescore.png
share/icons/hicolor/96x96/apps/musescore.png
share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml+xml.png
share/icons/hicolor/48x48/mimetypes/application-vnd.recordare.musicxml.png
share/icons/hicolor/48x48/mimetypes/application-x-musescore+xml.png
share/icons/hicolor/48x48/mimetypes/application-x-musescore.png
share/icons/hicolor/64x64/apps/mscore.png
share/icons/hicolor/scalable/apps/mscore.svg
share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml+xml.svg
share/icons/hicolor/scalable/mimetypes/application-vnd.recordare.musicxml.svg
share/icons/hicolor/scalable/mimetypes/application-x-musescore+xml.svg
share/icons/hicolor/scalable/mimetypes/application-x-musescore.svg
share/mime/packages/musescore.xml
share/mscore-2.0/
share/mscore-2.0/demos/
share/mscore-2.0/demos/All_Dudes.mscz
@ -162,6 +160,7 @@ share/mscore-2.0/templates/01-General/
share/mscore-2.0/templates/01-General/00-Blank.mscz
share/mscore-2.0/templates/01-General/01-Treble_Clef.mscz
share/mscore-2.0/templates/01-General/02-Bass_Clef.mscz
share/mscore-2.0/templates/01-General/03-Grand_Staff.mscz
share/mscore-2.0/templates/02-Choral/
share/mscore-2.0/templates/02-Choral/01-SATB.mscz
share/mscore-2.0/templates/02-Choral/02-SATB_+_Organ.mscz
@ -169,30 +168,34 @@ share/mscore-2.0/templates/02-Choral/03-SATB_+_Piano.mscz
share/mscore-2.0/templates/02-Choral/04-SATB_Closed_Score.mscz
share/mscore-2.0/templates/02-Choral/05-SATB_Closed_Score_+_Organ.mscz
share/mscore-2.0/templates/02-Choral/06-SATB_Closed_Score_+_Piano.mscz
share/mscore-2.0/templates/02-Choral/07-Voice_Piano.mscz
share/mscore-2.0/templates/02-Choral/08-Liturgical_Unmetrical.mscz
share/mscore-2.0/templates/02-Choral/09-Liturgical_Unmetrical_+_Organ.mscz
share/mscore-2.0/templates/02-Choral/07-Voice_+_Piano.mscz
share/mscore-2.0/templates/02-Choral/08-Barbershop_Quartet.mscz
share/mscore-2.0/templates/02-Choral/09-Liturgical_Unmetrical.mscz
share/mscore-2.0/templates/02-Choral/10-Liturgical_Unmetrical_+_Organ.mscz
share/mscore-2.0/templates/03-Chamber_Music/
share/mscore-2.0/templates/03-Chamber_Music/01-String_Quartet.mscz
share/mscore-2.0/templates/03-Chamber_Music/02-Wind_Quintet.mscz
share/mscore-2.0/templates/03-Chamber_Music/03-Wind_Quartet.mscz
share/mscore-2.0/templates/03-Chamber_Music/02-Wind_Quartet.mscz
share/mscore-2.0/templates/03-Chamber_Music/03-Wind_Quintet.mscz
share/mscore-2.0/templates/03-Chamber_Music/04-Saxophone_Quartet.mscz
share/mscore-2.0/templates/03-Chamber_Music/05-Brass_Quintet.mscz
share/mscore-2.0/templates/03-Chamber_Music/06-Brass_Quartet.mscz
share/mscore-2.0/templates/03-Solo/
share/mscore-2.0/templates/03-Solo/01-Guitar.mscz
share/mscore-2.0/templates/03-Solo/02-Guitar_+_Tablature.mscz
share/mscore-2.0/templates/03-Solo/03-Guitar_Tablature.mscz
share/mscore-2.0/templates/03-Solo/04-Piano.mscz
share/mscore-2.0/templates/04-Jazz/
share/mscore-2.0/templates/04-Jazz/01-Jazz_Lead_Sheet.mscz
share/mscore-2.0/templates/04-Jazz/02-Big_Band.mscz
share/mscore-2.0/templates/04-Jazz/03-Jazz_Combo.mscz
share/mscore-2.0/templates/05-Orchestral/
share/mscore-2.0/templates/05-Orchestral/01-Classical_Orchestra.mscz
share/mscore-2.0/templates/05-Orchestral/03-String_Orchestra.mscz
share/mscore-2.0/templates/06-Band/
share/mscore-2.0/templates/06-Band/01-Rock_Band.mscz
share/mscore-2.0/templates/03-Chamber_Music/05-Brass_Quartet.mscz
share/mscore-2.0/templates/03-Chamber_Music/06-Brass_Quintet.mscz
share/mscore-2.0/templates/04-Solo/
share/mscore-2.0/templates/04-Solo/01-Guitar.mscz
share/mscore-2.0/templates/04-Solo/02-Guitar_+_Tablature.mscz
share/mscore-2.0/templates/04-Solo/03-Guitar_Tablature.mscz
share/mscore-2.0/templates/04-Solo/04-Piano.mscz
share/mscore-2.0/templates/05-Jazz/
share/mscore-2.0/templates/05-Jazz/01-Jazz_Lead_Sheet.mscz
share/mscore-2.0/templates/05-Jazz/02-Big_Band.mscz
share/mscore-2.0/templates/05-Jazz/03-Jazz_Combo.mscz
share/mscore-2.0/templates/06-Popular/
share/mscore-2.0/templates/06-Popular/01-Rock_Band.mscz
share/mscore-2.0/templates/07-Band/
share/mscore-2.0/templates/07-Band/01-Concert_Band.mscz
share/mscore-2.0/templates/08-Orchestral/
share/mscore-2.0/templates/08-Orchestral/01-Classical_Orchestra.mscz
share/mscore-2.0/templates/08-Orchestral/02-Concert_Orchestra.mscz
share/mscore-2.0/templates/08-Orchestral/03-String_Orchestra.mscz
share/mscore-2.0/templates/drumset_fr.drm
share/mscore-2.0/templates/orchestral.drm
share/mscore-2.0/wallpaper/