rpms/texmaker/FC-6 texmaker-64bit_fix.patch, NONE, 1.1 texmaker.spec, 1.10, 1.11

Deji Akingunola (deji) fedora-extras-commits at redhat.com
Fri Jun 15 14:19:28 UTC 2007


Author: deji

Update of /cvs/extras/rpms/texmaker/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1310

Modified Files:
	texmaker.spec 
Added Files:
	texmaker-64bit_fix.patch 
Log Message:
* Fri Jun 15 2007 Deji Akingunola <dakingun at gmail.com> - 1.5-2
- Fix for crash on x86_64 by Kevin Kofler (BZ #235546)


texmaker-64bit_fix.patch:

--- NEW FILE texmaker-64bit_fix.patch ---
--- main.cpp.orig	2007-06-15 09:19:47.000000000 +0200
+++ main.cpp	2007-06-15 09:20:27.000000000 +0200
@@ -25,11 +25,11 @@
 protected:
     bool event(QEvent *event);
 public:
-    TexmakerApp( int argc, char ** argv );
+    TexmakerApp( int & argc, char ** argv );
     ~TexmakerApp();
 };
 
-TexmakerApp::TexmakerApp( int argc, char ** argv ) : QApplication ( argc, argv )
+TexmakerApp::TexmakerApp( int & argc, char ** argv ) : QApplication ( argc, argv )
 {
 QPixmap pixmap(":/images/splash.png");
 QSplashScreen *splash = new QSplashScreen(pixmap);


Index: texmaker.spec
===================================================================
RCS file: /cvs/extras/rpms/texmaker/FC-6/texmaker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- texmaker.spec	3 Jan 2007 07:22:48 -0000	1.10
+++ texmaker.spec	15 Jun 2007 14:18:53 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: LaTeX editor
 Name: texmaker
 Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Publishing
@@ -16,6 +16,7 @@
 Patch0: %{name}-desktop.patch
 # Patch to use default Fedora's document viewer
 Patch1: %{name}-tools.patch
+Patch2: %{name}-64bit_fix.patch
 
 %description
 Texmaker is a program, that integrates many tools needed to develop 
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p0 -b .desktop
 %patch1 -p0 -b .tools
+%patch2 -p0 -b .64bit
  
 %build
 export QTDIR=%{_libdir}/qt4
@@ -82,6 +84,9 @@
 %{_datadir}/icons/hicolor/*/apps/texmaker.png
 
 %changelog
+* Fri Jun 15 2007 Deji Akingunola <dakingun at gmail.com> - 1.5-2
+- Fix for crash on x86_64 by Kevin Kofler (BZ #235546)
+
 * Tue Jan 02 2007 Deji Akingunola <dakingun at gmail.com> - 1.5-1
 - New release
 




More information about the scm-commits mailing list