<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/df0ec130b75de9bf653154a7f148cc6da2cc4eba">https://github.com/macports/macports-ports/commit/df0ec130b75de9bf653154a7f148cc6da2cc4eba</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new df0ec13 fltk: update release to 1.3.5 and devel a7a3c5b4 (20190228)
</span>df0ec13 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit df0ec130b75de9bf653154a7f148cc6da2cc4eba
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Mar 3 07:35:04 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> fltk: update release to 1.3.5 and devel a7a3c5b4 (20190228)
</span>---
aqua/fltk/Portfile | 48 ++++++-----------------
aqua/fltk/files/patch-fix_empty_window.diff | 22 -----------
aqua/fltk/files/patch-fluid-Makefile.release.diff | 6 ++-
3 files changed, 15 insertions(+), 61 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/fltk/Portfile b/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 048f7ea..12811b3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/fltk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,7 @@
</span> # -*- Mode: Tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
name fltk
categories aqua devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,46 +32,27 @@ if {${subport} eq ${name}} {
</span> long_description ${long_description} \
This port provides the release of FLTK, typically updated a few times a year.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # NOTE: when this release is updated fix the octave port to use it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # again on 10.11.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.3.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set ver_bump 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- master_sites http://fltk.org/pub/fltk/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${ver_bump} == 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- worksrcdir ${name}-${version}-${ver_bump}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- distname ${worksrcdir}-source
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 bc0441ae6ee2b961b339c4b1a484cebd6b4ab608 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 25d349c18c99508737d48f225a2eb26a43338f9247551cab72a317fa42cda910 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5281263
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup fltk fltk 1.3.5 release-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 564a331014629299574925c43c1efb03da1a9ed1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 49d03ea050a9d1c88be7d91a52ef5e4381cf34c65078742da78e47a3cb305f56 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5099236
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span>
patchfiles-append \
patch-fluid-Makefile.release.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regexm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url ${homepage}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "Stable Release.*?\n.*?VERSION=(\\d+(\\.\\d+)*)'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> } else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> long_description ${long_description} \
This port provides the snapshot released of FLTK, typically updated a few times a month.
conflicts fltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>- github.setup fltk fltk a1b2d547584ce5631ed983fe7ede4e7a02a0723c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190224
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 3075776ae42975a9109b41038c672d1b81668413 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 9049fd006ded048c8bdc57683e0fa3e52515777974dc2be953e2a61da2a016e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5944988
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ github.setup fltk fltk a7a3c5b4298a2f23de5deba7cfb87a73f4eec279
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190228
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4fe311118e0056b946afeb7698f847d0d7dbe772 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a81ca4e855d8de55b46126992824a163edf22567f8c83696bb826352b6b9e77c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5944719
</span> revision 0
patchfiles-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,14 +65,6 @@ depends_lib port:jpeg \
</span> port:libpng \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${subport} eq "fltk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/fltk/fltk/commit/f76d2a2bf8c35c0c313f05bbd6deda49dd344efc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[vercmp ${xcodeversion} 10.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fix_empty_window.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #if {${subport} eq "fltk"} {
# patchfiles-append \
# patch-src-Makefile.release.diff \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/fltk/files/patch-fix_empty_window.diff b/aqua/fltk/files/patch-fix_empty_window.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8e7d210..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/fltk/files/patch-fix_empty_window.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Fl_cocoa.mm.orig 2017-09-14 12:42:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Fl_cocoa.mm 2018-10-10 23:04:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3301,14 +3301,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fl_window = i->xid;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Fl_X::set_high_resolution( i->mapped_to_retina() );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- current_ = this;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSGraphicsContext *nsgc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (fl_mac_os_version >= 100400)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nsgc = [fl_window graphicsContext]; // 10.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- nsgc = through_Fl_X_flush ? [NSGraphicsContext currentContext] : [NSGraphicsContext graphicsContextWithWindow:fl_window];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSGraphicsContext *nsgc = through_Fl_X_flush ? [NSGraphicsContext currentContext] : [NSGraphicsContext graphicsContextWithWindow:fl_window];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!nsgc) { // this occurs on 10.14 when through_Fl_X_flush==0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [[fl_window contentView] lockFocus];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nsgc = [NSGraphicsContext currentContext];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- i->gc = (CGContextRef)[nsgc graphicsPort];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fl_gc = i->gc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextSaveGState(fl_gc); // native context
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/fltk/files/patch-fluid-Makefile.release.diff b/aqua/fltk/files/patch-fluid-Makefile.release.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 49be223..536e764 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/fltk/files/patch-fluid-Makefile.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/fltk/files/patch-fluid-Makefile.release.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +1,15 @@
</span> --- fluid/Makefile.orig
+++ fluid/Makefile
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,13 +50,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span> fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \
$(IMGLIBNAME)
echo Linking $@...
- $(CXX) $(ARCHFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS)
+ $(CXX) $(ARCHFLAGS) $(CXXFLAGS) -o $@ $(OBJECTS) $(LINKFLTKFORMS) $(LINKFLTKIMG) $(LDLIBS) $(LDFLAGS)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OSX_ONLY) $(RM) -r -f fluid.app/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(OSX_ONLY) mkdir fluid.app/Contents/MacOS
</span> $(OSX_ONLY) $(INSTALL_BIN) fluid fluid.app/Contents/MacOS
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span> fluid-shared$(EXEEXT): $(OBJECTS) ../src/$(DSONAME) ../src/$(FLDSONAME) \
../src/$(IMGDSONAME)
echo Linking $@...
</pre><pre style='margin:0'>
</pre>