Skip to content

Commit

Permalink
Prepare for GAP 4.13.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fingolfin committed Mar 19, 2024
1 parent e5258e5 commit 030ca91
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 12 deletions.
6 changes: 3 additions & 3 deletions Artifacts.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[gap_packages]
git-tree-sha1 = "4e4ea19bd0229040a3916e7a351a4fa7b43ae0b6"
git-tree-sha1 = "1e4da4944af996a96c81addcc8034d122d0a5738"

[[gap_packages.download]]
sha256 = "358c42e54dba8275ec72b9c93218f423d9ed07bd7c6c267653cb4e1d3407ccd3"
url = "https://github.com/gap-system/PackageDistro/releases/download/v4.12.2-GAP.jl/packages.tar.gz"
sha256 = "43d75100eb75d3f1e7470d1a7b11164882dca66c70f7ad9d56915c9e4d90bc0f"
url = "https://github.com/gap-system/gap/releases/download/v4.13.0/packages-v4.13.0.tar.gz"
4 changes: 4 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changes in GAP.jl

## Version 0.11.0 (released 2024-MM-DD)

- Update to GAP 4.13.0

## Version 0.10.3 (released 2024-03-01)

- Fix TAB completion for e.g. 'GAP.Globals.MTX.S' in Julia >= 1.11
Expand Down
10 changes: 5 additions & 5 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name = "GAP"
uuid = "c863536a-3901-11e9-33e7-d5cd0df7b904"
authors = ["Thomas Breuer <[email protected]>", "Sebastian Gutsche <[email protected]>", "Max Horn <[email protected]>"]
version = "0.10.3"
version = "0.11.0-DEV"

[deps]
Artifacts = "56f22d72-fd6d-98f1-02f0-08ddc0907c33"
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Downloads = "f43a241f-c20a-4ad4-852c-f6b1247861c6"
GAP_jll = "5cd7a574-2c56-5be2-91dc-c8bc375b9ddf"
GAP_lib_jll = "de1ad85e-c930-5cd4-919d-ccd3fcafd1a3"
GAP_pkg_juliainterface_jll = "ba154793-3a7d-51ee-8800-e295b0cf7374"
#GAP_pkg_juliainterface_jll = "ba154793-3a7d-51ee-8800-e295b0cf7374"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
MacroTools = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
Expand All @@ -25,9 +25,9 @@ Scratch = "6c6a2e73-6563-6170-7368-637461726353"
Artifacts = "1.6"
Compat = "4.4.0"
Downloads = "1.4.3"
GAP_jll = "~400.1200.101"
GAP_lib_jll = "~400.1201.100"
GAP_pkg_juliainterface_jll = "=0.800.300"
GAP_jll = "~400.1300.000"
GAP_lib_jll = "~400.1300.000"
#GAP_pkg_juliainterface_jll = "=0.800.300"
InteractiveUtils = "1.6"
Libdl = "1.6"
MacroTools = "0.5"
Expand Down
2 changes: 2 additions & 0 deletions etc/setup_override_dir.jl
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ if debugmode
else
extraargs = []
end
push!(extraargs, "CPPFLAGS=-DUSE_GAP_INSIDE_JULIA=1")

# TODO: redirect the output of configure into a log file
@show run(`$(gap_prefix)/configure
--prefix=$(prefix)
Expand Down
8 changes: 4 additions & 4 deletions pkg/JuliaInterface/src/JuliaInterface.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static void JuliaObjCleanFunc(Obj obj)
{
}

static Int JuliaObjIsMutableFunc(Obj obj)
static BOOL JuliaObjIsMutableFunc(Obj obj)
{
/* always immutable as GAP object */
return 0L;
Expand Down Expand Up @@ -275,12 +275,12 @@ static Obj Func_JuliaGetGapModule(Obj self)
}

// Mark the Julia pointer inside the GAP JuliaObj
static void MarkJuliaObject(Bag bag)
static void MarkJuliaObject(Bag bag, void * ref)
{
#ifdef DEBUG_MASTERPOINTERS
MarkJuliaObjSafe((void *)GET_JULIA_OBJ(bag));
MarkJuliaObjSafe((void *)GET_JULIA_OBJ(bag), ref);
#else
MarkJuliaObj((void *)GET_JULIA_OBJ(bag));
MarkJuliaObj((void *)GET_JULIA_OBJ(bag), ref);
#endif
}

Expand Down

0 comments on commit 030ca91

Please sign in to comment.