You've already forked macports-ports
mirror of
https://github.com/macports/macports-ports.git
synced 2026-07-12 18:20:25 -07:00
committed by
Herby Gillot
parent
a048876437
commit
e2ce6c6fdb
+6
-12
@@ -9,8 +9,8 @@ PortGroup debug 1.0
|
||||
name gegl
|
||||
conflicts gegl-devel
|
||||
set my_name gegl
|
||||
version 0.4.64
|
||||
revision 2
|
||||
version 0.4.70
|
||||
revision 0
|
||||
epoch 1
|
||||
|
||||
license {GPL-3+ LGPL-3+}
|
||||
@@ -29,14 +29,14 @@ dist_subdir ${my_name}
|
||||
distname ${my_name}-${version}
|
||||
use_xz yes
|
||||
|
||||
checksums rmd160 b2c71c1a1d8b6fde481b6f9d10cd145b4ade2a1e \
|
||||
sha256 0de1c9dd22c160d5e4bdfc388d292f03447cca6258541b9a12fed783d0cf7c60 \
|
||||
size 6066976
|
||||
checksums rmd160 db6f064cf0df7688990d73d84145b4341f1e0051 \
|
||||
sha256 47f50d9c3aecd375deb48c11ebfead52d162e4fc162a4b3d44618277f1faec02 \
|
||||
size 6164464
|
||||
|
||||
# Disable unexpected download of subprojects
|
||||
meson.wrap_mode nodownload
|
||||
|
||||
set py_ver 3.13
|
||||
set py_ver 3.14
|
||||
set py_ver_nodot [string map {. {}} ${py_ver}]
|
||||
set py_framework ${frameworks_dir}/Python.framework/Versions/${py_ver}
|
||||
|
||||
@@ -95,12 +95,6 @@ post-patch {
|
||||
}
|
||||
}
|
||||
|
||||
# cc1: error: argument to '-O' should be a non-negative integer, 'g', 's', 'z' or 'fast'
|
||||
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117478
|
||||
if { [string match *gcc* ${configure.compiler}] } {
|
||||
patchfiles-append patch-fix-objc-flags.diff
|
||||
}
|
||||
|
||||
# needs C++14 C11
|
||||
compiler.cxx_standard 2014
|
||||
compiler.c_standard 2011
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
#==================================================================================================
|
||||
# From: Lukas Oberhuber
|
||||
# Date: Sun, 10 Nov 2024 15:48:14 +0000
|
||||
# Subject: [PATCH] meson: Fix objective c build for gcc
|
||||
#
|
||||
# Merge Request:
|
||||
# - https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/201
|
||||
#
|
||||
# Related Issues:
|
||||
# - https://gitlab.gnome.org/GNOME/gegl/-/issues/393
|
||||
# - https://gcc.gnu.org/bugzilla/show_bug.cgi?id=117478
|
||||
#==================================================================================================
|
||||
--- meson.build.orig 2024-11-04 00:39:32.000000000 +0800
|
||||
+++ meson.build 2024-11-07 19:28:37.000000000 +0800
|
||||
@@ -245,12 +245,12 @@
|
||||
|
||||
if os_osx
|
||||
add_languages('objc')
|
||||
- osx_ldflags = ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit', '-ObjC']
|
||||
+ osx_ldflags = ['-Wl,-framework,Foundation', '-Wl,-framework,AppKit']
|
||||
add_project_link_arguments(osx_ldflags, language : ['objc', 'c'])
|
||||
endif
|
||||
|
||||
if os_osx
|
||||
- add_project_arguments('-ObjC', language : 'c')
|
||||
+ add_project_arguments('-xobjective-c', language : 'c')
|
||||
endif
|
||||
|
||||
################################################################################
|
||||
Reference in New Issue
Block a user