[cppunit] Resolves: sf#2912630 unused argument warnings
Caolan McNamara
caolanm at fedoraproject.org
Wed Oct 5 14:58:28 UTC 2011
commit 721d7019810978ef34179c8f6e2b2a7f78d6685e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Oct 5 15:58:13 2011 +0100
Resolves: sf#2912630 unused argument warnings
cppunit-warnings-sf2912630.patch | 22 ++++++++++++++++++++++
cppunit.spec | 8 +++++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/cppunit-warnings-sf2912630.patch b/cppunit-warnings-sf2912630.patch
new file mode 100644
index 0000000..7b0ba8a
--- /dev/null
+++ b/cppunit-warnings-sf2912630.patch
@@ -0,0 +1,22 @@
+--- cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2007-01-12 05:54:34.000000000 +0100
++++ cppunit-1.12.1/include/cppunit/plugin/TestPlugIn.h 2009-12-02 15:33:29.639857272 +0100
+@@ -151,9 +151,7 @@
+ #include <windows.h>
+ #endif
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
+- BOOL APIENTRY DllMain( HANDLE hModule, \
+- DWORD ul_reason_for_call, \
+- LPVOID lpReserved ) \
++ BOOL APIENTRY DllMain( HANDLE, DWORD, LPVOID ) \
+ { \
+ return TRUE; \
+ } \
+@@ -162,7 +160,7 @@
+ // Unix
+ #elif defined(CPPUNIT_HAVE_UNIX_DLL_LOADER) || defined(CPPUNIT_HAVE_UNIX_SHL_LOADER)
+ #define CPPUNIT_PLUGIN_IMPLEMENT_MAIN() \
+- int main( int argc, char *argv[] ) \
++ int main( int, char *[] ) \
+ { \
+ return 0; \
+ } \
diff --git a/cppunit.spec b/cppunit.spec
index edfc7fa..cc350ca 100644
--- a/cppunit.spec
+++ b/cppunit.spec
@@ -1,6 +1,6 @@
Name: cppunit
Version: 1.12.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: C++ unit testing framework
# no license in files
@@ -10,6 +10,8 @@ Url: http://cppunit.sourceforge.net/
Source: http://downloads.sourceforge.net/cppunit/cppunit-%{version}.tar.gz
Patch0: cppunit-1.12.0-nolibdir.patch
Patch1: cppunit-msg.patch
+#https://sourceforge.net/tracker/?func=detail&aid=2912630&group_id=11795&atid=311795
+Patch2: cppunit-warnings-sf2912630.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: doxygen, graphviz
@@ -46,6 +48,7 @@ for file in THANKS ChangeLog NEWS; do
mv ${file}.utf8 $file
done
%patch1 -p1 -b .nomsg
+%patch2 -p1 -b .warnings-sf2912630
%build
export LDFLAGS=-ldl
@@ -100,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
%doc doc/html
%changelog
+* Wed Oct 05 2011 Caolán McNamara <caolanm at redhat.com> - 1.12.1-6
+- add sf#2912630 fix for unused argument warnings
+
* Tue Jun 28 2011 Steven M. Parrish <smparrish at gmail.com> - 1.12.1-5
- Fix for bug 452340
More information about the scm-commits
mailing list