Merge branch 'subproject-wrap'

.builds/alpine-x64.yml

@@ -24,8 +24,6 @@ packages:
 
 sources:
   - https://codeberg.org/dnkl/foot
-  - https://codeberg.org/dnkl/tllist
-  - https://codeberg.org/dnkl/fcft
 
 # triggers:
 #   - action: email
@@ -33,10 +31,6 @@ sources:
 #     to: <committer>
 
 tasks:
-  - subprojects: |
-      mkdir foot/subprojects
-      ln -s ../../tllist foot/subprojects/tllist
-      ln -s ../../fcft foot/subprojects/fcft
   - debug: |
       mkdir -p bld/debug
       meson --buildtype=debug -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/debug

.builds/alpine-x86.yml.disabled

@@ -23,8 +23,6 @@ packages:
 
 sources:
   - https://codeberg.org/dnkl/foot
-  - https://codeberg.org/dnkl/tllist
-  - https://codeberg.org/dnkl/fcft
 
 # triggers:
 #   - action: email
@@ -32,10 +30,6 @@ sources:
 #     to: <committer>
 
 tasks:
-  - subprojects: |
-      mkdir foot/subprojects
-      ln -s ../../tllist foot/subprojects/tllist
-      ln -s ../../fcft foot/subprojects/fcft
   - debug: |
       mkdir -p bld/debug
       meson --buildtype=debug -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/debug

.builds/freebsd-x64.yml.disabled

@@ -18,8 +18,6 @@ packages:
 
 sources:
   - https://codeberg.org/dnkl/foot
-  - https://codeberg.org/dnkl/tllist
-  - https://codeberg.org/dnkl/fcft
 
 # triggers:
 #   - action: email
@@ -27,10 +25,6 @@ sources:
 #     to: <committer>
 
 tasks:
-  - subprojects: |
-      mkdir foot/subprojects
-      ln -s ../../tllist foot/subprojects/tllist
-      ln -s ../../fcft foot/subprojects/fcft
   - debug: |
       mkdir -p bld/debug
       meson --buildtype=debug -Dfcft:text-shaping=enabled  -Dfcft:test-text-shaping=true foot bld/debug

.gitignore

@@ -1,4 +1,4 @@
 /bld/
 /pkg/
 /src/
-/subprojects/
+/subprojects/*/

.gitlab-ci.yml

@@ -13,10 +13,6 @@ before_script:
   - apk add git
   - apk add check-dev
   - apk add ttf-hack font-noto-emoji
-  - mkdir -p subprojects && cd subprojects
-  - git clone https://codeberg.org/dnkl/tllist.git
-  - git clone https://codeberg.org/dnkl/fcft.git
-  - cd ..
 
 debug-x64:
   image: alpine:edge

CHANGELOG.md

@@ -20,8 +20,15 @@
 
 
 ## Unreleased
+
 ### Added
+
 ### Changed
+
+* The fcft and tllist library subprojects are now handled via Meson
+  [wrap files](https://mesonbuild.com/Wrap-dependency-system-manual.html)
+  instead of needing to be manually cloned.
+
 ### Deprecated
 ### Removed
 ### Fixed
@@ -33,8 +40,11 @@
 
 
 ### Security
+
 ### Contributors
 
+* [craigbarnes](https://codeberg.org/craigbarnes)
+
 
 ## 1.6.0
 

INSTALL.md

@@ -26,15 +26,12 @@ foot makes use of a couple of libraries I have developed:
 [tllist](https://codeberg.org/dnkl/tllist) and
 [fcft](https://codeberg.org/dnkl/fcft). As such, they will most likely
 not have been installed already. You can either install them as system
-libraries, or you can build them as _subprojects_ in foot.
+libraries or build them as _subprojects_ in foot.
 
 When building foot, they will first be searched for as system
 libraries. If **found**, foot will link dynamically against them.
-
-If **not** found, they will be searched for as subprojects. In this
-case you need to create the `subprojects` directory and clone
-https://codeberg.org/dnkl/fcft.git and
-https://codeberg.org/dnkl/tllist.git (see [Other](#other) below).
+If **not** found, meson will attempt to download and build them as
+subprojects.
 
 
 ## Requirements
@@ -114,18 +111,6 @@ be interested in the compiler flags used there.
 
 ### Setup
 
-If you have not installed [tllist](https://codeberg.org/dnkl/tllist)
-and [fcft](https://codeberg.org/dnkl/fcft) as system libraries, clone
-them into the `subprojects` directory:
-
-```sh
-mkdir -p subprojects
-pushd subprojects
-git clone https://codeberg.org/dnkl/tllist.git
-git clone https://codeberg.org/dnkl/fcft.git
-popd
-```
-
 To build, first, create a build directory, and switch to it:
 ```sh
 mkdir -p bld/release && cd bld/release

subprojects/fcft.wrap

@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://codeberg.org/dnkl/fcft.git
+revision = master

subprojects/tllist.wrap

@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://codeberg.org/dnkl/tllist.git
+revision = master