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: lablgtk216.patch
Date: Fri, 24 Aug 2012 13:40:12
Message-Id: 20120824133948.1A99C2059F@flycatcher.gentoo.org
1 aballier 12/08/24 13:39:48
2
3 Added: lablgtk216.patch
4 Log:
5 fix build with lablgtk 2.16
6
7 (Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 sci-mathematics/coq/files/lablgtk216.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/lablgtk216.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-mathematics/coq/files/lablgtk216.patch?rev=1.1&content-type=text/plain
14
15 Index: lablgtk216.patch
16 ===================================================================
17 Fix build with lablgtk 2.16.
18 Apply conditionally because it uses new types introduced in this version.
19
20
21 Index: coq-8.3pl4/ide/preferences.ml
22 ===================================================================
23 --- coq-8.3pl4.orig/ide/preferences.ml
24 +++ coq-8.3pl4/ide/preferences.ml
25 @@ -31,6 +31,10 @@ let mod_to_str (m:Gdk.Tags.modifier) =
26 | `CONTROL -> "CONTROL"
27 | `LOCK -> "LOCK"
28 | `SHIFT -> "SHIFT"
29 + | `HYPER -> "HYPER"
30 + | `META -> "META"
31 + | `RELEASE -> "RELEASE"
32 + | `SUPER -> "SUPER"
33
34 let (str_to_mod:string -> Gdk.Tags.modifier) =
35 function
36 @@ -47,6 +51,10 @@ let (str_to_mod:string -> Gdk.Tags.modif
37 | "CONTROL" -> `CONTROL
38 | "LOCK" -> `LOCK
39 | "SHIFT" -> `SHIFT
40 + | "HYPER" -> `HYPER
41 + | "META" -> `META
42 + | "RELEASE" -> `RELEASE
43 + | "SUPER" -> `SUPER
44 | s -> `MOD1
45
46 type pref =
47 Index: coq-8.3pl4/ide/utils/okey.ml
48 ===================================================================
49 --- coq-8.3pl4.orig/ide/utils/okey.ml
50 +++ coq-8.3pl4/ide/utils/okey.ml
51 @@ -47,6 +47,10 @@ let int_of_modifier = function
52 | `BUTTON3 -> 1024
53 | `BUTTON4 -> 2048
54 | `BUTTON5 -> 4096
55 + | `HYPER -> 8192
56 + | `META -> 16384
57 + | `RELEASE -> 32768
58 + | `SUPER -> 65536
59
60 let print_modifier l =
61 List.iter