[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/files/

[gentoo-commits] dev/leio:master commit in: x11-libs/gtk+/files/

[Mart Raudsepp]

commit:     8287d8e94f63d43f35fad46faa5fc6fdff6b281b
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 24 10:30:29 2014 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Nov 24 10:30:29 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=dev/leio.git;a=commit;h=8287d8e9

gtk+: Add forgotten darwin patch

---
 x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch | 39 ++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch b/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
new file mode 100644
index 0000000..3955677
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
@@ -0,0 +1,39 @@
+Fix for Mac Os 10.7
+
+src_compile:
+gtkapplication-quartz-menu.c:265: error: incompatible type for argument 1 of 'roundf'
+make[4]: *** [libgtk_3_la-gtkapplication-quartz-menu.lo] Error 1
+
+More info:
+https://trac.macports.org/ticket/43283
+https://bugzilla.gnome.org/show_bug.cgi?id=727366
+https://bugs.gentoo.org/show_bug.cgi?id=519058
+
+--- 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
++
++@interface NSScreen (LionAPI)
++- (CGFloat)backingScaleFactor;
++- (NSRect)convertRectToBacking:(NSRect)aRect;
++@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)