From: "Christoph Junghans (ottxor)" <ottxor@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gtk+/files: gtk+-3.12.2-darwin10.6.patch
Date: Tue, 2 Sep 2014 00:26:32 +0000 (UTC) [thread overview]
Message-ID: <20140902002632.30F50479E@oystercatcher.gentoo.org> (raw)
ottxor 14/09/02 00:26:32
Added: gtk+-3.12.2-darwin10.6.patch
Log:
fix build on Darwin 10.6 (bug #519058)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path
1.1 x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch?rev=1.1&content-type=text/plain
Index: gtk+-3.12.2-darwin10.6.patch
===================================================================
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)
reply other threads:[~2014-09-02 0:26 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140902002632.30F50479E@oystercatcher.gentoo.org \
--to=ottxor@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox