rpms/mscore/devel mscore-dso-linking.patch, NONE, 1.1 mscore.spec, 1.8, 1.9

Orcan Ogetbil oget at fedoraproject.org
Tue Jun 15 04:01:39 UTC 2010


Author: oget

Update of /cvs/pkgs/rpms/mscore/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20569

Modified Files:
	mscore.spec 
Added Files:
	mscore-dso-linking.patch 
Log Message:
Add linking fix patch. This was submitted upstream and it got accepted. Apparently it didn't make it to the tarball.


mscore-dso-linking.patch:
 CMakeLists.txt |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE mscore-dso-linking.patch ---
diff -rupN mscore-0.9.6.old/mscore/mscore/CMakeLists.txt mscore-0.9.6/mscore/mscore/CMakeLists.txt
--- mscore-0.9.6.old/mscore/mscore/CMakeLists.txt	2010-06-07 17:26:55.000000000 -0400
+++ mscore-0.9.6/mscore/mscore/CMakeLists.txt	2010-06-14 23:57:57.000000000 -0400
@@ -286,6 +286,8 @@ else (MINGW)
       qtsingleapp
       fluid
       z
+      dl
+      rt
       )
 
    if (HAS_AUDIOFILE)


Index: mscore.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mscore/devel/mscore.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- mscore.spec	15 Jun 2010 03:23:47 -0000	1.8
+++ mscore.spec	15 Jun 2010 04:01:38 -0000	1.9
@@ -36,6 +36,9 @@ Patch2:        %{name}-split-doc.patch
 Patch3:        %{name}-arm-buildfix.patch
 # Fix some gcc warnings
 Patch4:        %{name}-fix-gcc-warnings.patch
+# 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
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: alsa-lib-devel
@@ -110,6 +113,7 @@ This package contains the musical notati
 %patch2 -p1 -b .splitdoc
 %patch3 -p1 -b .arm
 %patch4 -p1 -b .warnings
+%patch5 -p1 -b .dso
 
 # Remove the precompiled binary
 rm mscore/rtf2html/rtf2html



More information about the scm-commits mailing list