summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2014-11-24 12:30:29 +0200
committerMart Raudsepp <leio@gentoo.org>2014-11-24 12:30:29 +0200
commit8287d8e94f63d43f35fad46faa5fc6fdff6b281b (patch)
treee1144308c8c3ae72cbb6bedc49c4f50d8f9355a5
parentgtk+: Sync with portage (multilib support, Darwin patch) (diff)
downloadleio-8287d8e94f63d43f35fad46faa5fc6fdff6b281b.tar.gz
leio-8287d8e94f63d43f35fad46faa5fc6fdff6b281b.tar.bz2
leio-8287d8e94f63d43f35fad46faa5fc6fdff6b281b.zip
gtk+: Add forgotten darwin patch
-rw-r--r--x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch39
1 files changed, 39 insertions, 0 deletions
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)