<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/da363456bfba3d06627d9f7d94a8790d426d2c7b">https://github.com/macports/macports-ports/commit/da363456bfba3d06627d9f7d94a8790d426d2c7b</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 da36345 gtk3: update to version 3.24.10
</span>da36345 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit da363456bfba3d06627d9f7d94a8790d426d2c7b
</span>Author: Jonathan Stickel <jjstickel@gmail.com>
AuthorDate: Fri Jul 19 20:55:41 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> gtk3: update to version 3.24.10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * update to version 3.24.10
</span><span style='display:block; white-space:pre;color:#404040;'> * remove a patch that is no longer needed
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/58730
</span>---
gnome/gtk3/Portfile | 10 ++--
.../patch-quartz-hardcode-screen-resolution.patch | 61 ----------------------
2 files changed, 4 insertions(+), 67 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3/Portfile b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc6fa2f..6aef586 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,8 +9,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> name gtk3
set real_name gtk+
epoch 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.22.30
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24.10
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome x11
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +29,9 @@ use_xz yes
</span>
master_sites gnome:sources/gtk+/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 915f2ccceefab24893e02e0e26c57b0146909218 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 a1a4a5c12703d4e1ccda28333b87ff462741dc365131fbc94c218ae81d9a6567 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 18946084
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 ec6c7db0bb3446bbf1f032e3a0634bbd360a5ace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 35a8f107e2b90fda217f014c0c15cb20a6a66678f6fd7e36556d469372c01b03 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 20958300
</span>
minimum_xcodeversions {9 3.1}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -60,7 +59,6 @@ patchfiles O_CLOEXEC-10.6-and-earlier.patch
</span>
if {[variant_isset quartz]} {
compiler.blacklist *gcc-3.* *gcc-4.* {clang < 425}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-quartz-hardcode-screen-resolution.patch
</span> } else {
compiler.blacklist *gcc-3.* *gcc-4.* {clang < 300}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3/files/patch-quartz-hardcode-screen-resolution.patch b/gnome/gtk3/files/patch-quartz-hardcode-screen-resolution.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index eb4ee37..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3/files/patch-quartz-hardcode-screen-resolution.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,61 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This patch comprises two upstream patches
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/GNOME/gtk/commit/828f634 and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/GNOME/gtk/commit/bb376222c104aef0ec7e31b40959bc35eecf2253
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for the gtk3 3.22.30 release to solve the font rendering
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-problem for the quartz backend of gtk on HiDPI screens
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-like the MacBookPro Retina. The 828f634 patch is already
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-in 3.24.1 and the bb3762 patch will be in 3.24.2. See
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugzilla.gnome.org/show_bug.cgi?id=787867
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-for a detailed discussion.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk/quartz/gdkscreen-quartz.c | 18 +++++++++++-------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 11 insertions(+), 7 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/quartz/gdkscreen-quartz.c b/gdk/quartz/gdkscreen-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 586f7af02a6..219338832ee 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/quartz/gdkscreen-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/quartz/gdkscreen-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,7 +67,7 @@ static void gdk_quartz_screen_calculate_layout (GdkQuartzScreen *screen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void display_reconfiguration_callback (CGDirectDisplayID display,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGDisplayChangeSummaryFlags flags,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void *userInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static const double dpi = 72.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static gint get_mm_from_pixels (NSScreen *screen, int pixels);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_DEFINE_TYPE (GdkQuartzScreen, gdk_quartz_screen, GDK_TYPE_SCREEN);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -76,10 +76,17 @@ static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_quartz_screen_init (GdkQuartzScreen *quartz_screen)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GdkScreen *screen = GDK_SCREEN (quartz_screen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSDictionary *dd = [[[NSScreen screens] objectAtIndex:0] deviceDescription];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSSize size = [[dd valueForKey:NSDeviceResolution] sizeValue];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Screen resolution is used exclusively to pass to Pango for font
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * scaling. There's a long discussion in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * https://bugzilla.gnome.org/show_bug.cgi?id=787867 exploring how
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * screen resolution and pangocairo-coretext interact. The summary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * is that MacOS takes care of scaling fonts for Retina screens and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * that while the Apple Documentation goes on about "points" they're
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * CSS points (96/in), not typeography points (72/in) and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * pangocairo-coretext needs to default to that scaling factor.
</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;'>-- _gdk_screen_set_resolution (screen, size.width);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _gdk_screen_set_resolution (screen, dpi);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_quartz_screen_calculate_layout (quartz_screen);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -335,9 +342,6 @@ static gint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_mm_from_pixels (NSScreen *screen, int pixels)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const float mm_per_inch = 25.4;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSDictionary *dd = [[[NSScreen screens] objectAtIndex:0] deviceDescription];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- NSSize size = [[dd valueForKey:NSDeviceResolution] sizeValue];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- float dpi = size.width;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (pixels / dpi) * mm_per_inch;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>