[arch-commits] Commit in musescore/repos (12 files)
Maxime Gauduin
alucryd at archlinux.org
Sat Mar 21 16:31:17 UTC 2015
Date: Saturday, March 21, 2015 @ 17:31:16
Author: alucryd
Revision: 129705
archrelease: copy trunk to community-i686, community-x86_64
Added:
musescore/repos/community-i686/PKGBUILD
(from rev 129704, musescore/trunk/PKGBUILD)
musescore/repos/community-i686/mscore-paths.patch
(from rev 129704, musescore/trunk/mscore-paths.patch)
musescore/repos/community-i686/musescore.install
(from rev 129704, musescore/trunk/musescore.install)
musescore/repos/community-x86_64/PKGBUILD
(from rev 129704, musescore/trunk/PKGBUILD)
musescore/repos/community-x86_64/mscore-paths.patch
(from rev 129704, musescore/trunk/mscore-paths.patch)
musescore/repos/community-x86_64/musescore.install
(from rev 129704, musescore/trunk/musescore.install)
Deleted:
musescore/repos/community-i686/PKGBUILD
musescore/repos/community-i686/mscore-paths.patch
musescore/repos/community-i686/musescore.install
musescore/repos/community-x86_64/PKGBUILD
musescore/repos/community-x86_64/mscore-paths.patch
musescore/repos/community-x86_64/musescore.install
-------------------------------------+
/PKGBUILD | 68 ++++++++++++++++++
/mscore-paths.patch | 122 ++++++++++++++++++++++++++++++++++
/musescore.install | 26 +++++++
community-i686/PKGBUILD | 61 -----------------
community-i686/mscore-paths.patch | 61 -----------------
community-i686/musescore.install | 13 ---
community-x86_64/PKGBUILD | 61 -----------------
community-x86_64/mscore-paths.patch | 61 -----------------
community-x86_64/musescore.install | 13 ---
9 files changed, 216 insertions(+), 270 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-03-21 16:30:58 UTC (rev 129704)
+++ community-i686/PKGBUILD 2015-03-21 16:31:16 UTC (rev 129705)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Cristian Maureira <saint at archlinux.cl>
-# Contributor: Dr.Egg <rwhite at archlinux.us>
-
-pkgbase=musescore
-pkgname=('musescore' 'musescore-docs')
-pkgver=1.3
-pkgrel=6
-pkgdesc="Create, play and print beautiful sheet music"
-arch=('i686' 'x86_64')
-url="http://musescore.org/"
-license=('GPL')
-makedepends=('cmake' 'doxygen' 'portaudio' 'qtscriptgenerator' 'texlive-core')
-source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
- 'mscore-paths.patch')
-sha256sums=('a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683'
- '00984b9a2bb020b4f907cee7e6f95a8f2f0318613acfe79ad6ad9732e85b5150')
-
-prepare() {
- cd mscore-${pkgver}/mscore
-
- patch -Np2 -i ../../mscore-paths.patch
-}
-
-build() {
- cd mscore-${pkgver}/mscore
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build && cd build
-
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DBUILD_SCRIPTGEN='FALSE'
- make lupdate
- make lrelease
- make
-}
-
-package_musescore() {
- depends=('portaudio' 'qtscriptgenerator')
- optdepends=('musescore-docs: Documentation')
- install="${pkgname}.install"
-
- cd mscore-${pkgver}/mscore/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/share/mscore-${pkgver}/man
-}
-
-package_musescore-docs() {
- pkgdesc="Documentation for MuseScore"
-
- cd mscore-${pkgver}/mscore
-
- install -dm 755 "${pkgdir}"/usr/share/doc/${pkgbase}
- install -m 644 manual/*.pdf "${pkgdir}"/usr/share/doc/${pkgbase}/
-}
-
-# vim: ts=2 sw=2 et:
Copied: musescore/repos/community-i686/PKGBUILD (from rev 129704, musescore/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-03-21 16:31:16 UTC (rev 129705)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Cristian Maureira <saint at archlinux.cl>
+# Contributor: Dr.Egg <rwhite at archlinux.us>
+
+pkgname=musescore
+pkgver=2.0.0
+pkgrel=1
+pkgdesc='Create, play and print beautiful sheet music'
+arch=('i686' 'x86_64')
+url='http://musescore.org/'
+license=('GPL')
+depends=('libpulse' 'portaudio' 'qt5-quick1' 'qt5-svg' 'qt5-tools')
+makedepends=('cmake' 'doxygen' 'lame' 'qt5-script' 'texlive-core')
+optdepends=('lame: MP3 export')
+install='musescore.install'
+source=("musescore-${pkgver}.tar.gz::https://github.com/musescore/MuseScore/archive/v${pkgver}.tar.gz")
+sha256sums=('1c88d64f0b020b1eec9fd4d181353da07948cc08c6e2a35c5ea97c8e6ffa8ea8')
+
+build() {
+ cd MuseScore-${pkgver}
+
+ make PREFIX='/usr' release
+}
+
+package() {
+ cd MuseScore-${pkgver}/build.release
+
+ make DESTDIR="${pkgdir}" install
+ install -m 644 ../assets/musescore-icon-round-512.png "${pkgdir}"/usr/share/pixmaps/mscore.png
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-i686/mscore-paths.patch
===================================================================
--- community-i686/mscore-paths.patch 2015-03-21 16:30:58 UTC (rev 129704)
+++ community-i686/mscore-paths.patch 2015-03-21 16:31:16 UTC (rev 129705)
@@ -1,61 +0,0 @@
---- 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();
Copied: musescore/repos/community-i686/mscore-paths.patch (from rev 129704, musescore/trunk/mscore-paths.patch)
===================================================================
--- community-i686/mscore-paths.patch (rev 0)
+++ community-i686/mscore-paths.patch 2015-03-21 16:31:16 UTC (rev 129705)
@@ -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();
Deleted: community-i686/musescore.install
===================================================================
--- community-i686/musescore.install 2015-03-21 16:30:58 UTC (rev 129704)
+++ community-i686/musescore.install 2015-03-21 16:31:16 UTC (rev 129705)
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: musescore/repos/community-i686/musescore.install (from rev 129704, musescore/trunk/musescore.install)
===================================================================
--- community-i686/musescore.install (rev 0)
+++ community-i686/musescore.install 2015-03-21 16:31:16 UTC (rev 129705)
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-03-21 16:30:58 UTC (rev 129704)
+++ community-x86_64/PKGBUILD 2015-03-21 16:31:16 UTC (rev 129705)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Maxime Gauduin <alucryd at gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
-# Contributor: Cristian Maureira <saint at archlinux.cl>
-# Contributor: Dr.Egg <rwhite at archlinux.us>
-
-pkgbase=musescore
-pkgname=('musescore' 'musescore-docs')
-pkgver=1.3
-pkgrel=6
-pkgdesc="Create, play and print beautiful sheet music"
-arch=('i686' 'x86_64')
-url="http://musescore.org/"
-license=('GPL')
-makedepends=('cmake' 'doxygen' 'portaudio' 'qtscriptgenerator' 'texlive-core')
-source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
- 'mscore-paths.patch')
-sha256sums=('a0b60cc892ac0266c58fc6392be72c0a21c3aa7fd0b6e4f1dddad1c8b36be683'
- '00984b9a2bb020b4f907cee7e6f95a8f2f0318613acfe79ad6ad9732e85b5150')
-
-prepare() {
- cd mscore-${pkgver}/mscore
-
- patch -Np2 -i ../../mscore-paths.patch
-}
-
-build() {
- cd mscore-${pkgver}/mscore
-
- if [[ -d build ]]; then
- rm -rf build
- fi
- mkdir build && cd build
-
- cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -DBUILD_SCRIPTGEN='FALSE'
- make lupdate
- make lrelease
- make
-}
-
-package_musescore() {
- depends=('portaudio' 'qtscriptgenerator')
- optdepends=('musescore-docs: Documentation')
- install="${pkgname}.install"
-
- cd mscore-${pkgver}/mscore/build
-
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/share/mscore-${pkgver}/man
-}
-
-package_musescore-docs() {
- pkgdesc="Documentation for MuseScore"
-
- cd mscore-${pkgver}/mscore
-
- install -dm 755 "${pkgdir}"/usr/share/doc/${pkgbase}
- install -m 644 manual/*.pdf "${pkgdir}"/usr/share/doc/${pkgbase}/
-}
-
-# vim: ts=2 sw=2 et:
Copied: musescore/repos/community-x86_64/PKGBUILD (from rev 129704, musescore/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-03-21 16:31:16 UTC (rev 129705)
@@ -0,0 +1,34 @@
+# $Id$
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann at t-online.de>
+# Contributor: Cristian Maureira <saint at archlinux.cl>
+# Contributor: Dr.Egg <rwhite at archlinux.us>
+
+pkgname=musescore
+pkgver=2.0.0
+pkgrel=1
+pkgdesc='Create, play and print beautiful sheet music'
+arch=('i686' 'x86_64')
+url='http://musescore.org/'
+license=('GPL')
+depends=('libpulse' 'portaudio' 'qt5-quick1' 'qt5-svg' 'qt5-tools')
+makedepends=('cmake' 'doxygen' 'lame' 'qt5-script' 'texlive-core')
+optdepends=('lame: MP3 export')
+install='musescore.install'
+source=("musescore-${pkgver}.tar.gz::https://github.com/musescore/MuseScore/archive/v${pkgver}.tar.gz")
+sha256sums=('1c88d64f0b020b1eec9fd4d181353da07948cc08c6e2a35c5ea97c8e6ffa8ea8')
+
+build() {
+ cd MuseScore-${pkgver}
+
+ make PREFIX='/usr' release
+}
+
+package() {
+ cd MuseScore-${pkgver}/build.release
+
+ make DESTDIR="${pkgdir}" install
+ install -m 644 ../assets/musescore-icon-round-512.png "${pkgdir}"/usr/share/pixmaps/mscore.png
+}
+
+# vim: ts=2 sw=2 et:
Deleted: community-x86_64/mscore-paths.patch
===================================================================
--- community-x86_64/mscore-paths.patch 2015-03-21 16:30:58 UTC (rev 129704)
+++ community-x86_64/mscore-paths.patch 2015-03-21 16:31:16 UTC (rev 129705)
@@ -1,61 +0,0 @@
---- 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();
Copied: musescore/repos/community-x86_64/mscore-paths.patch (from rev 129704, musescore/trunk/mscore-paths.patch)
===================================================================
--- community-x86_64/mscore-paths.patch (rev 0)
+++ community-x86_64/mscore-paths.patch 2015-03-21 16:31:16 UTC (rev 129705)
@@ -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();
Deleted: community-x86_64/musescore.install
===================================================================
--- community-x86_64/musescore.install 2015-03-21 16:30:58 UTC (rev 129704)
+++ community-x86_64/musescore.install 2015-03-21 16:31:16 UTC (rev 129705)
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim: ts=2 sw=2 et:
Copied: musescore/repos/community-x86_64/musescore.install (from rev 129704, musescore/trunk/musescore.install)
===================================================================
--- community-x86_64/musescore.install (rev 0)
+++ community-x86_64/musescore.install 2015-03-21 16:31:16 UTC (rev 129705)
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
+
+# vim: ts=2 sw=2 et:
More information about the arch-commits
mailing list