[arch-commits] Commit in musescore/trunk (3 files)

[Maxime Gauduin]

    Date: Wednesday, March 19, 2014 @ 12:44:26
  Author: alucryd
Revision: 107770

FS#39420: musescore 1.3-6

Added:
  musescore/trunk/mscore-paths.patch
Modified:
  musescore/trunk/PKGBUILD
Deleted:
  musescore/trunk/mscore-docs.patch

--------------------+
 PKGBUILD           |   13 ++++------
 mscore-docs.patch  |   21 -----------------
 mscore-paths.patch |   61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-19 10:35:55 UTC (rev 107769)
+++ PKGBUILD	2014-03-19 11:44:26 UTC (rev 107770)
@@ -7,7 +7,7 @@
 pkgbase=musescore
 pkgname=('musescore' 'musescore-docs')
 pkgver=1.3
-pkgrel=5
+pkgrel=6
 pkgdesc="Create, play and print beautiful sheet music"
 arch=('i686' 'x86_64')
 url="http://musescore.org/"
@@ -14,17 +14,14 @@
 license=('GPL')
 makedepends=('cmake' 'doxygen' 'portaudio' 'qtscriptgenerator' 'texlive-core')
 source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
-        'mscore-docs.patch')
+        'mscore-paths.patch')
 sha256sums=('a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683'
-            'ea4c25e8998c1666103d48fb3bcb5a8d7c9601e971195ef23c2f535c1191585d')
+            '00984b9a2bb020b4f907cee7e6f95a8f2f0318613acfe79ad6ad9732e85b5150')
 
 prepare() {
   cd mscore-${pkgver}/mscore
 
-  patch -Np1 -i ../../mscore-docs.patch
-  sed 's/COMMAND lupdate/COMMAND lupdate-qt4/g
-       s/COMMAND lrelease/COMMAND lrelease-qt4/g
-       s/set(BUILD_SCRIPTGEN TRUE)/set(BUILD_SCRIPTGEN FALSE)/' -i CMakeLists.txt
+  patch -Np2 -i ../../mscore-paths.patch
 }
 
 build() {
@@ -35,7 +32,7 @@
   fi
   mkdir build && cd build
 
-  cmake .. -DCMAKE_INSTALL_PREFIX='/usr'
+  cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DBUILD_SCRIPTGEN='FALSE'
   make lupdate
   make lrelease
   make

Deleted: mscore-docs.patch
===================================================================
--- mscore-docs.patch	2014-03-19 10:35:55 UTC (rev 107769)
+++ mscore-docs.patch	2014-03-19 11:44:26 UTC (rev 107770)
@@ -1,21 +0,0 @@
---- a/mscore/mscore.cpp
-+++ b/mscore/mscore.cpp
-@@ -919,15 +919,15 @@
-       if (debugMode)
-             printf("open handbook for language <%s>\n", qPrintable(lang));
-
--      QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+      QFileInfo mscoreHelp(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
-       if (!mscoreHelp.isReadable()) {
-             if (debugMode) {
-                   printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
-                   }
-             lang = lang.left(2);
--            mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+            mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
-             if(!mscoreHelp.isReadable()){
--                mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
-+                mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-en.pdf"));
-                 if (!mscoreHelp.isReadable()) {
-                       QString info(tr("MuseScore handbook not found at: \n"));
-                       info += mscoreHelp.filePath();

Added: mscore-paths.patch
===================================================================
--- mscore-paths.patch	                        (rev 0)
+++ mscore-paths.patch	2014-03-19 11:44:26 UTC (rev 107770)
@@ -0,0 +1,61 @@
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -32,7 +32,7 @@ set(GCC_VISIBILITY TRUE)
+ set(HAS_AUDIOFILE TRUE)                   # requires libsndfile
+ set(OSC           TRUE)                   # osc remote control
+ 
+-set(BUILD_SCRIPTGEN TRUE)                 #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
++set(BUILD_SCRIPTGEN FALSE)                 #Generate Qt script bindings. (collides with qtscriptgenerator project on several distrib)
+ set(STATIC_SCRIPT_BINDINGS FALSE)
+ set(USE_SSE FALSE)
+ 
+@@ -421,14 +421,14 @@ include (CPack)
+ 
+ add_custom_target(lupdate
+    COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
+-   COMMAND lupdate -noobsolete ${PROJECT_BINARY_DIR}/mscore.pro
++   COMMAND lupdate-qt4 -noobsolete ${PROJECT_BINARY_DIR}/mscore.pro
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+ 
+ add_custom_target(lrelease
+    COMMAND ${PROJECT_SOURCE_DIR}/gen-qt-projectfile ${PROJECT_SOURCE_DIR} > mscore.pro
+-   COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/locale/*.ts
+-   COMMAND lrelease ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
++   COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/locale/*.ts
++   COMMAND lrelease-qt4 ${PROJECT_SOURCE_DIR}/share/plugins/musescore.com/translations/*.ts
+    WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+    )
+ 
+--- a/mscore/mscore/genft.cpp
++++ b/mscore/mscore/genft.cpp
+@@ -27,7 +27,7 @@
+ 
+ #include <ft2build.h>
+ #include FT_FREETYPE_H
+-#include <freetype/tttables.h>
++#include <freetype2/tttables.h>
+ #include "al/xml.h"
+ 
+ QMap<int, int> codemap;
+--- a/mscore/mscore/mscore.cpp
++++ b/mscore/mscore/mscore.cpp
+@@ -919,15 +919,15 @@
+       if (debugMode)
+             printf("open handbook for language <%s>\n", qPrintable(lang));
+
+-      QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
++      QFileInfo mscoreHelp(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
+       if (!mscoreHelp.isReadable()) {
+             if (debugMode) {
+                   printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
+                   }
+             lang = lang.left(2);
+-            mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
++            mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-") + lang + QString(".pdf"));
+             if(!mscoreHelp.isReadable()){
+-                mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
++                mscoreHelp.setFile(("/usr/share/doc/musescore/MuseScore-en.pdf"));
+                 if (!mscoreHelp.isReadable()) {
+                       QString info(tr("MuseScore handbook not found at: \n"));
+                       info += mscoreHelp.filePath();


Property changes on: musescore/trunk/mscore-paths.patch
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property