rpms/mscore/F-12 mscore-system-qtsingleapplication.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 mscore.spec, 1.8, 1.9 sources, 1.4, 1.5
Orcan Ogetbil
oget at fedoraproject.org
Thu Jul 22 22:26:34 UTC 2010
Author: oget
Update of /cvs/pkgs/rpms/mscore/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8886
Modified Files:
.cvsignore mscore.spec sources
Added Files:
mscore-system-qtsingleapplication.patch
Log Message:
* Tue Jul 20 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.9.6.1-1
- Update to 0.9.6.1
mscore-system-qtsingleapplication.patch:
CMakeLists.txt | 13 ++++++++++++-
mscore/CMakeLists.txt | 5 +++--
mscore/mscore.cpp | 2 +-
mscore/mscore.h | 2 +-
4 files changed, 17 insertions(+), 5 deletions(-)
--- NEW FILE mscore-system-qtsingleapplication.patch ---
diff -rupN mscore-0.9.6.1.old/mscore/CMakeLists.txt mscore-0.9.6.1/mscore/CMakeLists.txt
--- mscore-0.9.6.1.old/mscore/CMakeLists.txt 2010-07-12 15:59:57.000000000 -0400
+++ mscore-0.9.6.1/mscore/CMakeLists.txt 2010-07-20 23:39:31.000000000 -0400
@@ -54,6 +54,8 @@ if (APPLE)
set(OsxFrameworks ${AudioToolboxFW} ${AudioUnitFW} ${CoreAudioFW} ${CoreMidiFW} ${SystemConfigurationFW} ${CoreServicesFW})
endif (APPLE)
+option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication" OFF)
+
set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH ON)
set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
@@ -234,7 +236,16 @@ if (NOT MINGW AND NOT APPLE)
endif (NOT MINGW AND NOT APPLE)
set (subdirs al awl osdabzip rtf2html mscore share manual demos
- scriptgen singleapp fluid)
+ scriptgen fluid)
+
+if(USE_SYSTEM_QTSINGLEAPPLICATION)
+ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions)
+ find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
+else(USE_SYSTEM_QTSINGLEAPPLICATION)
+ set (subdirs ${subdirs} singleapp)
+ set(QTSINGLEAPPLICATION_INCLUDE_DIRS ${PROJECT_SOURCE_DIR}/singleapp/src)
+ set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapp)
+endif(USE_SYSTEM_QTSINGLEAPPLICATION)
if (MINGW OR APPLE)
set (subdirs ${subdirs} portmidi)
diff -rupN mscore-0.9.6.1.old/mscore/mscore/CMakeLists.txt mscore-0.9.6.1/mscore/mscore/CMakeLists.txt
--- mscore-0.9.6.1.old/mscore/mscore/CMakeLists.txt 2010-07-20 23:24:55.000000000 -0400
+++ mscore-0.9.6.1/mscore/mscore/CMakeLists.txt 2010-07-20 23:40:03.000000000 -0400
@@ -67,6 +67,7 @@ include_directories(
${PROJECT_SOURCE_DIR}/scriptdebug
${PROJECT_SOURCE_DIR}/osdabzip
${PROJECT_SOURCE_DIR}/fluid
+ ${QTSINGLEAPPLICATION_INCLUDE_DIRS}
)
QT4_WRAP_UI (ui_headers
@@ -232,7 +233,7 @@ if (MINGW)
awl
osdabzip
rtf2html
- qtsingleapp
+ ${QTSINGLEAPPLICATION_LIBRARIES}
${QT_mingw_LIBRARIES}
portaudio
portmidi
@@ -283,7 +284,7 @@ else (MINGW)
awl
osdabzip
rtf2html
- qtsingleapp
+ ${QTSINGLEAPPLICATION_LIBRARIES}
fluid
z
dl
diff -rupN mscore-0.9.6.1.old/mscore/mscore/mscore.cpp mscore-0.9.6.1/mscore/mscore/mscore.cpp
--- mscore-0.9.6.1.old/mscore/mscore/mscore.cpp 2010-07-12 15:55:45.000000000 -0400
+++ mscore-0.9.6.1/mscore/mscore/mscore.cpp 2010-07-21 00:01:44.000000000 -0400
@@ -1813,7 +1813,7 @@ int main(int argc, char* av[])
return 0;
}
else{
- if (app->sendMessage("")) {
+ if (app->sendMessage(QString(""))) {
return 0;
}
}
diff -rupN mscore-0.9.6.1.old/mscore/mscore/mscore.h mscore-0.9.6.1/mscore/mscore/mscore.h
--- mscore-0.9.6.1.old/mscore/mscore/mscore.h 2010-07-12 15:55:45.000000000 -0400
+++ mscore-0.9.6.1/mscore/mscore/mscore.h 2010-07-20 23:41:31.000000000 -0400
@@ -25,7 +25,7 @@
#include "ui_measuresdialog.h"
#include "ui_insertmeasuresdialog.h"
#include "ui_aboutbox.h"
-#include "singleapp/src/qtsingleapplication.h"
+#include <QtSingleApplication>
#include "updatechecker.h"
class ScoreView;
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 15 Jun 2010 04:32:24 -0000 1.4
+++ .cvsignore 22 Jul 2010 22:26:33 -0000 1.5
@@ -1 +1 @@
-mscore-0.9.6-free.tar.bz2
+mscore-0.9.6.1-free.tar.bz2
Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-12/mscore.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mscore.spec 15 Jun 2010 04:32:25 -0000 1.8
+++ mscore.spec 22 Jul 2010 22:26:33 -0000 1.9
@@ -3,7 +3,7 @@
Name: mscore
Summary: Music Composition & Notation Software
-Version: 0.9.6
+Version: 0.9.6.1
Release: 1%{?dist}
# rtf2html is LGPLv2+
# paper4.png paper5.png are LGPLv3
@@ -13,10 +13,10 @@ Group: Applications/Multimedia
URL: http://musescore.org/en
# Upstream tarball contains a non-free soundfont "Gort's Minipiano"
# We generate our own tarball by removing this soundfont via:
-# wget http://downloads.sourceforge.net/project/mscore/mscore/mscore-0.9.6/mscore-0.9.6.tar.bz2
-# tar jxf mscore-0.9.6.tar.bz2
+# wget http://download.sourceforge.net/mscore/mscore-0.9.6.1.tar.bz2
+# tar jxf mscore-0.9.6.1.tar.bz2
# rm -f mscore-*/mscore/mscore/data/piano1.sf2
-# tar jcf mscore-0.9.6-free.tar.bz2 mscore-0.9.6/
+# tar jcf mscore-0.9.6.1-free.tar.bz2 mscore-0.9.6.1/
Source0: %{name}-%{version}-free.tar.bz2
# For building the jazz font
Source1: %{name}-ConvertFont.ff
@@ -39,6 +39,8 @@ Patch4: %{name}-fix-gcc-warnings.
# Fix DSO linking. Seems to have fixed in trunk, but misssing in the tarball
# http://musescore.org/en/node/5817
Patch5: %{name}-dso-linking.patch
+# Use system qtsingleapplication
+Patch6: %{name}-system-qtsingleapplication.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -48,6 +50,7 @@ BuildRequires: jack-audio-connection-kit
BuildRequires: libsndfile-devel >= 1.0.19
BuildRequires: portaudio-devel
BuildRequires: qt4-devel
+BuildRequires: qtsingleapplication-devel
Requires: %{name}-fonts = %{version}-%{release}
Requires: soundfont2-default
@@ -114,6 +117,7 @@ This package contains the musical notati
%patch3 -p1 -b .arm
%patch4 -p1 -b .warnings
%patch5 -p1 -b .dso
+%patch6 -p1 -b .qtsingleapp
# Remove the precompiled binary
rm mscore/rtf2html/rtf2html
@@ -135,12 +139,18 @@ rm -f %{name}/%{name}/fonts/*.ttf
# Disable rpath
sed -i '/rpath/d' %{name}/%{name}/CMakeLists.txt
+# We don't use this 3rd party lib but remove anyways
+rm -fr mscore/singleapp/
+
%build
# Build the actual program
mkdir build
pushd build
export PATH=${PATH}:%{_libdir}/qt4/bin
- %cmake -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_CXX_FLAGS="%{optflags}" ../mscore
+ %cmake -DCMAKE_BUILD_TYPE=RELEASE \
+ -DCMAKE_CXX_FLAGS="%{optflags}" \
+ -DUSE_SYSTEM_QTSINGLEAPPLICATION=1 \
+ ../mscore
make lupdate %{?_smp_flags}
make lrelease %{?_smp_flags}
make %{?_smp_flags} VERBOSE=1
@@ -251,6 +261,9 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Tue Jul 20 2010 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 0.9.6.1-1
+- Update to 0.9.6.1
+
* Mon Jun 14 2010 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 0.9.6-1
- Update to 0.9.6
- Split documentation into its own package
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 15 Jun 2010 04:32:25 -0000 1.4
+++ sources 22 Jul 2010 22:26:33 -0000 1.5
@@ -1 +1 @@
-298b7eaf46d092045600bebaa99bea0a mscore-0.9.6-free.tar.bz2
+77a9c9ccb472b7ae82f9e0105f74807d mscore-0.9.6.1-free.tar.bz2
More information about the scm-commits
mailing list