rpms/gambas2/devel gambas2-2.11.1-gcc44.patch, NONE, 1.1 gambas2.spec, 1.13, 1.14

Tom Callaway spot at fedoraproject.org
Fri Feb 27 22:05:55 UTC 2009


Author: spot

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

Modified Files:
	gambas2.spec 
Added Files:
	gambas2-2.11.1-gcc44.patch 
Log Message:
fix with gcc44

gambas2-2.11.1-gcc44.patch:

--- NEW FILE gambas2-2.11.1-gcc44.patch ---
diff -up gambas2-2.11.1/gb.db.sqlite3/acinclude.m4.gcc44 gambas2-2.11.1/gb.db.sqlite3/acinclude.m4
--- gambas2-2.11.1/gb.db.sqlite3/acinclude.m4.gcc44	2009-02-27 16:04:39.000000000 -0500
+++ gambas2-2.11.1/gb.db.sqlite3/acinclude.m4	2009-02-27 16:05:11.000000000 -0500
@@ -206,7 +206,7 @@ AC_DEFUN([GB_INIT],
   AM_CONDITIONAL(OPTIMIZE, test "$gambas_optimization" = yes)
 
   AM_CFLAGS="$AM_CFLAGS -pipe -Wall -Wno-unused-value -fsigned-char"
-  AM_CXXFLAGS="$AM_CXXFLAGS -pipe -Wall -fno-exceptions -Wno-unused-value -fsigned-char"
+  AM_CXXFLAGS="$AM_CXXFLAGS -pipe -Wall -Wno-unused-value -fsigned-char"
 
   dnl ---- Check for gcc visibility flag
   
@@ -6001,10 +6001,10 @@ _LT_AC_TAGVAR(lt_prog_compiler_no_builti
 if test "$GCC" = yes; then
   _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
 
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti],
     lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+    [-fno-rtti], [],
+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti"])
 fi
 ])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
 
diff -up gambas2-2.11.1/gb.db.sqlite3/src/main.cpp.gcc44 gambas2-2.11.1/gb.db.sqlite3/src/main.cpp
--- gambas2-2.11.1/gb.db.sqlite3/src/main.cpp.gcc44	2009-02-01 12:41:38.000000000 -0500
+++ gambas2-2.11.1/gb.db.sqlite3/src/main.cpp	2009-02-27 16:02:51.000000000 -0500
@@ -1008,7 +1008,7 @@ static int field_index(DB_RESULT result,
 {
 	char *fld;
 
-	fld = strchr(name, (int) FLD_SEP);
+	fld = (char*) strchr(name, (int) FLD_SEP);
 	if (fld)
 	{															//Includes table identity
 		fld[0] = '.';


Index: gambas2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gambas2/devel/gambas2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gambas2.spec	24 Feb 2009 19:26:04 -0000	1.13
+++ gambas2.spec	27 Feb 2009 22:05:25 -0000	1.14
@@ -1,7 +1,7 @@
 Name:		gambas2
 Summary:	IDE based on a basic interpreter with object extensions
 Version:	2.11.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL+
 Group:		Development/Tools
 URL:		http://gambas.sourceforge.net/
@@ -22,6 +22,7 @@
 Patch0:		%{name}-2.0.0-use-system-ltdl.patch
 Patch1:		%{name}-2.0.0-nolintl.patch
 Patch2:		%{name}-2.0.0-noliconv.patch
+Patch3:		%{name}-2.11.1-gcc44.patch
 
 %description
 Gambas2 is a free development environment based on a Basic interpreter
@@ -414,6 +415,7 @@
 %patch0 -p1
 %patch1 -p1 -b .nolintl
 %patch2 -p1 -b .noliconv
+%patch3 -p1 -b .gcc44
 # We used to patch these out, but this is simpler.
 for i in acinclude.m4 gb.compress.bzlib2/configure gb.compress.zlib/configure gb.corba/configure \
 	 gb.crypt/configure gb.db.firebird/configure gb.db.mysql/configure gb.db.odbc/configure \
@@ -428,7 +430,8 @@
 	sed -i 's|$AM_CFLAGS -O0|$AM_CFLAGS|g' $i
 	sed -i 's|$AM_CXXFLAGS -O0|$AM_CXXFLAGS|g' $i
 done
-
+# Need this for gcc44
+sed -i 's|-fno-exceptions||g' gb.db.sqlite3/configure
 
 ./reconf-all
 
@@ -1491,6 +1494,9 @@
 %{_datadir}/%{name}/info/gb.xml.xslt.*
 
 %changelog
+* Fri Feb 27 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 2.11.1-3
+- fix gcc44 compile
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list