updated on Sat Jan 14 12:12:45 UTC 2012
[aur-mirror.git] / musescore / 20-fix-dso-linking-et-al.patch
blobc6c71a3fe17486ad959079b583a3312a2dc8c278
1 diff -Naur mscore-1.1.orig/mscore/CMakeLists.txt mscore-1.1.new/mscore/CMakeLists.txt
2 --- mscore-1.1.orig/mscore/CMakeLists.txt 2011-12-23 20:22:29.000000000 +0100
3 +++ mscore-1.1.new/mscore/CMakeLists.txt 2011-12-23 20:36:37.000000000 +0100
4 @@ -31,7 +31,7 @@
5 set(GCC_VISIBILITY TRUE) # requires gcc 4.x?
6 set(HAS_AUDIOFILE TRUE) # requires libsndfile
8 -set(BUILD_SCRIPTGEN TRUE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
9 +set(BUILD_SCRIPTGEN FALSE) #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
10 set(STATIC_SCRIPT_BINDINGS FALSE)
11 set(USE_SSE FALSE)
13 diff -Naur mscore-1.1.orig/mscore/manual/CMakeLists.txt mscore-1.1.new/mscore/manual/CMakeLists.txt
14 --- mscore-1.1.orig/mscore/manual/CMakeLists.txt 2011-12-23 20:22:29.000000000 +0100
15 +++ mscore-1.1.new/mscore/manual/CMakeLists.txt 2011-12-23 20:37:49.000000000 +0100
16 @@ -36,5 +36,5 @@
17 MuseScore-ro.pdf
18 MuseScore-ru.pdf
19 MuseScore-zh_CN.pdf
20 - DESTINATION ${Mscore_SHARE_NAME}${Mscore_INSTALL_NAME}man
21 + DESTINATION ${Mscore_SHARE_NAME}doc/mscore
23 diff -Naur mscore-1.1.orig/mscore/mscore/CMakeLists.txt mscore-1.1.new/mscore/mscore/CMakeLists.txt
24 --- mscore-1.1.orig/mscore/mscore/CMakeLists.txt 2011-12-23 20:22:29.000000000 +0100
25 +++ mscore-1.1.new/mscore/mscore/CMakeLists.txt 2011-12-23 20:32:34.000000000 +0100
26 @@ -186,7 +186,7 @@
27 importove.cpp ove.cpp interval.cpp sctimesig.cpp
28 ${AUDIO}
31 +target_link_libraries(mscore dl rt pthread)
32 if (STATIC_SCRIPT_BINDINGS)
33 target_link_libraries(mscore
34 qtscript_core
35 diff -Naur mscore-1.1.orig/mscore/mscore/exportxml.cpp mscore-1.1.new/mscore/mscore/exportxml.cpp
36 --- mscore-1.1.orig/mscore/mscore/exportxml.cpp 2011-12-23 20:22:29.000000000 +0100
37 +++ mscore-1.1.new/mscore/mscore/exportxml.cpp 2011-12-23 21:16:07.000000000 +0100
38 @@ -2363,8 +2363,8 @@
39 el->userOff().y());
41 if (el->type() == HAIRPIN || el->type() == OTTAVA || el->type() == TEXTLINE) {
42 - SLine* sl = static_cast<const SLine*>(el);
43 + SLine* sl = static_cast<SLine*>(el);
44 // printf("slin segsz=%d", sl->lineSegments().size());
45 if (sl->lineSegments().size() > 0) {
46 LineSegment* seg = sl->lineSegments().at(0);