From ec17d266651061f35772d1a47c864ef47703f4c7 Mon Sep 17 00:00:00 2001 From: Jonatas Esteves Date: Wed, 27 Aug 2025 11:53:00 -0300 Subject: [PATCH 1/2] doc: Fix typos --- README.md | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index c7b5dc78..3a64c3f3 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ To propose new components, it is necessary to open a [Pull Request](https://gith To do it, there is currently two methods. -### 1 - Add an entry to the CI (prefered method) +### 1 - Add an entry to the CI (preferred method) For most components, new stable versions (and experimental builds if they exist) are automatically pulled. This is accomplished by the [pull-components.yml](https://github.com/bottlesdevs/components/blob/main/.github/workflows/pull-components.yml) workflow, where components are described in the following format: ```yaml @@ -31,13 +31,13 @@ Sub-category: "", ``` where: - **repo** is the GitHub repository in the format `owner/repository` -- **workflow** is the workflow filename used to generate exerimental builds, if any -- **branch** is the **workflow** branch used to generate exerimental builds, if any -- **name-prefix** is used to generate the full name of the component using **name-prefix** + `version` + **name-suffix** (e.g. `dxvk-` + `2.0` + ∅), and look for release/experimental asset whose filename is begining by **name-prefix** -- **name-suffix** serves the exact same purpose as **name-prefix**, is only used when multiple variants are available for one component (e.g. `-x86`, `-x64`, etc) -- **version-prefix** is used to find the latest release version whose [tag](https://github.com/doitsujin/dxvk/tags) is begining by **version-prefix**, and to remove **version-prefix** from the final `version` string (e.g. `v2.0` will become `2.0`) +- **workflow** is the workflow filename used to generate experimental builds, if any +- **branch** is the **workflow** branch used to generate experimental builds, if any +- **name-prefix** is used to generate the full name of the component using **name-prefix** + `version` + **name-suffix** (e.g. `dxvk-` + `2.0` + ∅), and look for release/experimental asset whose filename is beginning by **name-prefix** +- **name-suffix** serves the exact same purpose as **name-prefix**, is only used when multiple variants are available for one component (e.g. `-x86`, `-x64`, etc.) +- **version-prefix** is used to find the latest release version whose [tag](https://github.com/doitsujin/dxvk/tags) is beginning by **version-prefix**, and to remove **version-prefix** from the final `version` string (e.g. `v2.0` will become `2.0`) - **yaml-file** is the YAML component filename located in the [input_files](https://github.com/bottlesdevs/components/blob/main/input_files) directory -- **Category** and **Sub-category** are repectively the Category and Sub-category as described in the **yaml-file** (e.g. [14-dxvk.yml](https://github.com/bottlesdevs/components/blob/main/input_files/14-dxvk.yml)) +- **Category** and **Sub-category** are respectively the Category and Sub-category as described in the **yaml-file** (e.g. [14-dxvk.yml](https://github.com/bottlesdevs/components/blob/main/input_files/14-dxvk.yml)) ### 2 - Manually (legacy method) Each poster must follow the following layout: @@ -51,9 +51,7 @@ File: file_checksum: 659ee0ee3dbe5274825734ad19692e12 rename: caffe-7.2-x86_64.tar.xz ``` -old json manifests can be converted using this [online tool](https://www.json2yaml.com). - -where: +Old JSON manifests can be converted using this [online tool](https://www.json2yaml.com), where: - **Name** is a name without spaces, including version, of the component (must reflect the name of the manifest file) - **Provider** is the name of the component supplier (not the maintainer) - **Channel** should be stable or unstable @@ -74,9 +72,9 @@ Post: We provide an [automatic tools](https://github.com/bottlesdevs/tools/blob/main/MaintainersHelpers/component-generator.py) for generating the manifest. -In addition to the manifest, en entry must be created in the corresponding file located in the [input_files](https://github.com/bottlesdevs/components/blob/main/input_files) directory. The index can then be regenerated using the [generate_index.sh](https://github.com/bottlesdevs/components/blob/main/generate_index.sh) script. +In addition to the manifest, an entry must be created in the corresponding file located in the [input_files](https://github.com/bottlesdevs/components/blob/main/input_files) directory. The index can then be regenerated using the [generate_index.sh](https://github.com/bottlesdevs/components/blob/main/generate_index.sh) script. -Please double check and test using the `LOCAL_COMPONENTS=/path/to/components flatpak run com.usebottles.bottles` command before open a pull request. +Please double-check and test using the `LOCAL_COMPONENTS=/path/to/components flatpak run com.usebottles.bottles` command before open a pull request. ### Guidelines The sources of the components must be public and searchable and must not infringe any copyright. Also, each archive must contain the compiled version and not the source code. From 98b3d1496a8b289b84915377298db0d1df22a980 Mon Sep 17 00:00:00 2001 From: Jonatas Esteves Date: Wed, 27 Aug 2025 12:09:28 -0300 Subject: [PATCH 2/2] Add build of kron4ek ntsync-wow64 --- 51.18.yml | 5 ++ 51.22.yml | 48 ++++++++++++++++++- index.yml | 5 ++ input_files/11-kron4ek.yml | 5 ++ ...e-10.13-staging-tkg-ntsync-amd64-wow64.yml | 14 ++++++ 5 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 runners/wine/kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64.yml diff --git a/51.18.yml b/51.18.yml index 8d81acff..d157533a 100644 --- a/51.18.yml +++ b/51.18.yml @@ -1143,6 +1143,11 @@ kron4ek-wine-10.13-staging-tkg-amd64: Sub-category: wine Channel: stable Date: '1755385726' +kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64: + Category: runners + Sub-category: wine + Channel: stable + Date: '1755385757' kron4ek-wine-proton-10.0-2-amd64: Category: runners Sub-category: wine diff --git a/51.22.yml b/51.22.yml index 463040b4..d157533a 100644 --- a/51.22.yml +++ b/51.22.yml @@ -638,6 +638,21 @@ vaniglia-21.1.0-cx: # ./input_files/10-GE-Proton.yml # ----------------------- +ge-proton10-13: + Category: runners + Sub-category: proton + Channel: stable + Date: '1755924171' +ge-proton10-12: + Category: runners + Sub-category: proton + Channel: stable + Date: '1755039786' +ge-proton10-11: + Category: runners + Sub-category: proton + Channel: stable + Date: '1754876344' ge-proton10-10: Category: runners Sub-category: proton @@ -1113,6 +1128,31 @@ ge-proton7-4: # ./input_files/11-kron4ek.yml # ----------------------- +kron4ek-wine-10.13-amd64: + Category: runners + Sub-category: wine + Channel: stable + Date: '1755385700' +kron4ek-wine-10.13-staging-amd64: + Category: runners + Sub-category: wine + Channel: stable + Date: '1755385709' +kron4ek-wine-10.13-staging-tkg-amd64: + Category: runners + Sub-category: wine + Channel: stable + Date: '1755385726' +kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64: + Category: runners + Sub-category: wine + Channel: stable + Date: '1755385757' +kron4ek-wine-proton-10.0-2-amd64: + Category: runners + Sub-category: wine + Channel: stable + Date: '1753975920' kron4ek-wine-10.12-amd64: Category: runners Sub-category: wine @@ -2445,10 +2485,10 @@ kron4ek-wine-6.3-proton-experimental-1b31393-amd64: # ./input_files/13-vkd3d-proton.yml # ----------------------- -vkd3d-proton-2.14.1-11-3a36428: +vkd3d-proton-2.14.1-13-c5cf288: Category: vkd3d Channel: unstable - Date: '1751379826' + Date: '1755013705' vkd3d-proton-2.14.1: Category: vkd3d Channel: stable @@ -2498,6 +2538,10 @@ vkd3d-proton-2.5: # ./input_files/14-dxvk.yml # ----------------------- +dxvk-2.7-3-402c290: + Category: dxvk + Channel: unstable + Date: '1756039649' dxvk-2.7: Category: dxvk Channel: stable diff --git a/index.yml b/index.yml index 8d81acff..d157533a 100644 --- a/index.yml +++ b/index.yml @@ -1143,6 +1143,11 @@ kron4ek-wine-10.13-staging-tkg-amd64: Sub-category: wine Channel: stable Date: '1755385726' +kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64: + Category: runners + Sub-category: wine + Channel: stable + Date: '1755385757' kron4ek-wine-proton-10.0-2-amd64: Category: runners Sub-category: wine diff --git a/input_files/11-kron4ek.yml b/input_files/11-kron4ek.yml index 6280652b..c287f755 100644 --- a/input_files/11-kron4ek.yml +++ b/input_files/11-kron4ek.yml @@ -13,6 +13,11 @@ kron4ek-wine-10.13-staging-tkg-amd64: Sub-category: wine Channel: stable Date: '1755385726' +kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64: + Category: runners + Sub-category: wine + Channel: stable + Date: '1755385757' kron4ek-wine-proton-10.0-2-amd64: Category: runners Sub-category: wine diff --git a/runners/wine/kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64.yml b/runners/wine/kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64.yml new file mode 100644 index 00000000..f189ba35 --- /dev/null +++ b/runners/wine/kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64.yml @@ -0,0 +1,14 @@ +Name: kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64 +Provider: Kron4ek +Maintainer: CI +Channel: stable +File: +- file_name: wine-10.13-staging-tkg-ntsync-amd64-wow64.tar.xz + url: https://github.com/Kron4ek/Wine-Builds/releases/download/10.13/wine-10.13-staging-tkg-ntsync-amd64-wow64.tar.xz + file_checksum: bcc72565d0224e0901a8ad20fc86c147 + file_size: 71923932 + rename: wine-10.13-staging-tkg-ntsync-amd64-wow64.tar.xz +Post: +- action: rename + source: wine-10.13-staging-tkg-ntsync-amd64-wow64 + dest: kron4ek-wine-10.13-staging-tkg-ntsync-amd64-wow64