diff options
| author | adam <adam@pkgsrc.org> | 2010-08-30 19:29:25 +0000 |
|---|---|---|
| committer | adam <adam@pkgsrc.org> | 2010-08-30 19:29:25 +0000 |
| commit | cbe6011bb5c3fc4b887a90a5f1872d3d17217b2d (patch) | |
| tree | 9d0fbd5cee8f04170f1a1ec5deb8327c85a204b2 /games | |
| parent | d33a5a177fb06a05c8363a8f42b322b9f23aec39 (diff) | |
| download | pkgsrc-cbe6011bb5c3fc4b887a90a5f1872d3d17217b2d.tar.gz | |
Minor update in patch-ag, following Wesnoth bug http://gna.org/bugs/?16576
Diffstat (limited to 'games')
| -rw-r--r-- | games/wesnoth/distinfo | 4 | ||||
| -rw-r--r-- | games/wesnoth/patches/patch-ag | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/games/wesnoth/distinfo b/games/wesnoth/distinfo index 4e224b726c1..e535c318b67 100644 --- a/games/wesnoth/distinfo +++ b/games/wesnoth/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.40 2010/08/29 10:51:29 wiz Exp $ +$NetBSD: distinfo,v 1.41 2010/08/30 19:29:25 adam Exp $ SHA1 (wesnoth-1.8.4.tar.bz2) = 30b82e06523f9a82b770a6fc4e2d4251bd358eca RMD160 (wesnoth-1.8.4.tar.bz2) = 86b6f6ca39cf87134d89e989ed20840836aeac28 @@ -6,5 +6,5 @@ Size (wesnoth-1.8.4.tar.bz2) = 300557790 bytes SHA1 (patch-aa) = 363dead4e4a6974db5a2d71a460e60404cc1246a SHA1 (patch-ae) = 9e0ee531c33da80565791d81f716b313fa85af18 SHA1 (patch-af) = d3554b1c164ff95ee2b86c17990ed236f0e00c32 -SHA1 (patch-ag) = 879382e9e53eaf4dea6795b8d23e87890682c1d2 +SHA1 (patch-ag) = 9a843d4fa2f011b69ee140dceaac3d56d1fe44f9 SHA1 (patch-ah) = ca06ab21724812290c4f4785cfbd42d3406202fb diff --git a/games/wesnoth/patches/patch-ag b/games/wesnoth/patches/patch-ag index eba3fbb2b7d..1fcad7ea277 100644 --- a/games/wesnoth/patches/patch-ag +++ b/games/wesnoth/patches/patch-ag @@ -1,6 +1,7 @@ -$NetBSD: patch-ag,v 1.6 2010/08/29 10:51:30 wiz Exp $ +$NetBSD: patch-ag,v 1.7 2010/08/30 19:29:26 adam Exp $ On MacOSX use Pasteboard Manager instead of deprecated Scrap Manager. +For details, see http://gna.org/bugs/?16576 --- src/clipboard.cpp.orig 2010-02-06 10:50:29.000000000 +0000 +++ src/clipboard.cpp @@ -38,7 +39,7 @@ On MacOSX use Pasteboard Manager instead of deprecated Scrap Manager. if (err != noErr) return; - PutScrapFlavor(scrap, kScrapFlavorTypeText, kScrapFlavorMaskNone, text.size(), new_str.c_str()); + syncFlags = PasteboardSynchronize(clipboard); -+ if (!(syncFlags&kPasteboardModified) || (syncFlags&kPasteboardClientIsOwner)) return; ++ if ((syncFlags&kPasteboardModified) && !(syncFlags&kPasteboardClientIsOwner)) return; + textData = CFDataCreate(kCFAllocatorDefault, (const UInt8 *)new_str.c_str(), text.size()); + PasteboardPutItemFlavor(clipboard, (PasteboardItemID)1, CFSTR("public.utf8-plain-text"), textData, 0); } |