Re: patch for compile failures!

[Aaron M Dulles-Coelho <dulles at artifex dot org>]

And if you get errors building the module along the lines of 
"asm/ioctl32.h: No such file or directory" edit 
modules/fglrx/firegl_public.c to refer to "linux/ioctl32.h"

Here's the patch to use from modules/fglrx/

--amdc

Aaron M Dulles-Coelho wrote:
> Running amd64 Debian sid, Qt 3.3
>
> Ok, so I'm not the only one who got the compile errors with this data...
>
> g++ -c  -O2 -fno-strength-reduce -funsigned-char -Wall -W -Dlinux
> -DFGLRX_USE_XEXTENSIONS -DFGLRX_OGL_INFO -DQT_NO_STL
> -I/usr/share/qt3/include -I. -I./include_dummy main.cpp
> main.cpp: In function 'int main(int, char**)':
> main.cpp:31: error: expected type-specifier before 'QWindowsStyle'
> main.cpp:31: error: expected `)' before 'QWindowsStyle'
> main.cpp:31: error: no matching function for call to
> 'QApplication::setStyle(int*)'
>
> But I figured out that if you just comment out that line 31 of main.cpp, 
> the whole thing compiles without error and produces the deb packages. Rock.
>
> In the source root, I replaced debian/patches-8.16.20/panel.diff with 
> this newly created patch that does everything else and comments out the 
> offending line.
>
> NB: I'm still stuck trying to compile the module, so I haven't tested 
> the actual module and seen the effects on the panel. I assume from what 
> I've seen in Qt documentation that it simply won't set the Window Style 
> to a Microsoft Windows style. That's ok by me, though!
>
> --amdc
>
>
> ------------------------------------------------------------------------
>
> diff -Nur panel.orig/ATITVOExtensions.c panel/ATITVOExtensions.c
> --- panel.orig/ATITVOExtensions.c	2005-06-15 23:55:07.000000000 -0400
> +++ panel/ATITVOExtensions.c	2005-09-15 00:11:47.000000000 -0400
> @@ -24,7 +24,7 @@
>  
>  #include <X11/extensions/xf86misc.h>
>  #include <X11/extensions/xf86mscstr.h>
> -#include "extutil.h"
> +#include <X11/extensions/extutil.h>
>  
>  #include <X11/extensions/XInput.h>
>  
> diff -Nur panel.orig/FGLRXExtensions.c panel/FGLRXExtensions.c
> --- panel.orig/FGLRXExtensions.c	2005-06-15 23:55:07.000000000 -0400
> +++ panel/FGLRXExtensions.c	2005-09-15 00:11:47.000000000 -0400
> @@ -18,7 +18,7 @@
>  
>  #include <X11/extensions/xf86misc.h>
>  #include <X11/extensions/xf86mscstr.h>
> -#include "extutil.h"
> +#include <X11/extensions/extutil.h>
>  
>  #include <X11/extensions/XInput.h>
>  
> diff -Nur panel.orig/main.cpp panel/main.cpp
> --- panel.orig/main.cpp	2005-06-15 23:55:07.000000000 -0400
> +++ panel/main.cpp	2005-09-15 00:11:56.000000000 -0400
> @@ -28,7 +28,7 @@
>  //    printf ( "%s\n", lpath.data() ) ;
>  //    printf ( "%s\n", lfile.data() ) ;
>  
> -    QApplication::setStyle ( new QWindowsStyle ) ;
> +    //QApplication::setStyle ( new QWindowsStyle ) ;
>  
>      QApplication a( argc, argv );
>  
> diff -Nur panel.orig/Makefile panel/Makefile
> --- panel.orig/Makefile	2005-06-15 23:55:07.000000000 -0400
> +++ panel/Makefile	2005-09-15 00:11:47.000000000 -0400
> @@ -37,28 +37,16 @@
>  # resolve target platform
>  # (on cross compiles this must be a commandline parameter)
>  PLATFORMTYPE = $(shell uname -m)
> -ifeq ($(PLATFORMTYPE), ia64) 
> -LIBQT_STATIC = libqt64.a
> -LIBQT_DYN = qt
> -LIB_DIR = lib
> -else
> -ifneq ($(findstring $(PLATFORMTYPE), i386 i486 i586 i686), )
> +ifneq ($(findstring $(PLATFORMTYPE), ia64 x86_64 i386 i486 i586 i686), )
>  LIBQT_STATIC = libqt.a
> -LIBQT_DYN = qt
> -LIB_DIR = lib
> -else
> -ifeq ($(PLATFORMTYPE), x86_64)
> -LIBQT_STATIC = libqtx86_64.a
>  LIBQT_DYN = qt-mt
> -LIB_DIR = lib64
> +LIB_DIR = lib
>  else
>  LIBQT_STATIC = libunknownplatform.a
>  LIBQT_DYN = qtunknown
>  LIB_DIR = unknowndir
>  $(error Unknown Platform)
>  endif
> -endif
> -endif
>  
>  
>  # ========================================
> @@ -88,7 +76,7 @@
>  endif
>  
>  ifeq ($(shell test -e $(MK_QTDIR)/include/qglobal.h$(colon) echo $$?),1)
> -$(error environment incomplete: MK_QTDIR=$(MK_QTDIR))
> +$(error environment incomplete: MK_QTDIR=$(MK_QTDIR) [missing $(MK_QTDIR)/include/qglobal.h])
>  endif
>  
>  ifeq ($(QT_VER),0)
> @@ -343,7 +331,7 @@
>  	$(STRIP) $@
>  	bzip2 -c $@ >$ at  dot bz2
>  	rm -f $(BASENAME)
> -	ln -s $@ $(BASENAME)
> +	ln $@ $(BASENAME)
>  
>  
>  $(TARGET1): $(TARGET1_OBJECTS)
> @@ -401,20 +389,9 @@
>  
>  
>  install::
> -	cp $(TARGET0) /usr/X11R6/bin/.
> -	cd /usr/X11R6/bin/. ; rm -f $(BASENAME) ; ln -s $(TARGET0) $(BASENAME)
> -	cp LICENSE.GPL /usr/X11R6/bin/.
> -	cp LICENSE.QPL /usr/X11R6/bin/.
> -	if  [ $KDEDIR ]; then\
> -	  cp fireglcontrol.kdelnk $(KDEDIR)/share/applnk/. ;\
> -	  cp ati.xpm $(KDEDIR)/share/icons/. ;\
> -	fi
> -	if test -d /usr/share/gnome/apps; then \
> -	  cp fireglcontrol.desktop /usr/share/gnome/apps/. ;\
> -	  if test -d /usr/share/pixmaps; then \
> -	    cp ati.xpm /usr/share/pixmaps/. ;\
> -	  fi ;\
> -	fi
> +	cp $(BASENAME) $(DESTDIR)/usr/X11R6/bin/.
> +	cp ati.xpm $(DESTDIR)/usr/share/icons/. ; \
> +	cp ati.xpm $(DESTDIR)/usr/share/pixmaps/. ; \
>  
>  source_package::
>  	@if [ -f $(PACKET_NAME).tar ]; then      \
--- firegl_public.c.orig	2005-09-15 00:12:46.000000000 -0400
+++ firegl_public.c	2005-09-15 00:38:06.000000000 -0400
@@ -121,7 +121,7 @@
 #endif
 
 #ifdef __x86_64__
-#include "asm/ioctl32.h"
+#include "linux/ioctl32.h"
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,2)
 #include "linux/syscalls.h"
 #endif