rpms/qmc2/devel qmc2-gcc44.patch,NONE,1.1 qmc2.spec,1.11,1.12

Author: belegdol Update of /cvs/nonfree/rpms/qmc2/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv18386 Modified Files: qmc2.spec Added Files: qmc2-gcc44.patch Log Message: Added gcc-4.4 fix from SVN qmc2-gcc44.patch: --- NEW FILE qmc2-gcc44.patch --- Index: options.cpp =================================================================== --- options.cpp (wersja 1328) +++ options.cpp (wersja 1329) @@ -1731,7 +1731,7 @@ qmc2MainWindow->log(QMC2_LOG_FRONTEND, "DEBUG: Options::on_toolButtonCalibrateAxes_clicked()"); #endif - if ( comboBoxSelectJoysticks->currentText() == tr("No joysticks found") || index < 0 ) { + if ( comboBoxSelectJoysticks->currentText() == tr("No joysticks found") || comboBoxSelectJoysticks->currentIndex() < 0 ) { toolButtonMapJoystick->setChecked(TRUE); on_toolButtonMapJoystick_clicked(); return; @@ -1784,7 +1784,7 @@ qmc2MainWindow->log(QMC2_LOG_FRONTEND, "DEBUG: Options::on_toolButtonTestJoystick_clicked()"); #endif - if ( comboBoxSelectJoysticks->currentText() == tr("No joysticks found") || index < 0 ) { + if ( comboBoxSelectJoysticks->currentText() == tr("No joysticks found") || comboBoxSelectJoysticks->currentIndex() < 0 ) { toolButtonMapJoystick->setChecked(TRUE); on_toolButtonMapJoystick_clicked(); return; Index: qmc2.spec =================================================================== RCS file: /cvs/nonfree/rpms/qmc2/devel/qmc2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qmc2.spec 9 Mar 2009 18:09:53 -0000 1.11 +++ qmc2.spec 10 Mar 2009 18:20:04 -0000 1.12 @@ -10,6 +10,7 @@ URL: http://qmc2.arcadehits.net/ Source0: http://dl.sourceforge.net/qmc2/%{name}-%{version}.%{beta}.tar.bz2 Patch1: qmc2-ini.patch +Patch2: qmc2-gcc44.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -58,6 +59,14 @@ mv %{name} sdlmess %patch1 -p1 -b .ini~ +pushd sdlmess +%patch2 -p0 -b .gcc44 +popd + +pushd sdlmame +%patch2 -p0 -b .gcc44 +popd + %build pushd sdlmess @@ -146,6 +155,7 @@ - No longer force Windows Qt style - Updated the URL - Added libXmu-devel to BuildRequires +- Added gcc-4.4 fix from SVN * Mon Jan 5 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.8.b6 - Updated to 0.2b6