rpms/fpc/devel fpc-2.2.2-gtk2-r11651.patch, NONE, 1.1 fpc-2.2.2-stackexecute.patch, NONE, 1.1 fpc.spec, 1.28, 1.29

[Joost van der Sluis]

Author: joost

Update of /cvs/pkgs/rpms/fpc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28490

Modified Files:
	fpc.spec 
Added Files:
	fpc-2.2.2-gtk2-r11651.patch fpc-2.2.2-stackexecute.patch 
Log Message:
* Sun Oct 19 2008 Joost van der Sluis <joost at cnoc.nl> 2.2.2-2
- Pass -z noexecstack to the linker from within the configuration file fpc.cfg (fpc-bug #11563)
- Added patch to fix fpc-bug #11837 for usage with newer gtk2-versions


fpc-2.2.2-gtk2-r11651.patch:

--- NEW FILE fpc-2.2.2-gtk2-r11651.patch ---
Index: fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas
===================================================================
--- fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas	(revision 11650)
+++ fpcsrc/packages/gtk2/src/gtk+/gtk/gtk2.pas	(revision 11651)
@@ -63,6 +63,8 @@
 {$DEFINE HasGTK2_8}
 {$ENDIF}
 
+// {$define HasGTK_FileSystem}
+
 interface
 
 uses
Index: fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc
===================================================================
--- fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc	(revision 11650)
+++ fpcsrc/packages/gtk2/src/gtk+/gtk/gtkfilesystem.inc	(revision 11651)
@@ -115,17 +115,14 @@
 
 {$IFDEF read_interface_rest}
 
+{$ifdef HasGTK_FileSystem}
 
 { GError enumeration for GtkFileSystem  }
 
 function GTK_FILE_SYSTEM_ERROR : TGQuark;
 
-
-
 function gtk_file_system_error_quark:TGQuark;cdecl;external gtklib name 'gtk_file_system_error_quark';
 
-
-
 { Boxed-type for gtk_file_folder_get_info() results  }
 
 function GTK_TYPE_FILE_INFO : GType;
@@ -244,11 +241,16 @@
 { GtkFileSystem modules support  }
 
 function _gtk_file_system_create(file_system_name:Pchar):PGtkFileSystem;cdecl;external gtklib name '_gtk_file_system_create';
+
+{$endif HasGTK_FileSystem}
+
 {$endif}  {read_interface_rest}
 
 
 {$ifdef read_implementation}
 
+{$ifdef HasGTK_FileSystem}
+
 function GTK_FILE_SYSTEM_ERROR : TGQuark;
   begin
      GTK_FILE_SYSTEM_ERROR:=gtk_file_system_error_quark;
@@ -307,6 +309,8 @@
    GTK_FILE_FOLDER_GET_IFACE:=G_TYPE_INSTANCE_GET_INTERFACE(inst,GTK_TYPE_FILE_FOLDER);
 end;
 
+{$endif HasGTK_FileSystem}
+
 function gtk_file_path_new_dup(str : Pgchar) : PGtkFilePath;
 begin
    gtk_file_path_new_dup:=PGtkFilePath(g_strdup(str));

fpc-2.2.2-stackexecute.patch:

--- NEW FILE fpc-2.2.2-stackexecute.patch ---
Index: fpcsrc/compiler/utils/samplecfg
===================================================================
--- fpcsrc/compiler/utils/samplecfg	(version 2.2.2)
+++ fpcsrc/compiler/utils/samplecfg	(working copy)
@@ -289,6 +289,11 @@
 -k--build-id
 
 # -----------------------
+# Do not mark executables as requiring an executable stack (fpc-bug #11563)
+# -----------------------
+-k-z noexecstack
+
+# -----------------------
 # Set Filenames and Paths
 # -----------------------
 


Index: fpc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fpc/devel/fpc.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- fpc.spec	13 Aug 2008 20:43:10 -0000	1.28
+++ fpc.spec	20 Oct 2008 20:54:45 -0000	1.29
@@ -1,6 +1,6 @@
 Name:           fpc
 Version:        2.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Free Pascal Compiler
 
 Group:          Development/Languages
@@ -14,6 +14,8 @@
 Patch0:         %{name}-%{version}-samplecfg_32and64bit.patch
 Patch1:         %{name}-%{version}-build-id.patch
 Patch2:         %{name}-%{version}-fpcdocs.patch
+Patch3:         %{name}-%{version}-stackexecute.patch
+Patch4:         %{name}-%{version}-gtk2-r11651.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       gpm, glibc, ncurses, binutils
@@ -53,18 +55,18 @@
 
 %ifarch ppc
 %define ppcname ppcppc
-%define fpcopt '-k--build-id -gl'
+%define fpcopt '-k"--build-id -z noexecstack" -gl'
 %else
 %ifarch x86_64
 %define ppcname ppcx64
-%define fpcopt '-k--build-id -gl'
+%define fpcopt '-k"--build-id -z noexecstack"'
 %else
 %ifarch ppc64
 %define ppcname ppcppc64
-%define fpcopt '-k--build-id'
+%define fpcopt '-k"--build-id -z noexecstack"'
 %else
 %define ppcname ppc386
-%define fpcopt '-k--build-id -gl'
+%define fpcopt '-k"--build-id -z noexecstack" -gl'
 %endif
 %endif
 %endif
@@ -78,6 +80,8 @@
 %patch0
 %patch1
 %patch2
+%patch3
+%patch4
 
 %build
 # The source-files:
@@ -176,6 +180,10 @@
 %{_datadir}/fpcsrc
 
 %changelog
+* Sun Oct 19 2008 Joost van der Sluis <joost at cnoc.nl> 2.2.2-2
+- Pass -z noexecstack to the linker from within the configuration file fpc.cfg (fpc-bug #11563)
+- Added patch to fix fpc-bug #11837 for usage with newer gtk2-versions
+
 * Wed Aug 13 2008 Joost van der Sluis <joost at cnoc.nl> 2.2.2-1
 - Updated to version 2.2.2
 - Disabled debuginfo for ppc64 again