[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ocaml-team/cairo-ocaml][master] 2 commits: Drop lablgtk2 and pangocairo support (Closes: #1050563)

Title: GitLab

Stéphane Glondu pushed to branch master at Debian OCaml Maintainers / cairo-ocaml

Commits:

  • 36430ce8
    by Bastian Germann at 2023-08-26T13:05:52+02:00 
    Drop lablgtk2 and pangocairo support (Closes: #1050563)
  • bac1443d
    by Stéphane Glondu at 2023-08-27T05:01:22+00:00 
    Merge branch 'master' into 'master'

Drop lablgtk2 and pangocairo support

See merge request ocaml-team/cairo-ocaml!3

6 changed files:

Changes:

  • debian/META
    ... ... @@ -3,9 +3,3 @@ description = "Bindings to the cairo library."
    3 3 
     archive(byte) = "cairo.cma"
    4 4 
     archive(native) = "cairo.cmxa"
    5 5 
     requires = "bigarray"
    6 
    -
    7 
    -package "lablgtk2" (
    8 
    -        requires = "cairo lablgtk2"
    9 
    -        archive(byte) = "cairo_lablgtk.cma"
    10 
    -        archive(native) = "cairo_lablgtk.cmxa"
    11 
    -)

  • debian/changelog
    ... ... @@ -8,6 +8,9 @@ cairo-ocaml (1:1.2.0-9) UNRELEASED; urgency=medium
    8 8 
       * Add Rules-Requires-Root: no
    9 9 
       * Bump Standards-Version to 4.6.2
    10 10
    11 
    +  [ Bastian Germann ]
    12 
    +  * Drop lablgtk2 and pangocairo support (Closes: #1050563)
    13 
    +
    11 14 
      -- Stéphane Glondu <glondu@debian.org>  Tue, 15 Aug 2023 09:53:45 +0200
    12 15
    13 16 
     cairo-ocaml (1:1.2.0-8) unstable; urgency=medium

  • debian/control
    ... ... @@ -10,7 +10,6 @@ Build-Depends:
    10 10 
      dh-ocaml,
    11 11 
      ocaml,
    12 12 
      libcairo2-dev,
    13 
    - liblablgtk2-ocaml-dev
    14 13 
     Standards-Version: 4.6.2
    15 14 
     Rules-Requires-Root: no
    16 15 
     Homepage: http://cairographics.org/cairo-ocaml/

  • debian/patches/0006-Ignore-defined-LABLGTKDIR.patch
    1 
    +From: Bastian Germann <bage@debian.org>
    2 
    +Date: Sat, 26 Aug 2023 11:31:22 +0200
    3 
    +Subject: Ignore defined LABLGTKDIR
    4 
    +
    5 
    +---
    6 
    + src/Makefile | 2 --
    7 
    + 1 file changed, 2 deletions(-)
    8 
    +
    9 
    +diff --git a/src/Makefile b/src/Makefile
    10 
    +index 46a62f6..46b75ac 100644
    11 
    +--- a/src/Makefile
    12 
    ++++ b/src/Makefile
    13 
    +@@ -5,7 +5,6 @@ CPPFLAGS = -g
    14 
    +
    15 
    + TARGETS = cairo
    16 
    + ifdef LABLGTKDIR
    17 
    +-TARGETS += lablgtk
    18 
    + endif
    19 
    + ifdef LIBSVG_CAIRO_CFLAGS
    20 
    + TARGETS += svgcairo
    21 
    +@@ -99,7 +98,6 @@ endif
    22 
    +
    23 
    + DOCFILES = cairo.mli cairo_bigarray.mli cairo_png.mli cairo_pdf.mli cairo_ps.mli cairo_ft.mli
    24 
    + ifdef LABLGTKDIR
    25 
    +-DOCFILES += cairo_lablgtk.mli
    26 
    + endif
    27 
    + ifdef LIBSVG_CAIRO_CFLAGS
    28 
    + DOCFILES += svg_cairo.mli

  • debian/patches/series
    ... ... @@ -3,3 +3,4 @@
    3 3 
     0003-Fix-FTBFS-on-bytecode-architectures.patch
    4 4 
     0004-ocamldoc-dont-use-v-option
    5 5 
     0005-Fix-compilation-with-OCaml-4.08.0.patch
    6 
    +0006-Ignore-defined-LABLGTKDIR.patch

  • debian/rules
    ... ... @@ -18,7 +18,7 @@ override_dh_auto_configure:
    18 18 
     	aclocal -I support
    19 19 
     	autoconf
    20 20 
     	chmod +x configure
    21 
    -	./configure --with-gtk
    21 
    +	./configure
    22 22
    23 23 
     .PHONY: override_dh_auto_build
    24 24 
     override_dh_auto_build:

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. Manage all notifications · Help

    Reply to: