Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wxWidgets-3.0: set c++ standards #27309

Merged
merged 1 commit into from
Jan 9, 2025
Merged

wxWidgets-3.0: set c++ standards #27309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 20 additions & 5 deletions graphics/wxWidgets-3.0/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint wxgtk-3.0:
Warning: Unnecessary platforms line as darwin is the default
Warning: Variant quartz overrides global description

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint wxgtk-3.0-cxx11:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint wxPython-3.0:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint wxWidgets-3.0:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-15 

port lint wxWidgets-3.0-cxx11:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint wxgtk-3.0:
Warning: Unnecessary platforms line as darwin is the default
Warning: Variant quartz overrides global description

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint wxgtk-3.0-cxx11:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint wxPython-3.0:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint wxWidgets-3.0:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-14 

port lint wxWidgets-3.0-cxx11:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port lint wxgtk-3.0:
Warning: Unnecessary platforms line as darwin is the default
Warning: Variant quartz overrides global description

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port lint wxgtk-3.0-cxx11:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port lint wxPython-3.0:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port lint wxWidgets-3.0:
Warning: Unnecessary platforms line as darwin is the default

Check warning on line 1 in graphics/wxWidgets-3.0/Portfile

View workflow job for this annotation

GitHub Actions / macos-13 

port lint wxWidgets-3.0-cxx11:
Warning: Unnecessary platforms line as darwin is the default

PortSystem 1.0
PortGroup active_variants 1.1
Expand All @@ -8,7 +8,7 @@

github.setup wxWidgets wxWidgets 3.0.5.1 v
github.tarball_from releases
revision 4
revision 5

# macOS 15 Requirement: CGDisplayCreateImage fails as it's been removed
platform darwin 24 {
Expand Down Expand Up @@ -40,7 +40,7 @@
} elseif {${subport} eq "wxPython-3.0"} {
wxWidgets.use wxPython-3.0
version 3.0.2
revision 8
revision 9
} elseif {${subport} eq "wxgtk-3.0"} {
# wxgtk-3.0 is need to support older systems where wxWidgets-3.0
# do not work correctly (they do build, but are unusable).
Expand Down Expand Up @@ -145,7 +145,11 @@
}


if {${subport} eq "wxPython-3.0"} {
if {${subport} eq ${name}} {
configure.cxxflags-append -std=c++03

} elseif {${subport} eq "wxPython-3.0"} {

master_sites sourceforge:project/wxwindows/${version} \
http://biolpc22.york.ac.uk/pub/${version}/ \
http://trac.macports.org/raw-attachment/ticket/19190/:trac
Expand Down Expand Up @@ -179,6 +183,8 @@
patch-upstream-strvararg.diff \
patch-upstream-webkit-proper-types.diff

configure.cxxflags-append -std=c++03

# https://trac.macports.org/ticket/52069
if {${os.platform} eq "darwin" && ${os.major} >= 16} {
# The patch probably works on all OS X versions,
Expand Down Expand Up @@ -215,6 +221,8 @@
--without-sdl
configure.args-append --with-sdl

configure.cxxflags-append -std=c++03

#variant gtk2 conflicts gtk3 description {} {
# depends_lib-append path:lib/pkgconfig/gtk+-2.0.pc:gtk2
# configure.args-append --with-gtk=2
Expand Down Expand Up @@ -272,11 +280,18 @@

configure.args-replace --with-cocoa --with-gtk=3 \
--without-sdl --with-sdl
}

if {${subport} eq "wxgtk-3.0" || ${subport} eq "wxgtk-3.0-cxx11"} {
configure.cxxflags-append -std=c++11

} elseif {${subport} eq "wxgtk-3.0"} {
# Address this bug: https://trac.macports.org/ticket/70124
patchfiles-append patch-no-osx-evtloopsrc.h.diff
configure.cxxflags-append -std=c++03

} elseif {${subport} eq "wxgtk-3.0-cxx11"} {
# Address this bug: https://trac.macports.org/ticket/70124
patchfiles-append patch-no-osx-evtloopsrc.h.diff
configure.cxxflags-append -std=c++11
kencu marked this conversation as resolved.
Show resolved Hide resolved
}

post-destroot {
Expand Down
Loading