Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-mathematics/coq/files: coq-8.4-lablgtk216.patch
Date: Fri, 24 Aug 2012 16:01:39
Message-Id: 20120824160119.B8581205BC@flycatcher.gentoo.org
1 aballier 12/08/24 16:01:19
2
3 Added: coq-8.4-lablgtk216.patch
4 Log:
5 version bump, use camlp4 and switch the desktop entry to make_desktop_entry
6
7 (Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sci-mathematics/coq/files/coq-8.4-lablgtk216.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/coq-8.4-lablgtk216.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/coq-8.4-lablgtk216.patch?rev=1.1&content-type=text/plain
14
15 Index: coq-8.4-lablgtk216.patch
16 ===================================================================
17 Fix build with lablgtk 2.16.
18 Apply conditionally because it uses new types introduced in this version.
19
20 Index: coq-8.4/ide/preferences.ml
21 ===================================================================
22 --- coq-8.4.orig/ide/preferences.ml
23 +++ coq-8.4/ide/preferences.ml
24 @@ -35,7 +35,7 @@ let mod_to_str (m:Gdk.Tags.modifier) =
25 | `MOD5 -> "<Mod5>"
26 | `CONTROL -> "<Control>"
27 | `SHIFT -> "<Shift>"
28 - | `BUTTON1| `BUTTON2| `BUTTON3| `BUTTON4| `BUTTON5| `LOCK -> ""
29 + | `BUTTON1| `BUTTON2| `BUTTON3| `BUTTON4| `BUTTON5| `LOCK | `HYPER | `META | `RELEASE | `SUPER -> ""
30
31 let mod_list_to_str l = List.fold_left (fun s m -> (mod_to_str m)^s) "" l
32
33 Index: coq-8.4/ide/utils/okey.ml
34 ===================================================================
35 --- coq-8.4.orig/ide/utils/okey.ml
36 +++ coq-8.4/ide/utils/okey.ml
37 @@ -47,6 +47,10 @@ let int_of_modifier = function
38 | `BUTTON3 -> 1024
39 | `BUTTON4 -> 2048
40 | `BUTTON5 -> 4096
41 + | `HYPER -> 8192
42 + | `META -> 16384
43 + | `RELEASE -> 32768
44 + | `SUPER -> 65536
45
46 let print_modifier l =
47 List.iter