rpms/kdegraphics/FC-4 kdegraphics-3.4.1-dviwin_draw.patch, NONE, 1.1 kdegraphics-3.4.1-gcc4.patch, NONE, 1.1 kdegraphics.spec, 1.50, 1.51

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdegraphics/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv17759

Modified Files:
	kdegraphics.spec 
Added Files:
	kdegraphics-3.4.1-dviwin_draw.patch 
	kdegraphics-3.4.1-gcc4.patch 
Log Message:
apply gcc4 workaround to fix #162430


kdegraphics-3.4.1-dviwin_draw.patch:
 dviwin_draw.cpp |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE kdegraphics-3.4.1-dviwin_draw.patch ---
--- kdegraphics/kdvi/dviwin_draw.cpp.old	2005/05/04 06:07:06	409205
+++ kdegraphics/kdvi/dviwin_draw.cpp	2005/07/04 09:23:36	431422
@@ -550,7 +551,15 @@
 	case FNTDEF3:
 	case FNTDEF4:
 	  command_pointer += 12 + ch - FNTDEF1 + 1;
-	  command_pointer += readUINT8() + readUINT8();
+	  
+	  // The variables _A_ and _L_, which are not used any
+	  // further, are there as a temporary workaround for a bug in
+	  // the C++ compiler that RedHat uses for Fedora Core 4.
+	  {
+	    Q_UINT8 _A_ = readUINT8();
+	    Q_UINT8 _L_ = readUINT8();
+	    command_pointer += _A_ + _L_ ;
+	  }
 	  break;
 	  
 	case PRE:

kdegraphics-3.4.1-gcc4.patch:
 kiconconfig.h |    1 +
 1 files changed, 1 insertion(+)

--- NEW FILE kdegraphics-3.4.1-gcc4.patch ---
--- kdegraphics-3.4.1/kiconedit/kiconconfig.h.tn	2005-06-28 23:27:15.000000000 +0200
+++ kdegraphics-3.4.1/kiconedit/kiconconfig.h	2005-06-28 23:27:27.000000000 +0200
@@ -36,6 +36,7 @@
 class KKeyChooser;
 class KColorButton;
 class KURLRequester;
+class QComboBox;
 
 class KTemplateEditDlg : public KDialogBase
 {


Index: kdegraphics.spec
===================================================================
RCS file: /cvs/dist/rpms/kdegraphics/FC-4/kdegraphics.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- kdegraphics.spec	16 Jun 2005 09:11:47 -0000	1.50
+++ kdegraphics.spec	5 Jul 2005 07:02:42 -0000	1.51
@@ -11,7 +11,7 @@
 %define no_scanner_archs s390 s390x
 
 Version: 3.4.1
-Release: 0.fc4.1
+Release: 0.fc4.2
 Name: kdegraphics
 Summary: K Desktop Environment - Graphics Applications
 Epoch: 7
@@ -24,6 +24,8 @@
 Patch1: kdegraphics-3.3.0-misc.patch
 Patch2: kdegraphics-3.3.1-xorg.patch
 Patch3: admin-visibility.patch
+Patch4: kdegraphics-3.4.1-gcc4.patch
+Patch5: kdegraphics-3.4.1-dviwin_draw.patch
 
 %ifnarch %{no_scanner_archs}
 BuildRequires: sane-backends-devel >= 1.0.3-10
@@ -259,6 +261,8 @@
 %patch1 -p1 -b .misc
 %patch2 -p1 -b .xorg
 %patch3 -p1 -b .gcc
+%patch4 -p1 -b .gcc4
+%patch5 -p1 -b .gcc4
 
 %if %{rhel}
   echo "DO_NOT_COMPILE=\"\$DO_NOT_COMPILE kfax\"" >kfax/configure.in.in
@@ -348,6 +352,9 @@
 %{_includedir}/kde/*
 
 %changelog
+* Tue Jul 05 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.2
+- apply gcc4 workaround to fix #162430
+
 * Thu Jun 16 2005 Than Ngo <than at redhat.com> 3.4.1-0.fc4.1
 - 3.4.1