From 68a5a430f886cf8d70e481c1797040fb08f2cbbe Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Jan 12 2019 19:39:42 +0000 Subject: Add patch to fix missing FALSE/TRUE defines --- diff --git a/gambas3-3.11.4-add-missing-FALSE-TRUE-defines.patch b/gambas3-3.11.4-add-missing-FALSE-TRUE-defines.patch new file mode 100644 index 0000000..a1ae11b --- /dev/null +++ b/gambas3-3.11.4-add-missing-FALSE-TRUE-defines.patch @@ -0,0 +1,26 @@ +From 75c0cafe4d18782083adba30981894ae2e4c9368 Mon Sep 17 00:00:00 2001 +From: bgermann +Date: Sun, 14 Oct 2018 16:31:24 +0200 +Subject: [PATCH] [GB.DB.POSTGRESQL] Fix undefined TRUE/FALSE + +[GB.DB.POSTGRESQL] +* BUG: Fix undefined TRUE/FALSE +--- + gb.db.postgresql/src/main.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/gb.db.postgresql/src/main.h b/gb.db.postgresql/src/main.h +index b45b607f6..a952b9564 100644 +--- a/gb.db.postgresql/src/main.h ++++ b/gb.db.postgresql/src/main.h +@@ -25,6 +25,7 @@ + #define __MAIN_H + + #include "gambas.h" ++#include "gb_common.h" + #include "gb.db.h" + + #ifndef __MAIN_C +-- +2.18.1 + diff --git a/gambas3.spec b/gambas3.spec index c7e7120..03086ef 100644 --- a/gambas3.spec +++ b/gambas3.spec @@ -12,7 +12,7 @@ Name: gambas3 Summary: IDE based on a basic interpreter with object extensions Version: 3.11.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL+ Group: Development/Tools URL: http://gambas.sourceforge.net/ @@ -50,8 +50,7 @@ BuildRequires: dumb-devel Patch1: %{name}-3.2.0-nolintl.patch Patch2: %{name}-3.2.0-noliconv.patch -# Don't conflict with siginfo_t define -Patch5: gambas3-3.1.1-linux-siginfo.patch +Patch3: %{name}-3.11.4-add-missing-FALSE-TRUE-defines.patch %description Gambas3 is a free development environment based on a Basic interpreter @@ -962,8 +961,7 @@ Requires: %{name}-gb-xml = %{version}-%{release} %setup -q -n gambas-%{version} %patch1 -p1 -b .nolintl %patch2 -p1 -b .noliconv -# %%patch5 -p1 -b .linux-siginfo -# We used to patch these out, but this is simpler. +%patch3 -p1 -b .false_true_defines for i in `find . |grep acinclude.m4`; do sed -i 's|$AM_CFLAGS -O3|$AM_CFLAGS|g' $i sed -i 's|$AM_CXXFLAGS -Os -fno-omit-frame-pointer|$AM_CXXFLAGS|g' $i @@ -1617,6 +1615,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %{_datadir}/%{name}/info/gb.xml.xslt.* %changelog +* Sat Jan 12 2019 Björn Esser - 3.11.4-3 +- Add patch to fix missing FALSE/TRUE defines + * Thu Aug 23 2018 Nicolas Chauvet - 3.11.4-2 - Rebuilt for glew 2.1.0