From 4dc1ea352d6dcee1189ebc381f2c620594fd9af4 Mon Sep 17 00:00:00 2001 From: Alexandros Theodotou Date: Sun, 22 Aug 2021 23:19:55 +0100 Subject: [PATCH] update cairo patch --- .../patches/cairo_remove_fortify_source.patch | 31 +++++-------------- 1 file changed, 7 insertions(+), 24 deletions(-) diff --git a/windows-msys/patches/cairo_remove_fortify_source.patch b/windows-msys/patches/cairo_remove_fortify_source.patch index b8652b0..30ea505 100644 --- a/windows-msys/patches/cairo_remove_fortify_source.patch +++ b/windows-msys/patches/cairo_remove_fortify_source.patch @@ -1,30 +1,13 @@ -# Copyright (C) 2021 Alexandros Theodotou -# -# This file is part of Zrythm -# -# Zrythm is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Zrythm is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with Zrythm. If not, see . - diff --git a/meson.build b/meson.build -index d78a5f2d6..6ede4189e 100644 +index f10a0067b..5789a4af1 100644 --- a/meson.build +++ b/meson.build @@ -71,7 +71,7 @@ if cc.get_id() != 'msvc' - '-fno-common' ] - -- cflags += '-Wp,-D_FORTIFY_SOURCE=2' -+ #cflags += '-Wp,-D_FORTIFY_SOURCE=2' - + + if get_option('optimization') in ['1', '2', '3'] +- cflags += '-Wp,-D_FORTIFY_SOURCE=2' ++ #cflags += '-Wp,-D_FORTIFY_SOURCE=2' + endif + supported_cflags = cc.get_supported_arguments(cflags) - add_project_arguments(supported_cflags, language: 'c')