[bug#73179] [PATCH 0/2] Remove lablgtk.

[bug#73179] [PATCH 0/2] Remove lablgtk.

[Josselin Poiret via Guix-patches via]

This patch series removes lablgtk, as it's actually not needed for any of our
leaf packages.

Josselin Poiret (2):
  gnu: ocaml-cairo2: Only build cairo2 package, remove unneeded deps.
  gnu: lablgtk: Remove variable.

 gnu/packages/ocaml.scm | 72 ++----------------------------------------
 1 file changed, 3 insertions(+), 69 deletions(-)


base-commit: b6d5a7f5836739dab884b49a64ca354794dd845f
-- 
2.45.2

[bug#73179] [PATCH 1/2] gnu: ocaml-cairo2: Only build cairo2 package, remove unneeded deps.

[Josselin Poiret via Guix-patches via]

From: Josselin Poiret <dev@jpoiret.xyz>

* gnu/packages/ocaml.scm (ocaml-cairo2): Only build cairo2 and not other ocaml
packages alongside.  Remove unneeded dependencies gtk+-2 and lablgtk.

Change-Id: I46a026cf0ed26789a590a889d2db47f32b9a97c8
---
 gnu/packages/ocaml.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 6ba5f5e374..804c51c5b0 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -8404,10 +8404,10 @@ (define-public ocaml-cairo2
                (base32
                 "06ag9b88ihhr7yd3s9l0ac7ysig02fmlmsswybbsvz71ni0mb105"))))
     (build-system dune-build-system)
+    (arguments
+     (list #:package "cairo2"))
     (inputs
-     `(("cairo" ,cairo)
-       ("gtk+-2" ,gtk+-2)
-       ("lablgtk" ,lablgtk)))
+     `(("cairo" ,cairo)))
     (native-inputs
      (list pkg-config))
     (home-page "https://github.com/Chris00/ocaml-cairo")
-- 
2.45.2

[bug#73179] [PATCH 2/2] gnu: lablgtk: Remove variable.

[Josselin Poiret via Guix-patches via]

From: Josselin Poiret <dev@jpoiret.xyz>

* gnu/packages/ocaml.scm (lablgtk): Package is no longer used as a dependency.

Change-Id: I7e3d1e5c0bd65a4938b0e08012094603d9d55cc5
---
 gnu/packages/ocaml.scm | 66 ------------------------------------------
 1 file changed, 66 deletions(-)

diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 804c51c5b0..9d29105cdb 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -1404,72 +1404,6 @@ (define-public ocaml-bigarray-compat
 @code{Stdlib.Bigarray} in OCaml.")
     (license license:isc)))
 
-(define-public lablgtk
-  (package
-    (name "lablgtk")
-    (version "2.18.11")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                     (url "https://github.com/garrigue/lablgtk")
-                     (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32
-                "179ipx0c6bpxm4gz0syxgqy09dp5p4x9qsdil7s9jlx8ffg1mm0w"))))
-    (build-system gnu-build-system)
-    (native-inputs
-     (list ;; Build failure with make-4.4, so we use make-4.2.
-           ;; See <https://github.com/garrigue/lablgtk/issues/170>.
-           gnu-make-4.2
-           ocaml
-           ocaml-findlib
-           pkg-config))
-    ;; FIXME: Add inputs gtkgl-2.0, libpanelapplet-2.0, gtkspell-2.0,
-    ;; and gtk+-quartz-2.0 once available.
-    (inputs
-     (list gtk+-2
-           gtksourceview-2
-           libgnomecanvas
-           libgnomeui
-           libglade
-           (librsvg-for-system)))
-    (arguments
-     `(#:tests? #f ; no check target
-
-       ;; opt: also install cmxa files
-       #:make-flags (list "all" "opt"
-                          (string-append "FINDLIBDIR="
-                                         (assoc-ref %outputs "out")
-                                         "/lib/ocaml"))
-       ;; Occasionally we would get "Error: Unbound module GtkThread" when
-       ;; compiling 'gtkThInit.ml', with 'make -j'.  So build sequentially.
-       #:parallel-build? #f
-
-       #:phases
-         (modify-phases %standard-phases
-           (add-before 'install 'prepare-install
-             (lambda* (#:key inputs outputs #:allow-other-keys)
-               (let ((out (assoc-ref outputs "out"))
-                     (ocaml (assoc-ref inputs "ocaml")))
-                 ;; Install into the output and not the ocaml directory.
-                 (mkdir-p (string-append out "/lib/ocaml"))
-                 (substitute* "config.make"
-                   ((ocaml) out))
-                 #t))))))
-    (home-page "http://lablgtk.forge.ocamlcore.org/")
-    (synopsis "GTK+ bindings for OCaml")
-    (description
-     "LablGtk is an OCaml interface to GTK+ 1.2 and 2.x.  It provides
-a strongly-typed object-oriented interface that is compatible with the
-dynamic typing of GTK+.  Most widgets and methods are available.  LablGtk
-also provides bindings to
-gdk-pixbuf, the GLArea widget (in combination with LablGL), gnomecanvas,
-gnomeui, gtksourceview, gtkspell,
-libglade (and it an generate OCaml code from .glade files),
-libpanel, librsvg and quartz.")
-    (license license:lgpl2.1)))
-
 (define-public binsec
   (package
     (name "binsec")
-- 
2.45.2

bug#73179: [PATCH 1/2] gnu: ocaml-cairo2: Only build cairo2 package, remove unneeded deps.

[Josselin Poiret via Guix-patches via]

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

Merged as a531af142ffdb2a31cf9e6258c336fcf2dbe755b.

Josselin Poiret <dev@jpoiret.xyz> writes:

> From: Josselin Poiret <dev@jpoiret.xyz>
>
> * gnu/packages/ocaml.scm (ocaml-cairo2): Only build cairo2 and not other ocaml
> packages alongside.  Remove unneeded dependencies gtk+-2 and lablgtk.
>
> Change-Id: I46a026cf0ed26789a590a889d2db47f32b9a97c8
> ---
>  gnu/packages/ocaml.scm | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
> index 6ba5f5e374..804c51c5b0 100644
> --- a/gnu/packages/ocaml.scm
> +++ b/gnu/packages/ocaml.scm
> @@ -8404,10 +8404,10 @@ (define-public ocaml-cairo2
>                 (base32
>                  "06ag9b88ihhr7yd3s9l0ac7ysig02fmlmsswybbsvz71ni0mb105"))))
>      (build-system dune-build-system)
> +    (arguments
> +     (list #:package "cairo2"))
>      (inputs
> -     `(("cairo" ,cairo)
> -       ("gtk+-2" ,gtk+-2)
> -       ("lablgtk" ,lablgtk)))
> +     `(("cairo" ,cairo)))
>      (native-inputs
>       (list pkg-config))
>      (home-page "https://github.com/Chris00/ocaml-cairo")
> -- 
> 2.45.2
>

-- 
Josselin Poiret

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 682 bytes --]