switch to 2.x maintenance branch

new pkg musescore-dev to point to master, which is now long term devel 3.0

4 files changed, 59 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7d66ee31eb8..bb6d6dd81a76 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Dec 17 20:58:48 UTC 2016
+# Thu May 25 00:54:08 UTC 2017
 pkgbase = musescore-git
-	pkgdesc = Latest git-version of the sheet music editor MuseScore
-	pkgver = r11518.67b111193
+	pkgdesc = git-version of the sheet music editor MuseScore
+	pkgver = 2.1.0.r15.g20cc6826d
 	pkgrel = 1
 	url = https://github.com/musescore/MuseScore
 	install = musescore.install
@@ -15,13 +15,20 @@ pkgbase = musescore-git
 	makedepends = lame
 	makedepends = qt5-script
 	makedepends = texlive-core
+	depends = desktop-file-utils
+	depends = gtk-update-icon-cache
+	depends = libpulse
+	depends = portaudio
+	depends = qt5-quickcontrols
 	depends = qt5-svg
 	depends = qt5-tools
-	depends = qt5-webengine
+	depends = qt5-webkit
 	depends = shared-mime-info
 	optdepends = lame: MP3 export
-	source = git+https://github.com/musescore/MuseScore.git#branch=master
+	source = git+https://github.com/musescore/MuseScore.git#branch=2.2
+	source = precompiled_headers_qt5.7.patch
 	md5sums = SKIP
+	md5sums = 2d3dae13250d5074922d9c94ebb2c1e8
 
 pkgname = musescore-git
 
diff --git a/PKGBUILD b/PKGBUILD
index b3760cad2cb1..f4b8b0393e4b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,23 @@
 # Contributor: Dr.Egg <rwhite@archlinux.us>
 
 pkgname=musescore-git
-pkgver=r11518.67b111193
-_branch=master
+pkgver=2.1.0.r15.g20cc6826d
+_branch=2.2
 pkgrel=1
-pkgdesc='Latest git-version of the sheet music editor MuseScore'
+pkgdesc='git-version of the sheet music editor MuseScore'
 arch=('i686' 'x86_64')
 url='https://github.com/musescore/MuseScore'
 license=('GPL')
-depends=('qt5-svg'
-	'qt5-tools'
-	'qt5-webengine'
-	'shared-mime-info')
+
+depends=('desktop-file-utils'
+    'gtk-update-icon-cache'
+    'libpulse'
+    'portaudio'
+    'qt5-quickcontrols'
+    'qt5-svg'
+    'qt5-tools'
+    'qt5-webkit'
+    'shared-mime-info')
 makedepends=('cmake'
 	'doxygen'
 	'git'
@@ -22,14 +28,21 @@ makedepends=('cmake'
 	'qt5-script'
 	'texlive-core')
 optdepends=('lame: MP3 export')
-install='musescore.install'
+install=musescore.install
 
-source=("git+$url.git#branch=$_branch")
-md5sums=('SKIP')
+source=("git+$url.git#branch=$_branch"
+    precompiled_headers_qt5.7.patch)
+md5sums=('SKIP'
+         '2d3dae13250d5074922d9c94ebb2c1e8')
 
 pkgver() {
   cd MuseScore
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  git describe --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  cd MuseScore
+  patch -p1 -i $srcdir/precompiled_headers_qt5.7.patch
 }
 
 build() {
diff --git a/musescore.install b/musescore.install
index 580a21aa4afb..ba866eea0998 100755
--- a/musescore.install
+++ b/musescore.install
@@ -1,20 +1,13 @@
-post_install() {
-  msg() {
-    ALL_OFF="\e[1;0m"
-    BOLD="\e[1;1m"
-    GREEN="${BOLD}\e[1;32m"
-    local mesg=$1; shift
-    printf "
-    ${GREEN}==>${ALL_OFF}${BOLD} ${mesg}${ALL_OFF}\n" "$@" >&2
-  }
-
-  msg "This is NOT A STABLE RELEASE!
-        Scores created with this dev-build may be incompatible with other releases of MuseScore!"
-  msg "It's possible to install this dev-version alongside a stable release."
-  msg "to run the git version execute 'mscore-git'
+warning() {
+  echo ""
+  echo ">>> NOTE: MuseScore and MuseScore-git can be installed alongside."
+  echo "    Run by executing 'mscore-git'
   "
 }
+post_install() {
+  warning
+}
 
 post_upgrade() {
-  post_install
+  warning
 }
diff --git a/precompiled_headers_qt5.7.patch b/precompiled_headers_qt5.7.patch
new file mode 100644
index 000000000000..f385e1ce16bc
--- /dev/null
+++ b/precompiled_headers_qt5.7.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d4dfe2bbd5..e2e91f3fe2 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -163,8 +163,8 @@ else (APPLE)
+       set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+       set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+    else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
++      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++11 -fPIC -g")
++      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+    endif (MINGW)
+ endif(APPLE)
+