[125969] trunk/dports/gnome/gtk3

[devans at macports.org]

Revision: 125969
          https://trac.macports.org/changeset/125969
Author:   devans at macports.org
Date:     2014-09-30 11:07:25 -0700 (Tue, 30 Sep 2014)
Log Message:
-----------
gtk3: update to version 3.14.1, drop backingScaleFactor patch, now fixed upstream.

Modified Paths:
--------------
    trunk/dports/gnome/gtk3/Portfile

Removed Paths:
-------------
    trunk/dports/gnome/gtk3/files/patch-backingScaleFactor.diff

Property Changed:
----------------
    trunk/dports/gnome/gtk3/


Property changes on: trunk/dports/gnome/gtk3
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-125820
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620
/users/rmstonecipher/gnome/gtk3:102363-103172
   + /branches/mld-qt-481/dports/gnome/gtk3:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/gtk3:119527-125967
/users/devans/GNOME-3/unstable/dports/gnome/gtk3:119539-125620
/users/rmstonecipher/gnome/gtk3:102363-103172

Modified: trunk/dports/gnome/gtk3/Portfile
===================================================================
--- trunk/dports/gnome/gtk3/Portfile	2014-09-30 16:12:08 UTC (rev 125968)
+++ trunk/dports/gnome/gtk3/Portfile	2014-09-30 18:07:25 UTC (rev 125969)
@@ -10,15 +10,15 @@
 name                gtk3
 set real_name       gtk+
 epoch               1
-version             3.14.0
+version             3.14.1
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          gnome x11
 license             LGPL-2.1+
 maintainers         cal devans openmaintainer
 platforms           darwin
 
-checksums           rmd160  7bba8619b20b8a76794b4539b0da4cfb59483361 \
-                    sha256  68d6b57d15c16808d0045e96b303f3dd439cc22a9c06fdffb07025cd713a82bc
+checksums           rmd160  5258f89c77177e525acf4265a6232956ea8a76c1 \
+                    sha256  7e86eb7c8acc18524d7758ca2340b723ddeee1d0cd2cadd56de5a13322770a52
 
 description         GTK+ widget toolkit
 
@@ -36,9 +36,6 @@
                     ftp://ftp.gtk.org/pub/gtk/${branch}/ \
                     http://ftp.gtk.org/pub/gtk/${branch}/
 
-# See http://trac.macports.org/ticket/43283
-patchfiles          patch-backingScaleFactor.diff
-
 # quartz build fails for 10.6 and earlier due to
 # https://git.gnome.org/browse/gtk+/commit/?id=ec17a649aed65fb0a27d6cf10ab097a5f310dfc6
 # https://trac.macports.org/ticket/45202

Deleted: trunk/dports/gnome/gtk3/files/patch-backingScaleFactor.diff
===================================================================
--- trunk/dports/gnome/gtk3/files/patch-backingScaleFactor.diff	2014-09-30 16:12:08 UTC (rev 125968)
+++ trunk/dports/gnome/gtk3/files/patch-backingScaleFactor.diff	2014-09-30 18:07:25 UTC (rev 125969)
@@ -1,28 +0,0 @@
---- gtk/gtkapplication-quartz-menu.c.orig	2014-05-08 01:40:39.000000000 +0200
-+++ gtk/gtkapplication-quartz-menu.c	2014-05-15 11:16:09.000000000 +0200
-@@ -30,6 +30,16 @@
- 
- #import <Cocoa/Cocoa.h>
- 
-+#if !defined(MAC_OS_X_VERSION_10_7) || \
-+MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
-+
-+ at interface NSScreen (LionAPI)
-+- (CGFloat)backingScaleFactor;
-+- (NSRect)convertRectToBacking:(NSRect)aRect;
-+ at end
-+
-+#endif // 10.7
-+
- #define ICON_SIZE 16
- 
- #define BLACK               "#000000"
-@@ -262,7 +272,7 @@
-         }
- 
-       theme = gtk_icon_theme_get_default ();
--      scale = roundf ([[NSScreen mainScreen] backingScaleFactor]);
-+      scale = [[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)] ? roundf ([[NSScreen mainScreen] backingScaleFactor]) : 1.;
-       info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon, ICON_SIZE, scale, GTK_ICON_LOOKUP_USE_BUILTIN);
- 
-       if (info != NULL)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140930/c7dfe505/attachment.html>