Ocaml-devel July 2011

ocaml-devel@lists.fedoraproject.org

5 participants
22 discussions

Broken dependencies: coq
by Fedora Koji Build System 30 Jul '11

30 Jul '11

coq has broken dependencies in the F-16 tree: On x86_64: coq-xemacs-8.3pl2-2.fc16.noarch requires xemacs-proofgeneral On i386: coq-xemacs-8.3pl2-2.fc16.noarch requires xemacs-proofgeneral On x86_64: coq-8.3pl2-2.fc16.x86_64 requires ocaml(Pprintf) = 0:d3dad80eee688f5bb2625fe8b407f032 coq-8.3pl2-2.fc16.x86_64 requires ocaml(Ploc) = 0:cd274e73bdce9a1bfc71cc5c19c0bf9c coq-8.3pl2-2.fc16.x86_64 requires ocaml(Extfun) = 0:7207a786d0841a302eae10db98979311 coq-8.3pl2-2.fc16.x86_64 requires ocaml(Pcaml) = 0:aab1078eb605ddd32382cd3b26e1e9cb coq-8.3pl2-2.fc16.x86_64 requires ocaml(MLast) = 0:053d904bced85ba25bf6ab0adb2c4eac coq-8.3pl2-2.fc16.x86_64 requires ocaml(Plexing) = 0:af03d74fdd25c7f5adef6fedca18c3f1 coq-8.3pl2-2.fc16.x86_64 requires ocaml(Eprinter) = 0:2c27930d3421a6c09548d4376540083e coq-8.3pl2-2.fc16.x86_64 requires ocaml(Quotation) = 0:bd6dab5ba3c9188ed82919075ac942e2 coq-8.3pl2-2.fc16.x86_64 requires ocaml(Token) = 0:1148e70ee439dfccb0930823a9dfa2ed coq-8.3pl2-2.fc16.x86_64 requires ocaml(Stdpp) = 0:4a9363c5c3c814dba55fb29c668cff31 coq-8.3pl2-2.fc16.x86_64 requires ocaml(Fstream) = 0:0638542c744443f2b176b95a5b211df9 coq-8.3pl2-2.fc16.x86_64 requires ocaml(Gramext) = 0:5dd2e0bee1e8f1d4eae3e3c00e14cf54 coq-8.3pl2-2.fc16.x86_64 requires ocaml(Grammar) = 0:62a81e78d8838c0f1b51aa279da1a82c On i386: coq-8.3pl2-2.fc16.i686 requires ocaml(Token) = 0:1148e70ee439dfccb0930823a9dfa2ed coq-8.3pl2-2.fc16.i686 requires ocaml(Eprinter) = 0:2c27930d3421a6c09548d4376540083e coq-8.3pl2-2.fc16.i686 requires ocaml(Plexing) = 0:af03d74fdd25c7f5adef6fedca18c3f1 coq-8.3pl2-2.fc16.i686 requires ocaml(MLast) = 0:053d904bced85ba25bf6ab0adb2c4eac coq-8.3pl2-2.fc16.i686 requires ocaml(Pcaml) = 0:aab1078eb605ddd32382cd3b26e1e9cb coq-8.3pl2-2.fc16.i686 requires ocaml(Extfun) = 0:7207a786d0841a302eae10db98979311 coq-8.3pl2-2.fc16.i686 requires ocaml(Gramext) = 0:5dd2e0bee1e8f1d4eae3e3c00e14cf54 coq-8.3pl2-2.fc16.i686 requires ocaml(Fstream) = 0:0638542c744443f2b176b95a5b211df9 coq-8.3pl2-2.fc16.i686 requires ocaml(Grammar) = 0:62a81e78d8838c0f1b51aa279da1a82c coq-8.3pl2-2.fc16.i686 requires ocaml(Stdpp) = 0:4a9363c5c3c814dba55fb29c668cff31 coq-8.3pl2-2.fc16.i686 requires ocaml(Pprintf) = 0:d3dad80eee688f5bb2625fe8b407f032 coq-8.3pl2-2.fc16.i686 requires ocaml(Quotation) = 0:bd6dab5ba3c9188ed82919075ac942e2 coq-8.3pl2-2.fc16.i686 requires ocaml(Ploc) = 0:cd274e73bdce9a1bfc71cc5c19c0bf9c On x86_64: coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkBaseProps) = 0:a390a19536bd16796ce682222ff6b617 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkData) = 0:ed8d836240555086d0cf60e0ed0cf922 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GTree) = 0:3a4be6d14cb3a804c2f38817ad35181d coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkThread) = 0:c48e24be2322c4077f5b1d5721ac179c coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GMenu) = 0:df68ebea5d58085c3de46d5472c494a0 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GEdit) = 0:19e02eb8d58960097f53d4a0663f9be4 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GToolbox) = 0:8d2c2d69db4efb3ec33c95b2b14c7a12 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GMain) = 0:e528f5b206fdb899c79821e2183480d5 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Gtk) = 0:432c93a47db000e1ed95278dd4683da6 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GDraw) = 0:98c42d84a8e51653007acb9fc812c5e4 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkPack) = 0:aead410d035212b1e97d53b130e35aca coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GdkEnums) = 0:70ad074db0644bf10588e8c34a1b5625 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GContainer) = 0:8d5a790080ff468050a55b191df2651d coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkTree) = 0:b685223f5c65e209056ebae79660ee6a coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkSignal) = 0:f3a43d7fa2d200cb558a9448faafe08c coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Stdpp) = 0:4a9363c5c3c814dba55fb29c668cff31 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkEnums) = 0:ae7b2c2a83853d2def52ca9abb2076a4 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Pango) = 0:3ab92ee82d8f09439813eb612c20e98f coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GdkKeysyms) = 0:c1374d91d7e967c95fd0ce53abcb3d10 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Plexing) = 0:af03d74fdd25c7f5adef6fedca18c3f1 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GBin) = 0:e99b37306f76d1ceea3c39aba9d457ca coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(PangoEnums) = 0:fcfc7f5fb6e3da02d9ac99231e43f39b coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Gdk) = 0:59caeee30c1d6bdb12b0ce5bf03118d1 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Glib) = 0:f56ca2b21a810156fc5f581555b8bfda coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GFile) = 0:88b7584bed14ec643e33afe4ad9845a0 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Ploc) = 0:cd274e73bdce9a1bfc71cc5c19c0bf9c coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GText) = 0:788dca86d93ded57b42d917bdb27e76c coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkText) = 0:49fdb3fa0e256770e7515821497ddbf7 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GRange) = 0:e706b1a15af06abd85c187b7e7ef7e73 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkBase) = 0:f55b95a8c913f3778bb2d11107fb76d6 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GObj) = 0:ea4f2bf03b3cc010442065020738f26f coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GPango) = 0:427fc1f4200e5e1307908b9317d0bcf2 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Token) = 0:1148e70ee439dfccb0930823a9dfa2ed coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkTextProps) = 0:42bfcbb039a9d86f50052425cfbd5ccb coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GdkPixbuf) = 0:ddc1e74b519ecdfe8fa2872f8034b32b coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Gaux) = 0:04762183969e1683729340648b1f9fe6 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GData) = 0:45b783e7a3c5e6f2cf498f5bd2d4c0f8 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkPackProps) = 0:d7d9dd21ecb8e5d56e765905a41be53d coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GBroken) = 0:db19762ffe438d58c33747d36d8983c4 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GMisc) = 0:fc78431e0214b7fb48a328cb5dcfd3f8 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Gobject) = 0:acbeeb6d76e2fc1f756c364840661748 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkTreeProps) = 0:d7c4a65fe6ca7cd6082feee5dea49e2c coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkMain) = 0:2d9fd1d005eb0b787ac3ff55a7e783cf coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkObject) = 0:8c44c1096e24211efc0b9c4428d07e4b coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Fstream) = 0:0638542c744443f2b176b95a5b211df9 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Gramext) = 0:5dd2e0bee1e8f1d4eae3e3c00e14cf54 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GdkEvent) = 0:e4b8521b9a48d576e12b4134bba11ce8 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GList) = 0:9e50fa5765b543503b5fa94c8944ce95 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Grammar) = 0:62a81e78d8838c0f1b51aa279da1a82c coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(Gpointer) = 0:ce10916e5dd0d785d6bd7a88c55aadfa coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GPack) = 0:4c5fea7a104450f81db5e0f135d6f92f coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GButton) = 0:97ad47f4320e49074cf8bc45305e1e53 coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GtkStock) = 0:43640c4aed32799b0ac32e8785a63cbc coq-coqide-8.3pl2-2.fc16.x86_64 requires ocaml(GWindow) = 0:8d76e812e47bee5dce8bbdbf61a2d3fb On i386: coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Token) = 0:1148e70ee439dfccb0930823a9dfa2ed coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GFile) = 0:88b7584bed14ec643e33afe4ad9845a0 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GPango) = 0:427fc1f4200e5e1307908b9317d0bcf2 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkBase) = 0:f55b95a8c913f3778bb2d11107fb76d6 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GRange) = 0:e706b1a15af06abd85c187b7e7ef7e73 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkText) = 0:49fdb3fa0e256770e7515821497ddbf7 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Ploc) = 0:cd274e73bdce9a1bfc71cc5c19c0bf9c coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Gdk) = 0:59caeee30c1d6bdb12b0ce5bf03118d1 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkObject) = 0:8c44c1096e24211efc0b9c4428d07e4b coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(PangoEnums) = 0:fcfc7f5fb6e3da02d9ac99231e43f39b coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GBin) = 0:e99b37306f76d1ceea3c39aba9d457ca coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Plexing) = 0:af03d74fdd25c7f5adef6fedca18c3f1 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Pango) = 0:3ab92ee82d8f09439813eb612c20e98f coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkSignal) = 0:f3a43d7fa2d200cb558a9448faafe08c coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GContainer) = 0:8d5a790080ff468050a55b191df2651d coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GdkEnums) = 0:70ad074db0644bf10588e8c34a1b5625 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkPack) = 0:aead410d035212b1e97d53b130e35aca coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkTree) = 0:b685223f5c65e209056ebae79660ee6a coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Gaux) = 0:04762183969e1683729340648b1f9fe6 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GDraw) = 0:98c42d84a8e51653007acb9fc812c5e4 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Gtk) = 0:432c93a47db000e1ed95278dd4683da6 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GObj) = 0:ea4f2bf03b3cc010442065020738f26f coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GToolbox) = 0:8d2c2d69db4efb3ec33c95b2b14c7a12 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GMenu) = 0:df68ebea5d58085c3de46d5472c494a0 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GTree) = 0:3a4be6d14cb3a804c2f38817ad35181d coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkData) = 0:ed8d836240555086d0cf60e0ed0cf922 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkStock) = 0:43640c4aed32799b0ac32e8785a63cbc coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkBaseProps) = 0:a390a19536bd16796ce682222ff6b617 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GWindow) = 0:8d76e812e47bee5dce8bbdbf61a2d3fb coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Stdpp) = 0:4a9363c5c3c814dba55fb29c668cff31 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkThread) = 0:c48e24be2322c4077f5b1d5721ac179c coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GButton) = 0:97ad47f4320e49074cf8bc45305e1e53 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GPack) = 0:4c5fea7a104450f81db5e0f135d6f92f coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Gpointer) = 0:ce10916e5dd0d785d6bd7a88c55aadfa coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Grammar) = 0:62a81e78d8838c0f1b51aa279da1a82c coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GdkKeysyms) = 0:c1374d91d7e967c95fd0ce53abcb3d10 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GList) = 0:9e50fa5765b543503b5fa94c8944ce95 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GText) = 0:788dca86d93ded57b42d917bdb27e76c coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Gramext) = 0:5dd2e0bee1e8f1d4eae3e3c00e14cf54 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Fstream) = 0:0638542c744443f2b176b95a5b211df9 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GEdit) = 0:19e02eb8d58960097f53d4a0663f9be4 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkMain) = 0:2d9fd1d005eb0b787ac3ff55a7e783cf coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkTreeProps) = 0:d7c4a65fe6ca7cd6082feee5dea49e2c coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Glib) = 0:f56ca2b21a810156fc5f581555b8bfda coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(Gobject) = 0:acbeeb6d76e2fc1f756c364840661748 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GMain) = 0:e528f5b206fdb899c79821e2183480d5 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GMisc) = 0:fc78431e0214b7fb48a328cb5dcfd3f8 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GBroken) = 0:db19762ffe438d58c33747d36d8983c4 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkPackProps) = 0:d7d9dd21ecb8e5d56e765905a41be53d coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GData) = 0:45b783e7a3c5e6f2cf498f5bd2d4c0f8 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GdkPixbuf) = 0:ddc1e74b519ecdfe8fa2872f8034b32b coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkTextProps) = 0:42bfcbb039a9d86f50052425cfbd5ccb coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GdkEvent) = 0:e4b8521b9a48d576e12b4134bba11ce8 coq-coqide-8.3pl2-2.fc16.i686 requires ocaml(GtkEnums) = 0:ae7b2c2a83853d2def52ca9abb2076a4 On x86_64: coq-emacs-8.3pl2-2.fc16.noarch requires emacs-proofgeneral On i386: coq-emacs-8.3pl2-2.fc16.noarch requires emacs-proofgeneral Please resolve this as soon as possible.

1 0

[ocaml-lablgtk/f16] - Add patch (sent upstream) to fix gtkThread async callbacks throwing Queue.Empty. (cherry picked
by Richard W.M. Jones 29 Jul '11

29 Jul '11

commit f6d790f834412c43ececde675f3f584aeb418e4d Author: Richard W.M. Jones <rjones(a)redhat.com> Date: Wed Jul 27 18:53:23 2011 +0100 - Add patch (sent upstream) to fix gtkThread async callbacks throwing Queue.Empty. (cherry picked from commit 120a908fae5943af36090e568ee349dfceab8be9) ...gtk-2.14.2-avoid-queue-empty-in-gtkThread.patch | 40 ++++++++++++++++++++ ocaml-lablgtk.spec | 11 +++++- 2 files changed, 50 insertions(+), 1 deletions(-) --- diff --git a/lablgtk-2.14.2-avoid-queue-empty-in-gtkThread.patch b/lablgtk-2.14.2-avoid-queue-empty-in-gtkThread.patch new file mode 100644 index 0000000..80b2735 --- /dev/null +++ b/lablgtk-2.14.2-avoid-queue-empty-in-gtkThread.patch @@ -0,0 +1,40 @@ +diff -ur lablgtk-2.14.2.old/src/gtkThread.ml lablgtk-2.14.2/src/gtkThread.ml +--- lablgtk-2.14.2.old/src/gtkThread.ml 2010-06-25 10:23:44.000000000 +0100 ++++ lablgtk-2.14.2/src/gtkThread.ml 2011-07-27 19:16:32.263724495 +0100 +@@ -28,8 +28,14 @@ + + let jobs : (unit -> unit) Queue.t = Queue.create () + let m = Mutex.create () ++type ('a, 'b) either = Left of 'a | Right of 'b + let with_jobs f = +- Mutex.lock m; let y = f jobs in Mutex.unlock m; y ++ Mutex.lock m; ++ let y = try Left (f jobs) with exn -> Right exn in ++ Mutex.unlock m; ++ match y with ++ | Left y -> y ++ | Right exn -> raise exn + + let loop_id = ref None + let reset () = loop_id := None +@@ -40,8 +46,6 @@ + let gui_safe () = + not (Sys.os_type = "Win32") || !loop_id = Some(Thread.id (Thread.self ())) + +-let has_jobs () = not (with_jobs Queue.is_empty) +-let n_jobs () = with_jobs Queue.length + let do_next_job () = with_jobs Queue.take () + let async j x = with_jobs + (Queue.add (fun () -> +@@ -64,9 +68,9 @@ + + let do_jobs () = + Thread.delay 0.0001; +- for i = 1 to n_jobs () do do_next_job () done; ++ let rec loop () = do_next_job (); loop () in ++ (try loop () with Queue.Empty -> ()); + true +- + + (* We check first whether there are some event pending, and run + some iterations. We then need to delay, thus focing a thread switch. *) diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec index a8aeb7f..43d71e8 100644 --- a/ocaml-lablgtk.spec +++ b/ocaml-lablgtk.spec @@ -2,7 +2,7 @@ Name: ocaml-lablgtk Version: 2.14.2 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Objective Caml interface to gtk+ @@ -12,6 +12,9 @@ License: LGPLv2 with exceptions URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html Source: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-%{version}.tar.gz +# Patch sent upstream 2011-07-27 by RWMJ. +Patch0: lablgtk-2.14.2-avoid-queue-empty-in-gtkThread.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x @@ -74,6 +77,8 @@ developing applications that use %{name}. # version information in META file is wrong perl -pi -e 's|version="1.3.1"|version="%{version}"|' META +%patch0 -p1 + %build %configure --with-gl --enable-debug @@ -153,6 +158,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 27 2011 Richard W.M. Jones <rjones(a)redhat.com> - 2.14.2-6 +- Add patch (sent upstream) to fix gtkThread async callbacks throwing + Queue.Empty. + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.14.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

1 0

[ocaml-lablgtk] - Add patch (sent upstream) to fix gtkThread async callbacks throwing Queue.Empty.
by Richard W.M. Jones 27 Jul '11

27 Jul '11

commit 120a908fae5943af36090e568ee349dfceab8be9 Author: Richard W.M. Jones <rjones(a)redhat.com> Date: Wed Jul 27 18:53:23 2011 +0100 - Add patch (sent upstream) to fix gtkThread async callbacks throwing Queue.Empty. ...gtk-2.14.2-avoid-queue-empty-in-gtkThread.patch | 40 ++++++++++++++++++++ ocaml-lablgtk.spec | 11 +++++- 2 files changed, 50 insertions(+), 1 deletions(-) --- diff --git a/lablgtk-2.14.2-avoid-queue-empty-in-gtkThread.patch b/lablgtk-2.14.2-avoid-queue-empty-in-gtkThread.patch new file mode 100644 index 0000000..80b2735 --- /dev/null +++ b/lablgtk-2.14.2-avoid-queue-empty-in-gtkThread.patch @@ -0,0 +1,40 @@ +diff -ur lablgtk-2.14.2.old/src/gtkThread.ml lablgtk-2.14.2/src/gtkThread.ml +--- lablgtk-2.14.2.old/src/gtkThread.ml 2010-06-25 10:23:44.000000000 +0100 ++++ lablgtk-2.14.2/src/gtkThread.ml 2011-07-27 19:16:32.263724495 +0100 +@@ -28,8 +28,14 @@ + + let jobs : (unit -> unit) Queue.t = Queue.create () + let m = Mutex.create () ++type ('a, 'b) either = Left of 'a | Right of 'b + let with_jobs f = +- Mutex.lock m; let y = f jobs in Mutex.unlock m; y ++ Mutex.lock m; ++ let y = try Left (f jobs) with exn -> Right exn in ++ Mutex.unlock m; ++ match y with ++ | Left y -> y ++ | Right exn -> raise exn + + let loop_id = ref None + let reset () = loop_id := None +@@ -40,8 +46,6 @@ + let gui_safe () = + not (Sys.os_type = "Win32") || !loop_id = Some(Thread.id (Thread.self ())) + +-let has_jobs () = not (with_jobs Queue.is_empty) +-let n_jobs () = with_jobs Queue.length + let do_next_job () = with_jobs Queue.take () + let async j x = with_jobs + (Queue.add (fun () -> +@@ -64,9 +68,9 @@ + + let do_jobs () = + Thread.delay 0.0001; +- for i = 1 to n_jobs () do do_next_job () done; ++ let rec loop () = do_next_job (); loop () in ++ (try loop () with Queue.Empty -> ()); + true +- + + (* We check first whether there are some event pending, and run + some iterations. We then need to delay, thus focing a thread switch. *) diff --git a/ocaml-lablgtk.spec b/ocaml-lablgtk.spec index a8aeb7f..43d71e8 100644 --- a/ocaml-lablgtk.spec +++ b/ocaml-lablgtk.spec @@ -2,7 +2,7 @@ Name: ocaml-lablgtk Version: 2.14.2 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Objective Caml interface to gtk+ @@ -12,6 +12,9 @@ License: LGPLv2 with exceptions URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html Source: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/dist/lablgtk-%{version}.tar.gz +# Patch sent upstream 2011-07-27 by RWMJ. +Patch0: lablgtk-2.14.2-avoid-queue-empty-in-gtkThread.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExcludeArch: sparc64 s390 s390x @@ -74,6 +77,8 @@ developing applications that use %{name}. # version information in META file is wrong perl -pi -e 's|version="1.3.1"|version="%{version}"|' META +%patch0 -p1 + %build %configure --with-gl --enable-debug @@ -153,6 +158,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 27 2011 Richard W.M. Jones <rjones(a)redhat.com> - 2.14.2-6 +- Add patch (sent upstream) to fix gtkThread async callbacks throwing + Queue.Empty. + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.14.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

1 0

[ocaml-ocamlgraph/f15] New upstream release. Drop unnecessary spec file elements (BuildRoot, etc.). Drop dependency generat
by Jerry James 14 Jul '11

14 Jul '11

Summary of changes: 256528d... New upstream release. Drop unnecessary spec file elements ( (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[ocaml-ocamlgraph] New upstream release. Drop unnecessary spec file elements (BuildRoot, etc.). Drop dependency generat
by Jerry James 11 Jul '11

11 Jul '11

commit 256528d223d93268d1782a05867ebdada25f1f37 Author: Jerry James <loganjerry(a)gmail.com> Date: Mon Jul 11 15:31:14 2011 -0600 New upstream release. Drop unnecessary spec file elements (BuildRoot, etc.). Drop dependency generation workaround for Fedora 12 and earlier. Remove spurious executable bits on source files. Replace the definition of __ocaml_requires_opts to "-i Sig", which removes the legitimate Requires: ocaml(GtkSignal), with __requires_exclude. .gitignore | 3 +- ocaml-ocamlgraph.spec | 54 +++++++++---------- ...as.patch => ocamlgraph-1.7-install-extras.patch | 6 +- sources | 2 +- 4 files changed, 31 insertions(+), 34 deletions(-) --- diff --git a/.gitignore b/.gitignore index eab46f3..29e7e85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -ocamlgraph-1.3.tar.gz -/ocamlgraph-1.6.tar.gz +/ocamlgraph-1.7.tar.gz diff --git a/ocaml-ocamlgraph.spec b/ocaml-ocamlgraph.spec index a706c15..73af83c 100644 --- a/ocaml-ocamlgraph.spec +++ b/ocaml-ocamlgraph.spec @@ -12,19 +12,12 @@ # follow standard practice. %global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0) +%global ocaml_destdir %{_libdir}/ocaml %global debug_package %{nil} -# Use new dependency generator in Fedora >= 13 -%if 0%{?fedora} <= 12 -%global _use_internal_dependency_generator 0 -%global __find_requires /usr/lib/rpm/ocaml-find-requires.sh -%global __find_provides /usr/lib/rpm/ocaml-find-provides.sh -%endif - -%global __ocaml_requires_opts -i Sig Name: ocaml-ocamlgraph -Version: 1.6 -Release: 3%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: OCaml library for arc and node graphs Group: Development/Libraries @@ -35,14 +28,18 @@ Source0: http://ocamlgraph.lri.fr/download/ocamlgraph-%{version}.tar.gz Source1: ocamlgraph-test.result # Fix the install-findlib rule, and install some extras. -Patch3: ocamlgraph-1.6-install-extras.patch +Patch0: ocamlgraph-1.7-install-extras.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExcludeArch: sparc64 s390 s390x -BuildRequires: ocaml >= 3.08, ocaml-findlib-devel, ocaml-ocamldoc +BuildRequires: libart_lgpl-devel +BuildRequires: libgnomecanvas-devel +BuildRequires: ocaml +BuildRequires: ocaml-findlib-devel BuildRequires: ocaml-lablgtk-devel -BuildRequires: gtk2-devel, libgnomecanvas-devel +BuildRequires: ocaml-ocamldoc +ExclusiveArch: %{ocaml_arches} + +%global __requires_exclude ocaml\\$Sig\\$ %description Ocamlgraph provides several different implementations of graph data @@ -69,14 +66,16 @@ developing applications that use %{name}. %prep %setup -q -n ocamlgraph-%{version} +%patch0 -%patch3 -p1 +cp -p %{SOURCE1} . -cp %{SOURCE1} . +# Remove spurious executable bits +find . -name '*.ml*' -perm /0111 | xargs chmod a-x %build -./configure --prefix=%{_prefix} --mandir=%{_mandir} --libdir=%{_libdir} +%configure %if %opt %global opt_option OCAMLBEST=opt OCAMLOPT=ocamlopt.opt @@ -89,13 +88,10 @@ make doc %check make --no-print-directory check >& test -diff test ocamlgraph-test.result +diff -u test ocamlgraph-test.result %install -rm -rf %{buildroot} - -%global ocaml_destdir %{_libdir}/ocaml mkdir -p %{buildroot}%{ocaml_destdir} make OCAMLFIND_DESTDIR=%{buildroot}%{ocaml_destdir} install-findlib @@ -108,12 +104,7 @@ cp -p examples/*.ml %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/examp cp -p doc/* %{buildroot}%{_defaultdocdir}/%{name}-%{version}-devel/API/ -%clean -rm -rf %{buildroot} - - %files -%defattr(-,root,root,-) %{ocaml_destdir}/ocamlgraph/ %if %opt %exclude %{ocaml_destdir}/*/*.a @@ -126,7 +117,6 @@ rm -rf %{buildroot} %files devel -%defattr(-,root,root,-) %if %opt %{ocaml_destdir}/*/*.a %{ocaml_destdir}/*/*.cmxa @@ -139,6 +129,14 @@ rm -rf %{buildroot} %changelog +* Mon Jul 11 2011 Jerry James <loganjerry(a)gmail.com> - 1.7-1 +- New upstream release +- Drop unnecessary spec file elements (BuildRoot, etc.) +- Drop dependency generation workaround for Fedora 12 and earlier +- Remove spurious executable bits on source files +- Replace the definition of __ocaml_requires_opts to "-i Sig", which removes + the legitimate Requires: ocaml(GtkSignal), with __requires_exclude. + * Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/ocamlgraph-1.6-install-extras.patch b/ocamlgraph-1.7-install-extras.patch similarity index 79% rename from ocamlgraph-1.6-install-extras.patch rename to ocamlgraph-1.7-install-extras.patch index 9027071..2dabef5 100644 --- a/ocamlgraph-1.6-install-extras.patch +++ b/ocamlgraph-1.7-install-extras.patch @@ -1,6 +1,6 @@ ---- ocamlgraph-1.6.old/Makefile.in 2010-12-13 08:47:38.000000000 +0000 -+++ ocamlgraph-1.6.fix/Makefile.in 2011-01-10 13:31:34.604320516 +0000 -@@ -352,7 +352,11 @@ +--- Makefile.in.orig 2011-02-23 01:35:33.000000000 -0700 ++++ Makefile.in 2011-07-07 10:34:10.340455498 -0600 +@@ -349,7 +349,11 @@ $(OCAMLFIND) install ocamlgraph META \ $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \ diff --git a/sources b/sources index a0ccad0..358a981 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b66ad9942e5a3acddeeeaf69c09a0c26 ocamlgraph-1.6.tar.gz +30282965f0fdce3cd31a92e08fc2057b ocamlgraph-1.7.tar.gz

1 0

File ocamlgraph-1.7.tar.gz uploaded to lookaside cache by jjames
by Jerry James 11 Jul '11

11 Jul '11

A file has been added to the lookaside cache for ocaml-ocamlgraph: 30282965f0fdce3cd31a92e08fc2057b ocamlgraph-1.7.tar.gz

1 0

[pkgdb] ocaml-ocamlgraph had acl change status
by Fedora PackageDB 07 Jul '11

07 Jul '11

amdunn has set the watchbugzilla acl on ocaml-ocamlgraph (Fedora devel) to Approved for ocamlmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/acls/name/ocaml-ocamlgraph

1 0

[pkgdb] ocaml-ocamlgraph had acl change status
by Fedora PackageDB 07 Jul '11

07 Jul '11

amdunn has set the watchcommits acl on ocaml-ocamlgraph (Fedora devel) to Approved for ocamlmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/acls/name/ocaml-ocamlgraph

1 0

[pkgdb] ocaml-ocamlgraph had acl change status
by Fedora PackageDB 07 Jul '11

07 Jul '11

amdunn has set the watchbugzilla acl on ocaml-ocamlgraph (Fedora 14) to Approved for ocamlmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/acls/name/ocaml-ocamlgraph

1 0

[pkgdb] ocaml-ocamlgraph had acl change status
by Fedora PackageDB 07 Jul '11

07 Jul '11

amdunn has set the watchcommits acl on ocaml-ocamlgraph (Fedora 14) to Approved for ocamlmaint To make changes to this package see: https://admin.fedoraproject.org/pkgdb/acls/name/ocaml-ocamlgraph

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

Ocaml-devel July 2011