diff options
| author | Gary Kramlich <grim@reaperworld.com> | 2022-09-23 03:44:40 -0500 |
|---|---|---|
| committer | Gary Kramlich <grim@reaperworld.com> | 2022-09-23 03:44:40 -0500 |
| commit | 0d8b6697e95e2dbe246bb0ce85c2ca9c89682978 (patch) | |
| tree | 9d259ef172f0afbf701a28e433b2f25615fd4278 /subprojects | |
| parent | 256f1d24fdc6fef6043671257924fd583dd44d4f (diff) | |
| download | pidgin-0d8b6697e95e2dbe246bb0ce85c2ca9c89682978.tar.gz | |
Revert the wrap-file change as it breaks our ability to use gi-docgen with subprojects
Using wrap-file causes the build directory to have the first path from the archive that was extracted. Normally this isn't a problem, but to use `gi-docgen` with our subproject we need to a `--add-include-dir` to `gi-docgen` which means we need to have a known path. These directories with the version number in them would then have to be updated for every `gi-docgen` call every time we update one of these dependencies.
This is a nightmare, so for the packages we do this for, we will continue using `wrap-hg` or `wrap-git` so that can can control the name of the directory for the subproject in the build directory.
Testing Done:
Build the docs many times while making sure my `$topsrcdir/subprojects` directory only had wrap files.
Reviewed at https://reviews.imfreedom.org/r/1830/
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/gi-docgen.wrap | 2 | ||||
| -rw-r--r-- | subprojects/gplugin.wrap | 9 | ||||
| -rw-r--r-- | subprojects/libgnt.wrap | 9 | ||||
| -rw-r--r-- | subprojects/libnice.wrap | 2 | ||||
| -rw-r--r-- | subprojects/talkatu.wrap | 9 |
5 files changed, 14 insertions, 17 deletions
diff --git a/subprojects/gi-docgen.wrap b/subprojects/gi-docgen.wrap index 7e3d53cfa4..3cd6fe307d 100644 --- a/subprojects/gi-docgen.wrap +++ b/subprojects/gi-docgen.wrap @@ -2,4 +2,4 @@ directory = gi-docgen-2022.1 source_url = https://download.gnome.org/sources/gi-docgen/2022/gi-docgen-2022.1.tar.xz source_filename = gi-docgen-2022.1.tar.xz -source_hash = fefe3153979595ddad2dc81d5efa7e54c8ca3770f91a5a75710c8fd6fad4575f +source_hash = fefe3153979595ddad2dc81d5efa7e54c8ca3770f91a5a75710c8fd6fad4575f
\ No newline at end of file diff --git a/subprojects/gplugin.wrap b/subprojects/gplugin.wrap index d30e0c1113..822d9e42ed 100644 --- a/subprojects/gplugin.wrap +++ b/subprojects/gplugin.wrap @@ -1,5 +1,4 @@ -[wrap-file] -directory = gplugin-v0.38.1 -source_url = https://keep.imfreedom.org/gplugin/gplugin/archive/v0.38.1.tar.bz2 -source_filename = gplugin-0.38.1.tar.bz2 -source_hash = 4dbea43ce9094debf633e1873d2c2e94cf27d193666a0d34a0a32598f209fe52 +[wrap-hg] +directory = gplugin +url = https://keep.imfreedom.org/gplugin/gplugin +revision = v0.38.1
\ No newline at end of file diff --git a/subprojects/libgnt.wrap b/subprojects/libgnt.wrap index 00708e2e2b..744177edc7 100644 --- a/subprojects/libgnt.wrap +++ b/subprojects/libgnt.wrap @@ -1,5 +1,4 @@ -[wrap-file] -directory = libgnt-b7174f76d7ee -source_url = https://keep.imfreedom.org/libgnt/libgnt/archive/b7174f76d7ee.tar.bz2 -source_filename = libgnt-b7174f76d7ee.tar.bz2 -source_hash = 56f76698c7bd050ae044410a8450f0ae063cdadab425a518866bd650acbbe652 +[wrap-hg] +directory = libgnt +url = https://keep.imfreedom.org/libgnt/libgnt +revision = b7174f76d7ee
\ No newline at end of file diff --git a/subprojects/libnice.wrap b/subprojects/libnice.wrap index bcdda8e5e2..5ff6c8d246 100644 --- a/subprojects/libnice.wrap +++ b/subprojects/libnice.wrap @@ -6,4 +6,4 @@ source_hash = 6747af710998cf708a2e8ceef51cccd181373d94201dd4b8d40797a070ed47cc [provide] dependency_names = nice -nice=libnice_dep +nice=libnice_dep
\ No newline at end of file diff --git a/subprojects/talkatu.wrap b/subprojects/talkatu.wrap index 0f0beb7c59..bdeb71d65b 100644 --- a/subprojects/talkatu.wrap +++ b/subprojects/talkatu.wrap @@ -1,5 +1,4 @@ -[wrap-file] -directory = talkatu-v0.1.0 -source_url = https://keep.imfreedom.org/talkatu/talkatu/archive/v0.1.0.tar.bz2 -source_filename = talkatu-0.1.0.tar.bz2 -source_hash = 6f189f7e70922253a662241c16f0ca546c8ff8a04c18ba99b40d792eebfa4f3c +[wrap-hg] +directory = talkatu +url = https://keep.imfreedom.org/talkatu/talkatu +revision = v0.1.0
\ No newline at end of file |