Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify GUI build using dune's new plugin support #161

Merged
merged 2 commits into from
Jul 26, 2020

Conversation

talex5
Copy link
Member

@talex5 talex5 commented Jun 7, 2020

Note: can't be merged until Debian has dune >= 2.5.

https://tracker.debian.org/pkg/ocaml-dune

This avoids using OCaml code in the dune file. It also makes it easier
to use 0install as a vendored library without it printing warnings about
GTK not being built.
@talex5
Copy link
Member Author

talex5 commented Jul 26, 2020

Looks like this is needed for Fedora 32, which is failing on master with:

#19 15.55 /usr/bin/ld: /home/opam/.opam/4.10/lib/cairo2/libcairo_stubs.a(cairo_stubs.o):/home/opam/.opam/4.10/.opam-switch/build/cairo2.0.6.1/_build/default/src/cairo_ocaml.h:53: multiple definition of `caml_cairo_font_type'; /home/opam/.opam/4.10/lib/lablgtk3/liblablgtk3_stubs.a(cairo_pango_stubs.o):/home/opam/.opam/4.10/lib/cairo2/cairo_ocaml.h:53: first defined here

@talex5 talex5 merged commit aacee07 into 0install:master Jul 26, 2020
@talex5 talex5 deleted the dune-plugin branch July 26, 2020 11:47
talex5 added a commit to talex5/opam-repository that referenced this pull request Aug 19, 2022
CHANGES:

Changes:

- Add support for ARM64 (Bastian Eicher).

- Add `+` to list of allowed characters in "extract" (Bastian Eicher, 0install/0install#185).

Bug fixes:

- Don't abort if chmod of launcher directory fails.
  We try to make the directory read-only, but this isn't very important.
  It can sometimes fail if running inside a sandbox that prevents modifications to the filesystem.

- Handle implementations that directly conflict with themselves (0install/0install#180).

- Improve SIGPIPE handling (0install/0install#162).
  Disable the SIGPIPE signal, so that we handle it as an exception instead, not by killing the process.

Updates for upstream changes:

- Make compatible with Yojson `json` type deprecation (Marek Kubica).
  Yojson 2.0 removes the `json` type, so this code switches to using `t`.

- Replace uses of deprecated `Stdlib.Stream` and `Lwt_unix.yield`.

- Fix new compiler warnings from OCaml 4.12 and 4.13.

- Update .NET Framework detection logic (Bastian Eicher, 0install/0install#178).

- Simplify GUI build using dune's new plugin support (0install/0install#161).

- Move feed to apps.0install.net (Bastian Eicher).
talex5 added a commit to talex5/opam-repository that referenced this pull request Aug 19, 2022
CHANGES:

Changes:

- Add support for ARM64 (Bastian Eicher).

- Add `+` to list of allowed characters in "extract" (Bastian Eicher, 0install/0install#185).

Bug fixes:

- Don't abort if chmod of launcher directory fails.
  We try to make the directory read-only, but this isn't very important.
  It can sometimes fail if running inside a sandbox that prevents modifications to the filesystem.

- Handle implementations that directly conflict with themselves (0install/0install#180).

- Improve SIGPIPE handling (0install/0install#162).
  Disable the SIGPIPE signal, so that we handle it as an exception instead, not by killing the process.

Updates for upstream changes:

- Make compatible with Yojson `json` type deprecation (Marek Kubica).
  Yojson 2.0 removes the `json` type, so this code switches to using `t`.

- Replace uses of deprecated `Stdlib.Stream` and `Lwt_unix.yield`.

- Fix new compiler warnings from OCaml 4.12 and 4.13.

- Update .NET Framework detection logic (Bastian Eicher, 0install/0install#178).

- Simplify GUI build using dune's new plugin support (0install/0install#161).

- Move feed to apps.0install.net (Bastian Eicher).
talex5 added a commit to talex5/opam-repository that referenced this pull request Aug 19, 2022
CHANGES:

Changes:

- Add support for ARM64 (Bastian Eicher).

- Add `+` to list of allowed characters in "extract" (Bastian Eicher, 0install/0install#185).

Bug fixes:

- Don't abort if chmod of launcher directory fails.
  We try to make the directory read-only, but this isn't very important.
  It can sometimes fail if running inside a sandbox that prevents modifications to the filesystem.

- Handle implementations that directly conflict with themselves (0install/0install#180).

- Improve SIGPIPE handling (0install/0install#162).
  Disable the SIGPIPE signal, so that we handle it as an exception instead, not by killing the process.

Updates for upstream changes:

- Make compatible with Yojson `json` type deprecation (Marek Kubica).
  Yojson 2.0 removes the `json` type, so this code switches to using `t`.

- Replace uses of deprecated `Stdlib.Stream` and `Lwt_unix.yield`.

- Fix new compiler warnings from OCaml 4.12 and 4.13.

- Update .NET Framework detection logic (Bastian Eicher, 0install/0install#178).

- Simplify GUI build using dune's new plugin support (0install/0install#161).

- Move feed to apps.0install.net (Bastian Eicher).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant