[102896] trunk/dports/gnome/gtk2
devans at macports.org
devans at macports.org
Sun Feb 10 09:57:11 PST 2013
Revision: 102896
https://trac.macports.org/changeset/102896
Author: devans at macports.org
Date: 2013-02-10 09:57:11 -0800 (Sun, 10 Feb 2013)
Log Message:
-----------
gtk2: update to version 2.24.15, remove quartz patch now included.
Modified Paths:
--------------
trunk/dports/gnome/gtk2/Portfile
Removed Paths:
-------------
trunk/dports/gnome/gtk2/files/gtkclipboard-quartz.patch
Modified: trunk/dports/gnome/gtk2/Portfile
===================================================================
--- trunk/dports/gnome/gtk2/Portfile 2013-02-10 11:33:42 UTC (rev 102895)
+++ trunk/dports/gnome/gtk2/Portfile 2013-02-10 17:57:11 UTC (rev 102896)
@@ -6,8 +6,7 @@
PortGroup xcodeversion 1.0
name gtk2
-version 2.24.14
-revision 1
+version 2.24.15
set branch [join [lrange [split ${version} .] 0 1] .]
categories gnome x11
license LGPL-2+
@@ -31,10 +30,10 @@
minimum_xcodeversions {9 3.1}
-checksums rmd160 80df2a4351f757d86c16ed19333a944a8214c8d6 \
- sha256 8bd1b8b511a3004e8972badf467ce829e6855cdff15540b9344dc934c68008ac
+checksums rmd160 6f691e8ec4564523eca4fd9c2a89d3c7e370038f \
+ sha256 d7e1c6d6ae6baa48c88441fe52b73b0fb6008763644867d59b049bafb0cf771b
-patchfiles patch-gtk-builder-convert.diff patch-aliases.diff gtkclipboard-quartz.patch
+patchfiles patch-gtk-builder-convert.diff patch-aliases.diff
depends_build port:pkgconfig \
port:perl5
Deleted: trunk/dports/gnome/gtk2/files/gtkclipboard-quartz.patch
===================================================================
--- trunk/dports/gnome/gtk2/files/gtkclipboard-quartz.patch 2013-02-10 11:33:42 UTC (rev 102895)
+++ trunk/dports/gnome/gtk2/files/gtkclipboard-quartz.patch 2013-02-10 17:57:11 UTC (rev 102896)
@@ -1,153 +0,0 @@
-From 4a8df7a33c298d22bf78b947d0e861fc03ec70e1 Mon Sep 17 00:00:00 2001
-From: Michael Natterer <mitch at lanedo.com>
-Date: Fri, 07 Dec 2012 11:19:52 +0000
-Subject: quartz: fix crash in the recent clipboard "fix", and really fix it
-
-We must not release the GtkClipboardOwner in pasteboardChangedOwner
-becaue we don't own a reference to ourselves (NSPasteboard does).
-Instead, release the owner right after setting it, transferring
-ownership to NSPasteboard
-
-Also, fix repeated setting of the same owner by keeping the
-owner around in GtkCLipboard, and re-use it if "user_data"
-doesn't change. To avoid clipboard_unset()ting our own contents
-in the process, add an ugly "setting_same_owner" boolean to
-GtkClipboardOwner, set it during re-setting the same owner,
-and avoid calling clipboard_unset() from pasteboardChangedOwner
-if it's TRUE.
----
-(limited to 'gtk/gtkclipboard-quartz.c')
-
-diff --git gtk/gtkclipboard-quartz.c gtk/gtkclipboard-quartz.c
-index 743f037..14b0974 100644
---- gtk/gtkclipboard-quartz.c
-+++ gtk/gtkclipboard-quartz.c
-@@ -39,6 +39,14 @@ enum {
- LAST_SIGNAL
- };
-
-+ at interface GtkClipboardOwner : NSObject {
-+ GtkClipboard *clipboard;
-+ @public
-+ gboolean setting_same_owner;
-+}
-+
-+ at end
-+
- typedef struct _GtkClipboardClass GtkClipboardClass;
-
- struct _GtkClipboard
-@@ -46,6 +54,7 @@ struct _GtkClipboard
- GObject parent_instance;
-
- NSPasteboard *pasteboard;
-+ GtkClipboardOwner *owner;
- NSInteger change_count;
-
- GdkAtom selection;
-@@ -88,12 +96,6 @@ static GtkClipboard *clipboard_peek (GdkDisplay *display,
- GdkAtom selection,
- gboolean only_if_exists);
-
-- at interface GtkClipboardOwner : NSObject {
-- GtkClipboard *clipboard;
--}
--
-- at end
--
- @implementation GtkClipboardOwner
- -(void)pasteboard:(NSPasteboard *)sender provideDataForType:(NSString *)type
- {
-@@ -132,9 +135,8 @@ static GtkClipboard *clipboard_peek (GdkDisplay *display,
- */
- - (void)pasteboardChangedOwner:(NSPasteboard *)sender
- {
-- clipboard_unset (clipboard);
--
-- [self release];
-+ if (! setting_same_owner)
-+ clipboard_unset (clipboard);
- }
-
- - (id)initWithClipboard:(GtkClipboard *)aClipboard
-@@ -144,6 +146,7 @@ static GtkClipboard *clipboard_peek (GdkDisplay *display,
- if (self)
- {
- clipboard = aClipboard;
-+ setting_same_owner = FALSE;
- }
-
- return self;
-@@ -334,10 +337,6 @@ gtk_clipboard_set_contents (GtkClipboard *clipboard,
- NSSet *types;
- NSAutoreleasePool *pool;
-
-- pool = [[NSAutoreleasePool alloc] init];
--
-- owner = [[GtkClipboardOwner alloc] initWithClipboard:clipboard];
--
- if (!(clipboard->have_owner && have_owner) ||
- clipboard->user_data != user_data)
- {
-@@ -352,26 +351,44 @@ gtk_clipboard_set_contents (GtkClipboard *clipboard,
- clipboard->user_data != user_data)
- {
- (*clear_func) (clipboard, user_data);
-- [pool release];
- return FALSE;
- }
- else
- {
-- [pool release];
- return TRUE;
- }
- }
- }
-
-+ pool = [[NSAutoreleasePool alloc] init];
-+
-+ types = _gtk_quartz_target_entries_to_pasteboard_types (targets, n_targets);
-+
- /* call declareTypes before setting the clipboard members because
- * declareTypes might clear the clipboard
- */
-- types = _gtk_quartz_target_entries_to_pasteboard_types (targets, n_targets);
-- clipboard->change_count = [clipboard->pasteboard declareTypes: [types allObjects]
-- owner: owner];
-+ if (user_data && user_data == clipboard->user_data)
-+ {
-+ owner = [clipboard->owner retain];
-+
-+ owner->setting_same_owner = TRUE;
-+ clipboard->change_count = [clipboard->pasteboard declareTypes: [types allObjects]
-+ owner: owner];
-+ owner->setting_same_owner = FALSE;
-+ }
-+ else
-+ {
-+ owner = [[GtkClipboardOwner alloc] initWithClipboard:clipboard];
-+
-+ clipboard->change_count = [clipboard->pasteboard declareTypes: [types allObjects]
-+ owner: owner];
-+ }
-+
-+ [owner release];
- [types release];
- [pool release];
-
-+ clipboard->owner = owner;
- clipboard->user_data = user_data;
- clipboard->have_owner = have_owner;
- if (have_owner)
-@@ -460,7 +477,8 @@ clipboard_unset (GtkClipboard *clipboard)
- clipboard->n_storable_targets = -1;
- g_free (clipboard->storable_targets);
- clipboard->storable_targets = NULL;
--
-+
-+ clipboard->owner = NULL;
- clipboard->get_func = NULL;
- clipboard->clear_func = NULL;
- clipboard->user_data = NULL;
---
-cgit v0.9.0.2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130210/79a9214a/attachment.html>
More information about the macports-changes
mailing list