Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

cairo package renaming, lablgl support for lablgtk2 #997

Merged
merged 2 commits into from

2 participants

@william3

Hello,
two commits :

  • cairo : package rename. it is important, because opam use the directory name to install ocamlfind META package. Without change, cairo1.ocaml opam package installs "cairo" ocamlfind package in cairo sub directory, which could be fine, but "cairo.0.4.x" opam package get installed in same cairo sub directory...
    to solve this, the best is to name opam package the same as ocamlfind package, that is to say :
    cairo1.ocaml-1.2.0 -> cairo.1.2.0 with cairo ocamlfind package (ocamlfind package not changed, only opam name);
    cairo.0.4.4 -> cairo2.0.4.4 with cairo2 ocamlfind package (ocamlfind package not changed, only opam name)

  • lablgtk2 :
    due to ocamlfind default install directory being in lib and not in lib/ocaml, (and lablGL -> lablgl renaming), it generates a problem with lablgl support in lablgtk2. solved with this commit

william3 added some commits
@william3

also, adds support for cairo.pango package

@samoht samoht merged commit d35ee88 into ocaml:master
@samoht
Owner

Can you please confirm on https://github.com/OCamlPro/opam-repository/issues/955 that your fine to license these patches to CC0 ?

@william3

I am not in the list, which is normal, as it is my first commit...

@samoht
Owner

We are in the process of migrating the repository to CC0, so I'm trying to keep track of new contributors as well (it will be easier later when the LICENSE file will clearly located at the root of the repository). But until then, I still need to ask you to confirm that you are happy with CC0 somewhere (and the existing thread seems a good place to do so, I'll add your name on the list at the same time).

@samoht
Owner

Thanks!

@samoht samoht referenced this pull request from a commit in samoht/opam-repository
@samoht samoht Propagate cairo1 -> cairo , cairo -> cairo2 changes introduced by #997
Fix #999
43a9cd4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 21, 2013
  1. @william3

    cairo1.ocaml-1.2.0 -> cairo.1.2.0

    william3 authored
    cairo.0.4.3 -> cairo2.0.4.3
    cairo.0.4.4 -> cairo2.0.4.4
  2. @william3

    lablgtk : add lablgl support

    william3 authored
This page is out of date. Refresh to see the latest.
View
0  packages/cairo1.ocaml-1.2.0/descr → packages/cairo.1.2.0/descr
File renamed without changes
View
10 packages/cairo1.ocaml-1.2.0/files/META → packages/cairo.1.2.0/files/META
@@ -4,6 +4,7 @@ requires = "bigarray"
archive(byte) = "cairo.cma"
archive(native) = "cairo.cmxa"
exists_if = "cairo.cma"
+
package "lablgtk2" (
version = "1.2.0"
description = "Rendering Cairo on Gtk canvas."
@@ -12,3 +13,12 @@ package "lablgtk2" (
archive(native) = "cairo_lablgtk.cmxa"
exists_if = "cairo_lablgtk.cma"
)
+
+package "pango" (
+ version = "1.2.0"
+ description = "interface with pango text rendering library"
+ requires = "lablgtk2 cairo"
+ archive(byte) = "pango_cairo.cma"
+ archive(native) = "pango_cairo.cmxa"
+ exists_if = "pango_cairo.cma"
+)
View
0  ...es/cairo1.ocaml-1.2.0/files/opam.patch.in → packages/cairo.1.2.0/files/opam.patch.in
File renamed without changes
View
0  packages/cairo1.ocaml-1.2.0/opam → packages/cairo.1.2.0/opam
File renamed without changes
View
0  packages/cairo1.ocaml-1.2.0/url → packages/cairo.1.2.0/url
File renamed without changes
View
0  packages/cairo.0.4.3/descr → packages/cairo2.0.4.3/descr
File renamed without changes
View
0  packages/cairo.0.4.3/opam → packages/cairo2.0.4.3/opam
File renamed without changes
View
0  packages/cairo.0.4.3/url → packages/cairo2.0.4.3/url
File renamed without changes
View
0  packages/cairo.0.4.4/descr → packages/cairo2.0.4.4/descr
File renamed without changes
View
0  packages/cairo.0.4.4/opam → packages/cairo2.0.4.4/opam
File renamed without changes
View
0  packages/cairo.0.4.4/url → packages/cairo2.0.4.4/url
File renamed without changes
View
12 packages/lablgtk.2.16.0/files/lablgldir.patch
@@ -0,0 +1,12 @@
+diff -Naur lablgtk-2.16.0.orig/configure lablgtk-2.16.0/configure
+--- lablgtk-2.16.0.orig/configure 2012-08-23 12:37:48.000000000 +0200
++++ lablgtk-2.16.0/configure 2013-08-21 11:16:50.707187151 +0200
+@@ -4066,7 +4066,7 @@
+ cat > conftest.ml << EOF
+ open Raw
+ EOF
+- if $CAMLC -c -I "${LABLGLDIR:=+lablGL}" conftest.ml > /dev/null 2>&1 ; then
++ if $CAMLC -c -I "$LABLGLDIR" conftest.ml > /dev/null 2>&1 ; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LABLGLDIR" >&5
+ $as_echo "$LABLGLDIR" >&6; }
+ else
View
5 packages/lablgtk.2.16.0/opam
@@ -2,12 +2,13 @@ opam-version: "1"
maintainer: "contact@ocamlpro.com"
homepage: "http://lablgtk.forge.ocamlcore.org/"
build: [
- ["./configure" "--prefix" "%{prefix}%"]
+ ["./configure" "--prefix" "%{prefix}%" "LABLGLDIR=%{lib}%/lablgl"]
[make "world"]
[make "install"]
]
remove: [
["ocamlfind" "remove" "lablgtk2"]
]
+patches: ["lablgldir.patch"]
depends: ["ocamlfind"]
-depopts: ["conf-gtksourceview"]
+depopts: ["conf-gtksourceview" "lablgl"]
Something went wrong with that request. Please try again.