Compare commits

..

162 Commits

Author SHA1 Message Date
Lleyton Gray 24aaa5ef66 feat: begin work on update PR strategy 2024-02-05 00:20:26 -08:00
Raboneko 423fff9925 bump: tectonic 2024-02-05 02:03:12 +00:00
Raboneko cf43eab133 bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly vala-nightly 2024-02-05 01:09:09 +00:00
madomado 29da8227ef bump: libusermetrics (#902)
* bump: libusermetrics

Signed-off-by: madomado <madonuko@outlook.com>

* Update libusermetrics.spec

Signed-off-by: madomado <madonuko@outlook.com>

* Create update.rhai

Signed-off-by: madomado <madonuko@outlook.com>

* Update libusermetrics.spec

Signed-off-by: madomado <madonuko@outlook.com>

* test files

Signed-off-by: madomado <madonuko@outlook.com>

* files

Signed-off-by: madomado <madonuko@outlook.com>

---------

Signed-off-by: madomado <madonuko@outlook.com>
2024-02-04 15:42:27 -08:00
lleyton a96a030a89 fix(vala-language-server-nightly): allow newer versions of vala (#906) 2024-02-05 07:30:37 +08:00
madomado efb95b7c57 fix: wingpanel (#898)
* fix: wingpanel

Add hinting to use Terra packages, not Fedora

* Update wingpanel.spec

Signed-off-by: madomado <madonuko@outlook.com>

* Update wingpanel.spec

Signed-off-by: madomado <madonuko@outlook.com>

---------

Signed-off-by: madomado <madonuko@outlook.com>
2024-02-04 12:06:16 -08:00
madomado d984370072 fix: bandwhich (#903) 2024-02-04 12:05:37 -08:00
madomado 3846f9874b fix: sccache (#904)
* bump: sccache

Signed-off-by: madomado <madonuko@outlook.com>

* fix: sccache

---------

Signed-off-by: madomado <madonuko@outlook.com>
2024-02-04 12:05:23 -08:00
Raboneko b66bbc4291 bump: iosevka-fusion 2024-02-04 13:16:52 +00:00
Raboneko e58698c4d9 bump: felix 2024-02-03 21:13:18 +00:00
Raboneko 422ab9514e bump: switchboard-plug-mouse-touchpad 2024-02-03 15:46:33 +00:00
Raboneko ea36e1a358 bump: switchboard-plug-mouse-touchpad 2024-02-03 15:36:37 +00:00
Raboneko a9368babee bump(nightly): nim-nightly tdlib avstplg 2024-02-03 01:05:52 +00:00
Raboneko 2c760b3ceb bump: xpadneo 2024-02-02 21:57:21 +00:00
Raboneko 2c44444caf bump: xpadneo 2024-02-02 21:48:12 +00:00
Raboneko e9aa9d66e6 bump: flutter 2024-02-02 20:36:47 +00:00
Raboneko 54af040ba7 bump: tau-helium 2024-02-02 19:14:34 +00:00
Raboneko af2bf74318 bump: libhelium tau-helium 2024-02-02 18:36:54 +00:00
Raboneko d840413f6e bump: gradle 2024-02-02 17:50:12 +00:00
madomado eb0ae0720f fix: libhelium (#901)
Signed-off-by: madomado <madonuko@outlook.com>
Co-authored-by: Lains <paulogalardi@outlook.com>
2024-02-02 12:24:53 -03:00
Raboneko cdcdaf69bd bump: wingpanel-indicator-datetime 2024-02-02 13:58:43 +00:00
Raboneko 61107bec55 bump: wingpanel-indicator-datetime 2024-02-02 13:48:22 +00:00
madomado a8b4d978cf fix: switchboard-plug-networking (#905)
Remove patches

Signed-off-by: madomado <madonuko@outlook.com>
2024-02-02 20:30:09 +07:00
Raboneko 183bf2033c bump: openh264 2024-02-02 08:59:27 +00:00
Raboneko 0f6cf45932 bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly nim-nightly tdlib 2024-02-02 01:07:13 +00:00
Raboneko e5a99bc2b9 bump: discord-canary-openasar discord-canary 2024-02-01 23:48:29 +00:00
Raboneko 9e3e227d3e bump: ruff 2024-02-01 23:28:07 +00:00
Raboneko 2bc09f45d1 bump: tau-helium 2024-02-01 17:14:36 +00:00
Raboneko 28a20935a9 bump: libhelium 2024-02-01 16:32:10 +00:00
Raboneko 056dad8dd6 bump: lomiri 2024-02-01 11:45:57 +00:00
Raboneko 3e457f763b bump: discord-canary-openasar discord-canary voicevox 2024-02-01 01:21:59 +00:00
Raboneko dd3ed8a7a9 bump(nightly): latte-dock-nightly nim-nightly 2024-02-01 01:10:54 +00:00
Raboneko e6ff989382 bump: containerd youki 2024-01-31 21:14:09 +00:00
Raboneko e2c592ac2f bump: containerd 2024-01-31 20:46:09 +00:00
Raboneko 530a62ace6 bump: electron 2024-01-31 20:25:35 +00:00
Raboneko 8502a1ed58 bump: osu-lazer 2024-01-31 15:48:41 +00:00
Raboneko c3e24942b6 bump: osu-lazer 2024-01-31 14:59:10 +00:00
Raboneko 10832d9e1b bump: osu-lazer 2024-01-31 14:49:00 +00:00
Raboneko 18bdb11a88 bump: voicevox 2024-01-31 12:58:12 +00:00
Raboneko e3f3578260 bump(nightly): nim-nightly 2024-01-31 01:07:25 +00:00
Raboneko d4a7dc8523 bump: libhelium tau-helium 2024-01-30 22:48:45 +00:00
Raboneko 49a59a08e6 bump: discord-canary-openasar discord-canary 2024-01-30 22:28:11 +00:00
Raboneko 380dc4b678 bump: libhelium tau-helium 2024-01-30 22:13:37 +00:00
Raboneko a43286ef67 bump: discord-canary-openasar discord-canary 2024-01-30 21:35:58 +00:00
Raboneko c6025dc5a3 bump: libhelium tau-helium 2024-01-30 20:47:07 +00:00
Raboneko bfd66c0808 bump: moby-compose 2024-01-30 18:45:51 +00:00
Raboneko 8b67053be4 bump: discord-canary-openasar discord-canary 2024-01-30 17:39:49 +00:00
Raboneko a4cd214eb5 bump: osu-lazer 2024-01-30 11:56:19 +00:00
Raboneko 5cb73404de bump: discord-canary-openasar discord-canary 2024-01-30 01:57:55 +00:00
Raboneko 480c621d8d bump(nightly): latte-dock-nightly nim-nightly tdlib 2024-01-30 01:07:00 +00:00
Raboneko e5ec54d2c5 bump: discord-canary-openasar discord-canary 2024-01-30 00:00:30 +00:00
Raboneko 5132e36da8 bump: discord-canary-openasar discord-canary 2024-01-29 23:49:58 +00:00
Raboneko aae1e3c43b bump: discord-canary-openasar discord-canary 2024-01-29 23:29:42 +00:00
Raboneko 836d20c41b bump: ruff 2024-01-29 23:19:45 +00:00
Raboneko 1c97b78dab bump: moby-compose 2024-01-29 22:14:15 +00:00
Raboneko f42a565398 bump: discord-openasar discord 2024-01-29 19:57:05 +00:00
Raboneko 48d7dd932d bump: discord-canary-openasar discord-canary 2024-01-29 18:45:55 +00:00
Raboneko 10b7f84269 bump: tau-helium 2024-01-29 18:35:38 +00:00
Raboneko 8a4b553807 bump: tau-helium 2024-01-29 14:58:33 +00:00
Raboneko 350d267363 bump: tau-helium 2024-01-29 14:48:28 +00:00
Raboneko d71700367c bump: osu-lazer 2024-01-29 10:45:47 +00:00
Raboneko e4ef9bed83 bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly nim-nightly 2024-01-29 01:07:39 +00:00
Raboneko 828489bba5 bump: neovide 2024-01-28 22:48:06 +00:00
Raboneko c5c3472c6c bump: armcord-bin armcord 2024-01-28 16:17:39 +00:00
Raboneko 5c7283b2bd bump: lomiri-system-settings 2024-01-28 12:25:45 +00:00
Raboneko 996ddc05a8 bump: lomiri-ui-toolkit 2024-01-28 11:00:36 +00:00
Raboneko f1284ab91c bump: lomiri-settings-components 2024-01-28 10:50:20 +00:00
Raboneko 196421e363 bump: lomiri-indicator-network 2024-01-28 10:39:59 +00:00
Raboneko b8bc44fae1 bump: lomiri-app-launch 2024-01-28 10:29:55 +00:00
Raboneko 89e5884931 bump: codium 2024-01-28 09:17:48 +00:00
Raboneko 3d875b65f4 bump: codium 2024-01-28 09:00:06 +00:00
Raboneko 4ddd6f3d02 bump(nightly): nim-nightly tdlib 2024-01-28 01:11:51 +00:00
Raboneko 80b14776bb bump: felix 2024-01-27 22:37:14 +00:00
Raboneko 047a4feff0 bump: bandwhich 2024-01-27 20:37:45 +00:00
Raboneko 5f6e94e242 bump: bandwhich 2024-01-27 18:40:04 +00:00
Raboneko 882c42f204 bump: bandwhich 2024-01-27 17:37:41 +00:00
Raboneko 15d6cfd8ab bump: tau-helium 2024-01-27 16:55:42 +00:00
Raboneko dab917b316 bump: choosenim 2024-01-27 16:30:49 +00:00
Raboneko 7b601705e9 bump: choosenim 2024-01-27 16:16:32 +00:00
Raboneko 6f9a111285 bump: sarasa-gothic 2024-01-27 13:55:58 +00:00
Raboneko 138cb7fee0 bump: iosevka-fusion 2024-01-27 12:25:10 +00:00
Raboneko e5a7ab8d1d bump: lomiri 2024-01-27 06:59:12 +00:00
Raboneko 5146738337 bump: lomiri-schemas lomiri 2024-01-27 06:48:57 +00:00
Raboneko 520d21437c bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly nim-nightly vala-nightly 2024-01-27 01:06:23 +00:00
Raboneko e9aa2584b5 bump: flutter 2024-01-26 19:15:45 +00:00
Raboneko cc530b7cd7 bump: osu-lazer 2024-01-26 15:59:52 +00:00
Raboneko 1938ede867 bump: libhelium tau-helium 2024-01-26 14:27:51 +00:00
Raboneko 8c6191a0a1 bump: unity-shell 2024-01-26 13:30:09 +00:00
Raboneko ec84d19377 bump: lomiri-system-settings 2024-01-26 02:48:49 +00:00
Raboneko 8477e2a5c2 bump: discord-canary-openasar discord-canary 2024-01-26 02:00:35 +00:00
Raboneko 4a776ba4b1 bump: discord-canary-openasar discord-canary discord-ptb-openasar discord-ptb limine 2024-01-26 01:19:28 +00:00
Raboneko 558f19ece3 bump(nightly): nim-nightly vala-nightly 2024-01-26 01:08:29 +00:00
Raboneko 1a706b7d6b bump: datetime flutter 2024-01-25 20:37:01 +00:00
Raboneko 1ac9432ada bump: deviceinfo geonames 2024-01-25 15:50:13 +00:00
Raboneko 15066ddf59 bump: bibata-cursor-theme 2024-01-25 11:27:11 +00:00
Raboneko 09cec4185b bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly 2024-01-25 01:13:59 +00:00
Raboneko 0b71dce46b bump: discord-canary-openasar discord-canary openh264 2024-01-24 23:36:55 +00:00
Raboneko e6819ccc08 bump: discord-canary-openasar discord-canary 2024-01-24 22:20:33 +00:00
Raboneko 8d331cc9e6 bump: uutils-coreutils 2024-01-24 21:00:41 +00:00
Raboneko 8804b81070 bump: electron 2024-01-24 20:17:49 +00:00
Raboneko 0e17d3e991 bump: dart 2024-01-24 19:25:38 +00:00
Raboneko ebb9d36756 bump: moby-compose 2024-01-24 18:23:56 +00:00
Raboneko dd3142025b bump: tau-helium 2024-01-24 15:49:11 +00:00
Raboneko 78e66d57da bump: tau-helium 2024-01-24 15:39:04 +00:00
Raboneko 49e2dec9e4 bump: tau-helium 2024-01-24 15:10:23 +00:00
Raboneko 36eb9d4f3f bump: subatomic 2024-01-24 02:11:45 +00:00
Raboneko 5ddeee3c5d bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly nim-nightly tdlib 2024-01-24 01:13:43 +00:00
Raboneko 091015322d bump: compiz9 2024-01-23 18:58:47 +00:00
Raboneko ad65b9bb22 bump: lomiri-system-settings lomiri 2024-01-23 04:33:28 +00:00
Raboneko a5bf587c9c bump(nightly): latte-dock-nightly prismlauncher-nightly prismlauncher-qt5-nightly nim-nightly 2024-01-23 01:14:08 +00:00
Raboneko d32501b193 bump: discord-canary-openasar discord-canary 2024-01-22 23:26:25 +00:00
Raboneko e42eac0ad5 bump: discord-openasar discord 2024-01-22 22:55:26 +00:00
Raboneko 34ca01b2f5 bump: discord-canary-openasar discord-canary 2024-01-22 22:40:37 +00:00
Raboneko 80aed38071 bump: containerd 2024-01-22 20:17:33 +00:00
Raboneko 6a7f38b828 bump: placebo 2024-01-22 18:19:38 +00:00
Raboneko 6f662431ca bump: moby-compose 2024-01-22 16:39:48 +00:00
Raboneko feb40412c5 bump: voicevox 2024-01-22 16:25:25 +00:00
Raboneko f4fd5896ec bump: switchboard-plug-bluetooth 2024-01-22 13:18:08 +00:00
Raboneko 27d2464029 bump: switchboard-plug-bluetooth 2024-01-22 12:55:18 +00:00
Raboneko de8a42d54d bump: wingpanel-indicator-session 2024-01-22 06:56:40 +00:00
Raboneko f59138968b bump: wingpanel-indicator-session 2024-01-22 06:46:30 +00:00
Raboneko 2f2ffc2572 bump: limine 2024-01-22 03:59:22 +00:00
Raboneko 232db4988c bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly 2024-01-22 01:15:43 +00:00
Raboneko 08e203fbaa bump: pop-launcher 2024-01-21 22:40:06 +00:00
Raboneko 783ca7552f bump: pop-launcher 2024-01-21 22:29:49 +00:00
Raboneko a1181ae791 bump: wingpanel-indicator-datetime 2024-01-21 21:47:25 +00:00
Raboneko ff8a9a3529 bump: wingpanel-indicator-datetime 2024-01-21 21:37:07 +00:00
Raboneko fc1f39c8e1 bump: lomiri-system-settings lomiri 2024-01-21 02:10:49 +00:00
madomado 8091ce3211 add: rgbds (#895)
* add: rgbds

* anda.hcl

* update.rhai
2024-01-20 17:49:53 -08:00
Raboneko ff3ec8bf39 bump(nightly): nim-nightly tdlib 2024-01-21 01:18:00 +00:00
Raboneko 14752341a8 bump: sarasa-gothic 2024-01-20 22:14:11 +00:00
Raboneko 59b00df647 bump: iosevka-fusion 2024-01-20 21:14:50 +00:00
Raboneko f2d49eae59 bump: unity-shell 2024-01-20 10:30:27 +00:00
Raboneko f994f4232c bump: discord-canary-openasar discord-canary 2024-01-20 02:04:44 +00:00
Raboneko a72d68488c bump(nightly): nim-nightly tdlib 2024-01-20 01:11:44 +00:00
Raboneko 0d4b481ac6 bump: ruff 2024-01-19 20:27:49 +00:00
Raboneko 76ff4eec52 bump: compiz9 2024-01-19 20:17:25 +00:00
Raboneko e337b7104e bump: codium 2024-01-19 18:37:33 +00:00
Raboneko d9ca1fc0de bump: crystal 2024-01-19 13:28:49 +00:00
Raboneko 4a2431209c bump: groovy-docs groovy bat-extras 2024-01-19 05:18:40 +00:00
Raboneko 33e1e88dda bump: bat-extras 2024-01-19 04:58:18 +00:00
Raboneko 385ef5dd28 bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly nim-nightly 2024-01-19 01:13:01 +00:00
Raboneko c53da81cce bump: discord-ptb-openasar discord-ptb 2024-01-18 23:14:35 +00:00
Raboneko 19d57b6828 bump: flutter 2024-01-18 19:25:51 +00:00
Raboneko f5736ce4f4 bump: discord-canary-openasar discord-canary 2024-01-18 18:45:45 +00:00
Raboneko b3f0031efb bump: elementary-code 2024-01-18 18:20:03 +00:00
Raboneko acaeb69ad6 bump: moby-compose 2024-01-18 10:19:16 +00:00
Raboneko 2810b5c6dc bump: sass 2024-01-18 03:16:58 +00:00
Raboneko 4ec98f3e21 bump(nightly): prismlauncher-nightly prismlauncher-qt5-nightly nim-nightly 2024-01-18 01:12:14 +00:00
Raboneko 730d25fe35 bump: flutter 2024-01-17 18:25:00 +00:00
Raboneko 0561fa8e11 bump: discord-canary-openasar discord-canary 2024-01-17 17:39:15 +00:00
Raboneko 2f437a9794 bump: dart 2024-01-17 13:40:31 +00:00
Raboneko d203658596 bump: electron 2024-01-17 06:55:42 +00:00
lleyton 85babd8d1c docs: correct broken links (#894) 2024-01-17 12:10:46 +08:00
Raboneko 3e20ea69c5 bump: subatomic 2024-01-16 06:33:42 +00:00
Raboneko 64d8eb5a76 bump: osu-lazer 2024-01-16 05:17:45 +00:00
madomado c7c4f27e1f feat(ci): sync updates to other branches (incl frawhide) (#892) 2024-01-15 17:51:18 -08:00
Raboneko 7e046d459a bump: vencord-desktop 2024-01-16 01:14:47 +00:00
Raboneko 9eab2d082e bump(nightly): nim-nightly 2024-01-16 01:12:27 +00:00
Raboneko c92c160d24 bump: lomiri-system-settings 2024-01-15 14:13:18 +00:00
Raboneko afe577aadd bump: lomiri 2024-01-15 12:30:47 +00:00
Raboneko 04792c9d51 bump: anda 2024-01-15 11:12:30 +00:00
273 changed files with 1626 additions and 4990 deletions
-9
View File
@@ -1,9 +0,0 @@
{
"repoOwner": "terrapkg",
"repoName": "packages",
"resetAuthor": true,
"targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
"branchLabelMapping": {
"^sync-(.+)$": "$1"
}
}
+15 -9
View File
@@ -6,13 +6,13 @@ on:
paths:
- anda/**
branches:
- frawhide
- f39
pull_request:
branches:
- frawhide
- f39
merge_group:
branches:
- frawhide
- f39
workflow_dispatch:
workflow_call:
@@ -23,13 +23,13 @@ jobs:
outputs:
build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
container:
image: ghcr.io/terrapkg/builder:frawhide
image: ghcr.io/terrapkg/builder:f39
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Set workspace as safe
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Generate build matrix
@@ -40,7 +40,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
version: ["rawhide"]
version: ["39"]
fail-fast: false
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
@@ -48,12 +48,19 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up git repository
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Cache buildroot
id: br-cache
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}
- name: Include custom build template instead of package default
run: |
cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
@@ -68,10 +75,9 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
+2 -2
View File
@@ -7,7 +7,7 @@ jobs:
bootstrap:
strategy:
matrix:
version: ["rawhide"]
version: ["39"]
arch: ["x86_64", "aarch64"]
fail-fast: true
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -21,7 +21,7 @@ jobs:
- name: Install Anda
run: cargo install anda
- uses: actions/checkout@v4
- uses: actions/checkout@v3
with:
ref: f${{ matrix.version }}
fetch-depth: 1
+5 -5
View File
@@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
version: ["rawhide"]
version: ["39"]
arch: ["x86_64", "aarch64"]
fail-fast: false
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
@@ -30,7 +30,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up git repository
@@ -38,7 +38,7 @@ jobs:
- name: Cache buildroot
id: br-cache
uses: actions/cache@v4
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}
@@ -53,10 +53,9 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
@@ -69,6 +68,7 @@ jobs:
terra${{ matrix.version }} anda-build/rpm/rpms/*
- name: Upload source packages to subatomic
if: github.event_name == 'push'
run: |
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
+4 -5
View File
@@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(inputs.packages) }}
version: ["rawhide"]
version: ["39"]
fail-fast: false
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
@@ -19,7 +19,7 @@ jobs:
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up git repository
@@ -27,7 +27,7 @@ jobs:
- name: Cache buildroot
id: br-cache
uses: actions/cache@v4
uses: actions/cache@v3
with:
path: /var/cache
key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
@@ -42,10 +42,9 @@ jobs:
x=${NAME//\//@}
echo "name=$x" >> $GITHUB_OUTPUT
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v3
with:
name: ${{ steps.art.outputs.name }}
compression-level: 0 # The RPMs are already compressed :p
path: |
anda-build/rpm/rpms/*
anda-build/rpm/srpm/*
+5 -5
View File
@@ -3,20 +3,20 @@ name: Lint
on:
push:
branches:
- frawhide
- f39
pull_request:
branches:
- frawhide
- f39
merge_group:
branches:
- frawhide
- f39
jobs:
lint:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:frawhide
image: ghcr.io/terrapkg/builder:f39
steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v3
- name: Lint spec files
run: rpmlint $(find anda -type f -name "*.spec" -type f)
-37
View File
@@ -1,37 +0,0 @@
name: Automatic backport/sync action
on:
pull_request_target:
types: ["labeled", "closed"]
jobs:
backport:
name: Backport/sync PR
runs-on: ubuntu-latest
if: github.event.pull_request.merged
steps:
- name: Install SSH signing key
run: |
mkdir -p ${{ runner.temp }}
echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
chmod 0700 ${{ runner.temp }}/signing_key
- name: Setup Raboneko Signing
run: |
git config --global gpg.format "ssh"
git config --global user.signingkey "${{ runner.temp }}/signing_key"
git config --global commit.gpgsign true
- name: Backport Action
uses: sorenlouv/backport-github-action@v9.3.0
with:
github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
auto_backport_label_prefix: sync-
- name: Info log
if: ${{ success() }}
run: cat ~/.backport/backport.info.log
- name: Debug log
if: ${{ failure() }}
run: cat ~/.backport/backport.debug.log
+38
View File
@@ -0,0 +1,38 @@
name: Sync PR to other branches
on:
pull_request:
types:
- closed
branches:
- f38
jobs:
sync:
strategy:
matrix:
branch: ["f37"]
fail-fast: false
if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync')
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
ref: ${{ matrix.branch }}
- name: Install SSH key and Setup Git
run: |
mkdir -p ${{ runner.temp }}
echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
chmod 0700 ${{ runner.temp }}/signing_key
git config --global --add safe.directory "$GITHUB_WORKSPACE"
git config user.name "Raboneko"
git config user.email "raboneko@fyralabs.com"
git config gpg.format "ssh"
git config user.signingkey "${{ runner.temp }}/signing_key"
- name: Apply patches and Push
run: |
curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
git am -S --keep-cr --signoff < pr.patch
git push -u origin --all
+2 -3
View File
@@ -3,7 +3,6 @@ name: Push comps updates
on:
push:
branches:
- frawhide
- f39
- f38
- f37
@@ -15,9 +14,9 @@ jobs:
update-comps:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:frawhide
image: ghcr.io/terrapkg/builder:f39
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v3
- name: Push to subatomic
run: |
branch=${{ github.ref_name }}
+6 -6
View File
@@ -8,21 +8,20 @@ jobs:
autoupdate:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:frawhide
image: ghcr.io/terrapkg/builder:f39
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
- name: Install SSH signing key & Set up git repository
- name: Install SSH signing key
run: |
mkdir -p ${{ runner.temp }}
echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
chmod 0700 ${{ runner.temp }}/signing_key
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Run Nightly Update
run: anda update -vv --filters nightly=1
@@ -31,6 +30,7 @@ jobs:
- name: Save
run: |
git config --global --add safe.directory "*"
if [[ `git status --porcelain` ]]; then
git config user.name "Raboneko"
git config user.email "raboneko@fyralabs.com"
@@ -46,8 +46,8 @@ jobs:
git add *
git commit -S -a -m "$msg"
}
copy_over f37 || true
copy_over f38 || true
copy_over f39 || true
copy_over f40 || true
copy_over frawhide || true
git push -u origin --all
fi
+17 -6
View File
@@ -8,21 +8,20 @@ jobs:
autoupdate:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:frawhide
image: ghcr.io/terrapkg/builder:f39
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
uses: actions/checkout@v3
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
- name: Install SSH signing key & Set up git repository
- name: Install SSH signing key
run: |
mkdir -p ${{ runner.temp }}
echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
chmod 0700 ${{ runner.temp }}/signing_key
git config --global --add safe.directory "$GITHUB_WORKSPACE"
- name: Run Update
run: anda update -vv
@@ -32,6 +31,7 @@ jobs:
- name: Save
run: |
git config --global --add safe.directory "*"
if [[ `git status --porcelain` ]]; then
git config user.name "Raboneko"
git config user.email "raboneko@fyralabs.com"
@@ -47,8 +47,19 @@ jobs:
git add *
git commit -S -a -m "$msg"
}
copy_over f37 || true
copy_over f38 || true
copy_over f39 || true
copy_over f40 || true
copy_over frawhide || true
git remote add raboneko git@github.com:raboneko/packages.git
git push -u origin --all
gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f37" --head "raboneko:f37"
gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f38" --head "raboneko:f38"
gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "frawhide" --head "raboneko:frawhide"
gh pr create --title "$msg" --body "Automatic update from Raboneko!" --label "auto-update" --base "f39" --head "raboneko:f39"
gh pr merge --auto --squash raboneko:f37
gh pr merge --auto --squash raboneko:f38
gh pr merge --auto --squash raboneko:frawhide
gh pr merge --auto --squash raboneko:f39
fi
+30
View File
@@ -0,0 +1,30 @@
# Repository
/.github @lleyton
/.devcontainer @lleyton
/.gitignore @windowsboy111
/CODE_OF_CONDUCT.md @lleyton
/CONTRIBUTING.md @lleyton
/LICENSE @lleyton
/README.md @windowsboy111
/SECURITY.md @lleyton
/anda.hcl @lleyton
/comps.xml @lleyton
# Package maintainers
/anda/lib/libbismuth @lainsce
/anda/lib/libhelium @lainsce
/anda/others/tau-helium @lainsce
/anda/others/tau-hydrogen @lainsce
/anda/tools/melody @lleyton
/anda/go/curlie @lleyton
/anda/games/prismlauncher @getchoo
/anda/games/prismlauncher-nightly @getchoo
/anda/games/prismlauncher-qt5-nightly @getchoo
/anda/games/prismlauncher-qt5 @getchoo
/anda/srpm-macros @korewaChino
/anda/rust/starship @korewaChino
/anda/rust/zellij @korewaChino
/anda/audio/distrho @korewaChino
+2 -4
View File
@@ -1,9 +1,7 @@
# Contributing
First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q).
## Documentations
First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documentation](https://developer.fyralabs.com/terra), our guidelines may be found there. See the links below:
* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
* [FAQ](https://developer.fyralabs.com/terra/faq)
* [Policy](https://developer.fyralabs.com/terra/policy)
* [Policy](https://developer.fyralabs.com/terra/policy)
-2
View File
@@ -2,8 +2,6 @@
[![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
[![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)
[![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40)
[![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)
Terra is a rolling-release Fedora repository for all the software you need.
With Terra, you can install the latest packages knowing that quality and security are assured.
+2 -2
View File
@@ -1,6 +1,6 @@
Name: anki-bin
Version: 24.04.1
Release: 1%?dist
Version: 23.12.1
Release: 1%{?dist}
Summary: Flashcard program for using space repetition learning (Installed with wheel)
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
URL: https://apps.ankiweb.net/
+2 -2
View File
@@ -1,6 +1,6 @@
Name: anki-qt5
Version: 24.04.1
Release: 1%?dist
Version: 23.12.1
Release: 1%{?dist}
Summary: Flashcard program for using space repetition learning
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
URL: https://apps.ankiweb.net/
+2 -2
View File
@@ -1,6 +1,6 @@
Name: anki
Version: 24.04.1
Release: 1%?dist
Version: 23.12.1
Release: 1%{?dist}
Summary: Flashcard program for using space repetition learning
License: AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
URL: https://apps.ankiweb.net/
+2 -2
View File
@@ -6,12 +6,12 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: authy
Version: 2.5.0
Version: 2.4.2
Release: 1%{?dist}
Summary: Two factor authentication desktop application
License: Unlicense
URL: https://authy.com/
Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_22.snap
Requires: gtk3
Requires: nss
BuildRequires: squashfs-tools desktop-file-utils
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-canary-openasar
Version: 0.0.396
Release: 1%?dist
Version: 0.0.267
Release: 1%{?dist}
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
+2 -2
View File
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-canary
Version: 0.0.396
Release: 1%?dist
Version: 0.0.267
Release: 1%{?dist}
Summary: Free Voice and Text Chat for Gamers
URL: discord.com
Source0: https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-openasar
Version: 0.0.54
Release: 1%?dist
Version: 0.0.42
Release: 1%{?dist}
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-ptb-openasar
Version: 0.0.85
Release: 1%?dist
Version: 0.0.66
Release: 1%{?dist}
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
URL: https://github.com/GooseMod/OpenAsar
+2 -2
View File
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-ptb
Version: 0.0.85
Release: 1%?dist
Version: 0.0.66
Release: 1%{?dist}
Summary: Free Voice and Text Chat for Gamers.
URL: https://discord.com
Source0: https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
+2 -2
View File
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord
Version: 0.0.54
Release: 1%?dist
Version: 0.0.42
Release: 1%{?dist}
Summary: Free Voice and Text Chat for Gamers
URL: https://discord.com
Source0: https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
-5
View File
@@ -1,5 +0,0 @@
project pkg {
rpm {
spec = "feishin.spec"
}
}
-69
View File
@@ -1,69 +0,0 @@
%define debug_package %nil
%global _build_id_links none
# Exclude private libraries
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: feishin
Version: 0.7.1
Release: 1%?dist
Summary: A modern self-hosted music player
License: GPL-3.0
URL: https://github.com/jeffvli/feishin
Source0: %url/archive/refs/tags/v%version.tar.gz
Requires: fuse mpv
BuildRequires: nodejs-npm jq libxcrypt-compat
%description
%summary.
%prep
%autosetup
cat package.json | jq '.author += { "email": "jeffvictorli@gmail.com" }' | jq '.build.linux += { "maintainer": "mado@fyralabs.com", "vendor": "Fyra Labs Terra" }' > a
mv a package.json
cat package.json
cat<<EOF > feishin.desktop
[Desktop Entry]
Type=Application
Name=Feishin
Comment=Rewrite of Sonixd
Exec=/usr/bin/feishin
Icon=feishin
Terminal=false
Categories=Network;Audio;Music
Keywords=Music;Jellyfin;Audio;Stream;Sonixd
EOF
%build
npm install --legacy-peer-deps
npm run postinstall
npm run build
%ifarch x86_64
%define a linux
%elifarch aarch64
%define a arm64
%endif
npx electron-builder --linux dir --%a
%install
mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
mv release/build/*-unpacked %buildroot%_datadir/feishin
install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png
ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin
install -Dm644 feishin.desktop %buildroot%_datadir/applications/
%files
%doc README.md CHANGELOG.md
%license LICENSE
%_bindir/feishin
%_datadir/feishin/
%_datadir/applications/feishin.desktop
%_datadir/pixmaps/feishin.png
%changelog
%autochangelog
-1
View File
@@ -1 +0,0 @@
rpm.version(gh("jeffvli/feishin"));
-8
View File
@@ -1,8 +0,0 @@
project pkg {
rpm {
spec = "mpv-nightly.spec"
}
labels {
nightly = "1"
}
}
-230
View File
@@ -1,230 +0,0 @@
%global commit 03ca3408354e99a7c50838c57531bba1c167ef87
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240516
%global ver v0.38.0
Name: mpv-nightly
Version: %ver^%commit_date.%shortcommit
Release: 1%?dist
License: GPL-2.0-or-later AND LGPL-2.1-or-later
Summary: Movie player playing most video formats and DVDs
URL: https://mpv.io/
Source0: https://github.com/mpv-player/mpv/archive/%commit/mpv-%commit.tar.gz
Conflicts: mpv
BuildRequires: desktop-file-utils
BuildRequires: gcc
BuildRequires: libappstream-glib
BuildRequires: libatomic
BuildRequires: meson
BuildRequires: python3-docutils
BuildRequires: perl(Encode)
BuildRequires: perl(Math::BigInt)
BuildRequires: perl(Math::BigRat)
BuildRequires: pkgconfig(alsa)
BuildRequires: pkgconfig(caca)
BuildRequires: pkgconfig(dvdnav)
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(ffnvcodec)
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(lcms2)
BuildRequires: pkgconfig(libarchive) >= 3.4.0
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libavcodec) >= 59.27.100
BuildRequires: pkgconfig(libavdevice) >= 58.13.100
BuildRequires: pkgconfig(libavfilter) >= 7.110.100
BuildRequires: pkgconfig(libavformat) >= 59.24.100
BuildRequires: pkgconfig(libavutil) >= 57.24.100
BuildRequires: pkgconfig(libbluray)
BuildRequires: pkgconfig(libcdio)
BuildRequires: pkgconfig(libcdio_paranoia)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.19
BuildRequires: pkgconfig(libplacebo) >= 6.338.0
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libswresample) >= 3.9.100
BuildRequires: pkgconfig(libswscale) >= 5.9.100
BuildRequires: pkgconfig(libva)
BuildRequires: pkgconfig(lua-5.1)
BuildRequires: pkgconfig(mujs)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(rubberband)
BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(shaderc)
BuildRequires: pkgconfig(uchardet) >= 0.0.5
BuildRequires: pkgconfig(vapoursynth)
BuildRequires: pkgconfig(vdpau)
BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(wayland-client)
BuildRequires: pkgconfig(wayland-cursor)
BuildRequires: pkgconfig(wayland-egl)
BuildRequires: pkgconfig(wayland-protocols)
BuildRequires: pkgconfig(wayland-scanner)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xdamage)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xinerama)
BuildRequires: pkgconfig(xkbcommon)
BuildRequires: pkgconfig(xpresent)
BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xscrnsaver)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zimg) >= 2.9
BuildRequires: pkgconfig(zlib)
Requires: hicolor-icon-theme
Provides: mplayer-backend
Recommends: (yt-dlp or youtube-dl)
Suggests: yt-dlp
%description
Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
of video file formats, audio and video codecs, and subtitle types. Special
input URL types are available to read input from a variety of sources other
than disk files. Depending on platform, a variety of different video and audio
output methods are supported.
Mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many
features loved by videophiles, such as video scaling with popular high quality
algorithms, color management, frame timing, interpolation, HDR, and more.
While mpv strives for minimalism and provides no real GUI, it has a small
controller on top of the video for basic control.
Mpv can leverage most hardware decoding APIs on all platforms. Hardware
decoding can be enabled at runtime on demand.
Powerful scripting capabilities can make the player do almost anything. There
is a large selection of user scripts on the wiki.
A straightforward C API was designed from the ground up to make mpv usable as
a library and facilitate easy integration into other applications.
%package libs
Summary: Dynamic library for Mpv frontends
%description libs
This package contains the dynamic library libmpv, which provides access to Mpv.
%package devel
Summary: Development package for libmpv
Provides: mpv-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: mpv-nightly-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: mpv-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: mpv-nightly-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
Requires: mpv-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
%description devel
This package contains development header files and libraries for Mpv.
%prep
%autosetup -p1 -n mpv-%commit
sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
%build
%meson --auto-features=auto \
-Dalsa=enabled \
-Dbuild-date=false \
-Dcaca=enabled \
-Dcdda=enabled \
-Dcplayer=true \
-Dcplugins=enabled \
-Dcuda-hwaccel=enabled \
-Dcuda-interop=enabled \
-Ddmabuf-wayland=enabled \
-Ddrm=enabled \
-Ddvbin=enabled \
-Ddvdnav=enabled \
-Degl-drm=enabled \
-Degl-wayland=enabled \
-Degl-x11=enabled \
-Degl=enabled \
-Dgbm=enabled \
-Dgl-x11=enabled \
-Dgl=enabled \
-Dhtml-build=enabled \
-Diconv=enabled \
-Djack=enabled \
-Djavascript=enabled \
-Djpeg=enabled \
-Dlcms2=enabled \
-Dlibarchive=enabled \
-Dlibavdevice=enabled \
-Dlibbluray=enabled \
-Dlibmpv=true \
-Dlua=enabled \
-Dmanpage-build=enabled \
-Dopenal=enabled \
-Dopensles=disabled \
-Doss-audio=disabled \
-Dpipewire=enabled \
-Dplain-gl=enabled \
-Dpulse=enabled \
-Drubberband=enabled \
-Dsdl2-audio=enabled \
-Dsdl2-gamepad=enabled \
-Dsdl2-video=enabled \
-Dsdl2=enabled \
-Dsndio=disabled \
-Dspirv-cross=disabled \
-Duchardet=enabled \
-Dvaapi-drm=enabled \
-Dvaapi-wayland=enabled \
-Dvaapi-x11=enabled \
-Dvaapi=enabled \
-Dvapoursynth=enabled \
-Dvdpau-gl-x11=enabled \
-Dvdpau=enabled \
-Dvector=enabled \
-Dvulkan-interop=disabled \
-Dvulkan=enabled \
-Dwayland=enabled \
-Dwerror=false \
-Dx11=enabled \
-Dxv=enabled \
-Dzimg=enabled \
-Dzlib=enabled
%meson_build
%install
%meson_install
%check
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/mpv.metainfo.xml
desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
%files
%docdir %{_docdir}/mpv/
%license LICENSE.GPL LICENSE.LGPL Copyright
%{_docdir}/mpv/
%{_bindir}/mpv
%{_datadir}/applications/mpv.desktop
%dir %{_datadir}/bash-completion/
%dir %{_datadir}/bash-completion/completions/
%{_datadir}/bash-completion/completions/mpv
%{_datadir}/icons/hicolor/*/apps/mpv*.*
%dir %{_datadir}/zsh/
%dir %{_datadir}/zsh/site-functions/
%{_datadir}/zsh/site-functions/_mpv
%{_mandir}/man1/mpv.*
%{_metainfodir}/mpv.metainfo.xml
%dir %{_sysconfdir}/mpv/
%config(noreplace) %{_sysconfdir}/mpv/encoding-profiles.conf
%files libs
%license LICENSE.GPL LICENSE.LGPL Copyright
%{_libdir}/libmpv.so.2{,.*}
%files devel
%{_includedir}/mpv/
%{_libdir}/libmpv.so
%{_libdir}/pkgconfig/mpv.pc
%changelog
%autochangelog
-8
View File
@@ -1,8 +0,0 @@
if filters.contains("nightly") {
rpm.global("commit", gh_commit("mpv-player/mpv"));
if rpm.changed() {
rpm.global("ver", gh("mpv-player/mpv"));
rpm.global("commit_date", date());
rpm.release();
}
}
+2 -2
View File
@@ -13,8 +13,8 @@
%global crate sccache
Name: rust-sccache
Version: 0.8.0
Release: 1%?dist
Version: 0.7.6
Release: %autorelease
Summary: Ccache-like tool
License: Apache-2.0
@@ -6,8 +6,8 @@
Name: vencord-desktop
Provides: VencordDesktop = %{version}-%{release}
Version: 1.5.2
Release: 1%?dist
Version: 1.5.0
Release: 1%{?dist}
License: GPL-3.0
Summary: Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
URL: https://github.com/Vencord/Vesktop
+3 -3
View File
@@ -1,6 +1,6 @@
%global nodev 20.12.2
%global npmv 10.5.0
%global ver 0.19.1
%global nodev 18.13.0
%global npmv 8.19.3
%global ver 0.15.2
%define debug_package %nil
%global _build_id_links none
@@ -1,5 +1,5 @@
Name: budgie-extras
Version: 1.8.0
Version: 1.7.1
Release: 1%{?dist}
License: GPL-3.0
+1 -1
View File
@@ -1,4 +1,4 @@
%define _ubuntu_rel 22.10.20220822-0ubuntu12
%define _ubuntu_rel 22.10.20220822-0ubuntu6
%global _hardened_build 0
Name: compiz9
@@ -3,7 +3,7 @@
Name: elementary-appcenter
Summary: Software Center from elementary
Version: 7.4.0
Release: 2%{?dist}
Release: 1%{?dist}
License: GPL-3.0
Provides: appcenter = %{version}-%{release}
@@ -12,8 +12,6 @@ Obsoletes: appcenter < 7.2.1-2
URL: https://github.com/elementary/appcenter
Source0: %url/archive/%{version}/appcenter-%{version}.tar.gz
Patch0: pr2099.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libappstream-glib
@@ -1,311 +0,0 @@
commit fce55d9373bfb82953191b32e276a2129ffcb8c1
Author: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
Date: Wed Feb 7 00:14:43 2024 +0100
Add support for AppStream 1.0 (#2099)
diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala
index 98931505..10f2baab 100644
--- a/src/Core/FlatpakBackend.vala
+++ b/src/Core/FlatpakBackend.vala
@@ -400,8 +400,13 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
var category_array = new GLib.GenericArray<AppStream.Category> ();
category_array.add (category);
+#if HAS_APPSTREAM_1_0
+ AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components ().as_array (), category_array, false);
+ AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components ().as_array (), category_array, false);
+#else
AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components (), category_array, false);
AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components (), category_array, false);
+#endif
components = category.get_components ();
var apps = new Gee.TreeSet<AppCenterCore.Package> ();
@@ -417,13 +422,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
var apps = new Gee.TreeSet<AppCenterCore.Package> ();
var comps = user_appstream_pool.search (query);
if (category == null) {
+#if HAS_APPSTREAM_1_0
+ comps.as_array ().foreach ((comp) => {
+#else
comps.foreach ((comp) => {
+#endif
var packages = get_packages_for_component_id (comp.get_id ());
apps.add_all (packages);
});
} else {
var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+ comps.as_array ().foreach ((comp) => {
+#else
comps.foreach ((comp) => {
+#endif
var packages = get_packages_for_component_id (comp.get_id ());
foreach (var package in packages) {
if (package in cat_packages) {
@@ -435,13 +448,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
comps = system_appstream_pool.search (query);
if (category == null) {
+#if HAS_APPSTREAM_1_0
+ comps.as_array ().foreach ((comp) => {
+#else
comps.foreach ((comp) => {
+#endif
var packages = get_packages_for_component_id (comp.get_id ());
apps.add_all (packages);
});
} else {
var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+ comps.as_array ().foreach ((comp) => {
+#else
comps.foreach ((comp) => {
+#endif
var packages = get_packages_for_component_id (comp.get_id ());
foreach (var package in packages) {
if (package in cat_packages) {
@@ -510,7 +531,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
continue;
}
+#if HAS_APPSTREAM_1_0
+ if (package.component.get_developer ().get_name () == author) {
+#else
if (package.component.developer_name == author) {
+#endif
package_ids.add (package.component.id);
AppCenterCore.Package? user_package = null;
@@ -1095,7 +1120,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
} finally {
var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+ user_appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
user_appstream_pool.get_components ().foreach ((comp) => {
+#endif
if (!comp_validator.validate (comp)) {
return;
}
@@ -1133,7 +1162,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
} finally {
var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+ system_appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
system_appstream_pool.get_components ().foreach ((comp) => {
+#endif
if (!comp_validator.validate (comp)) {
return;
}
diff --git a/src/Core/Package.vala b/src/Core/Package.vala
index 0f9a90c4..ed141292 100644
--- a/src/Core/Package.vala
+++ b/src/Core/Package.vala
@@ -306,7 +306,11 @@ public class AppCenterCore.Package : Object {
return _author;
}
+#if HAS_APPSTREAM_1_0
+ _author = component.get_developer ().get_name ();
+#else
_author = component.developer_name;
+#endif
if (_author == null) {
var project_group = component.project_group;
@@ -677,7 +681,11 @@ public class AppCenterCore.Package : Object {
}
try {
+#if HAS_APPSTREAM_1_0
+ description = AppStream.markup_convert (description, TEXT);
+#else
description = AppStream.markup_convert_simple (description);
+#endif
} catch (Error e) {
warning ("Failed to convert description to markup: %s", e.message);
}
@@ -919,7 +927,11 @@ public class AppCenterCore.Package : Object {
}
public AppStream.Release? get_newest_release () {
+#if HAS_APPSTREAM_1_0
+ var releases = component.get_releases_plain ().get_entries ();
+#else
var releases = component.get_releases ();
+#endif
releases.sort_with_data ((a, b) => {
if (a.get_version () == null || b.get_version () == null) {
if (a.get_version () != null) {
diff --git a/src/Core/PackageKitBackend.vala b/src/Core/PackageKitBackend.vala
index 09da4074..a108831e 100644
--- a/src/Core/PackageKitBackend.vala
+++ b/src/Core/PackageKitBackend.vala
@@ -275,7 +275,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
} finally {
var new_package_list = new Gee.HashMap<string, Package> ();
var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+ appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
appstream_pool.get_components ().foreach ((comp) => {
+#endif
if (!comp_validator.validate (comp)) {
return;
}
@@ -317,7 +321,12 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
component.set_id (id);
component.set_origin (Package.APPCENTER_PACKAGE_ORIGIN);
-#if HAS_APPSTREAM_0_15
+#if HAS_APPSTREAM_1_0
+ var components = new AppStream.ComponentBox (AppStream.ComponentBoxFlags.NONE);
+ components.add (component);
+
+ appstream_pool.add_components (components);
+#elif HAS_APPSTREAM_0_15
var components = new GenericArray<AppStream.Component> ();
components.add (component);
@@ -430,7 +439,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
break;
}
+#if HAS_APPSTREAM_1_0
+ if (package.component.get_developer ().get_name () == author) {
+#else
if (package.component.developer_name == author) {
+#endif
packages.add (package);
}
}
@@ -447,7 +460,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
var category_array = new GLib.GenericArray<AppStream.Category> ();
category_array.add (category);
+#if HAS_APPSTREAM_1_0
+ AppStream.utils_sort_components_into_categories (appstream_pool.get_components ().as_array (), category_array, true);
+#else
AppStream.utils_sort_components_into_categories (appstream_pool.get_components (), category_array, true);
+#endif
components = category.get_components ();
var apps = new Gee.TreeSet<AppCenterCore.Package> ();
@@ -465,7 +482,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
var apps = new Gee.TreeSet<AppCenterCore.Package> ();
var comps = appstream_pool.search (query);
if (category == null) {
+#if HAS_APPSTREAM_1_0
+ comps.as_array ().foreach ((comp) => {
+#else
comps.foreach ((comp) => {
+#endif
var package = get_package_for_component_id (comp.get_id ());
if (package != null) {
apps.add (package);
@@ -473,7 +494,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
});
} else {
var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+ comps.as_array ().foreach ((comp) => {
+#else
comps.foreach ((comp) => {
+#endif
var package = get_package_for_component_id (comp.get_id ());
if (package != null && package in cat_packages) {
apps.add (package);
diff --git a/src/Views/AppInfoView.vala b/src/Views/AppInfoView.vala
index 5a3a361a..bef37f0e 100644
--- a/src/Views/AppInfoView.vala
+++ b/src/Views/AppInfoView.vala
@@ -310,8 +310,16 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
oars_flowbox.add (uncurated);
}
#endif
+
+#if HAS_APPSTREAM_1_0
+ var active_locale = "en-US";
+ if (package_component.get_context () != null) {
+ active_locale = package_component.get_context ().get_locale () ?? "en-US";
+ }
+#else
var active_locale = package_component.get_active_locale ();
- if (active_locale != "en_US") {
+#endif
+ if (active_locale != "en_US" && active_locale != "en-US") {
var percent_translated = package_component.get_language (
// Expects language without locale
active_locale.split ("_")[0]
@@ -492,7 +500,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
}
}
+#if HAS_APPSTREAM_1_0
+ screenshots = package_component.get_screenshots_all ();
+#else
screenshots = package_component.get_screenshots ();
+#endif
if (screenshots.length > 0) {
screenshot_carousel = new Hdy.Carousel () {
@@ -1030,7 +1042,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
get_app_download_size.begin ();
Idle.add (() => {
+#if HAS_APPSTREAM_1_0
+ var releases = package.component.get_releases_plain ().get_entries ();
+#else
var releases = package.component.get_releases ();
+#endif
foreach (unowned var release in releases) {
if (release.get_version () == null) {
@@ -1049,7 +1065,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
release_carousel.add (release_row);
+#if HAS_APPSTREAM_1_0
+ if (package.installed && AppStream.vercmp_simple (release.get_version (), package.get_version ()) <= 0) {
+#else
if (package.installed && AppStream.utils_compare_versions (release.get_version (), package.get_version ()) <= 0) {
+#endif
break;
}
}
diff --git a/src/Widgets/ReleaseRow.vala b/src/Widgets/ReleaseRow.vala
index 3b487914..36fcbc76 100644
--- a/src/Widgets/ReleaseRow.vala
+++ b/src/Widgets/ReleaseRow.vala
@@ -116,7 +116,11 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
private string format_release_description (string? description ) {
if (description != null) {
try {
+#if HAS_APPSTREAM_1_0
+ var markup = AppStream.markup_convert (description, TEXT);
+#else
var markup = AppStream.markup_convert_simple (description);
+#endif
if (markup.strip () != "") {
return markup;
diff --git a/src/meson.build b/src/meson.build
index d3d558ef..df69a0bf 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -78,6 +78,10 @@ if appstream.version().version_compare('>=0.16')
args += '--define=HAS_APPSTREAM_0_16'
endif
+if appstream.version().version_compare('>=1.0')
+ args += '--define=HAS_APPSTREAM_1_0'
+endif
+
if get_option('packagekit_backend')
appcenter_files += files(
'Core/PackageKitBackend.vala',
@@ -11,7 +11,7 @@ URL: https://github.com/elementary/greeter
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
Source1: 40-%{appname}.conf
Patch0: https://github.com/elementary/greeter/compare/7.0.0..42320c266395606b0c20782603e7407124c3f7a4.patch
Patch0: https://github.com/elementary/greeter/commit/dbd9b6f9701f5992c3b3257c025b9cd80d041cc8.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -36,9 +36,9 @@ BuildRequires: pkgconfig(granite) >= 5.0
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libhandy-1)
BuildRequires: pkgconfig(liblightdm-gobject-1)
BuildRequires: pkgconfig(mutter-clutter-14)
BuildRequires: pkgconfig(mutter-cogl-14)
BuildRequires: pkgconfig(mutter-cogl-pango-14)
BuildRequires: pkgconfig(mutter-clutter-13)
BuildRequires: pkgconfig(mutter-cogl-13)
BuildRequires: pkgconfig(mutter-cogl-pango-13)
BuildRequires: pkgconfig(x11)
Provides: pantheon-greeter = %{version}-%{release}
@@ -3,8 +3,8 @@
Name: elementary-icon-theme
Summary: Icons from the Elementary Project
Version: 8.0.0
Release: 1%?dist
Version: 7.3.1
Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/icons
@@ -3,8 +3,8 @@
Name: elementary-theme
Summary: Elementary GTK+ Stylesheet
Version: 8.0.0
Release: 1%?dist
Version: 7.3.0
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/elementary/stylesheet
+9 -13
View File
@@ -3,16 +3,14 @@
Name: gala
Summary: Gala window manager
Version: 7.1.3
Release: 2%{?dist}
Release: 1%{?dist}
License: GPL-3.0-or-later
Epoch: 1
URL: https://github.com/elementary/gala
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
# patch some default settings to better match Fedora
Patch0: 0000-Modify-default-settings-for-Fedora.patch
Patch: https://github.com/elementary/gala/compare/7.1.3..43d1e6a01b56a84a4e752e1970a35c19402941eb.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -33,13 +31,11 @@ BuildRequires: pkgconfig(granite) >= 5.4.0
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(libbamf3)
BuildRequires: pkgconfig(libcanberra)
BuildRequires: pkgconfig(libhandy-1)
BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(mutter-clutter-14)
BuildRequires: pkgconfig(mutter-cogl-14)
BuildRequires: pkgconfig(mutter-cogl-pango-14)
BuildRequires: pkgconfig(mutter-clutter-13)
BuildRequires: pkgconfig(mutter-cogl-13)
BuildRequires: pkgconfig(mutter-cogl-pango-13)
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# gala provides a generic icon (apps/multitasking-view)
Requires: hicolor-icon-theme
@@ -65,7 +61,7 @@ This package contains the shared libraries.
%package devel
Summary: Gala window manager development files
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
Gala is Pantheon's Window Manager, part of the elementary project.
@@ -89,8 +85,8 @@ This package contains the development headers.
%check
%dnl desktop-file-validate \
%dnl %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
desktop-file-validate \
%{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
desktop-file-validate \
%{buildroot}/%{_datadir}/applications/gala*.desktop
@@ -102,7 +98,7 @@ desktop-file-validate \
%files -f gala.lang
%doc README.md
%license COPYING
%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
%{_bindir}/gala
%{_bindir}/gala-daemon
@@ -5,8 +5,8 @@ apps built for elementary.}
Name: granite-7
Summary: Elementary companion library for GTK+ and GLib
Version: 7.5.0
Release: 1%?dist
Version: 7.4.0
Release: 1%{?dist}
License: LGPL-3.0-or-later
URL: https://github.com/elementary/granite
@@ -82,7 +82,6 @@ desktop-file-validate \
%{_datadir}/metainfo/granite-7.metainfo.xml
%{_datadir}/icons/hicolor/*/apps/io.elementary.granite-7.svg
%{_datadir}/themes/Granite/
%files devel
@@ -9,14 +9,12 @@
Name: switchboard-plug-about
Summary: Switchboard System Information plug
Version: 6.2.0
Release: 3%{?dist}
Release: 2%{?dist}
License: GPL-3.0-or-later
URL: https://github.com/elementary/switchboard-plug-about
Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
Patch0: https://github.com/elementary/switchboard-plug-about/compare/6.2.0..72d7da13da2824812908276751fd3024db2dd0f8.patch
BuildRequires: gettext
BuildRequires: libappstream-glib
BuildRequires: meson
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "switchboard-plug-wallet.spec"
}
}
@@ -0,0 +1,62 @@
%global __provides_exclude_from ^%{_libdir}/switchboard/.*\\.so$
%global srcname switchboard-plug-wallet
%global plug_type personal
%global plug_name wallet
%global plug_rdnn io.elementary.switchboard.wallet
%global commit 50582fc7ee43a4b47647d04786dcf1d0eb45af36
Name: switchboard-plug-wallet
Summary: Switchboard Wallet Plug
Version: %(c=%commit; echo ${c:0:7})
Release: 2%?dist
License: GPL-3.0-or-later
URL: https://github.com/elementary/%name
Source0: %url/archive/%version/%srcname-%version.tar.gz
BuildRequires: libappstream-glib
BuildRequires: meson
BuildRequires: vala
BuildRequires: fdupes
BuildRequires: pkgconfig(granite) >= 0.5
BuildRequires: gtk3-devel
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: switchboard-devel
Requires: switchboard%{?_isa}
Supplements: switchboard%{?_isa}
%description
Manage Payment Methods and related settings.
%prep
%autosetup -n %srcname-%commit -p1
%build
%meson
%meson_build
%install
%meson_install
%fdupes %buildroot%_datadir/icons/hicolor
%files
%doc README.md
%license COPYING
%_libdir/switchboard/%plug_type/lib%plug_rdnn.so
%_datadir/icons/hicolor/*/apps/%plug_rdnn.svg
%_datadir/locale/*/LC_MESSAGES/%plug_rdnn.mo
%changelog
* Tue Jun 13 2023 windowsboy111 <windowsboy111@fyralabs.com> - bfe73dfb95d9b46a0a34e0db35a178233c8552b0-1
- Initial package.
@@ -0,0 +1,3 @@
let req = new_req("https://api.github.com/repos/elementary/switchboard-plug-wallet/commits/HEAD");
req.head("Authorization", `Bearer ${env("GITHUB_TOKEN")}`);
rpm.global("commit", json(req.get()).sha);
@@ -9,11 +9,10 @@ Summary: Stylish top panel
Version: 3.0.5
Release: 1%{?dist}
License: GPL-2.0-or-later
Epoch: 1
URL: https://github.com/elementary/wingpanel
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: https://github.com/elementary/wingpanel/compare/23a3eb7c2448b4f35398116df7d01b075361ef1f..5d22d436b45decfb2a50d9a7c27f2c961f1dd39f.patch
Patch0: https://github.com/elementary/wingpanel/commit/d6009d9f0d5c7479172093447ccceccba86ff1f3.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -29,11 +28,11 @@ BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(glib-2.0) >= 2.32
BuildRequires: pkgconfig(granite) >= 5.4.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.10
BuildRequires: pkgconfig(mutter-clutter-14)
BuildRequires: pkgconfig(mutter-cogl-14)
BuildRequires: pkgconfig(mutter-cogl-pango-14)
BuildRequires: pkgconfig(mutter-clutter-13)
BuildRequires: pkgconfig(mutter-cogl-13)
BuildRequires: pkgconfig(mutter-cogl-pango-13)
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
# wingpanel ayatana appindicator support was abandoned by upstream
# wingpanel-indicator-ayatana-2.0.3-10.fc32 retired for fedora 33+
@@ -44,8 +43,8 @@ Obsoletes: wingpanel-indicator-ayatana < 2.0.3-11
%package libs
Summary: Stylish top panel (shared library)
Enhances: %{name} = %{epoch}:%{version}-%{release}
Enhances: %{name}-devel = %{epoch}:%{version}-%{release}
Enhances: %{name} = %{version}-%{release}
Enhances: %{name}-devel = %{version}-%{release}
%description libs %{common_description}
@@ -54,7 +53,7 @@ This package contains the shared library.
%package devel
Summary: Stylish top panel (development files)
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel %{common_description}
@@ -1,13 +1,12 @@
# from Fedora upstream
%global extension pop-shell
%global uuid %{extension}@system76.com
%global commit cfa0c55e84b7ce339e5ce83832f76fee17e99d51
%global commit cf3c932b55d5c247906efe9d81f988ee092d9f51
%global shortcommit %{lua:print(macros.commit:sub(1,7))}
%global commit_date 20240404
%global ver 1.2.0
Name: terra-gnome-shell-extension-%{extension}
Version: %{ver}^%commit_date.%{shortcommit}
Version: %{ver}^%{shortcommit}
Release: 1%?dist
Summary: GNOME Shell extension for advanced tiling window management
License: GPL-3.0-only
@@ -1,8 +1,4 @@
if filters.contains("nightly") {
rpm.global("commit", gh_commit("pop-os/shell"));
if rpm.changed() {
rpm.global("ver", gh("pop-os/shell"));
rpm.release();
rpm.global("commit_date", date());
}
rpm.global("commit", get("https://api.github.com/repos/pop-os/shell/commits/HEAD").json().sha);
rpm.global("ver", gh("pop-os/shell"));
}
@@ -5,7 +5,7 @@
# https://github.com/FyshOS/fynedesk
%global goipath github.com/FyshOS/fynedesk
Version: 0.4.0
Version: 0.3.0
%gometa -f
@@ -17,7 +17,7 @@ A full desktop environment for Linux/Unix using Fyne.}
%global godocs AUTHORS README.md CHANGELOG.md
Name: %{goname}
Release: 1%?dist
Release: 1%{?dist}
Summary: A full desktop environment for Linux/Unix using Fyne
License: BSD-3-Clause
@@ -1,6 +1,6 @@
%global forgeurl https://github.com/KDE/latte-dock/
%global commit 10be08a7940b86d1cdca963a01542c92b064c7bd
%global commit 131ee4d39ce8913b2de8f9a673903225345c7a38
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
@@ -9,7 +9,7 @@ Name: latte-dock-nightly
Version: 0.10.0^%{snapshot_info}
%forgemeta
Release: 1%?dist
Release: 1%{?dist}
Summary: Latte is a dock based on plasma frameworks
License: GPL-2.0-or-later
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
%global commit 99fa99c6e8af868f64dbfdb973eebeb2ca3ad14a
%global commit d3bc3b7296a01f6b020e32080c9c40dd1c656b05
%forgemeta
Name: lomiri-app-launch
@@ -1,10 +1,10 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-download-manager
%global commit 6e4342ae0ef3710343e2dbf0b8da586853625e2e
%global commit 2c7d6921ac56862c197958f4e5c31aa76a1a50e1
%forgemeta
Name: lomiri-download-manager
Version: 0.5.2
Release: 1%?dist
Version: 0.1.2
Release: %autorelease
Summary: Upload Download Manager for Lomiri
License: LGPLv3
URL: https://gitlab.com/ubports/development/core/lomiri-download-manager
@@ -23,7 +23,6 @@ BuildRequires: qt5-qtdeclarative-devel
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(libglog)
BuildRequires: pkgconfig(liblomiri-api)
BuildRequires: pkgconfig(systemd)
BuildRequires: fdupes
%description
@@ -61,7 +60,7 @@ sed -e "s/-Werror//g" -i CMakeLists.txt
%files -f %{name}.lang
%license COPYING
%config /usr/etc/dbus-1/system.d/*.conf
%config %{_sysconfdir}/dbus-1/system.d/*.conf
%{_bindir}/lomiri-*
%{_userunitdir}/*.service
%{_libdir}/liblomiri-download-manager-client.so.*
@@ -1,7 +0,0 @@
let o = get("https://gitlab.com/api/v4/projects/25034025/repository/tags").json_arr()[0];
let f = rpm.f;
rpm.version(o.name);
// check if changed
if rpm.f != f {
rpm.global("commit", o.commit.id);
}
@@ -30,7 +30,6 @@ BuildRequires: pkgconfig(libgmenuharness)
BuildRequires: pkgconfig(ofono)
BuildRequires: pkgconfig(qofono-qt5)
BuildRequires: pkgconfig(lomiri-url-dispatcher)
BuildRequires: pkgconfig(systemd)
Requires: gmenuharness
%description
@@ -65,7 +64,7 @@ The %{name}-doc package contains documentation files for %{name}.
%files -f %{name}.lang
%doc README.md
%license COPYING COPYING.LGPL
%config /usr/etc/xdg/autostart/lomiri-indicator-network.desktop
%config %{_sysconfdir}/xdg/autostart/lomiri-indicator-network.desktop
%{_userunitdir}/*.service
%{_libdir}/liblomiri-connectivity-qt1.so.*
%dir %{_qt5_qmldir}/Lomiri/Connectivity
@@ -92,7 +91,10 @@ The %{name}-doc package contains documentation files for %{name}.
%{_libdir}/pkgconfig/lomiri-connectivity-qt1.pc
%files doc
%{_docdir}/lomiri-indicator-network
%dir %{_docdir}/lomiri-connectivity-doc
%{_docdir}/lomiri-connectivity-doc/cpp/
%{_docdir}/lomiri-connectivity-doc/dbus/
%{_docdir}/lomiri-connectivity-doc/qml/
%changelog
%autochangelog
@@ -1,15 +1,16 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
%global commit a17feddaac58fd275ee470dbce6d54df24da4a0d
%global commit ad39d8a88e71320c2d6f1a39a96bfe421f644519
%forgemeta
Name: lomiri-system-settings
Version: 1.1.0
Release: 1%?dist
Version: 1.0.2
Release: 1%{?dist}
Summary: The system settings application for Lomiri
License: GPLv3
URL: https://gitlab.com/ubports/development/core/lomiri-system-settings
Source0: %{url}/-/archive/%commit/lomiri-system-settings-%commit.tar.gz
Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/%version-3/debian/patches/2000_use-maliit-keyboard-for-language-plugin.patch
Patch0: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/1001_use-maliit-keyboard-for-language-plugin.patch
Patch1: https://sources.debian.org/data/main/l/lomiri-system-settings/1.0.1-2/debian/patches/2001_disable-current-language-switching.patch
BuildRequires: cmake
BuildRequires: gcc-c++
@@ -1,4 +1,2 @@
rpm.version(gitlab_tag("19057685"));
if rpm.changed() {
rpm.global("commit", gitlab_commit("19057685"));
}
rpm.version(get("https://gitlab.com/api/v4/projects/19057685/repository/tags").json_arr()[0].name);
rpm.global("commit", get("https://gitlab.com/api/v4/projects/19057685/repository/commits").json_arr()[0].id);
@@ -4,7 +4,7 @@
Name: lomiri-url-dispatcher
Version: 0.1.3
Release: 2%{?dist}
Release: 1%{?dist}
Summary: A small library for handling URLs over dbus
License: LGPL-3.0
@@ -1,4 +1,2 @@
rpm.version(gitlab_tag("17424894"));
if rpm.changed() {
rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
}
rpm.version(get("https://gitlab.com/api/v4/projects/17424894/repository/tags").json_arr()[0].name);
rpm.global("commit", get("https://gitlab.com/api/v4/projects/17424894/repository/commits").json_arr()[0].id);
@@ -1,4 +1,3 @@
rpm.version(gitlab_tag("25716028"));
if rpm.changed() {
rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
}
let o = get("https://gitlab.com/api/v4/projects/25716028/repository/tags").json_arr()[0];
rpm.version(o.name);
rpm.global("commit", get("https://gitlab.com/api/v4/projects/25716028/repository/commits").json_arr()[0].id);
@@ -1,4 +1,4 @@
%global rn 4
%global rn 1
Name: unity-greeter
Version: 23.10.1
@@ -1,9 +1,9 @@
%define _ubuntu_rel 1ubuntu4
%define _ubuntu_rel 1ubuntu1
Name: unity-session
Summary: Lightdm profile for Unity 7
Version: 46.0
Release: 1%?dist
Version: 45.0
Release: 1%{?dist}
License: GPL-2.0
URL: https://packages.ubuntu.com/jammy/unity-session
@@ -1,4 +1,4 @@
%define archive unity_7.7.0+23.04.20230222.2-0ubuntu7.tar.xz
%define archive unity_7.7.0+23.04.20230222.2-0ubuntu4.tar.xz
Name: unity-shell
Version: 7.7.0
@@ -1,6 +1,6 @@
Name: ayatana-indicator-datetime
Summary: A GTK implementation of the StatusNotifierItem Specification
Version: 24.2.0
Version: 23.10.1
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-datetime
@@ -38,7 +38,7 @@ Unity7 desktop and Lomiri desktop.
%build
%cmake -DENABLE_LOMIRI_FEATURES=ON \
-DENABLE_TESTS=OFF\
-DENABLE_TESTS=ON \
-DENABLE_COVERAGE=OFF \
%cmake_build
@@ -1,7 +1,7 @@
Name: ayatana-indicator-notifications
Summary: Ayatana Indicator Notifications Applet
Version: 23.10.1
Release: 1%?dist
Version: 23.10.0
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-notifications
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
Name: ayatana-indicator-session
Summary: Ayatana Indicator Session Applet
Version: 24.2.0
Release: 1%?dist
Version: 23.10.3
Release: 1%{?dist}
License: GPL-3.0
URL: https://github.com/AyatanaIndicators/ayatana-indicator-session
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,7 +1,7 @@
Name: ayatana-indicator-sound
Summary: Ayatana Indicator Sound Applet
Version: 24.4.0
Release: 1%?dist
Version: 23.10.3
Release: 1%{?dist}
License: GPLv3
URL: https://github.com/AyatanaIndicators/ayatana-indicator-sound
Source0: %{url}/archive/refs/tags/%{version}.tar.gz
@@ -1,142 +0,0 @@
From 4d44531c8f624f5b479c3ff23e8fecc67eb848ab Mon Sep 17 00:00:00 2001
From: Jeremy Linton <jeremy.linton@arm.com>
Date: Fri, 22 Oct 2021 14:51:54 -0500
Subject: [PATCH] Delay for logind, and fallback to seat0
There is systemd/logind race with when restarting
sddm that causes logind1 not to be available. Previously
this meant the seat0 was immediately created regardless
of the state of CanGraphical.
Fixing this, though we still want seat0 to be started
if none of the seats appear to be graphical. Presumably
there are some graphics on the machine, otherwise
why run sddm? Wait a bit, and create seat0 anyway. If
this fails the output from Xorg should tell us why. This
is generally a better strategy than what happens a good
amount of time now, where sddm is started and silent about
why the screen is blank.
References:
* https://bugzilla.redhat.com/2011991
* https://bugzilla.redhat.com/2016310
Signed-off-by: Jeremy Linton <jeremy.linton@arm.com>
---
src/daemon/LogindDBusTypes.cpp | 31 +++++++++++++++++++++----------
src/daemon/SeatManager.cpp | 22 ++++++++++++++++++++++
src/daemon/SeatManager.h | 1 +
3 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/src/daemon/LogindDBusTypes.cpp b/src/daemon/LogindDBusTypes.cpp
index 011bb7f..6255c69 100644
--- a/src/daemon/LogindDBusTypes.cpp
+++ b/src/daemon/LogindDBusTypes.cpp
@@ -8,6 +8,8 @@
#include <QDebug>
+#include <unistd.h>
+
class LogindPathInternal {
public:
LogindPathInternal();
@@ -46,17 +48,26 @@ LogindPathInternal::LogindPathInternal()
qRegisterMetaType<UserInfoList>("UserInfoList");
qDBusRegisterMetaType<UserInfoList>();
- if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
- qDebug() << "Logind interface found";
- available = true;
- serviceName = QStringLiteral("org.freedesktop.login1");
- managerPath = QStringLiteral("/org/freedesktop/login1");
- managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
- seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
- sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
- userIfaceName = QStringLiteral("org.freedesktop.login1.User");
- return;
+#ifdef HAVE_SYSTEMD
+ // systemd-logind should be running, although because it takes a few moments to restart after
+ // systemctl isolate calls, it may not yet be running. Wait a few seconds for it, while blocking everything else.
+ int logind_wait_seconds = 50;
+ while (logind_wait_seconds--) {
+ if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.login1"))) {
+ qDebug() << "Logind interface found";
+ available = true;
+ serviceName = QStringLiteral("org.freedesktop.login1");
+ managerPath = QStringLiteral("/org/freedesktop/login1");
+ managerIfaceName = QStringLiteral("org.freedesktop.login1.Manager");
+ seatIfaceName = QStringLiteral("org.freedesktop.login1.Seat");
+ sessionIfaceName = QStringLiteral("org.freedesktop.login1.Session");
+ userIfaceName = QStringLiteral("org.freedesktop.login1.User");
+ return;
+ }
+ qDebug() << "Sleeping for systemd-logind";
+ usleep(100000);
}
+#endif
if (QDBusConnection::systemBus().interface()->isServiceRegistered(QStringLiteral("org.freedesktop.ConsoleKit"))) {
qDebug() << "Console kit interface found";
diff --git a/src/daemon/SeatManager.cpp b/src/daemon/SeatManager.cpp
index bd207e6..39d8b85 100644
--- a/src/daemon/SeatManager.cpp
+++ b/src/daemon/SeatManager.cpp
@@ -26,6 +26,9 @@
#include <QDBusMessage>
#include <QDBusPendingReply>
#include <QDBusContext>
+#include <QDebug>
+#include <QFileInfo>
+#include <QTimer>
#include "LogindDBusTypes.h"
@@ -115,6 +118,8 @@ namespace SDDM {
QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatNew"), this, SLOT(logindSeatAdded(QString,QDBusObjectPath)));
QDBusConnection::systemBus().connect(Logind::serviceName(), Logind::managerPath(), Logind::managerIfaceName(), QStringLiteral("SeatRemoved"), this, SLOT(logindSeatRemoved(QString,QDBusObjectPath)));
+
+ QTimer::singleShot(5000, this, &SeatManager::checkSeat);
}
void SeatManager::createSeat(const QString &name) {
@@ -152,6 +157,23 @@ namespace SDDM {
m_seats.value(name)->createDisplay(Display::defaultDisplayServerType());
}
+ // this is a bit hacky, but linux DRM drivers
+ // won't initially be available so there is a race
+ // between determing if a efifb/etc graphical object
+ // is the only graphics on the machine, or a DRM driver
+ // will take over the display. So we will hang out for a few
+ // seconds and if none of the seats are declared cangraphical
+ // its possible the only graphics on the machine don't have
+ // a drm driver.
+ void SeatManager::checkSeat(void) {
+ if (m_seats.isEmpty()) {
+ //if (QFileInfo::exists(QStringLiteral("/dev/fb0"))) {
+ qWarning() << "No graphical seats found, attempt to start one on the main console anyway...";
+ createSeat(QStringLiteral("seat0"));
+ //}
+ }
+ }
+
void SDDM::SeatManager::logindSeatAdded(const QString& name, const QDBusObjectPath& objectPath)
{
auto logindSeat = new LogindSeat(name, objectPath);
diff --git a/src/daemon/SeatManager.h b/src/daemon/SeatManager.h
index b2f9796..aa43047 100644
--- a/src/daemon/SeatManager.h
+++ b/src/daemon/SeatManager.h
@@ -49,6 +49,7 @@ namespace SDDM {
private:
QHash<QString, Seat *> m_seats; //these will exist only for graphical seats
QHash<QString, LogindSeat*> m_systemSeats; //these will exist for all seats
+ void checkSeat(void);
};
}
--
2.39.2
-2
View File
@@ -1,2 +0,0 @@
This scripts dir contains only samples, but are generally not used directly.
In practice, sddm runtime uses items under /etc/sddm by default
-5
View File
@@ -1,5 +0,0 @@
project pkg {
rpm {
spec = "terra-sddm.spec"
}
}
@@ -1,11 +0,0 @@
diff -up sddm-0.18.0/services/sddm.service.in.env sddm-0.18.0/services/sddm.service.in
--- sddm-0.18.0/services/sddm.service.in.env 2018-07-18 05:31:40.000000000 -0500
+++ sddm-0.18.0/services/sddm.service.in 2019-03-14 08:23:22.095498405 -0500
@@ -7,6 +7,7 @@ After=systemd-user-sessions.service gett
[Service]
ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm
Restart=always
+EnvironmentFile=-/etc/sysconfig/sddm
[Install]
Alias=display-manager.service
@@ -1,53 +0,0 @@
diff --git a/src/common/Configuration.h b/src/common/Configuration.h
index 54bcace..9b8fa22 100644
--- a/src/common/Configuration.h
+++ b/src/common/Configuration.h
@@ -37,9 +37,8 @@ namespace SDDM {
enum NumState { NUM_NONE, NUM_SET_ON, NUM_SET_OFF };
// Name Type Default value Description
- // TODO: Change default to x11-user in a future release
- Entry(DisplayServer, QString, _S("x11"), _S("Which display server should be used.\n"
- "Valid values are: x11, x11-user, wayland. Wayland support is experimental"));
+ Entry(DisplayServer, QString, _S("wayland"), _S("Which display server should be used.\n"
+ "Valid values are: x11, x11-user, wayland."));
Entry(HaltCommand, QString, _S(HALT_COMMAND), _S("Halt command"));
Entry(RebootCommand, QString, _S(REBOOT_COMMAND), _S("Reboot command"));
Entry(Numlock, NumState, NUM_NONE, _S("Initial NumLock state. Can be on, off or none.\n"
@@ -51,7 +50,7 @@ namespace SDDM {
// Name Entries (but it's a regular class again)
Section(Theme,
Entry(ThemeDir, QString, _S(DATA_INSTALL_DIR "/themes"), _S("Theme directory path"));
- Entry(Current, QString, _S(""), _S("Current theme name"));
+ Entry(Current, QString, _S("01-breeze-fedora"), _S("Current theme name"));
Entry(FacesDir, QString, _S(DATA_INSTALL_DIR "/faces"), _S("Global directory for user avatars\n"
"The files should be named <username>.face.icon"));
Entry(CursorTheme, QString, QString(), _S("Cursor theme used in the greeter"));
@@ -71,9 +70,9 @@ namespace SDDM {
Entry(SessionDir, QStringList, {_S("/usr/local/share/xsessions"),
_S("/usr/share/xsessions")}, _S("Comma-separated list of directories containing available X sessions"));
Entry(SessionCommand, QString, _S(SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
- Entry(SessionLogFile, QString, _S(".local/share/sddm/xorg-session.log"), _S("Path to the user session log file"));
- Entry(DisplayCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xsetup"), _S("Path to a script to execute when starting the display server"));
- Entry(DisplayStopCommand, QString, _S(DATA_INSTALL_DIR "/scripts/Xstop"), _S("Path to a script to execute when stopping the display server"));
+ Entry(SessionLogFile, QString, _S(".cache/xsession-errors"), _S("Path to the user session log file"));
+ Entry(DisplayCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xsetup"), _S("Path to a script to execute when starting the display server"));
+ Entry(DisplayStopCommand, QString, _S(SYS_CONFIG_DIR "/sddm/Xstop"), _S("Path to a script to execute when stopping the display server"));
Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
);
@@ -82,12 +81,12 @@ namespace SDDM {
Entry(SessionDir, QStringList, {_S("/usr/local/share/wayland-sessions"),
_S("/usr/share/wayland-sessions")}, _S("Comma-separated list of directories containing available Wayland sessions"));
Entry(SessionCommand, QString, _S(WAYLAND_SESSION_COMMAND), _S("Path to a script to execute when starting the desktop session"));
- Entry(SessionLogFile, QString, _S(".local/share/sddm/wayland-session.log"),_S("Path to the user session log file"));
+ Entry(SessionLogFile, QString, _S(".cache/wayland-errors"), _S("Path to the user session log file"));
Entry(EnableHiDPI, bool, true, _S("Enable Qt's automatic high-DPI scaling"));
);
Section(Users,
- Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin"), _S("Default $PATH for logged in users"));
+ Entry(DefaultPath, QString, _S("/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"), _S("Default $PATH for logged in users"));
Entry(MinimumUid, int, UID_MIN, _S("Minimum user id for displayed users"));
Entry(MaximumUid, int, UID_MAX, _S("Maximum user id for displayed users"));
Entry(HideUsers, QStringList, QStringList(), _S("Comma-separated list of users that should not be listed"));
@@ -1,67 +0,0 @@
From 52175648f4e1b415f93b24a3ef970983024659f2 Mon Sep 17 00:00:00 2001
From: Neal Gompa <neal@gompa.dev>
Date: Wed, 28 Feb 2024 16:47:16 -0500
Subject: [PATCH] Default to Qt6 and always use versioned greeters
Distributors can handle creating an unversioned name if necessary.
---
src/common/ThemeMetadata.cpp | 4 ++--
src/daemon/Greeter.cpp | 3 +--
src/greeter/CMakeLists.txt | 9 +--------
3 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/src/common/ThemeMetadata.cpp b/src/common/ThemeMetadata.cpp
index 2cb3762..003056a 100644
--- a/src/common/ThemeMetadata.cpp
+++ b/src/common/ThemeMetadata.cpp
@@ -28,7 +28,7 @@ namespace SDDM {
QString mainScript { QStringLiteral("Main.qml") };
QString configFile;
QString translationsDirectory { QStringLiteral(".") };
- int qtVersion = 5;
+ int qtVersion = 6;
};
ThemeMetadata::ThemeMetadata(const QString &path, QObject *parent) : QObject(parent), d(new ThemeMetadataPrivate()) {
@@ -61,6 +61,6 @@ namespace SDDM {
d->mainScript = settings.value(QStringLiteral("SddmGreeterTheme/MainScript"), QStringLiteral("Main.qml")).toString();
d->configFile = settings.value(QStringLiteral("SddmGreeterTheme/ConfigFile"), QStringLiteral("theme.conf")).toString();
d->translationsDirectory = settings.value(QStringLiteral("SddmGreeterTheme/TranslationsDirectory"), QStringLiteral(".")).toString();
- d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 5).toInt();
+ d->qtVersion = settings.value(QStringLiteral("SddmGreeterTheme/QtVersion"), 6).toInt();
}
}
diff --git a/src/daemon/Greeter.cpp b/src/daemon/Greeter.cpp
index 07fccde..5a956b6 100644
--- a/src/daemon/Greeter.cpp
+++ b/src/daemon/Greeter.cpp
@@ -82,8 +82,7 @@ namespace SDDM {
QString Greeter::greeterPathForQt(int qtVersion)
{
- const QString suffix = qtVersion == 5 ? QString() : QStringLiteral("-qt%1").arg(qtVersion);
- return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter%1").arg(suffix);
+ return QStringLiteral(BIN_INSTALL_DIR "/sddm-greeter-qt%1").arg(qtVersion);
}
bool Greeter::start() {
diff --git a/src/greeter/CMakeLists.txt b/src/greeter/CMakeLists.txt
index 72769e4..524368d 100644
--- a/src/greeter/CMakeLists.txt
+++ b/src/greeter/CMakeLists.txt
@@ -1,11 +1,4 @@
-if(QT_MAJOR_VERSION EQUAL "5")
- # Keep the unversioned name for Qt5. When upgrading SDDM, the old daemon
- # might still be running and only know about "sddm-greeter". Keeping the
- # previous name around also helps users calling it directly.
- set(GREETER_TARGET sddm-greeter)
-else()
- set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
-endif()
+set(GREETER_TARGET sddm-greeter-qt${QT_MAJOR_VERSION})
message(STATUS "Building greeter for Qt ${QT_MAJOR_VERSION} as ${GREETER_TARGET}")
--
2.43.0
File diff suppressed because it is too large Load Diff
-20
View File
@@ -1,20 +0,0 @@
#%PAM-1.0
auth required pam_env.so
auth required pam_permit.so
auth include postlogin
account required pam_nologin.so
account include system-auth
password include system-auth
session required pam_selinux.so close
session required pam_loginuid.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include system-auth
-session optional pam_gnome_keyring.so auto_start
-session optional pam_kwallet5.so auto_start
-session optional pam_kwallet.so auto_start
session include postlogin
-17
View File
@@ -1,17 +0,0 @@
#%PAM-1.0
# Load environment from /etc/environment and ~/.pam_environment
auth required pam_env.so
# Always let the greeter start without authentication
auth required pam_permit.so
# No action required for account management
account required pam_permit.so
# Can't change password
password required pam_deny.so
# Setup session
session required pam_unix.so
session optional pam_systemd.so
@@ -1,12 +0,0 @@
diff --git a/services/sddm-tmpfiles.conf.in b/services/sddm-tmpfiles.conf.in
index fb45553..6acfb6c 100644
--- a/services/sddm-tmpfiles.conf.in
+++ b/services/sddm-tmpfiles.conf.in
@@ -1,5 +1,7 @@
# Home dir of the sddm user, also contains state.conf
d ${STATE_DIR} 0750 sddm sddm
+# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
+Z ${STATE_DIR} - sddm sddm
# This contains X11 auth files passed to Xorg and the greeter
d ${RUNTIME_DIR} 0711 root root
# Sockets for IPC
@@ -1,2 +0,0 @@
#Type Name ID GECOS Home directory Shell
u sddm - "SDDM Greeter Account" /var/lib/sddm -
-2
View File
@@ -1,2 +0,0 @@
[General]
DisplayServer=x11
-122
View File
@@ -1,122 +0,0 @@
[Autologin]
# Whether sddm should automatically log back into sessions when they exit
#Relogin=false
# Name of session file for autologin session
#Session=
# Username for autologin session
#User=
[General]
# Enable Qt's automatic high-DPI scaling
#EnableHiDPI=false
# Halt command
#HaltCommand=/usr/bin/systemctl poweroff
# Initial NumLock state. Can be on, off or none.
# If property is set to none, numlock won't be changed
# NOTE: Currently ignored if autologin is enabled.
#Numlock=none
# Reboot command
#RebootCommand=/usr/bin/systemctl reboot
# Control x11/wayland startup
# DisplayServer=wayland
[Theme]
# Current theme name
#Current=01-breeze-fedora
# Cursor theme used in the greeter
#CursorTheme=
# Number of users to use as threshold
# above which avatars are disabled
# unless explicitly enabled with EnableAvatars
#DisableAvatarsThreshold=7
# Enable display of custom user avatars
#EnableAvatars=true
# Global directory for user avatars
# The files should be named <username>.face.icon
#FacesDir=/usr/share/sddm/faces
# Theme directory path
#ThemeDir=/usr/share/sddm/themes
[Users]
# Default $PATH for logged in users
#DefaultPath=/usr/local/bin:/usr/bin:/bin
# Comma-separated list of shells.
# Users with these shells as their default won't be listed
#HideShells=
# Comma-separated list of users that should not be listed
#HideUsers=
# Maximum user id for displayed users
#MaximumUid=60000
# Minimum user id for displayed users
#MinimumUid=1000
# Remember the session of the last successfully logged in user
#RememberLastSession=true
# Remember the last successfully logged in user
#RememberLastUser=true
[Wayland]
# Path to a script to execute when starting the desktop session
#SessionCommand=/etc/sddm/wayland-session
# Directory containing available Wayland sessions
#SessionDir=/usr/share/wayland-sessions
# Path to the user session log file
#SessionLogFile=.cache/wayland-errors
[X11]
# Path to a script to execute when starting the display server
#DisplayCommand=/etc/sddm/Xsetup
# Path to a script to execute when stopping the display server
#DisplayStopCommand=/etc/sddm/Xstop
# The lowest virtual terminal number that will be used.
#MinimumVT=1
# Arguments passed to the X server invocation
#ServerArguments=-nolisten tcp
# Path to X server binary
#ServerPath=/usr/bin/X
# Path to a script to execute when starting the desktop session
#SessionCommand=/etc/X11/xinit/Xsession
# Directory containing available X sessions
#SessionDir=/usr/share/xsessions
# Path to the user session log file
#SessionLogFile=.cache/xsession-errors
# Path to the Xauthority file
#UserAuthFile=.Xauthority
# Path to xauth binary
#XauthPath=/usr/bin/xauth
# Path to Xephyr binary
#XephyrPath=/usr/bin/Xephyr
-23
View File
@@ -1,23 +0,0 @@
auth [success=done ignore=ignore default=bad] pam_selinux_permit.so
auth substack password-auth
-auth optional pam_gnome_keyring.so
-auth optional pam_kwallet5.so
-auth optional pam_kwallet.so
auth include postlogin
account required pam_nologin.so
account include password-auth
password include password-auth
session required pam_selinux.so close
session required pam_loginuid.so
-session optional pam_ck_connector.so
session required pam_selinux.so open
session optional pam_keyinit.so force revoke
session required pam_namespace.so
session include password-auth
-session optional pam_gnome_keyring.so auto_start
-session optional pam_kwallet5.so auto_start
-session optional pam_kwallet.so auto_start
session include postlogin
-5
View File
@@ -1,5 +0,0 @@
# workaround https://bugzilla.redhat.com/1686675
# see also https://bugreports.qt.io/browse/QTBUG-58508
QML_DISABLE_DISK_CACHE=1
# enable qDebug messages for debug build
# QT_LOGGING_RULES="*.debug=true"
-293
View File
@@ -1,293 +0,0 @@
# Disable X11 for RHEL 10+
%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
Name: terra-sddm
Version: 0.21.0
Release: 5%{?dist}
License: GPL-2.0-or-later
Summary: QML based desktop and login manager
Provides: sddm = %version-%release
URL: https://github.com/sddm/sddm
Source0: %{url}/archive/v%{version}/sddm-%{version}.tar.gz
## upstream patches
# Port all themes to Qt 6
# Submitted: https://github.com/sddm/sddm/pull/1876
Patch1: sddm-PR1876.patch
## upstreamable patches
# Fix race with logind restart, and start seat0 if !CanGraphical on timer
# https://bugzilla.redhat.com/show_bug.cgi?id=2011991
# https://bugzilla.redhat.com/show_bug.cgi?id=2016310
# Submmited: https://github.com/sddm/sddm/pull/1494
Patch11: 0001-Delay-for-logind-and-fallback-to-seat0.patch
## downstream patches
Patch101: sddm-0.20.0-fedora_config.patch
# sddm.service: +EnvironmentFile=-/etc/sysconfig/sddm
Patch103: sddm-0.18.0-environment_file.patch
# Workaround for https://pagure.io/fedora-kde/SIG/issue/87
Patch104: sddm-rpmostree-tmpfiles-hack.patch
# Workaround lack of Qt 5 greeter build
Patch105: sddm-0.21.0-qt6greeter.patch
# https://github.com/sddm/sddm/pull/1779
Patch106: https://github.com/sddm/sddm/pull/1779.patch
# Shamelessly stolen from gdm
Source10: sddm.pam
# Shamelessly stolen from gdm
Source11: sddm-autologin.pam
# Previously included in sddm sources
Source12: sddm-greeter.pam
# sample sddm.conf generated with sddm --example-config, and entries commented-out
Source13: sddm.conf
# README.scripts
Source14: README.scripts
# sysconfig snippet
Source15: sddm.sysconfig
# sddm x11 override config
Source16: sddm-x11.conf
# sysusers config file. note these are shipped in the upstream tarball
# but we cannot use the files from the tarball for %pre scriptlet
# generation, so we duplicate them as source files for that purpose;
# this is an ugly hack that should be removed if it becomes possible.
# see https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/TFDMAU7KLMSQTKPJELHSM6PFVXIZ56GK/
Source17: sddm-systemd-sysusers.conf
Provides: service(graphical-login) = sddm
BuildRequires: cmake >= 2.8.8
BuildRequires: extra-cmake-modules
BuildRequires: pam-devel
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(xcb)
BuildRequires: pkgconfig(xcb-xkb)
# sometimes python-docutils, sometimes python2-docutils, sometimes python3-docutils.
# use path then for sanity
BuildRequires: /usr/bin/rst2man
BuildRequires: cmake(Qt6Core)
BuildRequires: cmake(Qt6DBus)
BuildRequires: cmake(Qt6Gui)
BuildRequires: cmake(Qt6Qml)
BuildRequires: cmake(Qt6Quick)
BuildRequires: cmake(Qt6LinguistTools)
BuildRequires: cmake(Qt6Test)
BuildRequires: cmake(Qt6QuickTest)
# verify presence to pull defaults from /etc/login.defs
BuildRequires: shadow-utils
BuildRequires: systemd
BuildRequires: systemd-rpm-macros
Obsoletes: kde-settings-sddm < 20-5
%if 0%{?fedora}
# for /usr/share/backgrounds/default.png
BuildRequires: desktop-backgrounds-compat
BuildRequires: GraphicsMagick
Requires: desktop-backgrounds-compat
# for /usr/share/pixmaps/system-logo-white.png
Requires: system-logos
%endif
Requires: systemd
%if %{with x11}
Requires: xorg-x11-xinit
%endif
%{?systemd_requires}
Requires(pre): shadow-utils
# Virtual dependency for sddm greeter setup
Requires: sddm-greeter-displayserver
Suggests: sddm-wayland-generic
%description
SDDM is a modern graphical display manager aiming to be fast, simple and
beautiful. It uses modern technologies like QtQuick, which in turn gives the
designer the ability to create smooth, animated user interfaces.
%package wayland-generic
Summary: Generic Wayland SDDM greeter configuration
Provides: sddm-greeter-displayserver
Conflicts: sddm-greeter-displayserver
Requires: weston
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description wayland-generic
This package contains configuration and dependencies for SDDM
to use Weston for the greeter display server.
This is the generic default Wayland configuration provided
by SDDM.
%if %{with x11}
%package x11
Summary: X11 SDDM greeter configuration
Provides: sddm-greeter-displayserver
Conflicts: sddm-greeter-displayserver
# This will eventually go away...
Provides: deprecated()
Requires: xorg-x11-server-Xorg
Requires: %{name} = %{version}-%{release}
Recommends: qt6-qtvirtualkeyboard
BuildArch: noarch
%description x11
This package contains configuration and dependencies for SDDM
to use X11 for the greeter display server.
%endif
%package themes
Summary: SDDM Themes
# for upgrade path
Obsoletes: sddm < 0.2.0-0.12
Requires: %{name} = %{version}-%{release}
BuildArch: noarch
%description themes
A collection of sddm themes, including: elarun, maldives, maya
%prep
%autosetup -p1 %{?commitdate:-n sddm-%{commit}} -n sddm-%version
%if 0%{?fedora}
#FIXME/TODO: use version on filesystem instead of using a bundled copy
cp -v /usr/share/backgrounds/default.png \
src/greeter/theme/background.png
ls -sh src/greeter/theme/background.png
gm mogrify -resize 1920x1200 src/greeter/theme/background.png
ls -sh src/greeter/theme/background.png
%endif
%build
%cmake \
-DBUILD_WITH_QT6:BOOL=ON \
-DBUILD_MAN_PAGES:BOOL=ON \
-DCMAKE_BUILD_TYPE:STRING="Release" \
-DENABLE_JOURNALD:BOOL=ON \
-DSESSION_COMMAND:PATH=/etc/X11/xinit/Xsession \
-DWAYLAND_SESSION_COMMAND:PATH=/etc/sddm/wayland-session
%cmake_build
%install
%cmake_install
mkdir -p %{buildroot}%{_sysconfdir}/sddm.conf.d
mkdir -p %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d
install -Dpm 644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/sddm
install -Dpm 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/sddm-autologin
install -Dpm 644 %{SOURCE12} %{buildroot}%{_sysconfdir}/pam.d/sddm-greeter
install -Dpm 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/sddm.conf
install -Dpm 644 %{SOURCE14} %{buildroot}%{_datadir}/sddm/scripts/README.scripts
install -Dpm 644 %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/sddm
%if %{with x11}
install -Dpm 644 %{SOURCE16} %{buildroot}%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
%endif
mkdir -p %{buildroot}/run/sddm
mkdir -p %{buildroot}%{_localstatedir}/lib/sddm
mkdir -p %{buildroot}%{_sysconfdir}/sddm/
cp -a %{buildroot}%{_datadir}/sddm/scripts/* \
%{buildroot}%{_sysconfdir}/sddm/
# we're using /etc/X11/xinit/Xsession (by default) instead
rm -fv %{buildroot}%{_sysconfdir}/sddm/Xsession
# De-conflict the dbus file
mv %{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf \
%{buildroot}%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
%if 0%{?fedora} && 0%{?fedora} < 43
# Provide unversioned greeter until F40 is EOL
ln -sr %{buildroot}%{_bindir}/sddm-greeter-qt6 %{buildroot}%{_bindir}/sddm-greeter
%endif
%pre
%sysusers_create_compat %{SOURCE17}
%post
%systemd_post sddm.service
# handle incompatible configuration changes
(grep \
-e '^Current=fedora$' \
-e '^\[XDisplay\]$' \
-e '^\[WaylandDisplay\]$' \
%{_sysconfdir}/sddm.conf > /dev/null && \
sed -i.rpmsave \
-e 's|^Current=fedora$|#Current=01-breeze-fedora|' \
-e 's|^\[XDisplay\]$|\[X11\]|' \
-e 's|^\[WaylandDisplay\]$|\[Wayland\]|' \
%{_sysconfdir}/sddm.conf
) ||:
%preun
%systemd_preun sddm.service
%postun
%systemd_postun sddm.service
%files
%license LICENSE
%doc README.md CONTRIBUTORS
%dir %{_sysconfdir}/sddm/
%dir %{_sysconfdir}/sddm.conf.d
%dir %{_prefix}/lib/sddm/sddm.conf.d
%config(noreplace) %{_sysconfdir}/sddm/*
%config(noreplace) %{_sysconfdir}/sddm.conf
%config(noreplace) %{_sysconfdir}/sysconfig/sddm
%config(noreplace) %{_sysconfdir}/pam.d/sddm*
%{_datadir}/dbus-1/system.d/org.freedesktop.DisplayManager-sddm.conf
%{_bindir}/sddm
%{_bindir}/sddm-greeter*
%{_libexecdir}/sddm-helper
%{_libexecdir}/sddm-helper-start-wayland
%{_libexecdir}/sddm-helper-start-x11user
%{_tmpfilesdir}/sddm.conf
%{_sysusersdir}/sddm.conf
%attr(0711, root, sddm) %dir /run/sddm
%attr(1770, sddm, sddm) %dir %{_localstatedir}/lib/sddm
%{_unitdir}/sddm.service
%{_qt6_archdatadir}/qml/SddmComponents/
%dir %{_datadir}/sddm
%{_datadir}/sddm/faces/
%{_datadir}/sddm/flags/
%{_datadir}/sddm/scripts/
%dir %{_datadir}/sddm/themes/
# %%lang'ify? they're small, probably not worth it -- rex
%{_datadir}/sddm/translations*/
%{_mandir}/man1/sddm.1*
%{_mandir}/man1/sddm-greeter.1*
%{_mandir}/man5/sddm.conf.5*
%{_mandir}/man5/sddm-state.conf.5*
%files wayland-generic
# No files since default configuration
%if %{with x11}
%files x11
%{_prefix}/lib/sddm/sddm.conf.d/x11.conf
%endif
%files themes
%{_datadir}/sddm/themes/elarun/
%{_datadir}/sddm/themes/maldives/
%{_datadir}/sddm/themes/maya/
%changelog
%autochangelog
-1
View File
@@ -1 +0,0 @@
rpm.version(gh("sddm/sddm"));
@@ -1,6 +1,6 @@
Name: terra-blueprint-compiler
Version: 0.12.0
Release: 1%?dist
Version: 0.10.0
Release: 1%{?dist}
License: LGPL-3.0-or-later
Summary: Markup language for GTK user interfaces
URL: https://jwestman.pages.gitlab.gnome.org/blueprint-compiler/
+2 -2
View File
@@ -12,8 +12,8 @@
%endif
Name: codium
Version: 1.89.1.24130
Release: 1%?dist
Version: 1.85.2.24019
Release: 1%{?dist}
Summary: Code editing. Redefined.
License: MIT
URL: https://vscodium.com/
+2 -2
View File
@@ -1,6 +1,6 @@
Name: flutter
Version: 3.22.0
Release: 1%?dist
Version: 3.19.0.0.4.pre
Release: 1%{?dist}
Summary: SDK for crafting beautiful, fast user experiences from a single codebase
License: BSD-3-Clause
URL: https://flutter.dev
+1 -6
View File
@@ -1,7 +1,2 @@
let obj = get("https://storage.googleapis.com/flutter_infra_release/releases/releases_linux.json").json();
for release in obj.releases {
if release.channel == "stable" {
rpm.version(release.version);
break;
}
}
rpm.version(obj.releases[0].version);
+2 -2
View File
@@ -7,7 +7,7 @@
# https://github.com/containerd/containerd
%global goipath github.com/containerd/containerd
Version: 1.7.16
Version: 1.7.13
%gometa
@@ -26,7 +26,7 @@ low-level storage and network attachments, etc.}
BUILDING.md README.md RELEASES.md
Name: %{goname}
Release: 1%?dist
Release: 1%{?dist}
Summary: Open and reliable container runtime
License: Apache-2.0
+2 -2
View File
@@ -1,8 +1,8 @@
%define debug_package %nil
Name: moby-buildx
Version: 0.14.0
Release: 1%?dist
Version: 0.12.1
Release: 1%{?dist}
Summary: Docker CLI plugin for extended build capabilities with BuildKit
License: Apache-2.0
+2 -2
View File
@@ -1,8 +1,8 @@
%define debug_package %{nil}
Name: moby-compose
Version: 2.27.0
Release: 1%?dist
Version: 2.24.5
Release: 1%{?dist}
Summary: Define and run multi-container applications with Docker
License: Apache-2.0
@@ -1,6 +1,6 @@
project pkg {
arches = ["x86_64"]
rpm {
spec = "terra-obsolete.spec"
spec = "iosevka-fusion-fonts.spec"
}
}
@@ -0,0 +1,142 @@
%global source_name Iosevka
%global debug_package %{nil}
Name: iosevka-fusion-fonts
Version: 28.1.0
Release: 1%{?dist}
Summary: A custom font based on iosevka
License: OFL-1.1
URL: https://github.com/be5invis/Iosevka
Source0: %{url}/archive/v%{version}.tar.gz
Source1: iosevka-fusion.toml
BuildArch: noarch
BuildRequires: clang
BuildRequires: nodejs-npm
BuildRequires: ttfautohint
%description
Based on Iosevka font, https://github.com/be5invis/Iosevka,
this font mixes elements from various fonts tailored to my personal taste.
%prep
%autosetup -n %{source_name}-%{version}
%__cp %SOURCE1 %{_builddir}/%{source_name}-%{version}/private-build-plans.toml
%build
npm install
npm run build -- ttf::iosevka-fusion
%install
%__mkdir -p %{buildroot}%{_datadir}/fonts/%{name}
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-bold.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Bold.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-bolditalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BoldItalic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-book.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Book.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-bookitalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-BookItalic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-extrabold.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBold.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-extrabolditalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraBoldItalic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-extralight.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLight.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-extralightitalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ExtraLightItalic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-heavy.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Heavy.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-heavyitalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-HeavyItalic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-italic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Italic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-light.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Light.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-lightitalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-LightItalic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-medium.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Medium.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-mediumitalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-MediumItalic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-regular.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Regular.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-semibold.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBold.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-semibolditalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-SemiBoldItalic.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-thin.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-Thin.ttf
%__install -m 0644 \
dist/iosevka-fusion/ttf/iosevka-fusion-thinitalic.ttf \
-T \
%{buildroot}%{_datadir}/fonts/%{name}/IosevkaFusion-ThinItalic.ttf
%files
%license LICENSE.md
%doc README.md
%{_datadir}/fonts/*
%changelog
* Wed Dec 28 2022 windowsboy111 <windowsboy111@fyralabs.com> - 16.8.4
- Initial package
@@ -0,0 +1,190 @@
[buildPlans.iosevka-fusion]
family = "Iosevka Fusion"
spacing = "fixed"
serifs = "sans"
[buildPlans.iosevka-fusion.variants.design]
cv01 = 1 # A cap straight
cv02 = 1 # B cap straight
cv03 = 1 # C cap serifless
cv04 = 1 # D cap serifless
cv05 = 1 # E cap serifless
cv06 = 1 # F cap serifless
cv07 = 6 # G cap toothless rounded serifless hooked
cv08 = 1 # H cap serifless
cv09 = 1 # I cap long serifs
cv10 = 2 # J cap serified
cv11 = 2 # K cap curly
cv12 = 1 # L cap serifless
cv13 = 1 # M cap short middle leg
cv14 = 1 # N cap symmetric
cv15 = 1 # P cap straight
cv16 = 4 # Q cap crossing tail
cv17 = 1 # R cap straight
cv18 = 1 # S cap serifless
cv19 = 1 # T cap serifless
cv20 = 3 # U cap serifless
cv21 = 1 # V cap straight
cv22 = 1 # W straight
cv23 = 1 # X cap straight
cv24 = 1 # Y cap straight
cv25 = 1 # Z cap straight
cv28 = 1 # c serifless
cv33 = 1 # h straight
cv34 = 10 # i serified flat tailed
cv35 = 6 # j flat hook serified
cv37 = 10 # l serified flat tailed
cv42 = 9 # r compact
cv43 = 1 # s serifless
cv44 = 2 # t flat hook
cv49 = 6 # y cursive flat terminal hook
cv53 = 1 # Λ, Δ lambda and delta cap straight
cv54 = 2 # α alpha straight tailed
cv55 = 1 # δ delta rounded top
cv56 = 1 # Γ gamma cap straight
cv57 = 6 # ι iota serified flat tailed
cv58 = 2 # λ lambda top tailed
cv59 = 1 # μ me tailless
cv60 = 2 # ξ xe flat top
cv77 = 13 # 0 oval dashed forward slash
cv80 = 2 # 3 arched
cv82 = 2 # 5 open contour
cv84 = 1 # 7 straight
cv85 = 3 # 8 two asymmetric circles
cv89 = 2 # ~ tilde low
cv90 = 3 # * asterisk five-pointed low
cv91 = 1 # _ underscore right below baseline
cv92 = 1 # ^ uptick high
cv93 = 1 # ( parentheses normal slope
cv94 = 2 # { braces curly
cv95 = 1 # # column straight
cv97 = 4 # @ three-fold, tall height
cv98 = 2 # $ dollar strike through
VXSF = 2 # ¢ cent strike through
cv99 = 1 # % percent dots
VXSA = 1 # | bar natural slope
VXSB = 1 # ' single quote straight
VXSC = 1 # ` grave/backtick straight
VXSD = 1 # ? smooth
cv88 = 2 # .:; square punctuation marks
cv87 = 2 # ijäöü square diacretics
[buildPlans.iosevka-fusion.variants.upright]
cv26 = 3 # a double storey rounded
cv27 = 2 # b rounded
cv29 = 2 # d rounded
cv30 = 1 # e straight
cv31 = 16 # f serifless bottom flat top crossbar at x height
cv32 = 9 # g single storey flat hook earless cornered top
cv36 = 1 # k straight
cv38 = 5 # m earless normal middle leg
cv39 = 3 # n earless straight
cv40 = 2 # p earless
cv41 = 2 # q earless
cv45 = 2 # u rounded
cv46 = 1 # v straight
cv47 = 1 # w straight
cv48 = 1 # x straight
cv50 = 1 # z straight
cv78 = 3 # 1 serified with base
cv79 = 1 # 2 straight
cv81 = 3 # 4 semi-open contour
cv83 = 3 # 6 straight
cv86 = 3 # 9 straight
cv96 = 2 # & et open top (ampersand)
[buildPlans.iosevka-fusion.variants.italic]
cv26 = 1 # a double storey straight
cv27 = 1 # b straight
cv29 = 1 # d straight
cv30 = 2 # e curly
cv31 = 18 # f flat hook tailed crossbar at x height
cv32 = 7 # g single storey flat hook
cv36 = 2 # k curly
cv38 = 1 # m straight normal middle leg
cv39 = 1 # n straight
cv40 = 1 # p straight
cv41 = 1 # q straight
cv45 = 1 # u straight
cv46 = 2 # v curly
cv47 = 2 # w curly short middle top
cv48 = 2 # x curly
cv50 = 4 # z curly
cv78 = 2 # 1 serified no base
cv79 = 2 # 2 curly
cv81 = 1 # 4 closed contour crossing
cv83 = 1 # 6 closed contour
cv86 = 1 # 9 closed contour
cv96 = 4 # & et open top toothed (ampersand)
[buildPlans.iosevka-fusion.weights.thin]
shape = 100
menu = 100
css = 100
[buildPlans.iosevka-fusion.weights.extralight]
shape = 200
menu = 200
css = 200
[buildPlans.iosevka-fusion.weights.light]
shape = 300
menu = 300
css = 300
[buildPlans.iosevka-fusion.weights.regular]
shape = 400
menu = 400
css = 400
[buildPlans.iosevka-fusion.weights.book]
shape = 450
menu = 450
css = 450
[buildPlans.iosevka-fusion.weights.medium]
shape = 500
menu = 500
css = 500
[buildPlans.iosevka-fusion.weights.semibold]
shape = 600
menu = 600
css = 600
[buildPlans.iosevka-fusion.weights.bold]
shape = 700
menu = 700
css = 700
[buildPlans.iosevka-fusion.weights.extrabold]
shape = 800
menu = 800
css = 800
[buildPlans.iosevka-fusion.weights.heavy]
shape = 900
menu = 900
css = 900
[buildPlans.iosevka-fusion.slopes.upright]
angle = 0
shape = "upright"
menu = "upright"
css = "normal"
[buildPlans.iosevka-fusion.slopes.italic]
angle = 9.4
shape = "italic"
menu = "italic"
css = "italic"
[buildPlans.iosevka-fusion.widths.normal]
shape = 600
menu = 5
css = "normal"
[buildPlans.iosevka-fusion.metric-override]
leading = 1350
sb = 60
xHeight = 530
+1
View File
@@ -0,0 +1 @@
rpm.version(gh("be5invis/Iosevka"));
+2 -2
View File
@@ -4,8 +4,8 @@ Nerd Fonts is a project that patches developer targeted fonts with a high
number of glyphs (icons).}
Name: nerd-fonts
Version: 3.2.1
Release: 1%?dist
Version: 3.1.1
Release: 1%{?dist}
URL: https://nerdfonts.com/
Source0: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/readme.md
Source1: https://raw.githubusercontent.com/ryanoasis/nerd-fonts/v%version/LICENSE
@@ -1,6 +1,6 @@
Name: sarasa-gothic-fonts
Version: 1.0.12
Release: 1%?dist
Version: 1.0.5
Release: 1%{?dist}
URL: https://github.com/be5invis/Sarasa-Gothic
Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z
Source1: %url/releases/download/v%version/Sarasa-SuperTTC-%version.7z
+9 -5
View File
@@ -1,10 +1,11 @@
Name: seto-fonts
Version: 6.20
Release: 3%?dist
Release: 2%?dist
URL: https://setofont.osdn.jp/
Source0: https://github.com/terrapkg/pkg-seto-fonts/archive/refs/tags/%version.tar.gz
Source0: https://osdn.net/frs/redir.php?m=nchc&f=setofont%2F61995%2Fsetofont_v_6_20.zip
License: OFL-1.1
Summary: A handwritten font that contains kanji up to JIS 4th level and difficult kanji
BuildRequires: unzip
BuildArch: noarch
@@ -13,7 +14,7 @@ BuildArch: noarch
%prep
%setup -q -n pkg-seto-fonts-%version
%setup -q -n setofont
%build
@@ -24,8 +25,11 @@ install -Dm644 *.ttf %buildroot/%_datadir/fonts/%name/
%files
%doc readme.txt
%license LICENSE.md
%_datadir/fonts/%name/
%changelog
%autochangelog
* Sun Jun 18 2023 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-2
- Fix install dir.
* Tue Nov 22 2022 windowsboy111 <windowsboy111@fyralabs.com> - 6.20-1
- Initial package
+3 -4
View File
@@ -1,10 +1,9 @@
%define osuresver 2024.510.0
%define osuresver 2024.129.0
%global debug_package %{nil}
%define __strip /bin/true
Name: osu-lazer
Version: 2024.412.1
Release: 1%?dist
Version: 2024.131.0
Release: 1%{?dist}
Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
ExclusiveArch: x86_64
URL: https://osu.ppy.sh/
@@ -1,13 +1,13 @@
%global real_name prismlauncher
%global nice_name PrismLauncher
%global commit 93da066aa24220097d6f424fe13a74bbcfe54c21
%global commit 6935c0dc3ba6463b95c66c12ff2e2e0de1fa5ec0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f
%global quazip_commit 6117161af08e366c37499895b00ef62f93adc345
%global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8
%global commit_date 20240513
%global commit_date %(date '+%Y%m%d')
%global snapshot_info %{commit_date}.%{shortcommit}
%bcond_without qt6
@@ -32,8 +32,8 @@ Name: prismlauncher-nightly
%else
Name: prismlauncher-qt5-nightly
%endif
Version: 9.0^%{snapshot_info}
Release: 1%?dist
Version: 8.0^%{snapshot_info}
Release: 1%{?dist}
Summary: Minecraft launcher with ability to manage multiple instances
License: GPL-3.0-only AND Apache-2.0 AND LGPL-3.0-only AND GPL-3.0-or-later AND GPL-2.0-or-later AND ISC AND OFL-1.1 AND LGPL-2.1-only AND MIT AND BSD-2-Clause-FreeBSD AND BSD-3-Clause AND LGPL-3.0-or-later
Group: Amusements/Games
@@ -76,9 +76,8 @@ Requires(postun): desktop-file-utils
Requires: qt%{qt_version}-qtimageformats
Requires: qt%{qt_version}-qtsvg
Requires: javapackages-filesystem
Recommends: java-21-openjdk
Recommends: java-17-openjdk
Suggests: java-1.8.0-openjdk
Requires: java-17-openjdk
Requires: java-1.8.0-openjdk
# xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128
Recommends: xrandr

Some files were not shown because too many files have changed in this diff Show More