MuseScore and LyckyBackup update

luckybackup/PKGBUILD

@@ -8,7 +8,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=luckybackup
-pkgver=0.4.6
+pkgver=0.4.7
 pkgrel=1
 pkgdesc="Backup & Sync tool using Rsync and Qt4"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ license=('GPL3')
 depends=( 'qt' 'rsync' 'openssh')
 makedepends=('pkgconfig' 'desktop-file-utils')
 source=(http://sourceforge.net/projects/luckybackup/files/$pkgver/source/$pkgname-$pkgver.tar.gz)
-md5sums=('b456f2a26e56da62922142fa8f4f93d7')
+md5sums=('ca8d1699f98fe85b0811fb7447064339')
 
 build() {
 cd "${srcdir}/$pkgname-$pkgver"

musescore/64bit.patch

@@ -0,0 +1,12 @@
+diff -Naur mscore-1.2.orig/mscore/CMakeLists.txt mscore-1.2.new/mscore/CMakeLists.txt
+--- mscore-1.2.orig/mscore/CMakeLists.txt	2012-03-13 19:22:57.000000000 +0100
++++ mscore-1.2.new/mscore/CMakeLists.txt	2012-03-14 11:28:44.000000000 +0100
+@@ -287,7 +287,7 @@
+       add_custom_command(
+          OUTPUT ${PROJECT_BINARY_DIR}/all.h.gch
+          COMMAND ${CMAKE_CXX_COMPILER}
+-           -x c++-header -g  ${FLAGS} -m32
++           -x c++-header -g  ${FLAGS} 
+            -I${QT_HEADERS_DIR}
+            -o all.h.gch all.h
+          DEPENDS ${PROJECT_BINARY_DIR}/all.h

musescore/PKGBUILD

@@ -1,42 +1,38 @@
 #
 # Apps Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+# Maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
+# Contributor: tefan Husmann <stefan-husmann@t-online.de
+# Contributor: Cristian Maureira <saint [at] archlinux.cl>
+# Contributor: Dr.Egg <rwhite @ archlinux . us>
 
 pkgname=musescore
-pkgver=1.0
+_pkgname=mscore
+pkgver=1.2
 pkgrel=1
-pkgdesc="A music score editor written in Qt4"
+pkgdesc="A music score editor written in Qt"
 arch=('i686' 'x86_64')
 url="http://www.musescore.org/en/"
 license=('GPL')
-depends=('qt>=4.5.0' 'openssl' 'libsndfile' 'qtscriptgenerator')
+depends=('qtwebkit' 'libsndfile' 'qtscriptgenerator' 'portaudio')
 makedepends=('cmake' 'doxygen')
-optdepends=('portaudio' 'jack-audio-connection-kit')
-conflicts=('musescore-svn' 'mscore')
-source=(http://downloads.sourceforge.net/project/mscore/mscore/MuseScore-${pkgver}/MuseScore-${pkgver}.tar.bz2 'paths.patch')
-md5sums=('475c7c5abdaa80318b207884475de9ac'
-         'e5011154d217f633f21b4bb70e589510')
-         
+optdepends=('jack')
+install=musescore.install
+source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.bz2"
+paths.patch 64bit.patch)
+md5sums=('9dd182ab3b6a80dae33d3cfe3ff08ef9'
+         'a0419cbe08b655820d52ea440653b1d3'
+         '7f98c6f97ccc6c5ed3f1641c49cb7358')
+
 build() {
-  cd $srcdir/mscore-${pkgver}
-  export QT_PLUGINS_DIR=/usr/lib/qt/plugins
+  cd $srcdir/${_pkgname}-${pkgver}
+  export QT_PLUGINS_DIR=/usr/lib/qt/plugins 
   [ -d build ] && make clean
   patch -p1 < $srcdir/paths.patch
-  sed -i 's+${Mscore_INSTALL_NAME}man+doc/mscore+' \
-    "$srcdir"/mscore-$pkgver/mscore/manual/CMakeLists.txt
-  make PREFIX=/usr release
+  patch -p1 < $srcdir/64bit.patch
+  make PREFIX=/usr release 
 }
 package() {
-  cd $srcdir/mscore-${pkgver}
+  cd $srcdir/${_pkgname}-${pkgver}
   make DESTDIR="$pkgdir" install
-  # avoid file conflict with "qtscriptgenerator" 
-  for _i in gui network core uitools xml
-  do 
-    rm $pkgdir/usr/lib/qt/plugins/script/libqtscript_${_i}.so
-  done
 }

musescore/QtEvent.patch

@@ -1,19 +0,0 @@
-diff -Naur mscore-0.9.6.3.orig/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp mscore-0.9.6.3.new/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp
---- mscore-0.9.6.3.orig/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp	2010-10-12 22:01:35.000000000 +0200
-+++ mscore-0.9.6.3.new/mscore/scriptgen/qtbindings/core/qtscript_QEvent.cpp	2010-10-12 22:03:11.000000000 +0200
-@@ -214,7 +214,6 @@
-     , QEvent::UngrabMouse
-     , QEvent::GrabKeyboard
-     , QEvent::UngrabKeyboard
--    , QEvent::CocoaRequestModal
-     , QEvent::User
-     , QEvent::MaxUser
- };
-@@ -362,7 +361,6 @@
-     , "UngrabMouse"
-     , "GrabKeyboard"
-     , "UngrabKeyboard"
--    , "CocoaRequestModal"
-     , "User"
-     , "MaxUser"
- };

musescore/musescore.install

@@ -0,0 +1,11 @@
+post_install() {
+	      update-desktop-database -q
+}
+
+post_upgrade() {
+ 	      post_install
+}
+
+post_remove() {
+	      post_install
+}

musescore/paths.patch

@@ -1,7 +1,7 @@
 diff -Naur musescore-svn.orig//mscore/mscore/mscore.cpp musescore-svn.new//mscore/mscore/mscore.cpp
 --- musescore-svn.orig//mscore/mscore/mscore.cpp	2010-06-16 23:10:27.000000000 +0200
 +++ musescore-svn.new//mscore/mscore/mscore.cpp	2010-06-16 23:13:59.000000000 +0200
-@@ -897,15 +897,15 @@
+@@ -919,15 +919,15 @@
        if (debugMode)
              printf("open handbook for language <%s>\n", qPrintable(lang));