Skip to content

Commit fbcbe36

Browse files
committed
add patches from the opam-repository
1 parent 796068e commit fbcbe36

File tree

1,106 files changed

+50819
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,106 files changed

+50819
-0
lines changed

patches/0install/0install.install

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
bin: [
2+
"dist/files/0install"
3+
"dist/files/0install" {"0launch"}
4+
"dist/files/0install" {"0store"}
5+
"dist/files/0install" {"0store-secure-add"}
6+
"dist/files/0install" {"0desktop"}
7+
"dist/files/0install" {"0alias"}
8+
]
9+
lib: [
10+
"?dist/files/gui_gtk.cmxs"
11+
"?dist/files/gui_gtk.cma"
12+
]
13+
man: [
14+
"0launch.1" {"man1/0launch.1"}
15+
"0store-secure-add.1" {"man1/0store-secure-add.1"}
16+
"0store.1" {"man1/0store.1"}
17+
"0desktop.1" {"man1/0desktop.1"}
18+
"0install.1" {"man1/0install.1"}
19+
]

patches/0install/gui_gtk_dir.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/ocaml/zeroinstall/gui.ml b/ocaml/zeroinstall/gui.ml
2+
index fa92430..8f15419 100644
3+
--- a/ocaml/zeroinstall/gui.ml
4+
+++ b/ocaml/zeroinstall/gui.ml
5+
@@ -359,6 +359,8 @@ let try_get_gui config ~use_gui =
6+
let plugin_path =
7+
let sys_lib = Filename.dirname bindir +/ "lib" in
8+
U.first_match check_plugin_dir [
9+
+ (* 0install lib dir *)
10+
+ sys_lib +/ "0install";
11+
(* Is 0install is installed as distro package? *)
12+
sys_lib +/ "0install.net";
13+
(* Are we running via 0install? *)

patches/CamlGI/CamlGI.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
lib: ["camlGI.a"]

patches/FrontC/FrontC.install

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
bin: [
2+
"calipso/calipso"
3+
"calipso/calipso_stat"
4+
"ctoxml/ctoxml"
5+
"printc/printc"
6+
]

patches/FrontC/META

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
description = "Parser for the C language"
2+
version = "3.4"
3+
requires = "unix"
4+
archive(byte) = "frontc.cma"
5+
archive(native) = "frontc.cmxa"

patches/FrontC/META.1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
description = "Parser for the C language"
2+
version = "3.4.1"
3+
requires = "unix"
4+
archive(byte) = "frontc.cma"
5+
archive(native) = "frontc.cmxa"

patches/FrontC/fix-cmxs-cmx.patch

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
diff --git a/Makefile.head b/Makefile.head
2+
index 88e5b65..5f9969f 100644
3+
--- a/Makefile.head
4+
+++ b/Makefile.head
5+
@@ -100,8 +100,9 @@ $(1)_CMIX = $$(patsubst %.cmx,%.cmi,$$($(1)_CMX))
6+
_DEPS += $$(patsubst %.cmx,$(DEP_DIR)/%.d,$$($(1)_CMX)) \
7+
$$(patsubst %.mly,$(DEP_DIR)/%.mli.d,$$($(1)_MLYX))
8+
_PRE_DEPS += $$($(1)_MLX)
9+
-_DIST_CLEAN += $(1).cmxa $(1).a $$($(1)_CMIX)
10+
+_DIST_CLEAN += $(1).cmxa $(1).cmxs $(1).a $$($(1)_CMIX)
11+
_CLEAN += $$($(1)_CMX) \
12+
+ $(1).cmxa $(1).cmxs \
13+
$$(patsubst %.cmx,%.o,$$($(1)_CMX)) \
14+
$$(patsubst %.mll,%.ml,$$($(1)_MLLX)) \
15+
$$(patsubst %.mly,%.ml,$$($(1)_MLYX)) \
16+
@@ -113,12 +114,12 @@ _INSTALL += _install_$(1)_CMXA _install_$(1)_CMXS
17+
$(1).cmxa: $$($(1)_CMX)
18+
$$(OCAMLOPT) -a $$($(1)_LDFLAGS) $$(OCAMLOPT_LDFLAGS) -o $$@ $$($(1)_CMX) $$(OCAMLOPT_LIBS)
19+
20+
-$(1).cmxs: $$($(1).cmxa)
21+
- $$(OCAMLOPT) -shared -linkall $$($(1).cmxa) -o $$@
22+
+$(1).cmxs: $(1).cmxa $(1).a
23+
+ $$(OCAMLOPT) -shared -linkall $(1).cmxa -o $$@
24+
25+
_install_$(1)_CMXA:
26+
install -d $(OCAML_SITE)/FrontC
27+
- install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/FrontC
28+
+ install $(1).cmxa $(1).a $$($(1)_CMX) $$($(1)_CMIX) $(OCAML_SITE)/FrontC
29+
30+
_install_$(1)_CMXS:
31+
install -d $(OCAML_SITE)/FrontC

patches/FrontC/opam.patch

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff -ru FrontC.3.4/Makefile.head FrontC.3.4/Makefile.head
2+
--- FrontC.3.4/Makefile.head 2008-04-01 15:53:52.000000000 +0200
3+
+++ FrontC.3.4/Makefile.head 2012-10-05 18:14:56.993802068 +0200
4+
@@ -84,8 +84,8 @@
5+
$$(OCAMLC) -a $$($(1)_LDFLAGS) $$(OCAMLC_LDFLAGS) -o $$@ $$($(1)_CMO) $$(OCAMLC_LIBS)
6+
7+
_install_$(1)_CMA:
8+
- install -d $(OCAML_SITE)/$(1)
9+
- install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/$(1)
10+
+ install -d $(OCAML_SITE)/FrontC
11+
+ install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/FrontC
12+
13+
endef
14+
15+
@@ -114,8 +114,8 @@
16+
$$(OCAMLOPT) -a $$($(1)_LDFLAGS) $$(OCAMLOPT_LDFLAGS) -o $$@ $$($(1)_CMX) $$(OCAMLOPT_LIBS)
17+
18+
_install_$(1)_CMXA:
19+
- install -d $(OCAML_SITE)/$(1)
20+
- install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/$(1)
21+
+ install -d $(OCAML_SITE)/FrontC
22+
+ install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/FrontC
23+
24+
endef
25+

patches/FrontC/opam.patch.1

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
diff -ru FrontC.3.4.1/Makefile.head FrontC.3.4.1/Makefile.head
2+
--- FrontC.3.4.1/Makefile.head 2008-04-01 15:53:52.000000000 +0200
3+
+++ FrontC.3.4.1/Makefile.head 2012-10-05 18:14:56.993802068 +0200
4+
@@ -84,8 +84,8 @@
5+
$$(OCAMLC) -a $$($(1)_LDFLAGS) $$(OCAMLC_LDFLAGS) -o $$@ $$($(1)_CMO) $$(OCAMLC_LIBS)
6+
7+
_install_$(1)_CMA:
8+
- install -d $(OCAML_SITE)/$(1)
9+
- install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/$(1)
10+
+ install -d $(OCAML_SITE)/FrontC
11+
+ install $(1).cma $$($(1)_CMIO) $(OCAML_SITE)/FrontC
12+
13+
endef
14+
15+
@@ -114,8 +114,8 @@
16+
$$(OCAMLOPT) -a $$($(1)_LDFLAGS) $$(OCAMLOPT_LDFLAGS) -o $$@ $$($(1)_CMX) $$(OCAMLOPT_LIBS)
17+
18+
_install_$(1)_CMXA:
19+
- install -d $(OCAML_SITE)/$(1)
20+
- install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/$(1)
21+
+ install -d $(OCAML_SITE)/FrontC
22+
+ install $(1).cmxa $(1).a $$($(1)_CMIX) $(OCAML_SITE)/FrontC
23+
24+
endef
25+

patches/abella/abella.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bin: ["_build/src/abella.native" {"abella"}]

0 commit comments

Comments
 (0)