Skip to content

add patches from the opam-repository #28

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
May 29, 2024
Merged

add patches from the opam-repository #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb91a0d
add patches from opam-repository
hannesm May 23, 2024
aecad3f
reconcile ocaml-variant fix-gcc10 patches
hannesm May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
19 changes: 19 additions & 0 deletions patches/0install/0install.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
bin: [
"dist/files/0install"
"dist/files/0install" {"0launch"}
"dist/files/0install" {"0store"}
"dist/files/0install" {"0store-secure-add"}
"dist/files/0install" {"0desktop"}
"dist/files/0install" {"0alias"}
]
lib: [
"?dist/files/gui_gtk.cmxs"
"?dist/files/gui_gtk.cma"
]
man: [
"0launch.1" {"man1/0launch.1"}
"0store-secure-add.1" {"man1/0store-secure-add.1"}
"0store.1" {"man1/0store.1"}
"0desktop.1" {"man1/0desktop.1"}
"0install.1" {"man1/0install.1"}
]
13 changes: 13 additions & 0 deletions patches/0install/gui_gtk_dir.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/ocaml/zeroinstall/gui.ml b/ocaml/zeroinstall/gui.ml
index fa92430..8f15419 100644
--- a/ocaml/zeroinstall/gui.ml
+++ b/ocaml/zeroinstall/gui.ml
@@ -359,6 +359,8 @@ let try_get_gui config ~use_gui =
let plugin_path =
let sys_lib = Filename.dirname bindir +/ "lib" in
U.first_match check_plugin_dir [
+ (* 0install lib dir *)
+ sys_lib +/ "0install";
(* Is 0install is installed as distro package? *)
sys_lib +/ "0install.net";
(* Are we running via 0install? *)
1 change: 1 addition & 0 deletions patches/CamlGI/CamlGI.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
lib: ["camlGI.a"]
6 changes: 6 additions & 0 deletions patches/FrontC/FrontC.install
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
bin: [
"calipso/calipso"
"calipso/calipso_stat"
"ctoxml/ctoxml"
"printc/printc"
]
5 changes: 5 additions & 0 deletions patches/FrontC/META.3.4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
description = "Parser for the C language"
version = "3.4"
requires = "unix"
archive(byte) = "frontc.cma"
archive(native) = "frontc.cmxa"
5 changes: 5 additions & 0 deletions patches/FrontC/META.3.4.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
description = "Parser for the C language"
version = "3.4.1"
requires = "unix"
archive(byte) = "frontc.cma"
archive(native) = "frontc.cmxa"
5 changes: 5 additions & 0 deletions patches/FrontC/META.3.4.2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
description = "Parser for the C language"
version = "3.4.1"
requires = "unix"
archive(byte) = "frontc.cma"
archive(native) = "frontc.cmxa"
31 changes: 31 additions & 0 deletions patches/FrontC/fix-cmxs-cmx.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
diff --git a/Makefile.head b/Makefile.head
index 88e5b65..5f9969f 100644
--- a/Makefile.head
+++ b/Makefile.head
@@ -100,8 +100,9 @@ $(1)_CMIX = $$(patsubst %.cmx,%.cmi,$$($(1)_CMX))
_DEPS += $$(patsubst %.cmx,$(DEP_DIR)/%.d,$$($(1)_CMX)) \
$$(patsubst %.mly,$(DEP_DIR)/%.mli.d,$$($(1)_MLYX))
_PRE_DEPS += $$($(1)_MLX)
-_DIST_CLEAN += $(1).cmxa $(1).a $$($(1)_CMIX)
+_DIST_CLEAN += $(1).cmxa $(1).cmxs $(1).a $$($(1)_CMIX)
_CLEAN += $$($(1)_CMX) \
+ $(1).cmxa $(1).cmxs \
$$(patsubst %.cmx,%.o,$$($(1)_CMX)) \
$$(patsubst %.mll,%.ml,$$($(1)_MLLX)) \
$$(patsubst %.mly,%.ml,$$($(1)_MLYX)) \
@@ -113,12 +114,12 @@ _INSTALL += _install_$(1)_CMXA _install_$(1)_CMXS
$(1).cmxa: $$($(1)_CMX)
$$(OCAMLOPT) -a $$($(1)_LDFLAGS) $$(OCAMLOPT_LDFLAGS) -o $$@ $$($(1)_CMX) $$(OCAMLOPT_LIBS)

-$(1).cmxs: $$($(1).cmxa)
- $$(OCAMLOPT) -shared -linkall $$($(1).cmxa) -o $$@
+$(1).cmxs: $(1).cmxa $(1).a
+ $$(OCAMLOPT) -shared -linkall $(1).cmxa -o $$@

_install_$(1)_CMXA:
install -d $(OCAML_SITE)/FrontC
- install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/FrontC
+ install $(1).cmxa $(1).a $$($(1)_CMX) $$($(1)_CMIX) $(OCAML_SITE)/FrontC

_install_$(1)_CMXS:
install -d $(OCAML_SITE)/FrontC
25 changes: 25 additions & 0 deletions patches/FrontC/opam.patch.3.4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff -ru FrontC.3.4/Makefile.head FrontC.3.4/Makefile.head
--- FrontC.3.4/Makefile.head 2008-04-01 15:53:52.000000000 +0200
+++ FrontC.3.4/Makefile.head 2012-10-05 18:14:56.993802068 +0200
@@ -84,8 +84,8 @@
$$(OCAMLC) -a $$($(1)_LDFLAGS) $$(OCAMLC_LDFLAGS) -o $$@ $$($(1)_CMO) $$(OCAMLC_LIBS)

_install_$(1)_CMA:
- install -d $(OCAML_SITE)/$(1)
- install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/$(1)
+ install -d $(OCAML_SITE)/FrontC
+ install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/FrontC

endef

@@ -114,8 +114,8 @@
$$(OCAMLOPT) -a $$($(1)_LDFLAGS) $$(OCAMLOPT_LDFLAGS) -o $$@ $$($(1)_CMX) $$(OCAMLOPT_LIBS)

_install_$(1)_CMXA:
- install -d $(OCAML_SITE)/$(1)
- install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/$(1)
+ install -d $(OCAML_SITE)/FrontC
+ install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/FrontC

endef

25 changes: 25 additions & 0 deletions patches/FrontC/opam.patch.3.4.1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff -ru FrontC.3.4.1/Makefile.head FrontC.3.4.1/Makefile.head
--- FrontC.3.4.1/Makefile.head 2008-04-01 15:53:52.000000000 +0200
+++ FrontC.3.4.1/Makefile.head 2012-10-05 18:14:56.993802068 +0200
@@ -84,8 +84,8 @@
$$(OCAMLC) -a $$($(1)_LDFLAGS) $$(OCAMLC_LDFLAGS) -o $$@ $$($(1)_CMO) $$(OCAMLC_LIBS)

_install_$(1)_CMA:
- install -d $(OCAML_SITE)/$(1)
- install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/$(1)
+ install -d $(OCAML_SITE)/FrontC
+ install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/FrontC

endef

@@ -114,8 +114,8 @@
$$(OCAMLOPT) -a $$($(1)_LDFLAGS) $$(OCAMLOPT_LDFLAGS) -o $$@ $$($(1)_CMX) $$(OCAMLOPT_LIBS)

_install_$(1)_CMXA:
- install -d $(OCAML_SITE)/$(1)
- install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/$(1)
+ install -d $(OCAML_SITE)/FrontC
+ install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/FrontC

endef

25 changes: 25 additions & 0 deletions patches/FrontC/opam.patch.3.4.2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
diff -ru FrontC.3.4.1/Makefile.head FrontC.3.4.1/Makefile.head
--- FrontC.3.4.1/Makefile.head 2008-04-01 15:53:52.000000000 +0200
+++ FrontC.3.4.1/Makefile.head 2012-10-05 18:14:56.993802068 +0200
@@ -84,8 +84,8 @@
$$(OCAMLC) -a $$($(1)_LDFLAGS) $$(OCAMLC_LDFLAGS) -o $$@ $$($(1)_CMO) $$(OCAMLC_LIBS)

_install_$(1)_CMA:
- install -d $(OCAML_SITE)/$(1)
- install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/$(1)
+ install -d $(OCAML_SITE)/FrontC
+ install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/FrontC

endef

@@ -114,8 +114,8 @@
$$(OCAMLOPT) -a $$($(1)_LDFLAGS) $$(OCAMLOPT_LDFLAGS) -o $$@ $$($(1)_CMX) $$(OCAMLOPT_LIBS)

_install_$(1)_CMXA:
- install -d $(OCAML_SITE)/$(1)
- install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/$(1)
+ install -d $(OCAML_SITE)/FrontC
+ install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/FrontC

endef

1 change: 1 addition & 0 deletions patches/abella/abella.install.2.0.2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bin: ["_build/src/abella.native" {"abella"}]
120 changes: 120 additions & 0 deletions patches/abella/abella.install.2.0.3
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
bin: ["_build/src/abella.native" {"abella"}]
share: [ "emacs/abella.el" {"emacs/abella.el"}
"emacs/lprolog.el" {"emacs/lprolog.el"}
"emacs/pg/abella.el" {"emacs/pg/abella.el"}
"emacs/pg/abella-syntax.el" {"emacs/pg/abella-syntax.el"}
"emacs/pg/Makefile" {"emacs/pg/Makefile"}
"emacs/pg/README.markdown" {"emacs/pg/README.markdown"}
"emacs/README" {"emacs/README"}
"examples/first-order/ackermann.thm" {"examples/first-order/ackermann.thm"}
"examples/first-order/add.mod" {"examples/first-order/add.mod"}
"examples/first-order/add.sig" {"examples/first-order/add.sig"}
"examples/first-order/add.thm" {"examples/first-order/add.thm"}
"examples/first-order/even-odd.thm" {"examples/first-order/even-odd.thm"}
"examples/first-order/gcd.mod" {"examples/first-order/gcd.mod"}
"examples/first-order/gcd.sig" {"examples/first-order/gcd.sig"}
"examples/first-order/gcd.thm" {"examples/first-order/gcd.thm"}
"examples/first-order/lists.mod" {"examples/first-order/lists.mod"}
"examples/first-order/lists.sig" {"examples/first-order/lists.sig"}
"examples/first-order/lists.thm" {"examples/first-order/lists.thm"}
"examples/higher-order/bred_alt.mod" {"examples/higher-order/bred_alt.mod"}
"examples/higher-order/bred_alt.sig" {"examples/higher-order/bred_alt.sig"}
"examples/higher-order/bred_alt.thm" {"examples/higher-order/bred_alt.thm"}
"examples/higher-order/breduce.mod" {"examples/higher-order/breduce.mod"}
"examples/higher-order/breduce.sig" {"examples/higher-order/breduce.sig"}
"examples/higher-order/breduce.thm" {"examples/higher-order/breduce.thm"}
"examples/higher-order/debruijn_ho.mod" {"examples/higher-order/debruijn_ho.mod"}
"examples/higher-order/debruijn_ho.sig" {"examples/higher-order/debruijn_ho.sig"}
"examples/higher-order/debruijn_ho.thm" {"examples/higher-order/debruijn_ho.thm"}
"examples/higher-order/fsub.mod" {"examples/higher-order/fsub.mod"}
"examples/higher-order/fsub.sig" {"examples/higher-order/fsub.sig"}
"examples/higher-order/fsub.thm" {"examples/higher-order/fsub.thm"}
"examples/lambda-calculus/cr.mod" {"examples/lambda-calculus/cr.mod"}
"examples/lambda-calculus/cr.sig" {"examples/lambda-calculus/cr.sig"}
"examples/lambda-calculus/cr.thm" {"examples/lambda-calculus/cr.thm"}
"examples/lambda-calculus/eval.mod" {"examples/lambda-calculus/eval.mod"}
"examples/lambda-calculus/eval.sig" {"examples/lambda-calculus/eval.sig"}
"examples/lambda-calculus/eval.thm" {"examples/lambda-calculus/eval.thm"}
"examples/lambda-calculus/normalization/stlc-strong-norm.mod" {"examples/lambda-calculus/normalization/stlc-strong-norm.mod"}
"examples/lambda-calculus/normalization/stlc-strong-norm.sig" {"examples/lambda-calculus/normalization/stlc-strong-norm.sig"}
"examples/lambda-calculus/normalization/stlc-strong-norm.thm" {"examples/lambda-calculus/normalization/stlc-strong-norm.thm"}
"examples/lambda-calculus/normalization/stlc-weak-norm.mod" {"examples/lambda-calculus/normalization/stlc-weak-norm.mod"}
"examples/lambda-calculus/normalization/stlc-weak-norm.sig" {"examples/lambda-calculus/normalization/stlc-weak-norm.sig"}
"examples/lambda-calculus/normalization/stlc-weak-norm.thm" {"examples/lambda-calculus/normalization/stlc-weak-norm.thm"}
"examples/lambda-calculus/sred.mod" {"examples/lambda-calculus/sred.mod"}
"examples/lambda-calculus/sred.sig" {"examples/lambda-calculus/sred.sig"}
"examples/lambda-calculus/sred.thm" {"examples/lambda-calculus/sred.thm"}
"examples/lambda-calculus/term-structure/debruijn.mod" {"examples/lambda-calculus/term-structure/debruijn.mod"}
"examples/lambda-calculus/term-structure/debruijn.sig" {"examples/lambda-calculus/term-structure/debruijn.sig"}
"examples/lambda-calculus/term-structure/debruijn.thm" {"examples/lambda-calculus/term-structure/debruijn.thm"}
"examples/lambda-calculus/term-structure/normal.mod" {"examples/lambda-calculus/term-structure/normal.mod"}
"examples/lambda-calculus/term-structure/normal.sig" {"examples/lambda-calculus/term-structure/normal.sig"}
"examples/lambda-calculus/term-structure/normal.thm" {"examples/lambda-calculus/term-structure/normal.thm"}
"examples/lambda-calculus/term-structure/path.mod" {"examples/lambda-calculus/term-structure/path.mod"}
"examples/lambda-calculus/term-structure/path.sig" {"examples/lambda-calculus/term-structure/path.sig"}
"examples/lambda-calculus/term-structure/path.thm" {"examples/lambda-calculus/term-structure/path.thm"}
"examples/lambda-calculus/type-uniq/type-uniq-fresh.thm" {"examples/lambda-calculus/type-uniq/type-uniq-fresh.thm"}
"examples/lambda-calculus/type-uniq/type-uniq-lg.thm" {"examples/lambda-calculus/type-uniq/type-uniq-lg.thm"}
"examples/lambda-calculus/type-uniq/type-uniq.mod" {"examples/lambda-calculus/type-uniq/type-uniq.mod"}
"examples/lambda-calculus/type-uniq/type-uniq.sig" {"examples/lambda-calculus/type-uniq/type-uniq.sig"}
"examples/lambda-calculus/type-uniq/type-uniq-single.thm" {"examples/lambda-calculus/type-uniq/type-uniq-single.thm"}
"examples/lambda-calculus/type-uniq/type-uniq.thm" {"examples/lambda-calculus/type-uniq/type-uniq.thm"}
"examples/logic/cut.mod" {"examples/logic/cut.mod"}
"examples/logic/cut.sig" {"examples/logic/cut.sig"}
"examples/logic/cut.thm" {"examples/logic/cut.thm"}
"examples/logic/equiv.mod" {"examples/logic/equiv.mod"}
"examples/logic/equiv.sig" {"examples/logic/equiv.sig"}
"examples/logic/equiv.thm" {"examples/logic/equiv.thm"}
"examples/logic/focus.mod" {"examples/logic/focus.mod"}
"examples/logic/focus.sig" {"examples/logic/focus.sig"}
"examples/logic/focus.thm" {"examples/logic/focus.thm"}
"examples/logic/hh_meta.thm" {"examples/logic/hh_meta.thm"}
"examples/logic/seq.thm" {"examples/logic/seq.thm"}
"examples/misc/cascade.thm" {"examples/misc/cascade.thm"}
"examples/misc/colist.thm" {"examples/misc/colist.thm"}
"examples/misc/conat.thm" {"examples/misc/conat.thm"}
"examples/misc/copy.mod" {"examples/misc/copy.mod"}
"examples/misc/copy.sig" {"examples/misc/copy.sig"}
"examples/misc/copy.thm" {"examples/misc/copy.thm"}
"examples/misc/flex-rigid.thm" {"examples/misc/flex-rigid.thm"}
"examples/misc/higher-order.mod" {"examples/misc/higher-order.mod"}
"examples/misc/higher-order.sig" {"examples/misc/higher-order.sig"}
"examples/misc/higher-order.thm" {"examples/misc/higher-order.thm"}
"examples/misc/subst.mod" {"examples/misc/subst.mod"}
"examples/misc/subst.sig" {"examples/misc/subst.sig"}
"examples/misc/subst.thm" {"examples/misc/subst.thm"}
"examples/misc/umt.thm" {"examples/misc/umt.thm"}
"examples/process-calculi/ccs/ccs_bisim_context_examples.thm" {"examples/process-calculi/ccs/ccs_bisim_context_examples.thm"}
"examples/process-calculi/ccs/ccs_bisim_context.thm" {"examples/process-calculi/ccs/ccs_bisim_context.thm"}
"examples/process-calculi/ccs/ccs_bisim_examples_helper.thm" {"examples/process-calculi/ccs/ccs_bisim_examples_helper.thm"}
"examples/process-calculi/ccs/ccs_bisim_examples.thm" {"examples/process-calculi/ccs/ccs_bisim_examples.thm"}
"examples/process-calculi/ccs/ccs_bisim.thm" {"examples/process-calculi/ccs/ccs_bisim.thm"}
"examples/process-calculi/ccs/ccs_context.thm" {"examples/process-calculi/ccs/ccs_context.thm"}
"examples/process-calculi/ccs/ccs_core.thm" {"examples/process-calculi/ccs/ccs_core.thm"}
"examples/process-calculi/ccs/ccs_ctx.thm" {"examples/process-calculi/ccs/ccs_ctx.thm"}
"examples/process-calculi/ccs_two_level/ccs.mod" {"examples/process-calculi/ccs_two_level/ccs.mod"}
"examples/process-calculi/ccs_two_level/ccs.sig" {"examples/process-calculi/ccs_two_level/ccs.sig"}
"examples/process-calculi/ccs_two_level/ccs.thm" {"examples/process-calculi/ccs_two_level/ccs.thm"}
"examples/process-calculi/pic/pic_bisim_examples.thm" {"examples/process-calculi/pic/pic_bisim_examples.thm"}
"examples/process-calculi/pic/pic_bisim.thm" {"examples/process-calculi/pic/pic_bisim.thm"}
"examples/process-calculi/pic/pic_core.thm" {"examples/process-calculi/pic/pic_core.thm"}
"examples/process-calculi/pic/pic_ctx.thm" {"examples/process-calculi/pic/pic_ctx.thm"}
"examples/process-calculi/pic_two_level/finite-pic-cong.thm" {"examples/process-calculi/pic_two_level/finite-pic-cong.thm"}
"examples/process-calculi/pic_two_level/finite-pic.mod" {"examples/process-calculi/pic_two_level/finite-pic.mod"}
"examples/process-calculi/pic_two_level/finite-pic.sig" {"examples/process-calculi/pic_two_level/finite-pic.sig"}
"examples/process-calculi/pic_two_level/finite-pic.thm" {"examples/process-calculi/pic_two_level/finite-pic.thm"}
"examples/process-calculi/pic_two_level/pic.mod" {"examples/process-calculi/pic_two_level/pic.mod"}
"examples/process-calculi/pic_two_level/pic.sig" {"examples/process-calculi/pic_two_level/pic.sig"}
"examples/process-calculi/pic_two_level/pic.thm" {"examples/process-calculi/pic_two_level/pic.thm"}
"examples/programming-languages/ees.mod" {"examples/programming-languages/ees.mod"}
"examples/programming-languages/ees.sig" {"examples/programming-languages/ees.sig"}
"examples/programming-languages/ees.thm" {"examples/programming-languages/ees.thm"}
"examples/programming-languages/pcf.mod" {"examples/programming-languages/pcf.mod"}
"examples/programming-languages/pcf.sig" {"examples/programming-languages/pcf.sig"}
"examples/programming-languages/pcf.thm" {"examples/programming-languages/pcf.thm"}
"examples/programming-languages/poplmark-1a.mod" {"examples/programming-languages/poplmark-1a.mod"}
"examples/programming-languages/poplmark-1a.sig" {"examples/programming-languages/poplmark-1a.sig"}
"examples/programming-languages/poplmark-1a.thm" {"examples/programming-languages/poplmark-1a.thm"}
"examples/programming-languages/poplmark-2a.mod" {"examples/programming-languages/poplmark-2a.mod"}
"examples/programming-languages/poplmark-2a.sig" {"examples/programming-languages/poplmark-2a.sig"}
"examples/programming-languages/poplmark-2a.thm" {"examples/programming-languages/poplmark-2a.thm"} ]
Loading