rpms/speedcrunch/devel speedcrunch-0.11-alpha-dso_linking.patch, NONE, 1.1 speedcrunch.spec, 1.16, 1.17
Rex Dieter
rdieter at fedoraproject.org
Fri Jun 25 18:01:24 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/speedcrunch/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27072
Modified Files:
speedcrunch.spec
Added Files:
speedcrunch-0.11-alpha-dso_linking.patch
Log Message:
upstreamable fix for dso linking
speedcrunch-0.11-alpha-dso_linking.patch:
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE speedcrunch-0.11-alpha-dso_linking.patch ---
diff -up speedcrunch-0.11-alpha/src/CMakeLists.txt.dso speedcrunch-0.11-alpha/src/CMakeLists.txt
--- speedcrunch-0.11-alpha/src/CMakeLists.txt.dso 2009-11-04 15:37:15.000000000 -0600
+++ speedcrunch-0.11-alpha/src/CMakeLists.txt 2010-06-25 13:02:10.173711778 -0500
@@ -80,7 +80,7 @@ ENDIF( APPLE )
ADD_CUSTOM_TARGET( confclean COMMAND rm -rf Makefile CMakeFiles/ CMakeCache.txt cmake_install.cmake DartTestfile.txt install_manifest.txt )
-TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES})
+TARGET_LINK_LIBRARIES(${PROGNAME} ${QT_LIBRARIES} ${X11_X11_LIB} )
# only needed for static builds when directx is enabled in qt and you
# get a linker error because of missing a directx function
#IF(WIN32)
Index: speedcrunch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/speedcrunch/devel/speedcrunch.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- speedcrunch.spec 25 Jun 2010 17:41:40 -0000 1.16
+++ speedcrunch.spec 25 Jun 2010 18:01:24 -0000 1.17
@@ -12,6 +12,10 @@ URL: http://speedcrunch.digit
Source0: http://speedcrunch.googlecode.com/files/speedcrunch-%{version}%{?pre:-%{pre}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+## upstreamable patches
+# link -lX11 for XInternAtom symbol
+Patch50: speedcrunch-0.11-alpha-dso_linking.patch
+
BuildRequires: cmake qt4-devel desktop-file-utils ImageMagick
# to be paranoid and include a minimal qt4 dep (ie, require at least the
@@ -27,6 +31,8 @@ full keyboard-friendly and more than 15
%prep
%setup -q -n speedcrunch-%{version}%{?pre:-%{pre}}
+%patch50 -p1 -b .dso_linking
+
sed -i 's/\r//' COPYING ChangeLog README
More information about the scm-commits
mailing list