commit 1ddf0e116a8da45fbd392f3b3cd9095556fa070c
Author: Lukasz Glebicki <ble...@pld-linux.org>
Date: Sat Jun 1 19:54:00 2013 +0200
- removed outdated patch: muse-libtool.patch
- added muse-CMakeLists.txt.patch for linking problems (X11) and change
muse-version install name to muse
muse-CMakeLists.txt.patch | 21 +++++++++++++++++++++
muse-libtool.patch | 16 ----------------
muse.spec | 3 ++-
3 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/muse.spec b/muse.spec
index 4ef9dee..ad63bde 100644
--- a/muse.spec
+++ b/muse.spec
@@ -16,6 +16,7 @@ Group: X11/Applications/Sound
Source0: http://downloads.sourceforge.net/lmuse/%{name}-%{version}.tar.gz
# Source0-md5: ad917335ac05a3d62e3cd073af901001
Source1: %{name}.desktop
+Patch0: %{name}-CMakeLists.txt.patch
URL: http://muse.seh.de/
BuildRequires: QtDesigner-devel
BuildRequires: QtSvg-devel
@@ -55,7 +56,7 @@ Dokumentacja do anta.
%prep
%setup -q
-sed -i 's,SET(MusE_INSTALL_NAME "muse-2.1"),SET(MusE_INSTALL_NAME "muse"),g'
CMakeLists.txt
+%patch0 -p0
%build
install -d build
diff --git a/muse-CMakeLists.txt.patch b/muse-CMakeLists.txt.patch
new file mode 100644
index 0000000..9d790be
--- /dev/null
+++ b/muse-CMakeLists.txt.patch
@@ -0,0 +1,21 @@
+--- muse/widgets/CMakeLists.txt.old 2013-03-28 16:17:35.000000000 +0100
++++ muse/widgets/CMakeLists.txt 2013-06-01 19:34:33.000000000 +0200
+@@ -271,6 +271,7 @@
+ ##
+ target_link_libraries ( widgets
+ ${QT_LIBRARIES}
++ X11
+ icons
+ instruments
+ )
+--- CMakeLists.txt.org 2013-06-01 19:43:43.000000000 +0200
++++ CMakeLists.txt 2013-06-01 19:45:23.000000000 +0200
+@@ -86,7 +86,7 @@
+ SET(MusE_VERSION_PATCH 0)
+ SET(MusE_VERSION "2.1.2")
+ SET(MusE_VERSION_FULL "2.1.2")
+-SET(MusE_INSTALL_NAME "muse-2.1")
++SET(MusE_INSTALL_NAME "muse")
+ SET(MusE_EXEC_NAME "muse2")
+
+ ## The directory where we will install the shared components:
diff --git a/muse-libtool.patch b/muse-libtool.patch
deleted file mode 100644
index 67a6953..0000000
--- a/muse-libtool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur old/common.am new/common.am
---- old/common.am 2004-11-29 14:32:48.000000000 +0000
-+++ new/common.am 2005-03-22 11:35:20.000000000 +0000
-@@ -34,11 +34,10 @@
- $(UIC) -L $(top_srcdir)/muse/widgets -o $*.cpp -impl $*.h $*.ui
- $(MOC) $*.h -o moc_$*.cpp
- $(LTCXXCOMPILE) -c $*.cpp -o base_$*.lo
-+ $(LTCXXCOMPILE) -c $*.cpp -o $*.lo
- $(LTCXXCOMPILE) -c moc_$*.cpp -o moc_$*.lo
-- $(CXXLINK) -r base_$*.lo moc_$*.lo -o $*.lo
- $(RM) $*.cpp moc_$*.cpp base_$*.lo moc_$*.lo base_$*.o moc_$*.o
-
--
- moc_%.cpp: %.h
- $(MOC) $< -o $@
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/muse.git/commitdiff/8aa11bcfb1d65db1d087c6d26d0e66e224b77814
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
