[Gnome-print] PATCH: IBM AIX patch

From: Christian Schaller <Uraeus linuxrising org>
To: gnome-print ximian com
Subject: [Gnome-print] PATCH: IBM AIX patch
Date: 20 Aug 2001 17:54:50 +0200

Hi,
Here is the gnome-print patches from the Official IBM AIX package.

(From http://www-1.ibm.com/servers/aix/products/aixos/linux/index.html)

Since I believe that these patches haven't been submitted before I am
mailing them to the respective lists.

Christian

Index: gnome-print-0.20/ltconfig
diff -c gnome-print-0.20/ltconfig:1.1 gnome-print-0.20/ltconfig:1.2
*** gnome-print-0.20/ltconfig:1.1	Tue Aug 29 10:47:06 2000
--- gnome-print-0.20/ltconfig	Tue Aug 29 10:49:18 2000
***************
*** 696,702 ****
  else
    # PORTME Check for PIC flags for the system compiler.
    case "$host_os" in
!   aix3* | aix4*)
      # All AIX code is PIC.
      link_static_flag='-bnso -bI:/lib/syscalls.exp'
      ;;
--- 696,702 ----
  else
    # PORTME Check for PIC flags for the system compiler.
    case "$host_os" in
!   aix3* | aix4* | aix5*)
      # All AIX code is PIC.
      link_static_flag='-bnso -bI:/lib/syscalls.exp'
      ;;
***************
*** 1115,1121 ****
  
    # See if GNU ld supports shared libraries.
    case "$host_os" in
!   aix3* | aix4*)
      # On AIX, the GNU linker is very broken
      ld_shlibs=no
      cat <<EOF 1>&2
--- 1115,1121 ----
  
    # See if GNU ld supports shared libraries.
    case "$host_os" in
!   aix3* | aix4* | aix5*)
      # On AIX, the GNU linker is very broken
      ld_shlibs=no
      cat <<EOF 1>&2
***************
*** 1270,1308 ****
      fi
      ;;
  
!   aix4*)
!     hardcode_libdir_flag_spec='${wl}-b ${wl}nolibpath ${wl}-b ${wl}libpath:$libdir:/usr/lib:/lib'
!     hardcode_libdir_separator=':'
!     if test "$with_gcc" = yes; then
!       collect2name=`${CC} -print-prog-name=collect2`
!       if test -f "$collect2name" && \
! 	 strings "$collect2name" | grep resolve_lib_name >/dev/null
!       then
! 	# We have reworked collect2
! 	hardcode_direct=yes
        else
! 	# We have old collect2
! 	hardcode_direct=unsupported
! 	# It fails to find uninstalled libraries when the uninstalled
! 	# path is not listed in the libpath.  Setting hardcode_minus_L
! 	# to unsupported forces relinking
! 	hardcode_minus_L=yes
! 	hardcode_libdir_flag_spec='-L$libdir'
! 	hardcode_libdir_separator=
        fi
!       shared_flag='-shared'
      else
!       shared_flag='${wl}-bM:SRE'
!       hardcode_direct=yes
      fi
!     allow_undefined_flag=' ${wl}-berok'
!     archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
!     archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
!     case "$host_os" in aix4.[01]|aix4.[01].*)
!       # According to Greg Wooledge, -bexpall is only supported from AIX 4.2 on
!       always_export_symbols=yes ;;
!     esac
!    ;;
  
    amigaos*)
      archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
--- 1270,1349 ----
      fi
      ;;
  
!   aix4* | aix5*)
!     # First test if we are trying to use run time linking, or normal AIX style linking.
!     # If -brtl is somewhere in LDFLAGS, we need to do run time linking.
!     aix_use_runtimelinking=no
!     for ld_flag in $LDFLAGS; do
!       if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl" ); then
!         aix_use_runtimelinking=yes
!         break
!       fi
!     done
!     if test "$aix_use_runtimelinking" = yes; then
!       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
!       hardcode_libdir_separator=':'
!       if test "$with_gcc" = yes; then
!         collect2name=`${CC} -print-prog-name=collect2`
!         if test -f "$collect2name" && \
! 	   strings "$collect2name" | grep resolve_lib_name >/dev/null
!         then
! 	  # We have reworked collect2
! 	  hardcode_direct=yes
!         else
! 	  # We have old collect2
! 	  hardcode_direct=unsupported
! 	  # It fails to find uninstalled libraries when the uninstalled
! 	  # path is not listed in the libpath.  Setting hardcode_minus_L
! 	  # to unsupported forces relinking
! 	  hardcode_minus_L=yes
! 	  hardcode_libdir_flag_spec='-L$libdir'
! 	  hardcode_libdir_separator=
!         fi
!         shared_flag='-shared'
        else
!         shared_flag='${wl}-bM:SRE'
!         hardcode_direct=yes
        fi
!       allow_undefined_flag=' -Wl,-G'
!       archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bnoentry${allow_undefined_flag}'
!       # It seems that -bexpall can do strange things, so it is better to
!       # generate a list of symbols to export.
!       always_export_symbols=yes
!       archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
      else
!       hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
!       hardcode_libdir_separator=':'
!       if test "$with_gcc" = yes; then
!         collect2name=`${CC} -print-prog-name=collect2`
!         if test -f "$collect2name" && \
!            strings "$collect2name" | grep resolve_lib_name >/dev/null
!         then
!           # We have reworked collect2
!           hardcode_direct=yes
!         else
!           # We have old collect2
!           hardcode_direct=unsupported
!           # It fails to find uninstalled libraries when the uninstalled
!           # path is not listed in the libpath.  Setting hardcode_minus_L
!           # to unsupported forces relinking
!           hardcode_minus_L=yes
!           hardcode_libdir_flag_spec='-L$libdir'
!           hardcode_libdir_separator=
!         fi
!         shared_flag='-shared'
!       else
!         shared_flag='${wl}-bM:SRE'
!         hardcode_direct=yes
!       fi
!       # Warning - without using the other run time loading flags, -berok will
!       #           link without error, but may produce a broken library.
!       allow_undefined_flag=' ${wl}-berok'
!       archive_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bexpall ${wl}-bnoentry${allow_undefined_flag}'
!       archive_expsym_cmds="\$CC $shared_flag"' -o $objdir/$soname $libobjs $deplibs $linkopts ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}'
!       always_export_symbols=yes
      fi
!     ;;
  
    amigaos*)
      archive_cmds='$rm $objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $objdir/a2ixlibrary.data~$AR cru $lib $libobjs~$RANLIB $lib~(cd $objdir && a2ixlibrary -32)'
***************
*** 1800,1813 ****
    soname_spec='${libname}${release}.so$major'
    ;;
  
! aix4*)
    version_type=linux
    # AIX has no versioning support, so currently we can not hardcode correct
    # soname into executable. Probably we can add versioning support to
    # collect2, so additional links can be useful in future.
!   # We preserve .a as extension for shared libraries though AIX4.2
!   # and later linker supports .so
!   library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
    shlibpath_var=LIBPATH
    deplibs_check_method=pass_all
    ;;
--- 1841,1860 ----
    soname_spec='${libname}${release}.so$major'
    ;;
  
! aix4* | aix5*)
    version_type=linux
    # AIX has no versioning support, so currently we can not hardcode correct
    # soname into executable. Probably we can add versioning support to
    # collect2, so additional links can be useful in future.
!   if test "$aix_use_runtimelinking" = yes; then
!     # If using run time linking (on AIX 4.2 or later) use lib<name>.so instead of
!     # lib<name>.a to let people know that these are not typical AIX shared libraries.
!     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
!   else
!     # We preserve .a as extension for shared libraries though AIX4.2
!     # and later linker supports .so
!     library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.a'
!   fi
    shlibpath_var=LIBPATH
    deplibs_check_method=pass_all
    ;;
Index: gnome-print-0.20/libgnomeprint/Makefile.am
diff -c gnome-print-0.20/libgnomeprint/Makefile.am:1.1 gnome-print-0.20/libgnomeprint/Makefile.am:1.2
*** gnome-print-0.20/libgnomeprint/Makefile.am:1.1	Tue Aug 29 10:47:07 2000
--- gnome-print-0.20/libgnomeprint/Makefile.am	Tue Aug 29 10:51:38 2000
***************
*** 82,85 ****
--- 82,86 ----
  	@PRINT_INCLUDEDIR@	\
  	-DPROFILEDIR=\""$(profilesdir)"\"
  
+ libgnomeprint_la_LIBADD = $(GNOMEUI_LIBS) $(INTLLIBS) $(GNOME_XML_LIB)
  libgnomeprint_la_LDFLAGS = -version-info $(GNOMEPRINT_CURRENT):$(GNOMEPRINT_REVISION):$(GNOMEPRINT_AGE)
Index: gnome-print-0.20/libgnomeprint/Makefile.in
diff -c gnome-print-0.20/libgnomeprint/Makefile.in:1.1 gnome-print-0.20/libgnomeprint/Makefile.in:1.2
*** gnome-print-0.20/libgnomeprint/Makefile.in:1.1	Tue Aug 29 10:47:07 2000
--- gnome-print-0.20/libgnomeprint/Makefile.in	Tue Aug 29 10:52:31 2000
***************
*** 156,162 ****
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
  LIBS = @LIBS@
! libgnomeprint_la_LIBADD = 
  libgnomeprint_la_OBJECTS =  gnome-print-master.lo \
  gnome-print-master-preview.lo gnome-print-dialog.lo \
  gnome-print-copies.lo gnome-printer.lo gnome-print.lo \
--- 156,162 ----
  
  DEFS = @DEFS@ -I. -I$(srcdir) -I..
  LIBS = @LIBS@
! libgnomeprint_la_LIBADD = $(GNOMEUI_LIBS) $(INTLLIBS) $(GNOME_XML_LIB)
  libgnomeprint_la_OBJECTS =  gnome-print-master.lo \
  gnome-print-master-preview.lo gnome-print-dialog.lo \
  gnome-print-copies.lo gnome-printer.lo gnome-print.lo \
Index: gnome-print-0.20/libgnomeprint/gnome-print-dialog.h
diff -c gnome-print-0.20/libgnomeprint/gnome-print-dialog.h:1.1 gnome-print-0.20/libgnomeprint/gnome-print-dialog.h:1.2
*** gnome-print-0.20/libgnomeprint/gnome-print-dialog.h:1.1	Tue Aug 29 10:47:08 2000
--- gnome-print-0.20/libgnomeprint/gnome-print-dialog.h	Tue Aug 29 10:53:33 2000
***************
*** 54,60 ****
  	/* options specific to dates */
  	GNOME_PRINT_RANGE_DATE_TIME = 1<<8,
  	GNOME_PRINT_RANGE_DATE_24HR = 1<<9,
! 	GNOME_PRINT_RANGE_DATE_MONDAY = 1<<10,
  };
  
  /* used to new call */
--- 54,60 ----
  	/* options specific to dates */
  	GNOME_PRINT_RANGE_DATE_TIME = 1<<8,
  	GNOME_PRINT_RANGE_DATE_24HR = 1<<9,
! 	GNOME_PRINT_RANGE_DATE_MONDAY = 1<<10
  };
  
  /* used to new call */
Index: gnome-print-0.20/libgnomeprint/gnome-print-pclr.c
diff -c gnome-print-0.20/libgnomeprint/gnome-print-pclr.c:1.1 gnome-print-0.20/libgnomeprint/gnome-print-pclr.c:1.2
*** gnome-print-0.20/libgnomeprint/gnome-print-pclr.c:1.1	Tue Aug 29 10:47:08 2000
--- gnome-print-0.20/libgnomeprint/gnome-print-pclr.c	Tue Aug 29 10:54:51 2000
***************
*** 79,85 ****
  	PCL_COLOR_MODE_BLACK,
  	PCL_COLOR_MODE_CMY,
  	PCL_COLOR_MODE_CMYK,
! 	PCL_COLOR_MODE_RGB,
  } PCLColorModes;
  
  typedef enum {
--- 79,85 ----
  	PCL_COLOR_MODE_BLACK,
  	PCL_COLOR_MODE_CMY,
  	PCL_COLOR_MODE_CMYK,
! 	PCL_COLOR_MODE_RGB
  } PCLColorModes;
  
  typedef enum {
***************
*** 92,98 ****
  	PLC_COMPRESSION_METHOD_RESERVED_6,     /* 6 */
  	PLC_COMPRESSION_METHOD_RESERVED_7,     /* 7 */
  	PLC_COMPRESSION_METHOD_RESERVED_8,     /* 8 */
! 	PLC_COMPRESSION_METHOD_RESERVED_9,     /* 9 */
  } PCLCompressionModes;
  
  typedef struct _PCLJobData {
--- 92,98 ----
  	PLC_COMPRESSION_METHOD_RESERVED_6,     /* 6 */
  	PLC_COMPRESSION_METHOD_RESERVED_7,     /* 7 */
  	PLC_COMPRESSION_METHOD_RESERVED_8,     /* 8 */
! 	PLC_COMPRESSION_METHOD_RESERVED_9      /* 9 */
  } PCLCompressionModes;
  
  typedef struct _PCLJobData {
Index: gnome-print-0.20/libgnomeprint/gnome-printer.h
diff -c gnome-print-0.20/libgnomeprint/gnome-printer.h:1.1 gnome-print-0.20/libgnomeprint/gnome-printer.h:1.2
*** gnome-print-0.20/libgnomeprint/gnome-printer.h:1.1	Tue Aug 29 10:47:08 2000
--- gnome-print-0.20/libgnomeprint/gnome-printer.h	Tue Aug 29 10:56:15 2000
***************
*** 43,49 ****
  	GNOME_PRINTER_ACTIVE,
  	GNOME_PRINTER_INACTIVE,
  	GNOME_PRINTER_OFFLINE,
! 	GNOME_PRINTER_NET_FAILURE,
  } GnomePrinterStatus;
  
  GnomePrinterStatus  gnome_printer_get_status (GnomePrinter *printer);
--- 43,49 ----
  	GNOME_PRINTER_ACTIVE,
  	GNOME_PRINTER_INACTIVE,
  	GNOME_PRINTER_OFFLINE,
! 	GNOME_PRINTER_NET_FAILURE
  } GnomePrinterStatus;
  
  GnomePrinterStatus  gnome_printer_get_status (GnomePrinter *printer);
Index: gnome-print-0.20/libgnomeprint/gt1-misc.h
diff -c gnome-print-0.20/libgnomeprint/gt1-misc.h:1.1 gnome-print-0.20/libgnomeprint/gt1-misc.h:1.2
*** gnome-print-0.20/libgnomeprint/gt1-misc.h:1.1	Tue Aug 29 10:47:08 2000
--- gnome-print-0.20/libgnomeprint/gt1-misc.h	Tue Aug 29 10:57:09 2000
***************
*** 23,29 ****
  #define gt1_false 0
  #define gt1_true 1
  
! typedef unsigned char uchar;
  
  /* define pi */
  #ifndef M_PI
--- 23,29 ----
  #define gt1_false 0
  #define gt1_true 1
  
! /* *AIX fix* typedef unsigned char uchar; */
  
  /* define pi */
  #ifndef M_PI

--- gnome-print-0.20/configure.in	Sat May 20 13:26:03 2000
+++ gnome-print-0.20.fix/configure.in	Tue Sep 12 12:48:20 2000
@@ -34,7 +34,7 @@
 GNOME_COMPILE_WARNINGS
 GNOME_X_CHECKS
 GNOME_XML_CHECK
-AM_GNOME_GETTEXT
+AM_GNU_GETTEXT
 
 dnl
 dnl Gtk-doc documentation

[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]