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: - debian/META - debian/changelog - debian/control - + debian/patches/0006-Ignore-defined-LABLGTKDIR.patch - debian/patches/series - debian/rules Changes: ===================================== debian/META ===================================== @@ -3,9 +3,3 @@ description = "Bindings to the cairo library." archive(byte) = "cairo.cma" archive(native) = "cairo.cmxa" requires = "bigarray" - -package "lablgtk2" ( - requires = "cairo lablgtk2" - archive(byte) = "cairo_lablgtk.cma" - archive(native) = "cairo_lablgtk.cmxa" -) ===================================== debian/changelog ===================================== @@ -8,6 +8,9 @@ cairo-ocaml (1:1.2.0-9) UNRELEASED; urgency=medium * Add Rules-Requires-Root: no * Bump Standards-Version to 4.6.2 + [ Bastian Germann ] + * Drop lablgtk2 and pangocairo support (Closes: #1050563) + -- Stéphane Glondu <[email protected]> Tue, 15 Aug 2023 09:53:45 +0200 cairo-ocaml (1:1.2.0-8) unstable; urgency=medium ===================================== debian/control ===================================== @@ -10,7 +10,6 @@ Build-Depends: dh-ocaml, ocaml, libcairo2-dev, - liblablgtk2-ocaml-dev Standards-Version: 4.6.2 Rules-Requires-Root: no Homepage: http://cairographics.org/cairo-ocaml/ ===================================== debian/patches/0006-Ignore-defined-LABLGTKDIR.patch ===================================== @@ -0,0 +1,28 @@ +From: Bastian Germann <[email protected]> +Date: Sat, 26 Aug 2023 11:31:22 +0200 +Subject: Ignore defined LABLGTKDIR + +--- + src/Makefile | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/src/Makefile b/src/Makefile +index 46a62f6..46b75ac 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -5,7 +5,6 @@ CPPFLAGS = -g + + TARGETS = cairo + ifdef LABLGTKDIR +-TARGETS += lablgtk + endif + ifdef LIBSVG_CAIRO_CFLAGS + TARGETS += svgcairo +@@ -99,7 +98,6 @@ endif + + DOCFILES = cairo.mli cairo_bigarray.mli cairo_png.mli cairo_pdf.mli cairo_ps.mli cairo_ft.mli + ifdef LABLGTKDIR +-DOCFILES += cairo_lablgtk.mli + endif + ifdef LIBSVG_CAIRO_CFLAGS + DOCFILES += svg_cairo.mli ===================================== debian/patches/series ===================================== @@ -3,3 +3,4 @@ 0003-Fix-FTBFS-on-bytecode-architectures.patch 0004-ocamldoc-dont-use-v-option 0005-Fix-compilation-with-OCaml-4.08.0.patch +0006-Ignore-defined-LABLGTKDIR.patch ===================================== debian/rules ===================================== @@ -18,7 +18,7 @@ override_dh_auto_configure: aclocal -I support autoconf chmod +x configure - ./configure --with-gtk + ./configure .PHONY: override_dh_auto_build override_dh_auto_build: View it on GitLab: https://salsa.debian.org/ocaml-team/cairo-ocaml/-/compare/50bc06942288bf5a9dd688e10d72b47e29419ff0...bac1443d794131f82336d06a044a9a926c69ebe1 -- View it on GitLab: https://salsa.debian.org/ocaml-team/cairo-ocaml/-/compare/50bc06942288bf5a9dd688e10d72b47e29419ff0...bac1443d794131f82336d06a044a9a926c69ebe1 You're receiving this email because of your account on salsa.debian.org.
