gmane.linux.redhat.fedora.ocaml

Ocaml and pthread_atfork()

Tony Breeds — 2012-04-17T03:02:29

Hi All,
Firstly I apologize if this is noise.  I elected to not file a
bugzilla as the problem seems to be powerpc specific and with the limited
resources for Fedora developers it would seem unfair.

I was recently trying to build a "current" libguestfs from the f16
branch[1].  During the build I hit:

(extracted from rpmbuild)

[tony< at >sneetch ~]$ bash -x  tmp/ocaml-test.sh 
+ cd rpmbuild/BUILD/libguestfs-1.16.9/ocaml/
+ LD_LIBRARY_PATH=../src/.libs
+ ocamlfind ocamlc -g -warn-error CDEFLMPSUVYZX -I . -package unix,threads -thread -linkpkg mlguestfs.cma t/guestfs_070_threads.cmo -o t/guestfs_070_threads.bc
File "_none_", line 1, characters 0-1:
Error: Error on dynamically loaded library: /usr/lib64/ocaml/stublibs/dllthreads.so: /usr/lib64/ocaml/stublibs/dllthreads.so: undefined symbol: pthread_atfork

I did a quick bit of googling and found:
http://ryanarn.blogspot.com.au/2011/07/curious-case-of-pthreadatfork-on.html

which seems to explain what's going on to my naive eye anyway.

I've tried a few different CFLAGS/patches to
otherlibs/systhreads/Makefile to try and induce pthreads_atfork() to be
resolved and linked during the ocaml build.  Nothing I try works.

Does anyone have any ideas on how to solve this?

I'm happy to do the heavy lifting I just don't have the background in
ocaml to solve this by myself.

Yours Tony

[1] I suspects that as a result of the demotion to secondary and things
    languishing there we skipped a few builds.
_______________________________________________
ocaml-devel mailing list
ocaml-devel< at >lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel

[Bug 812582] New: ocaml-lablgtk needs to be rebuilt

2012-04-15T05:35:09

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: ocaml-lablgtk needs to be rebuilt

https://bugzilla.redhat.com/show_bug.cgi?id=812582

           Summary: ocaml-lablgtk needs to be rebuilt
           Product: Fedora
           Version: 16
          Platform: i686
        OS/Version: Linux
            Status: NEW
          Severity: unspecified
          Priority: unspecified
         Component: ocaml-lablgtk
        AssignedTo: rjones< at >redhat.com
        ReportedBy: emertens< at >gmail.com
         QAContact: extras-qa< at >fedoraproject.org
                CC: dwheeler< at >dwheeler.com, rjones< at >redhat.com,
                    amdunn< at >gmail.com, fedora-ocaml-list< at >redhat.com
    Classification: Fedora
      Story Points: ---
              Type: Bug
        Regression: ---
        Mount Type: ---
     Documentation: ---


Description of problem:
This library needs to be rebuilt. Without rebuilding it linking ocaml programs
against this library cause ld to fail with an error.

I encountered this while trying to build the why3 package.

Downloading the SRPM and building it and installing it allowed my build to
succeed.

[pkgdb] ocaml-camlimages ownership changed

Fedora PackageDB — 2012-03-12T15:10:37

Package ocaml-camlimages in Fedora devel is now owned by bruno

To make changes to this package see:
  https://admin.fedoraproject.org/pkgdb/acls/name/ocaml-camlimages
_______________________________________________
ocaml-devel mailing list
ocaml-devel< at >lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel

Review request for bringing back ocaml-calimages

Bruno Wolff III — 2012-02-23T17:27:39

I want to bring back ocaml-calimages since it is a build dependency
of free tennis. I used the current ocaml template mixed a bit with the
previous spec file to create the proposed new spec file.

While I'd really like an official review, even a quick looksee from someone
that works with ocaml regularly (which I don't), for obvious issues
would be appreciated.

Thanks.

The review bug is at:
https://bugzilla.redhat.com/show_bug.cgi?id=785727
_______________________________________________
ocaml-devel mailing list
ocaml-devel< at >lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel

[Bug 789784] New: Provide native systemd service

2012-02-12T23:28:38

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: Provide native systemd service

https://bugzilla.redhat.com/show_bug.cgi?id=789784

           Summary: Provide native systemd service
           Product: Fedora
           Version: rawhide
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: unspecified
          Priority: unspecified
         Component: mldonkey
        AssignedTo: lemenkov< at >gmail.com
        ReportedBy: johannbg< at >gmail.com
         QAContact: extras-qa< at >fedoraproject.org
                CC: rjones< at >redhat.com, lemenkov< at >gmail.com,
                    fedora-ocaml-list< at >redhat.com
    Classification: Fedora
      Story Points: ---
              Type: ---
        Regression: ---
        Mount Type: ---
     Documentation: ---


Description of problem:

Let's get the ball rolling on this one...

http://fedoraproject.org/wiki/Features/SysVtoSystemd
https://fedoraproject.org/wiki/Packaging:Guidelines:Systemd
https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd

Version-Release number of selected component (if applicable):


How reproducible:


Steps to Reproduce:
1.
2.
3.

Actual results:


Expected results:


Additional info:

[Bug 785680] New: Incomplete packaging

2012-01-30T10:23:47

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: Incomplete packaging

https://bugzilla.redhat.com/show_bug.cgi?id=785680

           Summary: Incomplete packaging
           Product: Fedora
           Version: 16
          Platform: x86_64
        OS/Version: Linux
            Status: NEW
          Severity: high
          Priority: unspecified
         Component: ocaml-deriving
        AssignedTo: rjones< at >redhat.com
        ReportedBy: 5764c029b688c1c0d24a2e97cd764f< at >gmail.com
         QAContact: extras-qa< at >fedoraproject.org
                CC: rjones< at >redhat.com, fedora-ocaml-list< at >redhat.com
    Classification: Fedora
      Story Points: ---
              Type: ---
        Regression: ---
        Mount Type: ---
     Documentation: ---


Created attachment 558296
  --> https://bugzilla.redhat.com/attachment.cgi?id=558296
two files ... "Makefile" and "Main.ml"

Description of problem:

  I cannot link libraries provided by "ocaml-deriving-devel" package.

Which Version-Release number of selected component (if applicable):

  Fedora release 16 (Verne)

How reproducible:

  always

Steps to Reproduce:
1. sudo yum install ocaml-deriving-devel
2. tar xvzf deriving.tar.gz
2. cd deriving
3. make && ./main

Actual results:

  ocamlc -c -pp "camlp4of -I /usr/lib64/ocaml/deriving pa_deriving.cma"
  -I /usr/lib64/ocaml/deriving nums.cma Main.ml
  Camlp4: Uncaught exception: DynLoader.Error
  ("pa_deriving.cma", "file not found in path")

  File "Main.ml", line 1, characters 0-1:
  Error: Preprocessor error
  make: *** [Main.cmo] Error 2

Expected results:

  ocamlc -c -pp "camlp4of -I ~/lib/godi/lib/ocaml/pkg-lib/deriving-ocsigen
  pa_deriving.cma" -I ~/lib/godi/lib/ocaml/pkg-lib/deriving-ocsigen nums.cma
  Main.ml

  ocamlc -o main -I ~/lib/godi/lib/ocaml/pkg-lib/deriving-ocsigen nums.cma 
  deriving.cma Main.cmo

  len(s) = 15; s = test
  s' = {a = 30; b = "test"}

Additional info:

  The following (relevant) file:

    /usr/lib64/ocaml/deriving/META

  has suspicious contents.

    name="deriving"
    version="0.1.1a"
    requires="%{camlp4}"
    description="%{description}"
    # need a syntax here XXX

  Compare it with analogous file

    /home/mkosik/lib/godi/lib/ocaml/pkg-lib/deriving-ocsigen/META

  provided by GODI:

    version = "0.2-ocsigen"
    description = "Deriving (patched for the Ocsigen project)"
    requires = "num"
    archive(byte) = "deriving.cma"
    archive(native) = "deriving.cmxa"

    package "syntax" (
    requires(syntax) = "camlp4,unix"
    requires(syntax,toploop) += "deriving-ocsigen"
    archive(preprocessor,syntax) = "pa_deriving.cma"
    archive(syntax,toploop) = "pa_deriving.cma"

    package "base" (
    requires(syntax) = "camlp4"
    archive(preprocessor,syntax) = "pa_deriving_common.cmo pa_deriving.cmo"
    archive(syntax,toploop) = "pa_deriving_common.cmo pa_deriving.cmo"
    )
    )

    package "syntax_tc" (
    exists_if = "pa_deriving_tc.cma"
    requires(syntax) = "camlp4,unix,type-conv"
    requires(syntax,toploop) += "deriving-ocsigen"
    archive(preprocessor,syntax) = "pa_deriving_tc.cma"
    archive(syntax,toploop) = "pa_deriving_tc.cma"

    package "base" (
    requires(syntax) = "camlp4"
    archive(preprocessor,syntax) = "pa_deriving_common.cmo pa_deriving_tc.cmo"
    archive(syntax,toploop) = "pa_deriving_common.cmo pa_deriving_tc.cmo"
    )
    )

Looking for comaintainers for js-of-ocaml

Scott Tsai — 2011-12-22T20:59:29

Dear all,

I'm looking for comaintainers for js-of-ocaml:
https://admin.fedoraproject.org/pkgdb/acls/name/js-of-ocaml

js-of-ocaml is an OCaml bytecode to Javascript compiler and enables one 
to write Ajax apps in OCaml:
http://ocsigen.org/js_of_ocaml/manual/overview

_______________________________________________
ocaml-devel mailing list
ocaml-devel< at >lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/ocaml-devel

OCaml Packaging wiki page

Jerry James — 2011-12-22T15:41:23

I'm reviewing a submission of an ocaml program.  The spec file has
this at the top:

%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

as required by https://fedoraproject.org/wiki/Packaging:OCaml#Requires_and_provides.
 But it seems that those lines are not only unnecessary, but
detrimental.  Taking them off generates the same Requires/Provides
(due to /usr/lib/rpm/fileattrs/ocaml.attr), plus additional ones.  In
the case of the package I'm reviewing, it's innocuous.  But I have an
ocaml package that I maintain where the extra Requires/Provides
generated by omitting those lines appear to be significant.

Is the wiki correct?  Are those lines still needed for some reason?
Or is the wiki out of date?

[Bug 761325] New: update ocaml-lwt to 2.3.2

2011-12-08T03:39:59

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: update ocaml-lwt to 2.3.2

https://bugzilla.redhat.com/show_bug.cgi?id=761325

           Summary: update ocaml-lwt to 2.3.2
           Product: Fedora
           Version: rawhide
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: unspecified
          Priority: unspecified
         Component: ocaml-lwt
        AssignedTo: rjones< at >redhat.com
        ReportedBy: scottt.tw< at >gmail.com
         QAContact: extras-qa< at >fedoraproject.org
                CC: rjones< at >redhat.com, fedora-ocaml-list< at >redhat.com
    Classification: Fedora
      Story Points: ---
              Type: ---


js_of_ocaml (http://ocsigen.org/js_of_ocaml) now requires ocaml-lwt >= 2.3.0 to
build but Fedora only packages ocaml-lwt-2.2.0

[Bug 755720] New: /etc/rc.d/init.d/mldonkey BY DEFAULT FOR A PIDFILE CALLS /var/run/mldonkey/ THAT DOES NOT EXIST...

2011-11-21T21:05:36

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: /etc/rc.d/init.d/mldonkey BY DEFAULT FOR A PID FILE CALLS /var/run/mldonkey/  THAT DOES NOT EXIST...

https://bugzilla.redhat.com/show_bug.cgi?id=755720

           Summary: /etc/rc.d/init.d/mldonkey BY DEFAULT FOR A PID FILE
                    CALLS /var/run/mldonkey/  THAT DOES NOT EXIST...
           Product: Fedora
           Version: 16
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: unspecified
          Priority: unspecified
         Component: mldonkey
        AssignedTo: lemenkov< at >gmail.com
        ReportedBy: pawel.eljasz< at >jatymy.org
         QAContact: extras-qa< at >fedoraproject.org
                CC: rjones< at >redhat.com, lemenkov< at >gmail.com,
                    fedora-ocaml-list< at >redhat.com
    Classification: Fedora
      Story Points: ---
              Type: ---


Description of problem:

unless pid-dir manually created start by /etc/rc.d/init.d/mldonkey start -
FAILS

script mldonkey-server.rpm to create above pid-directory at rpm-installation
time

Version-Release number of selected component (if applicable):


How reproducible:


Steps to Reproduce:
1.
2.
3.

Actual results:


Expected results:


Additional info:

[Bug 741483] New: New upstream version 7.0.4

2011-09-27T01:19:09

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: New upstream version 7.0.4

https://bugzilla.redhat.com/show_bug.cgi?id=741483

           Summary: New upstream version 7.0.4
           Product: Fedora
           Version: rawhide
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: unspecified
          Priority: unspecified
         Component: ocaml-sexplib
        AssignedTo: rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
        ReportedBy: michael-I7y7/2XxMoLR7s880joybQ< at >public.gmane.org
         QAContact: extras-qa-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy< at >public.gmane.org
                CC: rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org, michael-I7y7/2XxMoLR7s880joybQ< at >public.gmane.org,
                    fedora-ocaml-list-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
    Classification: Fedora
      Story Points: ---
              Type: ---


sexplib 7.0.4 is now available from its new master home at the OCamlCore Forge.

Project URL: http://forge.ocamlcore.org/projects/sexplib
Tarball: http://forge.ocamlcore.org/frs/download.php/699/sexplib-7.0.4.tar.gz

[Bug 741482] New: 3.12.0 compatibility patch removes functionality

2011-09-27T01:15:17

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: 3.12.0 compatibility patch removes functionality

https://bugzilla.redhat.com/show_bug.cgi?id=741482

           Summary: 3.12.0 compatibility patch removes functionality
           Product: Fedora
           Version: rawhide
          Platform: Unspecified
        OS/Version: Unspecified
            Status: NEW
          Severity: unspecified
          Priority: unspecified
         Component: ocaml-type-conv
        AssignedTo: rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
        ReportedBy: michael-I7y7/2XxMoLR7s880joybQ< at >public.gmane.org
         QAContact: extras-qa-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy< at >public.gmane.org
                CC: rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org, michael-I7y7/2XxMoLR7s880joybQ< at >public.gmane.org,
                    fedora-ocaml-list-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
    Classification: Fedora
      Story Points: ---
              Type: ---


Description of problem:
ocaml-type-conv 3.0.4-1 includes a patch which removes a case from the syntax
extension for compatibility with an omission in OCaml 3.12.0 which has been
corrected in OCaml 3.12.1.  This patch should be removed once OCaml is upgraded
(#718956).

Version-Release number of selected component (if applicable):
ocaml-type-conv 3.0.4-1.fc17

[Bug 732868] New: glibc too low for mldonkey

2011-08-24T02:01:53

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: glibc too low for mldonkey

https://bugzilla.redhat.com/show_bug.cgi?id=732868

           Summary: glibc too low for mldonkey
           Product: Fedora
           Version: 15
          Platform: i686
        OS/Version: Linux
            Status: NEW
          Severity: unspecified
          Priority: unspecified
         Component: mldonkey
        AssignedTo: lemenkov-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org
        ReportedBy: cyc19921205-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org
         QAContact: extras-qa-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy< at >public.gmane.org
                CC: rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org, lemenkov-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org,
                    fedora-ocaml-list-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
    Classification: Fedora
      Story Points: ---
              Type: ---


Description of problem:
what I have done:
  sudo yum install mldonkey
  mldonkey
then:'''
2011/08/24 09:50:23 [cO] Starting MLDonkey 3.0.3 ... 
2011/08/24 09:50:23 [cO] Language ZH_CN, locale UTF-8, ulimit for open files
1024
2011/08/24 09:50:23 [cO] MLDonkey is working in /home/cyc/.mldonkey
2011/08/24 09:50:23 [Gettext] Loading language resource
mlnet_strings.zh_CN.utf8
2011/08/24 09:50:23 [cO] loaded language resource file
2011/08/24 09:50:23 [DNS] Resolving [xxx.yyy] ...
2011/08/24 09:50:23 [DNS] Resolving [www.mldonkey.org] ...

Attention!
This core is running with glibc 2.14 but it was compiled with glibc 2.12.90.
This can lead to unexpected behaviour. Consider compiling the core yourself
or getting a binary compiled with glibc 2.12.90.

2011/08/24 09:50:24 [dMain] Libmagic file-type recognition database present
2011/08/24 09:50:24 [cO] Logging in /home/xxx/.mldonkey/mlnet.log
'''

I think it easy to understand though my English is not good.
It seems that it should be compiled with glibc 2.14.

[Bug 729977] New: [abrt] mldonkey-3.0.3-1.fc14: mark_slice: Process/usr/bin/mlnet was killed by signal 11 (SIGSEGV)

2011-08-11T12:55:33

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: [abrt] mldonkey-3.0.3-1.fc14: mark_slice: Process /usr/bin/mlnet was killed by signal 11 (SIGSEGV)

https://bugzilla.redhat.com/show_bug.cgi?id=729977

           Summary: [abrt] mldonkey-3.0.3-1.fc14: mark_slice: Process
                    /usr/bin/mlnet was killed by signal 11 (SIGSEGV)
           Product: Fedora
           Version: 14
          Platform: i686
        OS/Version: Unspecified
            Status: NEW
 Status Whiteboard: abrt_hash:e2ece02ed7c81eb437b1498518f7a88f623efc91
          Severity: unspecified
          Priority: unspecified
         Component: mldonkey
        AssignedTo: lemenkov-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org
        ReportedBy: lonicerae-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org
         QAContact: extras-qa-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy< at >public.gmane.org
                CC: rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org, lemenkov-Re5JQEeQqe8AvxtiuMwx3w< at >public.gmane.org,
                    fedora-ocaml-list-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
    Classification: Fedora
      Story Points: ---
              Type: ---


abrt version: 1.1.18
architecture: i686
Attached file: backtrace, 16576 bytes
cmdline: mlnet
component: mldonkey
Attached file: coredump, 42991616 bytes
crash_function: mark_slice
executable: /usr/bin/mlnet
kernel: 2.6.35.13-91.fc14.i686
package: mldonkey-3.0.3-1.fc14
rating: 4
reason: Process /usr/bin/mlnet was killed by signal 11 (SIGSEGV)
release: Fedora release 14 (Laughlin)
time: 1313066611
uid: 500

How to reproduce
-----
1. mlnet running in background
2. suddenly crashed
3.

[Bug 729130] New: Please update Tuareg to version 2.0.4

2011-08-08T19:35:31

Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.

Summary: Please update Tuareg to version 2.0.4

https://bugzilla.redhat.com/show_bug.cgi?id=729130

           Summary: Please update Tuareg to version 2.0.4
           Product: Fedora
           Version: 15
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: low
          Priority: unspecified
         Component: emacs-common-tuareg
        AssignedTo: rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
        ReportedBy: bugzilla.redhat.com-tVgzeSXHqdsr73x8oonFJg9yQbAG1k9O< at >public.gmane.org
         QAContact: extras-qa-rxtnV0ftBwyoClj4AeEUq9i2O/JbrIOy< at >public.gmane.org
                CC: rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org, fedora-ocaml-list-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org
    Classification: Fedora
      Story Points: ---
              Type: ---


Description of problem:
The latest version of tuareg-mode is 2.04
(https://forge.ocamlcore.org/frs/?group_id=43) but the version in repositories
is 1.45.6 .
 Please update the package

Version-Release number of selected component (if applicable):
1.45.6

[ocaml-lablgtk/f16] - Add patch (sent upstream) to fix gtkThreadasync callbacks throwing Queue.Empty. (cherry picked

Richard W.M. Jones — 2011-07-29T14:33:31

commit f6d790f834412c43ececde675f3f584aeb418e4d
Author: Richard W.M. Jones <rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
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
< at >< at > -0,0 +1,40 < at >< at >
+diff -ur lablgtk-2.14.2.old/src/gtkThread.ml lablgtk-2.14.2/src/gtkThread.ml
+--- lablgtk-2.14.2.old/src/gtkThread.ml2010-06-25 10:23:44.000000000 +0100
++++ lablgtk-2.14.2/src/gtkThread.ml2011-07-27 19:16:32.263724495 +0100
+< at >< at > -28,8 +28,14 < at >< at >
+ 
+ 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
+< at >< at > -40,8 +46,6 < at >< at >
+ 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 () ->
+< at >< at > -64,9 +68,9 < at >< at >
+ 
+ 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
< at >< at > -2,7 +2,7 < at >< at >
 
 Name:           ocaml-lablgtk
 Version:        2.14.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
< at >< at > -12,6 +12,9 < at >< at > 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
 
< at >< at > -74,6 +77,8 < at >< at > 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
< at >< at > -153,6 +158,10 < at >< at > rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 27 2011 Richard W.M. Jones <rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org> - 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-TuqUDEhatI4ANWPb/1PvSmm0pvjS0E/A< at >public.gmane.org> - 2.14.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

Broken dependencies: ocaml-mikmatch

2011-07-30T15:50:00


ocaml-mikmatch has broken dependencies in the F-16 tree:
On x86_64:
ocaml-mikmatch-1.0.3-4.fc16.x86_64 requires ocaml(Pcre) = 0:deb83e3bbc68881256f106c52268697e
On i386:
ocaml-mikmatch-1.0.3-4.fc16.i686 requires ocaml(Pcre) = 0:deb83e3bbc68881256f106c52268697e
Please resolve this as soon as possible.

Broken dependencies: coq

2011-07-30T15:49:53


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.

[ocaml-lablgtk/f15] - Add patch (sent upstream) to fix gtkThreadasync callbacks throwing Queue.Empty. (cherry picked

Richard W.M. Jones — 2011-08-01T20:57:03

commit 0defd12e1530ac9b18e282faae5964d69bde237c
Author: Richard W.M. Jones <rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
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
< at >< at > -0,0 +1,40 < at >< at >
+diff -ur lablgtk-2.14.2.old/src/gtkThread.ml lablgtk-2.14.2/src/gtkThread.ml
+--- lablgtk-2.14.2.old/src/gtkThread.ml2010-06-25 10:23:44.000000000 +0100
++++ lablgtk-2.14.2/src/gtkThread.ml2011-07-27 19:16:32.263724495 +0100
+< at >< at > -28,8 +28,14 < at >< at >
+ 
+ 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
+< at >< at > -40,8 +46,6 < at >< at >
+ 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 () ->
+< at >< at > -64,9 +68,9 < at >< at >
+ 
+ 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
< at >< at > -2,7 +2,7 < at >< at >
 
 Name:           ocaml-lablgtk
 Version:        2.14.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
< at >< at > -12,6 +12,9 < at >< at > 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
 
< at >< at > -74,6 +77,8 < at >< at > 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
< at >< at > -153,6 +158,10 < at >< at > rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 27 2011 Richard W.M. Jones <rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org> - 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-TuqUDEhatI4ANWPb/1PvSmm0pvjS0E/A< at >public.gmane.org> - 2.14.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

Broken dependencies: ocaml

2011-07-30T15:49:58


ocaml has broken dependencies in the F-16 tree:
On x86_64:
ocaml-runtime-3.12.0-5.fc16.x86_64 requires libgdbm_compat.so.3()(64bit)
ocaml-runtime-3.12.0-5.fc16.x86_64 requires libgdbm.so.3()(64bit)
On i386:
ocaml-runtime-3.12.0-5.fc16.i686 requires libgdbm_compat.so.3
ocaml-runtime-3.12.0-5.fc16.i686 requires libgdbm.so.3
On x86_64:
ocaml-3.12.0-5.fc16.x86_64 requires libgdbm_compat.so.3()(64bit)
ocaml-3.12.0-5.fc16.x86_64 requires gdbm-devel
ocaml-3.12.0-5.fc16.x86_64 requires libgdbm.so.3()(64bit)
On i386:
ocaml-3.12.0-5.fc16.i686 requires gdbm-devel
ocaml-3.12.0-5.fc16.i686 requires libgdbm_compat.so.3
ocaml-3.12.0-5.fc16.i686 requires libgdbm.so.3
On x86_64:
ocaml-docs-3.12.0-5.fc16.x86_64 requires /sbin/install-info
ocaml-docs-3.12.0-5.fc16.x86_64 requires /sbin/install-info
On i386:
ocaml-docs-3.12.0-5.fc16.i686 requires /sbin/install-info
ocaml-docs-3.12.0-5.fc16.i686 requires /sbin/install-info
Please resolve this as soon as possible.

[ocaml-lablgtk] - Add patch (sent upstream) to fix gtkThread asynccallbacks throwing Queue.Empty.

Richard W.M. Jones — 2011-07-27T18:21:55

commit 120a908fae5943af36090e568ee349dfceab8be9
Author: Richard W.M. Jones <rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org>
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
< at >< at > -0,0 +1,40 < at >< at >
+diff -ur lablgtk-2.14.2.old/src/gtkThread.ml lablgtk-2.14.2/src/gtkThread.ml
+--- lablgtk-2.14.2.old/src/gtkThread.ml2010-06-25 10:23:44.000000000 +0100
++++ lablgtk-2.14.2/src/gtkThread.ml2011-07-27 19:16:32.263724495 +0100
+< at >< at > -28,8 +28,14 < at >< at >
+ 
+ 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
+< at >< at > -40,8 +46,6 < at >< at >
+ 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 () ->
+< at >< at > -64,9 +68,9 < at >< at >
+ 
+ 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
< at >< at > -2,7 +2,7 < at >< at >
 
 Name:           ocaml-lablgtk
 Version:        2.14.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
< at >< at > -12,6 +12,9 < at >< at > 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
 
< at >< at > -74,6 +77,8 < at >< at > 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
< at >< at > -153,6 +158,10 < at >< at > rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Jul 27 2011 Richard W.M. Jones <rjones-H+wXaHxf7aLQT0dZR+AlfA< at >public.gmane.org> - 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-TuqUDEhatI4ANWPb/1PvSmm0pvjS0E/A< at >public.gmane.org> - 2.14.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild