Compare commits

...

238 Commits

Author SHA1 Message Date
sadlerm4 d2b7f887fd chore(el10): rm packages in nim 2025-02-14 17:48:29 +11:00
sadlerm4 1ad1dc9182 chore(el10): remove packages (#3321)
* chore(el10): remove bazzite-specific packages

* chore(el10): remove misc packages either in upstream or are not maintained in terra

Ref: #2876

* revert: "chore(el10): remove bazzite-specific packages"

Ref: d5d5b6958f

* chore(el10): rm mesa-freeworld and packages in haskell and zig

* rm: xyproto-{env,textoutput,vt100} (#3302)

Close #3088.

(cherry picked from commit 1efece3)

---------

Co-authored-by: madomado <madonuko@outlook.com>
2025-02-14 13:26:50 +08:00
sadlerm4 f8aa9506cd fix(el10): openssl pkg name (#3320) 2025-02-14 12:11:40 +08:00
Raboneko 25618dff62 youtube-music: fix WMClass (#3324) (#3327)
(cherry picked from commit 3bdb0e8da3)

Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>
2025-02-13 20:13:00 -06:00
Raboneko 89d1681b2b bump: ruffle sass 2025-02-14 01:48:58 +00:00
Raboneko d02002722b bump(nightly): envision nightly mpv nightly nightly prismlauncher-nightly 2025-02-14 01:35:37 +00:00
Raboneko a81e656056 bump: stable 2025-02-13 23:17:23 +00:00
Raboneko 445f42cbce bump: discord-canary-openasar discord-canary 2025-02-13 22:45:38 +00:00
Raboneko bdf9229066 bump: discord-canary-openasar discord-canary 2025-02-13 20:58:37 +00:00
Raboneko 66fffb55ac bump: stable 2025-02-13 20:37:33 +00:00
Raboneko 7a986ad154 bump: preview 2025-02-13 19:28:00 +00:00
Raboneko 349d272d90 bump: discord-ptb-openasar discord-ptb preview stable 2025-02-13 19:17:57 +00:00
Willow 09d7034981 Update bootstrap.yml
Update image to Alma

Signed-off-by: Willow <willow@willowidk.dev>
2025-02-13 11:50:05 -06:00
Raboneko e6e14ca042 bump(branch): kf6-kio 2025-02-13 17:32:56 +00:00
madonuko 9fee4fdd26 chore(sync): frawhide -> el10 2025-02-14 00:18:50 +08:00
Gilver 8f6903ca6d Backport (openh264): Rawhide changes (#3291) 2025-02-12 03:46:02 -06:00
Raboneko a66909dee4 [el10] Fix (anki-bin): New files (#3277) (#3283)
* Fix (anki-bin): New files (#3277)

Signed-off-by: Gilver <rockgrub@disroot.org>
(cherry picked from commit 8fbbe3ed8f)

* Backport frawhide

Signed-off-by: Gilver <rockgrub@disroot.org>

---------

Signed-off-by: Gilver <rockgrub@disroot.org>
Co-authored-by: Gilver <rockgrub@disroot.org>
2025-02-11 20:18:34 -06:00
Raboneko 14bbd61b88 bump: apparmor 2025-02-11 23:45:31 +00:00
Gilver 41b8ec40fe [el10] Fix (scenefx): Add missing build dependencies (#3275) (#3280)
Signed-off-by: Gilver <rockgrub@disroot.org>
2025-02-11 12:21:49 -06:00
Raboneko 30ae3a469e bump: fluent-icon-theme 2025-02-10 11:47:43 +00:00
Raboneko 1bfe87633a add: bun-bin (#3253) (#3268)
* add: bun-bin

Closes #3159.

* Update bun-bin.spec

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

* debug_package nil

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit f195473bcb)

Co-authored-by: madomado <madonuko@outlook.com>
2025-02-10 13:51:12 +08:00
Raboneko 9fdbfbba52 fix: ruffle (#3256) (#3262)
remove the patch and use `sed` instead

(cherry picked from commit 865ce7e301)

Co-authored-by: madomado <madonuko@outlook.com>
2025-02-10 13:35:47 +08:00
Raboneko c64aa6c883 bump: tela-icon-theme 2025-02-10 05:34:23 +00:00
Raboneko 88c11c5fdf add: golang-github-dhth-prs (#3254) (#3265)
* add: prs

* use mock to build

* Revert "use mock to build"

This reverts commit c69f400111.

* build without fedora macros

(cherry picked from commit 73d7a032ef)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2025-02-10 04:59:11 +11:00
Raboneko 192743e6b3 add: EmulationStation-DE (#3242) (#3259)
* add: EmulationStation-DE

* fix version template

* Disable application updater, add file provider

* Backport libgit2 macro fix from upstream, disable debugsource because there's none

* Don't actually deinit on launch, since this will cause issues on non-KMS sessions.

* try using CXX17

* Revert "try using CXX17"

This reverts commit 14a1466832.

* Update anda/games/emulationstation-de/emulationstation-de.spec

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
Signed-off-by: Cappy Ishihara <cappy@cappuchino.xyz>

* Apply suggestions from code review

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
Signed-off-by: Cappy Ishihara <cappy@cappuchino.xyz>

* Don't use AUR build flags

---------

Signed-off-by: Cappy Ishihara <cappy@cappuchino.xyz>
Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
(cherry picked from commit fc335382a7)

Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>
2025-02-10 00:38:16 +08:00
Raboneko 2fdc6103dc fix: glow (#3244) (#3247)
(cherry picked from commit 886e5f664a)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2025-02-09 15:24:21 +08:00
Raboneko 522dfc74da bump: cmake-extras 2025-02-08 15:59:06 +00:00
Raboneko 75a465c6f5 bump: sheldon 2025-02-08 13:22:31 +00:00
Raboneko 78a596bd4c bump: nim 2025-02-06 09:17:48 +00:00
Raboneko cb7bef85fa fix(walker): workaround for F40 Go not producing debug packages (#3221) (#3233)
* Build workaround for Go not producing debug symbols on F40

Signed-off-by: Gil <rockgrub@disroot.org>

* Update golang-github-abenz1267-walker.spec

Signed-off-by: Gil <rockgrub@disroot.org>

---------

Signed-off-by: Gil <rockgrub@disroot.org>
(cherry picked from commit b1fec8dce2)

Co-authored-by: Gil <rockgrub@disroot.org>
2025-02-06 16:59:05 +08:00
Raboneko 4ab45b683a add: tela-icon-theme (#3206) (#3231)
* add: tela-icon-theme

* fix: trigger update on new commits

the release schedule of other themes from the same author seems spotty

* fix: tela-icon-theme date

* update tela-icon-theme license

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>

---------

Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit 4f124129c5)

Co-authored-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
2025-02-06 16:39:11 +08:00
Raboneko 9f8cc9be8d add: fluent-kde-theme (#3207) (#3228)
* add: fluent-kde-theme

* update fluent-kde-theme license

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>

---------

Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit 73a539c5e7)

Co-authored-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
2025-02-06 16:38:45 +08:00
Raboneko 83c15163ab feat: add some missing update scripts (#3197) (#3218)
* chore: add update.rhai for switcheroo-control

Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>

* chore: add update.rhai for kf6-kio

Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>

* chore: add update.rhai for libva-nvidia-driver

Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>

* fix: libva-nvidia-driver update script

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>

* delete kf6-kio update script

Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>

---------

Signed-off-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit f0e764a420)

Co-authored-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
2025-02-06 16:01:03 +08:00
Raboneko 186953fe23 fix(tdlib): remove rm step for RPMBuild (#3124) (#3224)
* Fix: Use Mock

Signed-off-by: Gil <rockgrub@protonmail.com>

* Update tdlib-nightly.spec

Signed-off-by: Gil <rockgrub@protonmail.com>

* Let's try this instead I guess

Signed-off-by: Gil <rockgrub@protonmail.com>

* Nevermind since GCC 15 in Mock is breaking ARM

Signed-off-by: Gil <rockgrub@protonmail.com>

---------

Signed-off-by: Gil <rockgrub@protonmail.com>
(cherry picked from commit af2a4b0c47)

Co-authored-by: Gil <rockgrub@disroot.org>
2025-02-06 16:00:34 +08:00
Raboneko 5501411cde add: arduino-create-agent (#3129) (#3188) 2025-02-03 10:30:14 -06:00
Raboneko 9d1d1cd4a0 bump: opentabletdriver 2025-02-02 14:55:53 +00:00
Raboneko ef0cc6bdf1 Add: abuild (#3175) (#3181)
* Add: abuild

* fix spacing and add noarch

(cherry picked from commit b0c9eb1d85)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2025-02-01 23:25:05 -06:00
Raboneko b984a52eca Add: geteltorito (#3174) (#3178)
* Package geteltorito

* add noarch

(cherry picked from commit e20bc49052)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2025-02-01 23:23:20 -06:00
Raboneko b23ed7da9e bump: libhelium 2025-01-27 21:21:12 +00:00
Raboneko 98e9102681 bump: maple 2025-01-27 04:40:29 +00:00
Raboneko 531e706bf9 Fix (Espanso): Drop migrate (#3121) (#3135)
* Fix: Drop migrate

* Fix: No I seriously don't know why I always forget rel

(cherry picked from commit cf309e495b)

Co-authored-by: Gil <rockgrub@protonmail.com>
2025-01-26 02:13:44 -06:00
Raboneko cbdcc7c1fd bump: cbfstool 2025-01-25 02:32:59 +00:00
Raboneko 7add625670 bump: espanso-wayland espanso-x11 2025-01-24 23:20:00 +00:00
Raboneko 29641906bf bump: espanso-wayland espanso-x11 2025-01-24 22:47:33 +00:00
Raboneko da950f1dc0 add: matugen (#3099) (#3104)
* add: matugen

* remove %cargo_build

* packager

* source version string in update.rhai from crate

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>

* remove unneeded functions from update.rhai

---------

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit 63b54b3572)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2025-01-23 11:37:03 +08:00
Raboneko 467e1d8a46 fix(opentabletdriver): Add missing file (#3078) (#3082)
* Fix (opentabletdriver): Missing file

Signed-off-by: Gil <rockgrub@protonmail.com>

* Fix (opentabletdriver-nightly): Missing file

Signed-off-by: Gil <rockgrub@protonmail.com>

* Update opentabletdriver-nightly.spec

Signed-off-by: Gil <rockgrub@protonmail.com>

* I always forget rel bumps

Signed-off-by: Gil <rockgrub@protonmail.com>

---------

Signed-off-by: Gil <rockgrub@protonmail.com>
(cherry picked from commit 52fc3a8b3b)

Co-authored-by: Gil <rockgrub@protonmail.com>
2025-01-20 18:56:32 +08:00
Raboneko 47ba1ec013 bump: lomiri-schemas 2025-01-20 08:24:54 +00:00
Raboneko 4d468fa75e [el10] Fix: gamescope-session (#3059) (#3062)
* Fix: gamescope-session (#3059)

* Fix: Add %changelog so build doesn't complain

Signed-off-by: Gil <rockgrub@protonmail.com>

* Fix: File no longer exists?

Signed-off-by: Gil <rockgrub@protonmail.com>

---------

Signed-off-by: Gil <rockgrub@protonmail.com>
(cherry picked from commit 53005d54b1)

* Update gamescope-session.spec

---------

Co-authored-by: Gil <rockgrub@protonmail.com>
Co-authored-by: madomado <madonuko@outlook.com>
2025-01-19 16:45:52 +08:00
Raboneko bb16ffd8c6 Remove: terra-sddm and terra-wl-clipboard (#3048) (#3065)
(cherry picked from commit 0aadea3513)

Co-authored-by: Gil <rockgrub@protonmail.com>
2025-01-19 11:16:38 +08:00
Raboneko 19f6a3e3c4 bump: blueprint-compiler 2025-01-17 23:16:50 +00:00
madonuko 15cdad1bbd fix(ghostty): additional licenses, new upstream files (#2890) 2025-01-16 21:56:52 +08:00
Raboneko 268d90f2b1 add: sticky (#3012) (#3019)
(cherry picked from commit 0e598c0d9c)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2025-01-16 21:06:03 +08:00
Raboneko a9292747e2 bump: youki 2025-01-16 11:14:34 +00:00
Raboneko a9bea1fe41 Fix (protobuf): Move to Extras (#3013) (#3016)
* Fix: Move to Extras

Signed-off-by: Gil <rockgrub@protonmail.com>

* Fix: Quotes

Signed-off-by: Gil <rockgrub@protonmail.com>

---------

Signed-off-by: Gil <rockgrub@protonmail.com>
(cherry picked from commit d7a342150c)

Co-authored-by: Gil <rockgrub@protonmail.com>
2025-01-16 18:17:20 +08:00
Raboneko 7172b204f9 bump: choosenim (#2017) (#3005)
(cherry picked from commit 650abcf67e)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-16 00:25:46 +08:00
Raboneko 2a65fa1d6d fix: dive (#2986) (#3002)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 3d330414e0)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-16 00:25:38 +08:00
Raboneko 19ad474c2d bump: dive 2025-01-15 13:31:53 +00:00
Raboneko 44c11480d9 fix: keyd (#2969) (#2976)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit bde4443fdb)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-15 19:01:20 +08:00
Raboneko 034e714d9c bump(nim,nim-nightly): bump release (#2957) (#2959)
(cherry picked from commit ae1cafc2e6)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-15 12:24:47 +08:00
madonuko d397a81fa5 chore: backport the nim fixes from #2955 2025-01-15 00:45:17 +08:00
Raboneko 8d93c6975c fix: mkfstab` (#2949) (#2952)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit b8d3d00fa4)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-13 22:55:10 +08:00
Raboneko 7fe8fcf7e0 bump: mkfstab 2025-01-13 13:14:00 +00:00
Raboneko 4d96284bc2 fix(yt-dlp): try using mock instead (#2935) (#2945)
(cherry picked from commit e1b301c1c3)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-13 00:26:11 +08:00
Raboneko 4861d78287 [IPU6 Part 1] Add: IPU6 Camera Stack (Without ipu6-camera-hal) (#2919) (#2931)
* Add: IPU6 Camera Stack

* Fix: Use Mock

* Change: Remove ipu6-camera-hal to move to another PR

(cherry picked from commit 562cf68d3f)

Co-authored-by: Gil <rockgrub@protonmail.com>
2025-01-12 18:30:20 +08:00
Raboneko 0d90ae259f add: sheldon (#2897) (#2918)
* add: sheldon

* pkgconfig(openssl)

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit daee1f621a)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-12 18:13:50 +08:00
Raboneko 7e3145699e Add: v4l2-relayd (#2904) (#2911)
(cherry picked from commit 8cec8576cf)

Co-authored-by: Gil <rockgrub@protonmail.com>
2025-01-12 18:13:38 +08:00
Raboneko c7f79ba238 fix: swww (#2905) (#2908)
* fix: swww

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

* files

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 02be8ba29e)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-12 02:06:00 +08:00
Raboneko 73f818144e bump: lomiri-app-launch 2025-01-11 17:13:24 +00:00
Raboneko 00ee44999d fix: rgbds (#2757) (#2901)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit af44ae46f4)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-09 23:41:01 +08:00
Raboneko 42b32fbbde bump: apparmor 2025-01-09 10:58:43 +00:00
Raboneko 28dd497e4e bump: nph 2025-01-08 11:16:30 +00:00
Raboneko 98b988b60f bump: lomiri-indicator-network lomiri-settings-components 2025-01-07 16:05:21 +00:00
Raboneko e3d31e982d bump: lomiri-ui-toolkit open-in-mpv 2025-01-07 09:18:36 +00:00
Raboneko cbd9f93e08 bump: apparmor 2025-01-06 19:36:43 +00:00
Raboneko e2cd2289dd bump: lomiri-app-launch 2025-01-06 15:55:48 +00:00
Raboneko 00b1ff2d8b bump: lomiri-api 2025-01-06 15:31:58 +00:00
Raboneko 6e9d373906 add: topgrade (#2849) (#2887)
closes #2765

(cherry picked from commit 482456c58c)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-05 14:55:52 -08:00
Raboneko 16f2482bd8 bump: vala-panel-appmenu 2025-01-05 22:48:18 +00:00
sadlerm4 1bb61c1666 feat: andax (#2875)
cherry picks @38414e6 @aa21bc8 @3566e7e
2025-01-05 02:22:51 +08:00
Raboneko b05419b52b bump: unity-shell 2025-01-03 22:50:17 +00:00
Raboneko e4fddfa1a8 bump: compiz9 2025-01-03 15:55:59 +00:00
Raboneko 135943e065 bump: youki 2025-01-03 12:42:04 +00:00
Raboneko 7d6e82568d bump: neovide 2025-01-03 10:17:29 +00:00
Raboneko 82eab5e6af Add: Audacity (#2856) (#2861)
* add tograde

* add audacity

* Remove old files

(cherry picked from commit 25923de80b)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2025-01-03 17:03:52 +08:00
Raboneko dd879978c0 bump: vala-panel-appmenu 2025-01-02 13:32:01 +00:00
Raboneko 8fe609a586 bump: submarine 2025-01-02 07:56:20 +00:00
Raboneko 5da80fc81f bump: vala-panel-appmenu 2025-01-01 22:45:46 +00:00
Raboneko 4e5e5a9a44 bump: lomiri-schemas 2025-01-01 09:45:35 +00:00
Raboneko a7d254bca7 add: swww (#2744) (#2806)
closes #2743

(cherry picked from commit acf1c96cd4)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-01 14:39:55 +08:00
Raboneko 47b7d52fa8 add: lightdm-kde-greeter (#2734) (#2808)
(cherry picked from commit 0620bbd852)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-01 14:39:36 +08:00
Raboneko 355e25b92f feat: rename golang packages to shorter names (#2791) (#2811)
(cherry picked from commit 6be99194c0)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-01 14:39:23 +08:00
Raboneko 61b15c91a1 fix(update): zrythm (#2740) (#2813)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 324180adc1)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-01 14:39:13 +08:00
Raboneko fbe07df9fa add: mise (#2691) (#2818)
* add: mise

* no test

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

* Update rust-mise.spec

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit d8d774179a)

Co-authored-by: madomado <madonuko@outlook.com>
2025-01-01 14:38:53 +08:00
lea b39a37baf8 Fix: Several fixes and additions from now reverted PR (#2828) (#2832)
(cherry picked from commit df802b1aa9)

# Conflicts:
#	anda/devs/ghostty/nightly/ghostty-nightly.spec

Co-authored-by: Gil <rockgrub@protonmail.com>
2024-12-31 13:49:53 -08:00
Raboneko a589cf6f4f bump: stable 2024-12-31 20:31:16 +00:00
Raboneko a12ae00359 Revert "Add: GLFW Builds of Ghostty, Changes to Main Specs For Compatibility …" (#2823) (#2827)
This reverts commit d990cae780.

(cherry picked from commit 27b491a91d)

Co-authored-by: lea <lleyton@fyralabs.com>
2024-12-31 12:19:10 -08:00
Raboneko c288535e5b follow package guidelines (#2802) (#2822)
(cherry picked from commit 76cc49c6b1)

Co-authored-by: Brice <59537185+rhodes-b@users.noreply.github.com>
2024-12-31 12:10:19 -08:00
Raboneko 557c254753 Add: GLFW Builds of Ghostty, Changes to Main Specs For Compatibility (#2788) (#2800)
* Add: GLFW builds of Ghostty, edit existing builds for shared deps, add build deps to be explicitly called (just in case), some cleanup

* Add: Add warning about GLFW builds possibly being unstable

* Fix: Removed duplicate text (thanks mouse)

* Update ghostty-nightly.spec

Signed-off-by: Gil <rockgrub@protonmail.com>

* Cleanup: Removed unused build deps, removed unused patches (for now?)

* Fix: New icon size in Tip GTK (will need to be done in stable in 1.0.1), minor changes to summaries

* Resolve: Date conflict

---------

Signed-off-by: Gil <rockgrub@protonmail.com>
(cherry picked from commit d990cae780)

Co-authored-by: Gil <rockgrub@protonmail.com>
2025-01-01 00:41:46 +08:00
madonuko 636d51c011 feat(ci)!: remove lint.yml (#2793) 2024-12-31 03:25:25 +08:00
Raboneko 22b996f242 bump: walker 2024-12-29 09:21:45 +00:00
Raboneko 972e9894a7 Add: Ghostty and Ghostty Tip (#2760) (#2786)
* Add: Ghostty and Ghostty Tip

* fix: maybe strip the binary?

* Update anda/devs/ghostty/nightly/ghostty-nightly.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Gil <rockgrub@protonmail.com>

* Update ghostty-nightly.spec

Add: Provides

Signed-off-by: Gil <rockgrub@protonmail.com>

* Update ghostty-nightly.spec

Signed-off-by: Gil <rockgrub@protonmail.com>

* Add: .diff patches

* Fix: autosetup

Signed-off-by: Gil <rockgrub@protonmail.com>

* fix update script

* fix ghostty stable

* Fix: Terminfo and shell integration should be their own packages (see: Kitty packaging)

* Fix: What happened to my descriptions?

* Fix: Installation and build deps for man pages, package deps, some cleanup, commit bump on Tip, enabled debug packages for Tip

* Fix: Change libadwaita to an optional dep due to latest Ghostty commits (see: 5293fc9)

---------

Signed-off-by: Gil <rockgrub@protonmail.com>
Co-authored-by: madonuko <madonuko@outlook.com>
(cherry picked from commit 3c3863caf9)

Co-authored-by: Gil <rockgrub@protonmail.com>
2024-12-29 16:16:11 +08:00
Raboneko 4607c2eaaa Add: arduino-fwuploader (#2763) (#2770)
* package arduino-cli

* package arduino-lint

* remove old files

* package rpi-update

* remove old files

* exclusive arch in hcl

* package arduino-language-server

* remove old files

* package arduino-fwuploader

* remove old files

(cherry picked from commit 0ef73d1a56)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-12-29 02:05:55 +08:00
Raboneko 8f0a65a739 Add: arduino-langauge-server (#2774)
* package arduino-cli

* package arduino-lint

* remove old files

* package rpi-update

* remove old files

* exclusive arch in hcl

* package arduino-language-server

* remove old files

* No debug package

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

---------

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
(cherry picked from commit 6890a3d86c)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-12-29 02:05:46 +08:00
Raboneko b44f3dd28a bump: keyd 2024-12-28 08:25:42 +00:00
Raboneko 97bace3278 bump: walker 2024-12-27 08:55:31 +00:00
Raboneko a9d265e5ed bump: open-in-mpv 2024-12-26 10:37:03 +00:00
Raboneko baf3c4e824 bump: srpm-macros 2024-12-26 08:29:18 +00:00
Raboneko 3f59f2810b bump: srpm-macros 2024-12-26 07:38:52 +00:00
Raboneko 18650fe704 bump: open-in-mpv 2024-12-25 22:21:20 +00:00
Raboneko 0fdb0dbe1f bump: rgbds 2024-12-25 16:24:53 +00:00
Raboneko 40657c5f71 add: walker (#2742) (#2748)
closes #2741

(cherry picked from commit 65fda53c3e)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-25 02:41:09 +08:00
Raboneko 822bcfcfe0 bump: espanso-wayland espanso-x11 2024-12-24 14:15:34 +00:00
Raboneko 33c5136323 fix: use gh tags to update espanso (#2732) (#2738)
(cherry picked from commit 99fa158ca0)

Co-authored-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
2024-12-24 21:56:45 +08:00
Raboneko d8fefe97e7 bump: srpm-macros 2024-12-23 19:35:13 +00:00
Raboneko 7fa9617ae2 bump: xpadneo 2024-12-23 13:33:20 +00:00
Raboneko e6ad0f1a7f fix: open-in-mpv (#2717) (#2725)
* fix make target due to upstream change

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>

* use anda macros to clone git repository

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>

---------

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>
(cherry picked from commit 34089ebf36)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2024-12-23 17:17:56 +08:00
Raboneko d488b9a76e bump: srpm-macros 2024-12-23 08:30:30 +00:00
Raboneko 3eb9ac3a83 Add: pbcli (#2711) (#2715)
* Add pbcli

* Update anda/misc/pbcli/update.rhai

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Gil <130161554+ShinyGil@users.noreply.github.com>

* Update anda/misc/pbcli/pbcli.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Gil <130161554+ShinyGil@users.noreply.github.com>

* Update anda/misc/pbcli/pbcli.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Gil <130161554+ShinyGil@users.noreply.github.com>

* Update anda/misc/pbcli/pbcli.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Gil <130161554+ShinyGil@users.noreply.github.com>

* Update anda/misc/pbcli/pbcli.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Gil <130161554+ShinyGil@users.noreply.github.com>

* Update anda/misc/pbcli/pbcli.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Gil <130161554+ShinyGil@users.noreply.github.com>

* Update anda/misc/pbcli/pbcli.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Gil <130161554+ShinyGil@users.noreply.github.com>

---------

Signed-off-by: Gil <130161554+ShinyGil@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit fad2467841)

Co-authored-by: Gil <130161554+ShinyGil@users.noreply.github.com>
2024-12-22 15:24:04 +08:00
Raboneko c3cd060576 bump: sound 2024-12-21 22:18:51 +00:00
Raboneko fcf9d1ebca bump: open-in-mpv 2024-12-21 16:26:31 +00:00
madonuko e4b8175213 add: mold 2024-12-20 16:41:15 +08:00
madonuko a324bff65b add: dwarf, mimalloc 2024-12-20 16:23:20 +08:00
Raboneko 6a80625eb3 fix: fontviewer (#2700) (#2705)
(cherry picked from commit a4c6ca5bcf)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2024-12-20 13:38:08 +08:00
Raboneko 236448f7b0 add: wpaperd (#2679) (#2699)
* add: wpaperd

Closes #2678

* forgot description for doc subpackage

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

* Update wpaperd.spec

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

* I can't spell

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

* bye ps1

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 3ad647222f)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-20 13:36:14 +08:00
Raboneko 3e3aa16084 add: mpvpaper (#2682) (#2695)
* add: mpvpaper

closes #2680

* ninja-build

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

* Update mpvpaper.spec

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

* gz

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 2200dc49e1)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-20 01:32:26 +08:00
Raboneko 8026f499e6 add: clipse (#2675) (#2686)
* add: clipse

* -linkmode=external?

(cherry picked from commit de88c606cf)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-20 01:29:32 +08:00
Raboneko 9e517ed55f add: cliphist (#2676) (#2690)
(cherry picked from commit c56ff01484)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-20 01:29:25 +08:00
Raboneko d9b5c8a785 bump: arduino-lint 2024-12-19 08:56:07 +00:00
Raboneko 5c37aa1197 add: ctwm (attempt 2) (#1400) (#2674)
* feat: ctwm

* per mado suggestion

* wrong month

* Update anda/desktops/ctwm/ctwm.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Jaiden Riordan <jade@e.email>

* Update anda/desktops/ctwm/ctwm.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Jaiden Riordan <jade@e.email>

* fix ctwm

* Add myself in changelog

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* %description grammer lol

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

---------

Signed-off-by: Jaiden Riordan <jade@e.email>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
Co-authored-by: Owen-sz <owen@fyralabs.com>
Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
(cherry picked from commit 1ed10048d4)

Co-authored-by: Jaiden Riordan <jade@e.email>
2024-12-19 12:56:12 +08:00
Raboneko cbfb3c82b8 bump: opentabletdriver 2024-12-18 14:17:18 +00:00
Raboneko c816b710ee bump: fontviewer 2024-12-17 23:20:09 +00:00
Raboneko ec6de28999 fix: gping (#2663) (#2670)
* buildrequires mold

* shebangs imply the existence of theybangs

(cherry picked from commit 2927f233cf)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2024-12-18 03:46:54 +08:00
Raboneko bd366cab4b fix(ci): decrease anda update verbosity (#2652) (#2666)
(cherry picked from commit a913b6609b)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-18 03:35:39 +08:00
Raboneko 2319bb8799 fix(kotlin): non-existent binary (#2656) (#2660)
(cherry picked from commit 79d3dae824)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2024-12-17 13:56:46 +08:00
Raboneko 88082f5411 bump: espanso-wayland espanso-x11 2024-12-16 14:23:55 +00:00
Raboneko 05ace7c7d9 bump: espanso (#2644) (#2649)
(cherry picked from commit 289316fb15)

Co-authored-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
2024-12-16 22:09:29 +08:00
madonuko 1a12a8b695 Merge branch 'el10' of github.com:terrapkg/packages into el10 2024-12-15 16:41:59 +08:00
madonuko f8bffef63f fix(ci): server to madoguchi and subatomic 2024-12-15 16:41:23 +08:00
Raboneko 79a810f524 Add: rpi-update (#2634) (#2642) 2024-12-15 01:59:31 -06:00
Raboneko 4b6ddc514c add modulo feature to espanso-wayland (#2628) (#2638)
* fix(espanso): add missing build req, mold

* fix(espanso-wayland): add modulo feature (#2626)

(cherry picked from commit 3a5c5cdb77)

Co-authored-by: Alberto García <4411661+GarciaLnk@users.noreply.github.com>
2024-12-15 13:11:56 +08:00
Raboneko ef0132f760 package spotx-bash (#2629) (#2633)
(cherry picked from commit 0dbbb8f1a8)

Co-authored-by: J. <105894089+Its-J@users.noreply.github.com>
2024-12-14 19:13:43 -06:00
Raboneko f74bb35fb8 fix: manrope-fonts (#2617) (#2625)
(cherry picked from commit 8a234fef8c)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-15 01:24:52 +08:00
madonuko e130b5d22e Merge branch 'el10' of github.com:terrapkg/packages into el10 2024-12-15 01:11:25 +08:00
madonuko 12f1478284 feat(ci): fix bugs with update backporting, add weekly mode, remove f39, add el10 (#2610) 2024-12-15 01:10:36 +08:00
Raboneko d7e16285e4 add: icoextract-thumbnailer (#2618) (#2622)
(cherry picked from commit 258be4ae73)

Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>
2024-12-15 01:02:41 +08:00
madonuko b794b97c41 feat(ci): use -rrpmbuild 2024-12-14 16:46:08 +08:00
Raboneko 1a644e552e add: zrythm (#2575) (#2603)
* add: zrythm

* make it *work*

* bump

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit e5db106676)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-11 15:55:58 +08:00
Raboneko 230eac023e fix: tdlib (#2456) (#2600)
* fix: tdlib

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

* Update tdlib-nightly.spec

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

* Update tdlib-nightly.spec

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 903f9b68ba)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-11 01:43:39 +08:00
Raboneko e30717802c fix: prismlauncher-nightly (#2467) (#2595)
* fix: prismlauncher-nightly

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

* update libnbtplusplus

thanks to #2511!

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

* fix nightly and non-nightly prismlauncher

* Delete 2532.patch

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 81a0cd8da0)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-11 01:43:26 +08:00
Raboneko 7de2c50ad7 Add: arduino-lint (#2580) (#2588)
* package arduino-cli

* package arduino-lint

* remove old files

(cherry picked from commit 3ea06252f5)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-12-09 16:26:15 +08:00
madomado 82fc0bab09 fix(ci/bootstrap): don't sed the repo config
Signed-off-by: madomado <madonuko@outlook.com>
2024-12-06 03:01:28 +08:00
madomado 131578d0e1 fix(ci/bootstrap): update link to latest release package
Signed-off-by: madomado <madonuko@outlook.com>
2024-12-06 02:27:47 +08:00
Raboneko a8c7037845 add: zsh-autocomplete (#2565) (#2571)
Closes #2533

(cherry picked from commit 571cffb18e)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-05 13:51:51 +08:00
Raboneko 2f6b46664e add: WoeUSB-ng (#2561) (#2574)
(cherry picked from commit 98bd6f82a0)

Co-authored-by: madomado <madonuko@outlook.com>
2024-12-05 13:51:39 +08:00
Raboneko 07610e64cf Fix: msm-cros-efs-loader (#2557) (#2560)
* FIx: msm-cros-efs-loader name as to not conflict with fedora package

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Provide fedora package name

* remove qrtr, in kernel now

---------

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
(cherry picked from commit da4b02d397)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-12-04 17:59:46 +08:00
Raboneko 1cf85c302a fix: picotool (#2520) (#2545)
funny files

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 53e5fb590a)

Co-authored-by: madomado <madonuko@outlook.com>
2024-11-30 14:43:15 +08:00
Raboneko 869d59a269 fix: anki (#2525) (#2531)
* fix: anki

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

* Update anki.spec

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 04929dc5a2)

Co-authored-by: madomado <madonuko@outlook.com>
2024-11-29 00:46:41 +08:00
Raboneko c5d621fd3d Add: Raspberry Pi Picotool (#2500) (#2510)
* sign

* Add: Picotool

* Remove rpi-utils folder

* Add sdk_version update script

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Fix second Rhai script

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

---------

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit f63e40f454)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-11-21 21:25:37 +08:00
Raboneko b68e2b66fd sign (#2499) (#2504)
(cherry picked from commit 92777d31f0)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-11-21 21:22:17 +08:00
Raboneko 4adff8e330 Add: Polycrystal (#2498) (#2506)
* Add: Polycrystal

* switch from commit based to release based

* WIP - add systemd macros and potential preset file calling

* install service file

* Forgot to put the preset file in the files section

* update changelog

* add config and data dirs

* enable systemd scriptlets

* create empty dirs

* fix changelog and update version

* add buildroot prefixes

* remove config line

---------

Co-authored-by: madomado <madonuko@outlook.com>
Co-authored-by: lea <lleyton@fyralabs.com>
(cherry picked from commit deb18d2fa7)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-11-20 18:23:30 -08:00
Raboneko 342f523df8 fix(katsu): buildrequires mold (#2483) (#2487)
(cherry picked from commit 888a7c1e5d)

Co-authored-by: lea <lleyton@fyralabs.com>
2024-11-11 14:44:13 -08:00
Raboneko e23763a18d fix: gtk4-layer-shell (#2468) (#2477)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit f73a2bb598)

Co-authored-by: madomado <madonuko@outlook.com>
2024-11-07 11:48:31 +08:00
Raboneko dd68bea2d9 fix: zellij (#2469) (#2473)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit feffd5a90c)

Co-authored-by: madomado <madonuko@outlook.com>
2024-11-07 11:48:14 +08:00
Raboneko c533b876b3 fix: mpv (#2466) (#2481)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit f5893af6bd)

Co-authored-by: madomado <madonuko@outlook.com>
2024-11-07 11:48:05 +08:00
Raboneko a648fe1ae9 fix: mesa-freeworld (#2452) (#2455)
(cherry picked from commit 6620f23b02)

Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>
2024-10-31 02:01:31 +08:00
Raboneko b1c4500959 add: msm-cros-efs-loader (#2419) (#2451)
(cherry picked from commit f8f51a2076)

Co-authored-by: WeirdTreeThing <bradyn127@protonmail.com>
2024-10-30 14:35:21 +08:00
Raboneko 6f17c24be6 add: flashrom-cros (#2417) (#2448)
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit 0a8b1ef3c1)

Co-authored-by: WeirdTreeThing <bradyn127@protonmail.com>
2024-10-29 00:40:16 +08:00
Raboneko fe3877a94f add: crossystem (#2418) (#2445)
(cherry picked from commit bbbd0a4d35)

Co-authored-by: WeirdTreeThing <bradyn127@protonmail.com>
2024-10-29 00:25:45 +08:00
Raboneko 88eb259592 fix(update): apparmor (#2434) (#2438)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit e5ebb754a8)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-26 15:41:37 +08:00
Raboneko 3451218067 add: umu-launcher (#2416) (#2433)
(cherry picked from commit d236e63061)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-26 15:25:40 +08:00
Raboneko d702e6ff47 fix: libusermetrics (#2420) (#2429)
* fix: libusermetrics

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

* Update libusermetrics.spec

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 736c225d14)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-26 15:24:36 +08:00
Raboneko 00e18f76a0 fix: apparmor (#2135) (#2425)
* fix: apparmor

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

* normver?

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 123a34e994)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-26 15:12:59 +08:00
Raboneko 17b99d086e fix(stardust-telescope): stardust XR deps (#2401) (#2411)
* Update: stardust-telescope stardust XR deps

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* bump release

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

---------

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
(cherry picked from commit 21bc0c6ebe)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-10-25 15:57:39 +08:00
Raboneko bffcf32c3d fix(comps): stardust spelling (#2402) (#2407)
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
(cherry picked from commit 5845cf4d37)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-10-25 14:52:17 +08:00
Raboneko 9ebab54f3a feat(comps): stardust XR group (#2391) (#2399)
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
(cherry picked from commit 1ce5efe1bd)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-10-25 12:23:38 +08:00
Raboneko 84897dca3a fix(update): opentabletdriver (#2377) (#2385)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit f3aad99636)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-24 23:49:39 +08:00
Raboneko 3f718d3c2f fix(yt-dlp): use new nightly versioning scheme (#2375) (#2389)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit d290d1d908)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-24 23:48:25 +08:00
Raboneko 52fee1b87d fix: voicevox (#2343) (#2357)
try larger compression?

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 2e40cf28be)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-24 01:30:50 +08:00
Raboneko d1a8d512b8 fix: bandwhich (#2339) (#2361)
(cherry picked from commit d9a834f105)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-24 01:30:41 +08:00
Raboneko 70b0af2678 fix: gitoxide (#2340) (#2346)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 181a9203ca)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-24 01:16:44 +08:00
Raboneko 29862e2b35 fix: typeracer (#2342) (#2352)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 377d34df46)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-24 01:13:29 +08:00
Raboneko ddea235b5e fix(update): stardust-telescope (#2333) (#2337)
make this package nightly

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 926d7d72e8)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-24 00:39:13 +08:00
Raboneko f27c1ee5cd add: xwayland-satellite (#2318) (#2328)
(cherry picked from commit 4035a221ca)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-24 00:11:32 +08:00
Raboneko a35d79d9cf add: stardust-telescope (#2319) (#2324)
(cherry picked from commit f7ff86b1d2)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-23 23:57:32 +08:00
Raboneko e46101fcb2 fix: prismlauncher (#2285) (#2317)
cmake(Qt6NetworkAuth)

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 208a6099c6)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-23 23:34:10 +08:00
Raboneko c1219bb27d add: stardust-server (#2048) (#2308)
* initial package for stardust-server

* add missing build deps

* move to stardust folder

* inisital package for stardust-black-hole

* RPM bug workaround stardust-black-hole.spec

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Remove conflicts

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/stardust/black-hole/update.rhai

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/stardust/black-hole/stardust-black-hole.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/stardust/black-hole/stardust-black-hole.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/stardust/black-hole/stardust-black-hole.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update stardust-black-hole.spec

Add packager

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda.hcl

Fix name

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update stardust-black-hole.spec

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update update.rhai

Fix name

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update stardust-black-hole.spec

fix deps

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update stardust-black-hole.spec

Fix files

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update update.rhai

Remove if statement from Rhai

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/stardust/black-hole/update.rhai

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* fix directories issue

* actually fix directories error

* Update anda/stardust/server/stardust-server.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update stardust-server.spec

Lock cargo install

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update stardust-server.spec

Add %global

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update stardust-server.spec

Fix files

* Update stardust-server.spec

Add %_bindir

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* it works now
switched to the new release

* switch to 0.45.1

* Update update.rhai

Update update.rhai to track versions instead of commits

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Add __strip /bin/true

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Remove %cargo_prep_online and %cargo_build, replace with 'cargo build'

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* add cargo install path and remove %define line

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* add --locked

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Fix cargo install to install to buildroot

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Add back --path

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Move --path

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* --path in the wrong spot lol

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* --path .

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* add toml and json files

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* feat: this works. this works. this works. this works.

* feat: a;slkdjfl;sjfkal;j

---------

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
Co-authored-by: june-fish <git@june.fish>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit 170d8b9b4f)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-10-23 23:19:38 +08:00
Raboneko 95b684a9d5 fix: mate-dock-applet (#2287) (#2292)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 4b708572a6)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-23 00:37:32 +08:00
Raboneko d17e784ed0 fix(fontviewer): fix desktop file perms (#2263) (#2284)
Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>
(cherry picked from commit 6bb80ea3e5)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2024-10-22 13:52:08 +08:00
Raboneko 3c20e349ca add: inputplumber (#2258) (#2272)
close #2249

(cherry picked from commit 0cfb240cb4)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-22 13:48:14 +08:00
Raboneko c69925c2b8 add: joycond (#2259) (#2276)
(cherry picked from commit 82f5ffd11b)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-22 13:48:04 +08:00
Raboneko ffbbea717f fix: klassy (#2257) (#2268)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 6933f8e2e7)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-22 13:47:31 +08:00
Raboneko c0fb07afdb add: mate-dock-applet (#2261) (#2280)
Closes: #2247
(cherry picked from commit 37f1632fa7)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-22 13:35:15 +08:00
Raboneko b1789e340e fix: gcm-core (#2241) (#2245)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 4c66db8652)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-19 19:27:09 +08:00
Raboneko 92ca4466b6 Add swayfx package (#2235) (#2240)
* Add scenefx package

* Update anda/lib/scenefx/scenefx.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Atmois <130537361+Atmois@users.noreply.github.com>

* Update anda/lib/scenefx/scenefx.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Atmois <130537361+Atmois@users.noreply.github.com>

* Update scenefx.spec

Signed-off-by: Atmois <130537361+Atmois@users.noreply.github.com>

* Refactor version

* Add rhai file

* Add quote marker

* Add swayfx package

---------

Signed-off-by: Atmois <130537361+Atmois@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit 3670f0ace5)

Co-authored-by: Atmois <130537361+Atmois@users.noreply.github.com>
2024-10-14 13:24:07 +08:00
Raboneko 26f303d5f0 Revert "add: steam (#2211) (#2222)" (#2226) (#2231)
This reverts commit 85d3cbc3c8.

(cherry picked from commit 385acda665)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-10 11:47:22 +07:00
Raboneko 9bc5cf2cb9 add: steam (#2211) (#2224)
* add: steam

* do not inline patches, invert the package arch

* fix libdir

* whitelist the gitignore

* typo

* remove multilib

(cherry picked from commit f7bb590dac)

Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>
2024-10-10 12:07:11 +08:00
Raboneko ab4355d2a7 Add scenefx package (#2204) (#2220)
* Add scenefx package

* Update anda/lib/scenefx/scenefx.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Atmois <130537361+Atmois@users.noreply.github.com>

* Update anda/lib/scenefx/scenefx.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Atmois <130537361+Atmois@users.noreply.github.com>

* Update scenefx.spec

Signed-off-by: Atmois <130537361+Atmois@users.noreply.github.com>

* Refactor version

* Add rhai file

* Add quote marker

---------

Signed-off-by: Atmois <130537361+Atmois@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit 14681c240d)

Co-authored-by: Atmois <130537361+Atmois@users.noreply.github.com>
2024-10-09 21:41:13 +08:00
Raboneko cbd545b394 Add: surface-dtx-daemon (#2202) (#2216)
* initial package for surface-dtz-daemon

* Update anda/system/surface-dtx-daemon/surface-dtx-daemon.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/system/surface-dtx-daemon/surface-dtx-daemon.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/system/surface-dtx-daemon/surface-dtx-daemon.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/system/surface-dtx-daemon/surface-dtx-daemon.spec

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update anda/system/surface-dtx-daemon/update.rhai

Co-authored-by: madomado <madonuko@outlook.com>
Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update surface-dtx-daemon.spec

Add packager

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update surface-dtx-daemon.spec

fix % in Version

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update surface-dtx-daemon.spec

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update surface-dtx-daemon.spec

add cargo-srpm-macros

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update surface-dtx-daemon.spec

fix cargo-rpm-macros dep

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update surface-dtx-daemon.spec

Add mold dep

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

---------

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
Co-authored-by: madomado <madonuko@outlook.com>
(cherry picked from commit 9941e89d04)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-10-09 21:41:03 +08:00
Raboneko bd43f3ac76 add: fontviewer (#2205) (#2209)
* Create specfile

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>

* Add patch for meson.build

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>

* Create anda.hcl and update.rhai

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>

* Update version and add packager directive

---------

Signed-off-by: sadlerm4 <sad_lerm@hotmail.com>
(cherry picked from commit 1a5d36887a)

Co-authored-by: sadlerm4 <sad_lerm@hotmail.com>
2024-10-09 00:02:41 +08:00
madomado 55c9d8ce39 moby-addons: do not hard-depend on Docker (#2185) (#2189)
(cherry picked from commit d562057470)

Co-authored-by: Cappy Ishihara <cappy@cappuchino.xyz>
2024-10-05 00:09:02 +08:00
Raboneko 92ecc7103f fix: nushell (#2141) (#2184)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit bce7f784e6)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 23:28:29 +08:00
Raboneko cd6a6cddb0 fix: mesa-freeworld (#2145) (#2150)
* fix: mesa-freeworld

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

* Update mesa-freeworld.spec

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

* debug_package %nil

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

---------

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit ac392a2b2c)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 22:39:39 +08:00
Raboneko b79c466f47 fix: onefetch (#2137) (#2174)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 1384f435b8)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 22:24:38 +08:00
Raboneko 39ab9b3200 fix: uxplay (#2138) (#2170)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 5732c5389e)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 22:24:24 +08:00
Raboneko 62a0b27cdb bump: muon (#2140) (#2166)
Also add update.rhai

(cherry picked from commit fd155d243a)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 22:24:04 +08:00
Raboneko 7103d45d93 fix: felix (#2136) (#2178)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit c3168efcf7)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 22:11:52 +08:00
Raboneko e9c8c88ad7 fix: sccache (#2139) (#2162)
(cherry picked from commit ad4f3fca9f)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 22:11:07 +08:00
Raboneko 0fbcceee61 fix: zed-preview (#2142) (#2158)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 50742bebb9)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 22:10:58 +08:00
Raboneko ac9ed55114 fix: zed (#2143) (#2154)
Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit 20c0a26b20)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-04 22:10:15 +08:00
Raboneko 597a26ddc4 add: pet (#2127) (#2134)
* initial package for pet

* Update update.rhai

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update pet.spec

Remove build ID workaround

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

* Update pet.spec

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>

---------

Signed-off-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
(cherry picked from commit d16ff41d4d)

Co-authored-by: Owen Zimmerman <123591347+Owen-sz@users.noreply.github.com>
2024-10-04 13:55:41 +08:00
Raboneko f22ed1e5ec fix: mpv (#2121) (#2126)
no more -Dvulkan-interop=disabled

Signed-off-by: madomado <madonuko@outlook.com>
(cherry picked from commit e2c77d9115)

Co-authored-by: madomado <madonuko@outlook.com>
2024-10-01 01:07:14 +08:00
madonuko 597de131b4 fix(ci/bootstrap): also upload source packages 2024-09-28 18:52:48 +08:00
madonuko e75ba481f4 fix(release): no more bogus date 2024-09-28 18:35:49 +08:00
madonuko 0d7217cf25 bump: anda-srpm-macros 2024-09-28 18:29:03 +08:00
madonuko 0539781e23 fix(ci/bootstrap): also build terra-release 2024-09-28 18:28:46 +08:00
madonuko c3fee056cb fix(anda): use %__cargo run 2024-09-28 01:13:23 +08:00
madonuko 53b06e1f36 fix(anda): %__cargo? 2024-09-28 00:52:15 +08:00
madonuko 16e3beb422 fix(anda): …no mold? 2024-09-28 00:28:27 +08:00
madonuko a1c7f030eb Merge branch 'el10' of github.com:terrapkg/packages into el10 2024-09-28 00:19:21 +08:00
madonuko 71eeba185c fix(anda): please don't use mold 2024-09-28 00:18:47 +08:00
madonuko aa9e7d42e5 fix(anda): please don't use mold 2024-09-28 00:18:26 +08:00
madonuko d59779aba1 fix(anda): stop using mold??? 2024-09-28 00:11:06 +08:00
madonuko 8eddf3b28b fix(anda): disable mold again 2024-09-28 00:01:36 +08:00
madonuko ee651b502a fix(anda): get rid of mold 2024-09-27 23:48:07 +08:00
madonuko eb8dfd7236 fix(anda): builddep mold 2024-09-27 23:41:24 +08:00
madonuko f35ac91451 fix(ci/bootstrap): install anda-srpm-macros 2024-09-27 23:33:21 +08:00
madonuko 91107cfab1 fix(anda): deps for el10 2024-09-27 23:22:00 +08:00
madonuko d407c07620 bump: subatomic 2024-09-27 22:28:23 +08:00
madonuko 2fb4f24450 fix(ci/bootstrap): use sed -Ei 2024-09-27 21:49:11 +08:00
madonuko d467416bfe fix(ci/bootstrap): quote escaping? 2024-09-27 21:45:53 +08:00
madonuko df18df66e7 fix(ci/bootstrap): forgot sed ending again 2024-09-27 21:44:34 +08:00
madonuko 76e448dc7f fix(ci/bootstrap): set url? 2024-09-27 21:43:43 +08:00
madonuko e011dff0c8 fix(ci/bootstrap): forgot sed ending 2024-09-27 21:39:34 +08:00
madonuko 441af1d35b feat(ci/bootstrap): try sedding baseurl/metalink in repo file 2024-09-27 21:38:01 +08:00
madonuko 4148246925 fix(ci/bootstrap): url to (pre)release package 2024-09-10 21:54:11 +08:00
madonuko 30856fa414 fix(ci/bootstrap): use centos stream10-development 2024-09-10 21:49:42 +08:00
madonuko 9abd2c7d26 feat: sync stuff from frawhide, update to el10 2024-09-10 21:43:51 +08:00
madonuko e85628a37b feat(ci): change to el10 2024-08-31 16:57:13 +08:00
1166 changed files with 35148 additions and 20112 deletions
+14 -15
View File
@@ -6,13 +6,13 @@ on:
paths:
- anda/**
branches:
- f40
- el10
pull_request:
branches:
- f40
- el10
merge_group:
branches:
- f40
- el10
workflow_dispatch:
workflow_call:
@@ -23,7 +23,7 @@ jobs:
outputs:
build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
container:
image: ghcr.io/terrapkg/builder:f40
image: ghcr.io/terrapkg/builder:el10
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Set workspace as safe
@@ -40,11 +40,11 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
version: ["40"]
version: ["10"]
fail-fast: false
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || matrix.pkg.labels['large'] && 'x86-64-lg' || 'ubuntu-latest' }}
container:
image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
@@ -55,6 +55,7 @@ jobs:
- name: Checkout latest Mock configs
uses: actions/checkout@v4
with:
fetch-depth: 0
repository: terrapkg/mock-configs
path: mock-configs
@@ -63,15 +64,13 @@ jobs:
- name: Include custom build template instead of package default
run: |
cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl
cp -v mock-configs/terra-el.tpl /etc/mock/templates/
cp -v mock-configs/terra-el-dev.tpl /etc/mock/templates/
- name: Build with Andaman
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
- name: Build with Andaman (alternate arch)
if: |
matrix.pkg.arch == 'x86_64' && matrix.pkg.labels['multilib']
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-i386.cfg
run: |
dnf builddep -y `echo ${{ matrix.pkg.pkg }} | sed -E 's@/pkg$@/*.spec@'`
anda build ${{ matrix.pkg.pkg }} -rrpmbuild
- name: Generating artifact name
id: art
@@ -94,7 +93,7 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }} anda-build/rpm/rpms/*
terrael${{ matrix.version }} anda-build/rpm/rpms/*
- name: Upload source packages to subatomic
if: github.event_name == 'push'
@@ -102,7 +101,7 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }}-source anda-build/rpm/srpm/*
terrael${{ matrix.version }}-source anda-build/rpm/srpm/*
- name: Notify Madoguchi (Success)
if: success() && github.event_name == 'push'
+26 -18
View File
@@ -7,55 +7,63 @@ jobs:
bootstrap:
strategy:
matrix:
version: ["40"]
version: ["10"]
arch: ["x86_64", "aarch64"]
fail-fast: true
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
image: quay.io/almalinuxorg/almalinux:${{ matrix.version }}-kitten
options: --cap-add=SYS_ADMIN --privileged
steps:
- uses: actions/checkout@v4
with:
ref: el${{ matrix.version }}
fetch-depth: 1
- name: Install repositories
run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs
run: |
dnf install -y 'dnf-command(config-manager)'
dnf config-manager --set-enabled crb
dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${{ matrix.version }}.noarch.rpm
dnf install -y mock wget git-core openssl-devel cargo podman fuse-overlayfs rpm-build mock
dnf builddep -y anda/{terra/{mock-configs,srpm-macros},tools/buildsys/subatomic}/*.spec
- name: Install Anda
run: cargo install anda
- uses: actions/checkout@v4
with:
ref: f${{ matrix.version }}
fetch-depth: 1
- name: Build terra-mock-configs
run: |
echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
export PATH=$PATH:/github/home/.cargo/bin
git config --global --add safe.directory "$GITHUB_WORKSPACE"
anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm
- name: Install terra-mock-configs
run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
anda build anda/terra/mock-configs/pkg --rpm-builder=rpmbuild
- name: Build anda-srpm-macros
run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/terra/srpm-macros/pkg
run: anda build anda/terra/srpm-macros/pkg --rpm-builder=rpmbuild
- name: Build terra-release
run: anda build anda/terra/release/pkg --rpm-builder=rpmbuild
- name: Build Subatomic
run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
- name: Install Subatomic
run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm
run: anda build -c terra-el${{ matrix.version }}-dev-${{ matrix.arch }}.cfg anda/tools/buildsys/subatomic/pkg --rpm-builder=rpmbuild
- name: Install Subatomic and anda-srpm-macros
run: dnf install -y ./anda-build/rpm/rpms/{subatomic,anda-srpm-macros}-*.rpm
- name: Install Build Dependencies for Andaman
run: dnf builddep -y anda/tools/buildsys/anda/*.spec
- name: Build Andaman
run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg
run: anda build -c terra-el${{ matrix.version }}-dev-${{ matrix.arch }} anda/tools/buildsys/anda/pkg --rpm-builder=rpmbuild
- name: Upload packages to subatomic
run: |
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }} anda-build/rpm/rpms/*
terrael${{ 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 \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }}-source anda-build/rpm/srpm/*
terrael${{ matrix.version }}-source anda-build/rpm/srpm/*
+9 -6
View File
@@ -44,12 +44,12 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
version: ["40"]
version: ["10"]
arch: ${{ fromJson(needs.parse.outputs.arch) }}
fail-fast: false
runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || needs.parse.outputs.builder && needs.parse.outputs.builder || 'ubuntu-latest' }}
container:
image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
@@ -68,10 +68,13 @@ jobs:
- name: Include custom build template instead of package default
run: |
cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl
cp -v mock-configs/terra-el.tpl /etc/mock/templates/
cp -v mock-configs/terra-el-dev.tpl /etc/mock/templates/
- name: Build with Andaman
run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg
run: |
dnf builddep -y anda/${{ matrix.pkg }}*.spec
anda build anda/${{ matrix.pkg }}pkg -rrpmbuild
- name: Generating artifact name
id: art
@@ -93,14 +96,14 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }} anda-build/rpm/rpms/*
terrael${{ matrix.version }} anda-build/rpm/rpms/*
- name: Upload source packages to subatomic
run: |
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }}-source anda-build/rpm/srpm/*
terrael${{ matrix.version }}-source anda-build/rpm/srpm/*
- name: Notify Madoguchi (Success)
if: success()
+9 -6
View File
@@ -11,11 +11,11 @@ jobs:
strategy:
matrix:
pkg: ${{ fromJson(inputs.packages) }}
version: ["40"]
version: ["10"]
fail-fast: false
runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
container:
image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
image: ghcr.io/terrapkg/builder:el${{ matrix.version }}
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
@@ -34,10 +34,13 @@ jobs:
- name: Include custom build template instead of package default
run: |
cp -v mock-configs/terra.tpl /etc/mock/templates/terra.tpl
cp -v mock-configs/terra-el.tpl /etc/mock/templates/
cp -v mock-configs/terra-el-dev.tpl /etc/mock/templates/
- name: Build with Andaman
run: anda build ${{ matrix.pkg.pkg }} --package rpm -c mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
run: |
dnf builddep -y `echo ${{ matrix.pkg.pkg }} | sed -E 's@/pkg$@/*.spec@'`
anda build ${{ matrix.pkg.pkg }} -rrpmbuild
- name: Generating artifact name
id: art
@@ -59,7 +62,7 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }} anda-build/rpm/rpms/*
terrael${{ matrix.version }} anda-build/rpm/rpms/*
- name: Upload source packages to subatomic
if: github.event_name == 'push'
@@ -67,7 +70,7 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.version }}-source anda-build/rpm/srpm/*
terrael${{ matrix.version }}-source anda-build/rpm/srpm/*
- name: Notify Madoguchi (Success)
if: success()
-22
View File
@@ -1,22 +0,0 @@
name: Lint
on:
push:
branches:
- f40
pull_request:
branches:
- f40
merge_group:
branches:
- f40
jobs:
lint:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:f40
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Lint spec files
run: rpmlint $(find anda -type f -name "*.spec" -type f)
+2 -2
View File
@@ -7,7 +7,7 @@ export p="{\"id\":\"$5\",\"ver\":\"%v\",\"rel\":\"%r\",\"arch\":\"$4\",\"dirs\":
if [[ $1 == false ]]; then
d=${p/\%v/?}
d=${d/\%r/?}
curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci/terra$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terrael$3/builds/f -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
exit 0
fi
@@ -17,5 +17,5 @@ for f in anda-build/rpm/rpms/*; do
r=$(lesspipe.sh $f | grep -E "Release\s*: " | sed "s@Release\s*: @@")
d=${p/\%v/$v}
d=${d/\%r/$r}
curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terra$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
curl -H "Authorization: Bearer $6" https://madoguchi.fyralabs.com/ci5/terrael$3/builds/$n -X PUT -H "Content-Type: application/json" -d $d --fail-with-body
done
+54
View File
@@ -0,0 +1,54 @@
name: Update per branch
on:
schedule:
- cron: "*/30 * * * *"
workflow_dispatch:
jobs:
autoupdate:
runs-on: ubuntu-latest
strategy:
matrix:
branch:
- frawhide
- f40
- f41
- el10
container:
image: ghcr.io/terrapkg/builder:frawhide
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
with:
ref: ${{ matrix.branch }}
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
- name: Install SSH signing key & Set up git repository
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: |
nbranch="${{ matrix.branch }}"
[ "$nbranch" = 'frawhide' ] && nbranch='f42'
anda update --filters updbranch=1 --labels branch=${{ matrix.branch }},nbranch=$nbranch
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RUST_BACKTRACE: full
- name: Save
run: |
if [[ `git status --porcelain` ]]; then
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"
msg="bump(branch): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
git commit -S -a -m "$msg"
git push -u origin --all
fi
+4 -4
View File
@@ -3,10 +3,10 @@ name: Push comps updates
on:
push:
branches:
- frawhide
- f41
- f40
- f39
- f38
- f37
- el10
paths:
- comps.xml
workflow_dispatch:
@@ -15,7 +15,7 @@ jobs:
update-comps:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:f40
image: ghcr.io/terrapkg/builder:frawhide
steps:
- uses: actions/checkout@v4
- name: Push to subatomic
+10 -10
View File
@@ -8,7 +8,7 @@ jobs:
autoupdate:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:f40
image: ghcr.io/terrapkg/builder:frawhide
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
@@ -17,20 +17,21 @@ jobs:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
- name: Install SSH signing key
- name: Install SSH signing key & Set up git repository
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
run: anda update --filters nightly=1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RUST_BACKTRACE: full
- 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"
@@ -38,16 +39,15 @@ jobs:
git config user.signingkey "${{ runner.temp }}/signing_key"
msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
git commit -S -a -m "$msg"
git format-patch HEAD^
copy_over () {
git format-patch HEAD^
git checkout $1
git apply *.patch || true
rm *.patch
git add *
git add anda
git commit -S -a -m "$msg"
}
copy_over f37 || true
copy_over f38 || true
copy_over frawhide || true
copy_over f40 || true
copy_over f41 || true
copy_over el10 || true
git push -u origin --all
fi
+53
View File
@@ -0,0 +1,53 @@
name: Weekly Update
on:
schedule:
- cron: "0 0 * * 0"
workflow_dispatch:
jobs:
autoupdate:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:frawhide
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
- name: Install SSH signing key & Set up git repository
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 Weekly Update
run: anda update --filters weekly=1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
RUST_BACKTRACE: full
- name: Save
run: |
if [[ `git status --porcelain` ]]; then
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"
msg="bump(weekly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
git commit -S -a -m "$msg"
git format-patch HEAD^
copy_over () {
git checkout $1
git apply *.patch || true
git add anda
git commit -S -a -m "$msg"
}
copy_over f40 || true
copy_over f41 || true
copy_over el10 || true
git push -u origin --all
fi
+9 -11
View File
@@ -8,7 +8,7 @@ jobs:
autoupdate:
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/builder:f40
image: ghcr.io/terrapkg/builder:frawhide
options: --cap-add=SYS_ADMIN --privileged
steps:
- name: Checkout
@@ -17,21 +17,21 @@ jobs:
fetch-depth: 0
ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
- name: Install SSH signing key
- name: Install SSH signing key & Set up git repository
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
run: anda update --excludes nightly=1 --excludes weekly=1 --excludes updbranch=1
env:
GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
RUST_BACKTRACE: full
- 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"
@@ -39,17 +39,15 @@ jobs:
git config user.signingkey "${{ runner.temp }}/signing_key"
msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
git commit -S -a -m "$msg"
git format-patch HEAD^
copy_over () {
git format-patch HEAD^
git checkout $1
git apply *.patch || true
rm *.patch
git add *
git add anda
git commit -S -a -m "$msg"
}
copy_over f39 || true
copy_over f37 || true
copy_over f38 || true
copy_over frawhide || true
copy_over f40 || true
copy_over f41 || true
copy_over el10 || true
git push -u origin --all
fi
+3
View File
@@ -3,4 +3,7 @@ project pkg {
rpm {
spec = "anki-bin.spec"
}
labels {
subrepo = "extras"
}
}
+17 -12
View File
@@ -1,29 +1,32 @@
%global xurl https://files.pythonhosted.org/packages/51/5f/6f52b958fe38a36a0799c01fbd56a742ebdfcf41f89438dbee998b8ce692/anki-24.06.3-cp39-abi3-manylinux_2_28_x86_64.whl
%global aurl https://files.pythonhosted.org/packages/df/bb/b0bfbc6a06a598b0b614d18dd8c4f40827828649f9742f1f44a4e44d6a2c/anki-24.06.3-cp39-abi3-manylinux_2_31_aarch64.whl
%global qurl https://files.pythonhosted.org/packages/21/2a/d8e22a9521be04ef29a30d21a2c3008783ab03b6f07cc14696a040f747a4/aqt-24.06.3-py3-none-any.whl
%global xurl https://files.pythonhosted.org/packages/68/9c/7685bd012e597332f8ce379a31b0d58dd4eae960da96ff43e9fcd978c93f/anki-25.02-cp39-abi3-manylinux_2_35_x86_64.whl
%global aurl https://files.pythonhosted.org/packages/da/36/741cef7b7fce943d187784549fd8de8152986067d9226f384959c07770a7/anki-25.02-cp39-abi3-manylinux_2_35_aarch64.whl
%global qurl https://files.pythonhosted.org/packages/2c/bc/763589b97aa5c91acf3d834beaa473c25ca7f335c7b40954fd0d5fd41ddc/aqt-25.02-py3-none-any.whl
Name: anki-bin
Version: 24.06.3
Version: 25.02
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/
BuildRequires: python3-pip rpm_macro(fdupes) cargo
Requires: python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
Requires: python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
Requires: libxcrypt-compat hicolor-icon-theme sox mpv
ExclusiveArch: x86_64
BuildRequires: python3-pip rpm_macro(fdupes) cargo
Requires: python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
Requires: python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
Requires: python3-protobuf >= 4.21
Requires: libxcrypt-compat hicolor-icon-theme sox
Requires: (mpv or mpv-nightly)
ExclusiveArch: x86_64
Conflicts: anki
%ifarch x86_64
Source0: %xurl
%elifarch aarch64
Source0: %aurl
Source0: %aurl
%endif
Source1: %qurl
Source2: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/runanki.py
Source3: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.desktop
Source4: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png
Source4: https://raw.githubusercontent.com/ankitects/anki/%{version}/qt/bundle/lin/anki.png
Source5: https://raw.githubusercontent.com/ankitects/anki/%{version}/LICENSE
Source6: https://raw.githubusercontent.com/ankitects/anki/%{version}/README.md
@@ -57,6 +60,8 @@ rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2t
%license LICENSE
%doc README.md
%_bindir/anki
%_bindir/pyuic6
%_bindir/pylupdate6
/usr/lib/python*/site-packages/_aqt/
/usr/lib/python*/site-packages/anki-%{version}.dist-info/
/usr/lib/python*/site-packages/anki/
+1 -1
View File
@@ -1,5 +1,5 @@
Name: anki-qt5
Version: 24.06.3
Version: 25.02
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
+3
View File
@@ -3,4 +3,7 @@ project pkg {
rpm {
spec = "anki.spec"
}
labels {
subrepo = "extras"
}
}
+3 -2
View File
@@ -1,5 +1,5 @@
Name: anki
Version: 24.06.3
Version: 25.02
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
@@ -9,7 +9,7 @@ BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-sen
BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine
Requires: hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine
Recommends: mpv
Recommends: (mpv or mpv-nightly)
Obsoletes: anki <= 2.1.15
Conflicts: anki-qt5
Patch0: 0001-No-update.patch
@@ -30,6 +30,7 @@ git checkout %{version}
%build
export RELEASE=1
export PYTHONPATH=%_libdir/python3/dist-packages
cargo update
mold -run ./tools/build
-5
View File
@@ -1,5 +0,0 @@
project pkg {
rpm {
spec = "armcord-bin.spec"
}
}
-78
View File
@@ -1,78 +0,0 @@
%define debug_package %nil
%global _build_id_links none
%ifarch x86_64
%global src ArmCord-%version-linux-x64
%elifarch aarch64
%global src ArmCord-%version-linux-arm64
%elifarch armv7l
%global src ArmCord-%version-linux-armv7l
%endif
# Exclude private libraries
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/armcord/.*\\.so
Name: armcord-bin
Version: 3.3.0
Release: 1%?dist
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/ArmCord/ArmCord
Group: Applications/Internet
Source0: %url/releases/download/v%version/%src.tar.gz
Source1: armcord.png
Source2: https://raw.githubusercontent.com/ArmCord/ArmCord/v%version/README.md
Requires: electron xdg-utils
ExclusiveArch: x86_64 aarch64 armv7l
Conflicts: armcord
BuildRequires: add-determinism
%description
ArmCord is a custom client designed to enhance your Discord experience
while keeping everything lightweight.
%prep
%autosetup -n %src
cat <<EOF > .armcord.desktop
[Desktop Entry]
Name=ArmCord
Comment=%summary
GenericName=Internet Messenger
Type=Application
Exec=%_bindir/armcord
Icon=armcord
Categories=Network;InstantMessaging;
StartupWMClass=armcord
Keywords=discord;armcord;vencord;shelter;electron;
EOF
%build
%install
mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/armcord %buildroot%_docdir/%name
cp -a * %buildroot%_datadir/armcord/
ln -s %_datadir/armcord/armcord %buildroot%_bindir/armcord
chmod +x -R %buildroot%_datadir/armcord/*
chmod 755 %buildroot%_datadir/armcord/armcord
install -Dm644 .armcord.desktop %buildroot%_datadir/applications/ArmCord.desktop
install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/armcord.png
install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
%files
%doc README.md
%_datadir/armcord
%_bindir/armcord
%_datadir/applications/ArmCord.desktop
%_datadir/pixmaps/armcord.png
%changelog
* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
- Use /usr/share/ instead of /opt/
* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
- Initial package
-1
View File
@@ -1 +0,0 @@
rpm.version(gh("ArmCord/ArmCord"));
-70
View File
@@ -1,70 +0,0 @@
%define debug_package %nil
Name: armcord
Version: 3.3.0
Release: 1%?dist
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/ArmCord/ArmCord
Group: Applications/Internet
Source1: launch.sh
Packager: madonuko <mado@fyralabs.com>
Requires: electron xdg-utils
BuildRequires: git-core add-determinism pnpm
Conflicts: armcord-bin
BuildArch: noarch
%description
ArmCord is a custom client designed to enhance your Discord experience
while keeping everything lightweight.
%prep
rm -rf *
git clone %url .
git checkout v%version
cat <<EOF > armcord.desktop
[Desktop Entry]
Name=ArmCord
Comment=%summary
GenericName=Internet Messenger
Type=Application
Exec=/usr/bin/armcord
Icon=armcord
Categories=Network;InstantMessaging;
StartupWMClass=armcord
Keywords=discord;armcord;vencord;shelter;electron;
EOF
%build
pnpm install --no-frozen-lockfile
pnpm run packageQuick
%install
install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/armcord/app.asar
install -Dm755 %SOURCE1 %buildroot/usr/bin/armcord
install -Dm644 armcord.desktop %buildroot/usr/share/applications/ArmCord.desktop
install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/armcord.png
%files
%doc README.md
%license license.txt
/usr/bin/armcord
/usr/share/applications/ArmCord.desktop
/usr/share/pixmaps/armcord.png
/usr/share/armcord/app.asar
%changelog
* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
- Update to license.txt
* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
- Initial package
-1
View File
@@ -1 +0,0 @@
rpm.version(gh("ArmCord/ArmCord"));
+5
View File
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "audacity-freeworld.spec"
}
}
@@ -0,0 +1,749 @@
%global __requires_exclude ^lib-.*.so
%global __provides_exclude ^lib-.*.so
Name: audacity-freeworld
Version: Audacity.3.7.1
Release: 1%?dist
Summary: Multitrack audio editor
License: GPLv2
URL: https://www.audacityteam.org/
%define realname audacity
Conflicts: %{realname}
Source0: https://github.com/audacity/audacity/releases/download/Audacity-%{version}/audacity-sources-%{version}.tar.gz
# manual can be installed from the base Fedora Audacity package.
BuildRequires: cmake
BuildRequires: gettext-devel
BuildRequires: chrpath
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
BuildRequires: flac-devel
BuildRequires: git
BuildRequires: gtk3-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
BuildRequires: lame-devel
BuildRequires: libid3tag-devel
BuildRequires: libjpeg-turbo-devel turbojpeg
BuildRequires: libmad-devel
BuildRequires: taglib-devel
BuildRequires: twolame-devel
BuildRequires: libogg-devel
BuildRequires: libsndfile-devel
BuildRequires: libuuid-devel
BuildRequires: libvorbis-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: lilv-devel
BuildRequires: lv2-devel
BuildRequires: mpg123-devel
BuildRequires: opusfile-devel
BuildRequires: portaudio-devel >= 19-16
BuildRequires: portmidi-devel
BuildRequires: rapidjson-devel
BuildRequires: serd-devel
BuildRequires: shared-mime-info
BuildRequires: sord-devel
BuildRequires: soundtouch-devel
BuildRequires: soxr-devel
# Use local sqlite as system fails
BuildRequires: sqlite-devel
BuildRequires: sratom-devel
BuildRequires: suil-devel
BuildRequires: vamp-plugin-sdk-devel >= 2.0
BuildRequires: wavpack-devel
BuildRequires: wxGTK-devel
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: python3
BuildRequires: libappstream-glib
Recommends: ffmpeg-libs
# For new symbols in portaudio
Requires: portaudio%{?_isa} >= 19-16
ExcludeArch: s390x
%description
Audacity is a cross-platform multitrack audio editor. It allows you to
record sounds directly or to import files in various formats. It features
a few s0mple effects, all of the editing features you should need, and
unlimited undo. The GUI was built with wxWidgets and the audio I/O
supports PulseAudio, OSS and ALSA under Linux.
This build has support for mp3 and ffmpeg import/export.
%prep
%autosetup -p1 -n %{realname}-sources-%{version}
# Make sure we use the system versions.
rm -rf lib-src/{libvamp,libsoxr}/
#Included in src/AboutDialog.cpp but not supplied
touch include/RevisionIdent.h
%build
%cmake \
-DCMAKE_MODULE_LINKER_FLAGS:STRING="$(wx-config --libs)" \
-DCMAKE_SHARED_LINKER_FLAGS:STRING="$(wx-config --libs)" \
-DAUDACITY_BUILD_LEVEL:STRING=2 \
-Daudacity_conan_enabled=Off \
-Daudacity_has_networking=Off \
-Daudacity_has_crashreports=Off \
-Daudacity_has_updates_check=Off \
-Daudacity_has_sentry_reporting=Off \
-Daudacity_lib_preference:STRING=system \
-Daudacity_use_libsndfile=system \
-Daudacity_use_soxr=system \
-Daudacity_use_lame=system \
-Daudacity_use_twolame=system \
-Daudacity_use_libflac=system \
-Daudacity_use_ladspa=on \
-Daudacity_use_libvorbis=system \
-Daudacity_use_libid3tag=system \
-Daudacity_use_expat=system \
-Daudacity_use_soundtouch=system \
-Daudacity_use_vamp=system \
-Daudacity_use_lv2=system \
-Daudacity_use_midi=system \
-Daudacity_use_libogg=system \
-Daudacity_has_vst3:BOOL=Off \
-Daudacity_use_ffmpeg=loaded
%cmake_build
%install
%cmake_install
# Remove the RPATH from all the private libraries provided with Audacity and
# make them all executable so that debug symbol extraction happens.
# CMake could do this on its own using the install target for the library,
# but the Audacity build system manually copies around the libraries so it
# doesn't use the install target. This is very involved to fix in the code,
# so this work around is easier and more maintainable than patching the build
# system.
pushd %{buildroot}%{_libdir}/%{realname}
for libFile in *;
do
if [[ ! -d $libFile ]];
then
chrpath --delete $libFile
chmod 755 $libFile
fi
done
popd
pushd %{buildroot}%{_libdir}/%{realname}/modules
for libFile in *;
do
if [[ ! -d $libFile ]];
then
chrpath --delete $libFile
chmod 755 $libFile
fi
done
popd
if appstream-util --help | grep -q replace-screenshots ; then
appstream-util replace-screenshots %{buildroot}%{_metainfodir}/audacity.appdata.xml \
https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/audacity/a.png
fi
%{find_lang} %{realname}
desktop-file-install --dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/audacity.desktop
mkdir %{buildroot}%{_datadir}/doc/%{realname}/nyquist
cp -pr lib-src/libnyquist/nyquist/license.txt %{buildroot}%{_datadir}/doc/%{realname}/nyquist
cp -pr lib-src/libnyquist/nyquist/Readme.txt %{buildroot}%{_datadir}/doc/%{realname}/nyquist
rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt
rm -f %{buildroot}%{_prefix}/%{realname}
%files -f %{realname}.lang
%{_bindir}/%{realname}
%{_libdir}/%{realname}/
%dir %{_datadir}/%{realname}
%{_datadir}/%{realname}/EffectsMenuDefaults.xml
%{_datadir}/%{realname}/nyquist/
%{_datadir}/%{realname}/plug-ins/
%{_mandir}/man*/*
%{_datadir}/applications/*
%{_metainfodir}/%{realname}.appdata.xml
%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/*/%{realname}.png
%{_datadir}/icons/hicolor/scalable/apps/%{realname}.svg
%{_datadir}/mime/packages/*
%{_datadir}/doc/%{realname}
%license LICENSE.txt
%changelog
* Thu Jan 03 2025 Owen Zimmerman <owen@fyralabs.com>
- Port to Terra
* Thu Dec 12 2024 Leigh Scott <leigh123linux@gmail.com> - 3.7.1-1
- Update to 3.7.1
* Wed Oct 30 2024 Leigh Scott <leigh123linux@gmail.com> - 3.7.0-1
- Update to 3.7.0
* Sat Sep 14 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.3-1
- Update to 3.6.3
* Wed Sep 04 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.2-1
- Update to 3.6.2
* Mon Jul 29 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.1-1
- Update to 3.6.1
* Wed Jul 17 2024 Leigh Scott <leigh123linux@gmail.com> - 3.6.0-1
- Update to 3.6.0
* Fri Apr 26 2024 Leigh Scott <leigh123linux@gmail.com> - 3.5.1-1
- Update to 3.5.1
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 3.4.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Nov 17 2023 Leigh Scott <leigh123linux@gmail.com> - 3.4.2-1
- 3.4.2
* Fri Nov 03 2023 Leigh Scott <leigh123linux@gmail.com> - 3.4.0-1
- 3.4.0
* Wed Aug 02 2023 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 3.3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sun Jun 11 2023 Leigh Scott <leigh123linux@gmail.com> - 3.3.3-1
- 3.3.3
* Sun May 07 2023 Leigh Scott <leigh123linux@gmail.com> - 3.3.2-1
- 3.3.2
* Thu May 04 2023 Leigh Scott <leigh123linux@gmail.com> - 3.3.1-2
- Fix crash on startup (rfbz#6669)
* Fri Apr 28 2023 Leigh Scott <leigh123linux@gmail.com> - 3.3.1-1
- 3.3.1
* Mon Apr 24 2023 Leigh Scott <leigh123linux@gmail.com> - 3.3.0-1
- 3.3.0
* Sat Apr 01 2023 Leigh Scott <leigh123linux@gmail.com> - 3.2.5-2
- Add ffmpeg-6 support
* Tue Mar 14 2023 Leigh Scott <leigh123linux@gmail.com> - 3.2.5-1
- 3.2.5
- Use clang
* Tue Dec 06 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.2-1
- 3.2.2
* Thu Oct 06 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.1-1
- 3.2.1
* Fri Sep 23 2022 Leigh Scott <leigh123linux@gmail.com> - 3.2.0-1
- 3.2.0
* Sat Aug 06 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 3.1.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild and ffmpeg
5.1
* Thu Feb 24 2022 Leigh Scott <leigh123linux@gmail.com> - 3.1.3-3
- Use compat-ffmpeg4 for f36+
* Wed Feb 09 2022 RPM Fusion Release Engineering <sergiomb@rpmfusion.org> - 3.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Dec 23 2021 Leigh Scott <leigh123linux@gmail.com> - 3.1.3-1
- 3.1.3
* Sun Dec 12 2021 Leigh Scott <leigh123linux@gmail.com> - 3.1.2-1
- 3.1.2
* Sat Nov 13 2021 Leigh Scott <leigh123linux@gmail.com> - 3.1.1-1
- 3.1.1
* Wed Nov 10 2021 Leigh Scott <leigh123linux@gmail.com> - 3.1.0-1
- 3.1.0
* Wed Nov 10 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.5-5
- Rebuilt for new ffmpeg snapshot
* Tue Oct 26 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.5-4
- Fix build level
* Tue Oct 26 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.5-3
- Fix lang (rfbz#6117)
* Tue Oct 19 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.5-2
- Filter internal libs from provides and requires (rfbz#6112)
* Thu Oct 14 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.5-1
- 3.0.5
* Sat Oct 02 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.2-3
- Add Fedora patches
* Mon Aug 02 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 3.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Mon Apr 19 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.2-1
- 3.0.2
* Sun Mar 21 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.0-2
- Use local sqlite as system fails
* Thu Mar 18 2021 Leigh Scott <leigh123linux@gmail.com> - 3.0.0-1
- 3.0.0
- Use local wxwidgets, audacity isn't usable with gtk3
* Tue Feb 23 2021 Sérgio Basto <sergio@serjux.com> - 2.4.2-4
- partial fedora sync
* Wed Feb 03 2021 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 2.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jan 1 2021 Leigh Scott <leigh123linux@gmail.com> - 2.4.2-2
- Rebuilt for new ffmpeg snapshot
* Wed Oct 21 2020 Leigh Scott <leigh123linux@gmail.com> - 2.4.2-1
- Update to Audacity 2.4.2
* Wed Sep 02 2020 Leigh Scott <leigh123linux@gmail.com> - 2.3.3-5
- Add GDK_BACKEND=x11 to audacity.desktop exec line (rfbz#5551)
- Fix incorrect appdata.xml type tag (bug #1810509)
* Mon Aug 17 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 2.3.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Thu Mar 26 2020 leigh123linux <leigh123linux@googlemail.com> - 2.3.3-3
- Fix gcc-10 compile issue
* Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 2.3.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Nov 23 2019 David Timms <iinet.net.au@dtimms> - 2.3.3-1
- Update to Audacity 2.3.3.
- Modify wxWidgets build require to wxGTK3 (gtk3 version).
- Modify libdir patch for 2.3.3.
- Fix -manual file archive dropping the leading help/ in path.
- Disable twolame for EPEL-8 as the -devel package isn't available.
* Wed Aug 07 2019 Leigh Scott <leigh123linux@gmail.com> - 2.3.2-2
- Rebuild for new ffmpeg version
* Tue Jun 4 2019 David Timms <iinet.net.au@dtimms> - 2.3.2-1
- Update to Audacity 2.3.2 release.
- Rebase audacity-2.3.2-libdir.patch.
* Mon Mar 18 2019 Leigh Scott <leigh123linux@googlemail.com> - 2.3.1-1
- Update to Audacity 2.3.1 release
- Fixes Audacity 2.3.0 broken release (rfbz#5077)
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 2.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Oct 1 2018 David Timms <iinet.net.au@dtimms> - 2.3.0-1
- Update to Audacity 2.3.0 release.
- change mp3 capability to be always present rather than a compile option.
- Modify audacity-2.2.1-libdir.patch and audacity-2.2.1-libmp3lame-default.patch
to apply the rpm macro path directly.
- Add grep check to fail if RPMLIB is found in modified source.
- Fix libid3tag configure option.
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 2.2.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Apr 27 2018 Leigh Scott <leigh123linux@googlemail.com> - 2.2.2-5
- Revert 'Use compat-ffmpeg28 on Fedora 28+'
* Thu Mar 08 2018 RPM Fusion Release Engineering <leigh123linux@googlemail.com> - 2.2.2-4
- Rebuilt for new ffmpeg snapshot
* Mon Feb 26 2018 Sérgio Basto <sergio@serjux.com> - 2.2.2-3
- Restore remove after configure
- Remove obsolete scriptlets
* Sun Feb 25 2018 Sérgio Basto <sergio@serjux.com> - 2.2.2-2
- Use compat-ffmpeg28 on Fedora 28+
- Also add conditionals to be possible build with local ffmpeg (not in use)
- Use autoconf before ./configure
- Readd libmp3lame-default.patch and libdir.patch
- Readd to configure --disable-dynamic-loading
- General review of spec
- Comment BR portmidi-devel and remove no-local-includes.patch
* Thu Feb 22 2018 Sérgio Basto <sergio@serjux.com> - 2.2.2-1
- Update to 2.2.2
- Readd no-local-includes.patch
- Reorganize conditonal with_mp3, now have twolame, lame and libmad
- Readd desktop.in.patch
- Add to configure --with-lv2 --with-midi --with-portmidi with some commentaries
- Temporary fix to portaudio became permanent (--with-portaudio=local)
* Thu Feb 01 2018 Sérgio Basto <sergio@serjux.com> - 2.2.1-1
- Update to 2.2.1
* Sun Dec 03 2017 Sérgio Basto <sergio@serjux.com> - 2.2.0-1
- Update to 2.2.0
* Mon Oct 16 2017 Leigh Scott <leigh123linux@googlemail.com> - 2.1.3-5
- Rebuild for ffmpeg update
* Sun Oct 08 2017 Sérgio Basto <sergio@serjux.com> - 2.1.3-4
- Rebuild for soundtouch 2.0.0
- Fix build for new wxBase
- Sync with Fedora proper
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart@rpmfusion.org> - 2.1.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Apr 29 2017 Leigh Scott <leigh123linux@googlemail.com> - 2.1.3-2
- Rebuild for ffmpeg update
* Fri Mar 24 2017 Leigh Scott <leigh123linux@googlemail.com> - 2.1.3-1
- 2.1.3 release.
* Sat Mar 18 2017 RPM Fusion Release Engineering <kwizart@rpmfusion.org> - 2.1.3-0.10.20161109git53a5c93
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Nov 22 2016 Sérgio Basto <sergio@serjux.com> - 2.1.3-0.9.20161109git53a5c93
- Use bcond_without correctly, fix wx-config-3.0-gtk2 detection, also simplify
some comments
* Thu Nov 17 2016 David Timms <iinet.net.au@dtimms> - 2.1.3-0.8.20161109git53a5c93
- fix mp3 build parameter by defining mp3importexport conditional.
* Wed Nov 9 2016 David Timms <iinet.net.au@dtimms> - 2.1.3-0.7.20161109git53a5c93
- 2.1.3 Alpha git snapshot 2016-11-09.
* Sat Jul 30 2016 Julian Sikorski <belegdol@fedoraproject.org> - 2.1.2-3
- Rebuilt for ffmpeg-3.1.1
* Wed Jun 22 2016 Nicolas Chauvet <kwizart@gmail.com> - 2.1.2-2
- Backport fix for gcc6
* Thu Mar 03 2016 Sérgio Basto <sergio@serjux.com> - 2.1.2-1
- Update audacity to 2.1.2 final
* Sun Jul 19 2015 David Timms <iinet.net.au@dtimms> - 2.1.1-1
- Release of Audacity 2.1.1.
* Sun Jun 28 2015 David Timms <iinet.net.au@dtimms> - 2.1.1-0.2.dea351a
- remove Source1 reference to manual (available in Fedora audacity build).
* Wed Jun 24 2015 David Timms <iinet.net.au@dtimms> - 2.1.1-0.1.dea351a
- Update to 2.1.1 pre-release git snapshot to prepare for release.
- Conditionalize AppData out of EPEL <=7 release.
- Use better AppData screenshots.
* Mon Jan 12 2015 David Timms <iinet.net.au@dtimms> - 2.0.6-1
- update to upstream release 2.0.6
- update non-dl-ffmpeg.patch to match this version
* Sat Aug 30 2014 Sérgio Basto <sergio@serjux.com> - 2.0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Mon Sep 30 2013 Nicolas Chauvet <kwizart@gmail.com> - 2.0.4-3
- Rebuilt
* Sun Sep 22 2013 David Timms <iinet.net.au@dtimms> - 2.0.4-2
- Add upstream patch to avoid segfault when starting Effects|Equalization
* Sat Sep 14 2013 David Timms <iinet.net.au@dtimms> - 2.0.4-1
- update to upstream release 2.0.4
- rebase audacity-2.0.1-libmp3lame-default
* Sat May 4 2013 Hans de Goede <j.w.r.degoede@gmail.com> - 2.0.3-1
- New upstream release 2.0.3
- Fix FTBFS by using ffmpeg-compat (rf#2707)
- Disable dynamic loading to force proper Requires for the used libs
* Sun Mar 03 2013 Nicolas Chauvet <kwizart@gmail.com> - 2.0.1-2
- Mass rebuilt for Fedora 19 Features
* Tue Jul 3 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-1
- update to 2.0.1 final
- rebase libmp3lame-default.patch
- rebase desktop.in.patch
* Tue Jun 26 2012 David Timms <iinet.net.au@dtimms> - 2.0.1-0.1.rc2
- update to 2.0.1 release candidate 2
* Wed Mar 14 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-1
- update to 2.0.0 final
* Sun Mar 11 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.9.rc9
- update to 2.0.0 release candidate 9
- drop upstreamed glib2 include patch
* Tue Mar 6 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.8.rc8
- update to 2.0.0 release candidate 8 for testing only
* Wed Feb 22 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.3.rc3
- update to 2.0.0 release candidate 3
* Sat Feb 18 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.2.rc1.20120218svn11513
- update to release candidate from svn snapshot
* Sun Feb 5 2012 David Timms <iinet.net.au@dtimms> - 2.0.0-0.1.alpha20120205svn11456
- update to 2.0.0 alpha svn snapshot
- delete accepted ffmpeg-0.8.y patch
* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.5
- fix Source1 help reference (again).
* Tue Dec 13 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.4
- update to 1.3.14 beta release
* Thu Dec 8 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.3.alpha20111101svn11296
- add ffmpeg-0.8 patch from Leland Lucius
- add test patch to workaround gtypes-include problem
* Tue Nov 1 2011 David Timms <iinet.net.au@dtimms> - 1.3.14-0.1.alpha20111101svn11296
- update to 1.3.14 alpha svn snapshot
* Sat Apr 30 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.4.beta
- fix files and dir ownership including -manual files in the main package
* Tue Apr 26 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.2.beta
- delete help file Source reference; will be done in Fedora instead.
* Sun Apr 24 2011 David Timms <iinet.net.au@dtimms> - 1.3.13-0.2.beta
- upgrade to 1.3.13-beta
- drop patches included in upstream release
- convert desktop file to a patch against new upstream .desktop file.
* Wed Nov 10 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.11.beta
- fix build failure compiling ffmpeg.cpp
* Wed Nov 10 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.10.beta
- fix build failure in portmixer due to "Missing support in pa_mac_core.h"
Applied svn trunk portmixer configure changes.
- del previous patch attempt (unsuccessful)
* Sun Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.9.beta
- fix build failure due to portmixer configure problems
* Sun Oct 31 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.8.beta
- fix hang when play at speed with ratio less than 0.09 is used (#637347)
* Sat Aug 7 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.7.beta
- patch to suit APIChange introduced in ffmpeg-0.6. Resolves rfbz #1356.
fixes ffmpeg import/export.
* Thu Jul 15 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.6.beta
- drop vamp-plugin path patch to suit updated vamp-plugin-sdk-2.1
* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.4.beta
- mods to ease diffs between builds for fedora and full
* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.3.beta
- really package new icons found in icons/hicolor
* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.2.beta
- mod tartopdir to use package version macro
* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.1.3.beta
- fix icons glob to use realname
- add more supported mimetypes and categories to the desktop file
* Mon Jun 28 2010 David Timms <iinet.net.au@dtimms> - 1.3.12-0.1.2.beta
- upgrade to 1.3.12-beta
- package new icons found in icons/hicolor
* Sat Dec 5 2009 David Timms <iinet.net.au@dtimms> - 1.3.10-0.1.1.beta
- upgrade to 1.3.10-beta
- re-base spec to fedora devel and patches by mschwendt
* Thu Dec 3 2009 David Timms <iinet.net.au@dtimms> - 1.3.9-0.4.2.beta
- continue with upgrade to f12 version
* Mon Nov 16 2009 David Timms <iinet.net.au@dtimms> - 1.3.9-0.4.1.beta
- upgrade to 1.3.9-beta to match Fedora version.
- resync to include new and updated patches from mschwendt
- add conditional freeworld to allow minimal change from Fedora version
* Fri Oct 23 2009 Orcan Ogetbil <oged[DOT]fedora[AT]gmail[DOT]com> - 1.3.7-0.6.2.beta
- Update desktop file according to F-12 FedoraStudio feature
* Tue May 26 2009 David Timms <iinet.net.au@dtimms> - 1.3.7-0.6.1.beta
- match the 1.3.7.beta version in fedora proper
- include new and updated patches from mschwendt
- del no longer required patches
* Sun Mar 29 2009 Julian Sikorski <belegdol@fedoraproject.org> - 1.3.6-0.4.beta
- wxGTK no longer provides wxGTK2 in Fedora 11
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.3.6-0.3.beta
- rebuild for new F11 features
- revert to 1.3.6.beta for now
* Sat Feb 7 2009 David Timms <iinet.net.au@dtimms> - 1.3.7-0.1.beta
- update to new upstream beta release
- drop beta release 1.3.2 from package
* Sun Dec 14 2008 David Timms <iinet.net.au@dtimms> - 1.3.6-0.2.beta
- add Kevin Koflers portaudio patch to allow output via pulseaudio
* Sun Nov 23 2008 David Timms <iinet.net.au@dtimms> - 1.3.6-0.1.beta
- update to new upstream beta release
- drop libdir patch for now
- drop upstreamed fr.po patch
- add support for ffmpeg import and export via BR and --with-ffmpeg
- add patch to allow selection of ffmpeg library on unix.
* Fri Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.4.beta
- mod patch2 apply command
* Fri Aug 22 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.3.beta
- add Requires lame-libs
- update 1.3.4-gcc43.patch to suit 1.3.5, since patch mostly upstreamed.
* Mon Aug 18 2008 David Timms <iinet.net.au@dtimms> - 1.3.5-0.2.beta
- rename spec and Name to audacity-freeworld.
- add provides/obsoletes audacity-nonfree.
- import livna package into rpmfusion.
* Sun Jun 8 2008 Michael Schwendt <mschwendt@users.sf.net> - 1.3.5-0.1.beta
- fix bad fr.po that makes Fichier>Open dialog too wide
- sync with F-9 updates-testing
- update to 1.3.5-beta
- tmp patch merged upstream
- expat2 patch merged upstream
- desktop-file: drop deprecated Encoding, drop Icon file extension
* Fri May 9 2008 Michael Schwendt <mschwendt@users.sf.net>
- scriptlets: run update-desktop-database without path
- drop scriptlet dependencies
* Sat May 3 2008 Michael Schwendt <mschwendt@users.sf.net> - 1.3.4-0.7.20080123cvs
- check ownership of temporary files directory (#436260) (CVE-2007-6061)
* Sat Apr 12 2008 Michael Schwendt <mschwendt@users.sf.net> - 1.3.4-0.6.20080123cvs
- set a default location for libmp3lame.so.0 again
* Fri Mar 21 2008 Michael Schwendt <mschwendt@users.sf.net> - 1.3.4-0.5.20080123cvs
- package the old 1.3.2-beta and a post 1.3.4-beta snapshot in the
same package -- users may stick to the older one, but please help
with evaluating the newer one
- merge packaging changes from my 1.3.3/1.3.4 test packages:
- build newer release with wxGTK 2.8.x
- BR soundtouch-devel and --with-soundtouch=system
- drop obsolete patches: resample, mp3 export, destdir, FLAC, fr
* Fri Mar 21 2008 Michael Schwendt <mschwendt@users.sf.net> - 1.3.2-0.9.beta
- make soundtouch and allegro build with RPM optflags
* Sun Feb 10 2008 Michael Schwendt <mschwendt@users.sf.net> - 1.3.2-0.8.beta
- rawhide: patch for JACK 0.109.0 API changes (jack_port_lock/unlock removal).
- rebuilt for GCC 4.3 as requested by Fedora Release Engineering
- subst _libdir in ladspa plugin loader
* Thu Jan 3 2008 Michael Schwendt <mschwendt@users.sf.net> - 1.3.2-0.7.beta
- Patch for GCC 4.3.0 C++.
* Fri Nov 16 2007 Michael Schwendt <mschwendt@users.sf.net> - 1.3.2-0.6.beta
- rebuilt for FLAC 1.1.4 -> 1.2.x upgrade, which broke FLAC import
* Mon Mar 5 2007 Michael Schwendt <mschwendt@users.sf.net>
- add umask 022 to scriptlets
* Sat Mar 3 2007 Michael Schwendt <mschwendt[ATusers.sf.net> - 1.3.2-0.5.beta
- build with wxGTK 2.6 compatibility package
* Sat Feb 24 2007 Michael Schwendt <mschwendt@users.sf.net> - 1.3.2-0.4.beta
- patch for FLAC 1.1.4 API compatibility
- patch ExportMP3.cpp (MPEG-2 Layer III bitrates resulted in
broken/empty files)
* Tue Feb 20 2007 Michael Schwendt <mschwendt@users.sf.net> - 1.3.2-0.3.beta
- patch app init to set a default location for libmp3lame.so.0
- fix the libmp3lame.so.0 subst
- subst _libdir in libmp3lame search
- use sed instead of perl
* Sun Feb 18 2007 Michael Schwendt <mschwendt@users.sf.net> - 1.3.2-0.2.beta
- patch the source to use libsamplerate actually and fix Resample.cpp
* Thu Feb 15 2007 Michael Schwendt <mschwendt@users.sf.net> - 1.3.2-0.1.beta
- sync with Fedora Extras 6 upgrade to 1.3.2-beta
- add BR expat-devel jack-audio-connection-kit-devel alsa-lib-devel
- built-in/patched: nyquist soundtouch
- built-in/patched, n/a: twolame
- adjust configure options accordingly
- patches 1-3 unnecessary, add gemi's audacity-1.3.2-destdir.patch
- make patch from iconv src/Languages.cpp conversion (ISO Latin-1 to UTF-8)
- make patch for locale/fr.po (MAC to ISO Latin-1)
* Wed Oct 18 2006 Michael Schwendt <mschwendt@users.sf.net> - 1.2.4-0.3.b.2
- rename to "audacity-nonfree" and "Conflicts: audacity"
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info>
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
* Sun Sep 24 2006 Michael Schwendt <mschwendt[At]users.sf.net>
- rebuild
* Sat Jun 3 2006 Michael Schwendt <mschwendt@users.sf.net> - 1.2.4-0.2.b
- bump and rebuild
* Fri Mar 17 2006 Michael Schwendt <mschwendt@users.sf.net> - 1.2.4-0.1.b
- Update to 1.2.4b (stable release).
- Follow upstream recommendation and use the GTK+ 1.x wxGTK.
This is because of various issues with fonts/layout/behaviour.
- Build with compat-wxGTK-devel.
- Modify build section to find wx-2.4-config instead of wx-config.
* Thu Mar 09 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- switch to new release field
* Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
- add dist
* Wed Jul 20 2005 Michael Schwendt <mschwendt@users.sf.net> - 1.2.3-5.lvn.1
- Sync with minor changes in Fedora Extras 4 package.
- Drop Epoch and bump release so this is high enough for an upgrade.
* Fri May 20 2005 David Woodhouse <dwmw2@infradead.org> - 1.2.3-4
- Add more possible MIME types for ogg which may be seen even though
they're not standard.
* Sun Jan 30 2005 Michael Schwendt <mschwendt@users.sf.net> - 0:1.2.3-1.lvn.1
- Build with mp3 and wxGTK2 by default,
- Make the libmp3lame perl substitution in %%prep more robust.
- s/Fedora/Livna/ in desktop file.
* Sat Nov 20 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.3-1
- New Version 1.2.3
* Sat Oct 30 2004 Michael Schwendt <mschwendt@users.sf.net> - 0:1.2.2-0.fdr.1
- Update to 1.2.2, patch aboutdialog to be readable with wxGTK.
* Mon May 10 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.1-0.fdr.1
- New Version 1.2.1
* Sun Apr 11 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.0-0.fdr.2
- Fix for Language.cpp restored
* Tue Mar 2 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.0-0.fdr.1
- New Version 1.2.0
* Mon Nov 24 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.0-0.fdr.4.pre3
- Added icon
- Separated mp3 plugin
* Sun Nov 23 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.0-0.fdr.2.pre3
- Changes to specfile
* Sun Nov 2 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.0-0.fdr.1.pre3
- New upstream version 1.2.0-pre3
* Sat Oct 25 2003 Gerard Milmeister <gemi@bluewin.ch> - 0:1.2.0-pre2.fdr.1
- First Fedora release
+1
View File
@@ -0,0 +1 @@
rpm.version(gh("audacity/audacity"));
+8
View File
@@ -0,0 +1,8 @@
project pkg {
rpm {
spec = "coolercontrol.spec"
}
labels {
large = 1
}
}
+159
View File
@@ -0,0 +1,159 @@
%bcond_without mold
%global _desc %{expand:
CoolerControl is a feature-rich cooling device control application for Linux. It has a system daemon
for background device management, as well as a GUI to expertly customize your settings.
}
%global rdnn org.coolercontrol.CoolerControl
# Don't mangle shebangs
%global __brp_mangle_shebangs %{nil}
Name: coolercontrol
Version: 1.4.5
Release: 1%?dist
Summary: Cooling device control for Linux
License: GPL-3.0-or-later
URL: https://gitlab.com/coolercontrol/coolercontrol
Source0: %url/-/archive/%version/coolercontrol-%version.tar.gz
Packager: madonuko <mado@fyralabs.com>
Provides: coolercontrol-ui
Provides: coolercontrol-gui
Requires: hicolor-icon-theme
Requires: webkit2gtk4.1
Requires: libappindicator-gtk3
Requires: coolercontrold
BuildRequires: git-core make nodejs-npm libdrm-devel curl wget file mold
BuildRequires: systemd-rpm-macros anda-srpm-macros cargo >= 1.75.0 cargo-rpm-macros
BuildRequires: autoconf automake binutils bison flex gcc gcc-c++ gdb libtool pkgconf strace
BuildRequires: pkgconfig(webkit2gtk-4.1) pkgconfig(openssl) pkgconfig(librsvg-2.0)
BuildRequires: libappindicator-gtk3-devel
BuildRequires: python3-devel python3-wheel python3-liquidctl python3-setproctitle python3-fastapi python3-uvicorn python3-pip
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
%description %_desc
%package liqctld
Summary: CoolerControl daemon for interacting with liquidctl devices on a system level
Requires: coolercontrold
%description liqctld %_desc
coolercontrol-liqctld is a CoolerControl daemon for interacting with liquidctl devices on a system level, and is
installed as the coolercontrol-liqctld application. Its main purpose is to wrap the underlying
liquidctl library providing an API interface that the main coolercontrol daemon interacts with.
It also enables parallel device communication and access to specific device properties.
%package -n coolercontrold
Summary: Monitor and control your cooling devices.
Requires: coolercontrol-liqctld
%description -n coolercontrold %_desc
coolercontrold is the main daemon containing the core logic for interfacing with devices, and installed as
"coolercontrold". It is meant to run in the background as a system daemon. It handles all device
communication and data management, additionally connecting to the liqctld daemon for liquidctl
supported devices. It has an API that services client programs like the coolercontrol-gui.
%prep
%autosetup
pushd coolercontrold
%cargo_prep_online &
popd
pushd coolercontrol-ui
npm ci --prefer-offline &
pushd src-tauri
%cargo_prep_online &
popd
popd
wait
%build
pushd coolercontrold
%{cargo_license_online} > LICENSE.dependencies &
%cargo_build -- &
popd
pushd coolercontrol-liqctld
%pyproject_wheel
popd
pushd coolercontrol-ui
npm run build &
pushd src-tauri
%{cargo_license_online} > LICENSE.dependencies &
wait
%cargo_build -f custom-protocol
popd
popd
%install
pushd coolercontrol-liqctld
#define _pyproject_wheeldir .
%pyproject_install
%pyproject_save_files coolercontrol_liqctld
popd
pushd coolercontrold
install -Dpm755 target/rpm/coolercontrold %buildroot%_bindir/coolercontrold
install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/coolercontrold/LICENSE.dependencies
popd
pushd coolercontrol-ui/src-tauri
install -Dpm755 target/rpm/coolercontrol %buildroot%_bindir/coolercontrol
install -Dpm644 LICENSE.dependencies %buildroot%_datadir/licenses/%name/LICENSE.dependencies
popd
install -Dpm644 packaging/systemd/coolercontrol-liqctld.service %buildroot%_unitdir/coolercontrol-liqctld.service
desktop-file-install --dir=%buildroot%_datadir/applications packaging/metadata/%rdnn.desktop
install -Dpm644 packaging/metadata/%rdnn.svg %buildroot%_iconsdir/hicolor/scalable/apps/%rdnn.svg
install -Dpm644 packaging/metadata/%rdnn.png %buildroot%_iconsdir/hicolor/256x256/apps/%rdnn.svg
for f in packaging/systemd/*.service; do
install -Dpm644 $f %buildroot%_unitdir/$(basename $f)
done
install -Dpm644 packaging/metadata/%rdnn.metainfo.xml %buildroot%_metainfodir/%rdnn.metainfo.xml
%check
appstream-util validate-relax --nonet %buildroot%_metainfodir/%rdnn.metainfo.xml
%pyproject_check_import
%post -n coolercontrold
%systemd_post coolercontrold.service
%preun -n coolercontrold
%systemd_preun coolercontrold.service
%postun -n coolercontrold
%systemd_postun_with_restart coolercontrold.service
# coolercontrold.service automatically uses the liqctld service, so there are
# no scriptlets for liqctld.
%files
%doc README.md
%license LICENSE
%license LICENSE.dependencies
%_bindir/coolercontrol
%_datadir/applications/%rdnn.desktop
%_datadir/metainfo/%rdnn.metainfo.xml
%_iconsdir/hicolor/*/apps/%rdnn.svg
%files -n coolercontrold
%doc coolercontrold/README.md
%license LICENSE
%license LICENSE.dependencies
%_bindir/coolercontrold
%_unitdir/coolercontrold.service
%files liqctld -f %pyproject_files
%doc coolercontrol-liqctld/README.md
%license LICENSE
%_bindir/coolercontrol-liqctld
%_unitdir/coolercontrol-liqctld.service
%changelog
* Thu Aug 15 2024 madonuko <mado@fyralabs.com> - 1.4.0-1
- Initial package
+1
View File
@@ -0,0 +1 @@
rpm.version(gitlab("30707566"));
@@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-canary-openasar
Version: 0.0.474
Version: 0.0.591
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
@@ -1,3 +1 @@
let html = get("https://discordapp.com/api/download/canary?platform=linux&format=tar.gz");
let newver = find("https://dl-canary\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
rpm.version(newver);
rpm.version(get("https://discord.com/api/canary/updates?platform=linux").json().name);
+1 -1
View File
@@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-canary
Version: 0.0.474
Version: 0.0.591
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers
URL: discord.com
+1 -3
View File
@@ -1,3 +1 @@
let html = get("https://discordapp.com/api/download/canary?platform=linux&format=tar.gz");
let newver = find("https://dl-canary\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
rpm.version(newver);
rpm.version(get("https://discord.com/api/canary/updates?platform=linux").json().name);
@@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-openasar
Version: 0.0.64
Version: 0.0.85
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
+1 -3
View File
@@ -1,3 +1 @@
let html = get("https://discordapp.com/api/download?platform=linux&format=tar.gz");
let newver = find("https://dl\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
rpm.version(newver);
rpm.version(get("https://discord.com/api/stable/updates?platform=linux").json().name);
@@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-ptb-openasar
Version: 0.0.101
Version: 0.0.131
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
+1 -3
View File
@@ -1,3 +1 @@
let html = get("https://discordapp.com/api/download/ptb?platform=linux&format=tar.gz");
let newver = find("https://dl-ptb\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
rpm.version(newver);
rpm.version(get("https://discord.com/api/ptb/updates?platform=linux").json().name);
+1 -1
View File
@@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord-ptb
Version: 0.0.101
Version: 0.0.131
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers.
URL: https://discord.com
+1 -3
View File
@@ -1,3 +1 @@
let html = get("https://discordapp.com/api/download/ptb?platform=linux&format=tar.gz");
let newver = find("https://dl-ptb\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
rpm.version(newver);
rpm.version(get("https://discord.com/api/ptb/updates?platform=linux").json().name);
+1 -1
View File
@@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: discord
Version: 0.0.64
Version: 0.0.85
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers
URL: https://discord.com
+1 -3
View File
@@ -1,3 +1 @@
let html = get("https://discordapp.com/api/download?platform=linux&format=tar.gz");
let newver = find("https://dl\\.discordapp\\.net/apps/linux/([\\.\\d]+)/", html, 1);
rpm.version(newver);
rpm.version(get("https://discord.com/api/stable/updates?platform=linux").json().name);
+9 -7
View File
@@ -1,8 +1,8 @@
%global commit 6ff4bc2cd57628c95aacd2f5a07305fd83e197e4
%global commit_date 20240820
%global commit 1ed031a2bf25c81ba3795e42c5b063779bb391bf
%global commit_date 20250214
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: envision
Name: envision-nightly
Version: %commit_date.%shortcommit
Release: 1%?dist
Summary: UI for building, configuring and running Monado, the open source OpenXR runtime
@@ -21,7 +21,9 @@ BuildRequires: openxr-devel
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
BuildRequires: glib2-devel
BuildRequires: git-core
Recommends: android-tools
Conflicts: envision
%description
%summary.
@@ -40,8 +42,8 @@ Recommends: android-tools
%doc README.md
%license LICENSE
%_bindir/envision
%_datadir/applications/org.gabmus.envision.desktop
%_datadir/applications/org.gabmus.envision.Devel.desktop
%_datadir/envision/
%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.svg
%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision-symbolic.svg
%_metainfodir/org.gabmus.envision.appdata.xml
%_iconsdir/hicolor/scalable/apps/org.gabmus.envision.Devel.svg
%_iconsdir/hicolor/symbolic/apps/org.gabmus.envision.Devel-symbolic.svg
%_metainfodir/org.gabmus.envision.Devel.appdata.xml
+1 -1
View File
@@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: feishin
Version: 0.7.3
Version: 0.12.2
Release: 1%?dist
Summary: A modern self-hosted music player
License: GPL-3.0
+5
View File
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "fontviewer.spec"
}
}
+40
View File
@@ -0,0 +1,40 @@
Name: fontviewer
Epoch: 1
Version: 1.1.0
Release: 1%?dist
Summary: View and install fonts
License: GPL-2.0
URL: https://github.com/chocolateimage/%{name}
Source0: %{url}/archive/v%{version}.tar.gz
BuildRequires: gcc-c++
BuildRequires: meson
BuildRequires: pkgconfig(fontconfig)
BuildRequires: pkgconfig(gtkmm-3.0)
BuildRequires: pkgconfig(libcurl)
BuildRequires: json-glib-devel
Requires: gtk3 fontconfig
Packager: sadlerm <sad_lerm@hotmail.com>
%description
A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer
%prep
%autosetup
%build
%meson
%meson_build
%install
%meson_install
%files
%license LICENSE
%doc README.md
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/scalable/actions/%{name}-google-symbolic.svg
+4
View File
@@ -0,0 +1,4 @@
rpm.version(gh("chocolateimage/fontviewer"));
if rpm.changed() {
rpm.release();
}
+1 -1
View File
@@ -5,7 +5,7 @@
%global pure_protobuf_version 2.0.0
Name: komikku
Version: 1.55.0
Version: 1.70.0
%forgemeta
Release: 1%?dist
Summary: A manga reader for GNOME
+5
View File
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "legcord-bin.spec"
}
}
@@ -0,0 +1,96 @@
%define debug_package %nil
%global _build_id_links none
%ifarch x86_64
%global src LegCord-%version-linux-x64
%elifarch aarch64
%global src LegCord-%version-linux-arm64
%elifarch armv7l
%global src LegCord-%version-linux-armv7l
%endif
# Exclude private libraries
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
Name: legcord-bin
Version: 1.1.0
Release: 1%?dist
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/LegCord/LegCord
Group: Applications/Internet
Source0: %url/releases/download/v%version/%src.zip
Source1: legcord.png
Source2: https://raw.githubusercontent.com/LegCord/LegCord/v%version/README.md
Requires: xdg-utils
BuildRequires: unzip
ExclusiveArch: x86_64 aarch64 armv7l
Conflicts: legcord
Conflicts: legcord-nightly
BuildRequires: add-determinism
Obsoletes: armcord < 3.3.2-1
%description
LegCord is a custom client designed to enhance your Discord experience
while keeping everything lightweight.
%prep
mkdir legcord
cd legcord
unzip %SOURCE0
cat <<EOF > .legcord.desktop
[Desktop Entry]
Name=LegCord
Comment=%summary
GenericName=Internet Messenger
Type=Application
Exec=%_bindir/legcord
Icon=legcord
Categories=Network;InstantMessaging;
StartupWMClass=legcord
Keywords=discord;armcord;legcord;vencord;shelter;electron;
EOF
%build
%install
cd legcord
mkdir -p %buildroot%_bindir %buildroot%_datadir/applications %buildroot%_datadir/pixmaps %buildroot%_datadir/legcord %buildroot%_docdir/%name
cp -a * %buildroot%_datadir/legcord/
ln -s %_datadir/legcord/legcord %buildroot%_bindir/legcord
ln -s %_datadir/legcord %buildroot%_datadir/armcord
chmod +x -R %buildroot%_datadir/legcord/*
chmod 755 %buildroot%_datadir/legcord/legcord
install -Dm644 .legcord.desktop %buildroot%_datadir/applications/LegCord.desktop
install -Dm644 %SOURCE1 %buildroot%_datadir/pixmaps/legcord.png
install -Dm644 %SOURCE2 %buildroot%_docdir/%name/
# HACK: rpm bug for unability to replace existing files on system.
%pre
if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
echo "Found old %_datadir/armcord directory, removing"
rm -rf %_datadir/armcord
fi
%files
%doc README.md
%_datadir/legcord
%_datadir/armcord
%_bindir/legcord
%_datadir/applications/LegCord.desktop
%_datadir/pixmaps/legcord.png
%changelog
* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
* Sat Jun 17 2023 madonuko <mado@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
- Use /usr/share/ instead of /opt/
* Sat May 6 2023 madonuko <mado@fyralabs.com> - 3.1.7-1
- Initial package

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

@@ -0,0 +1 @@
rpm.version(gh("LegCord/LegCord"));
+9
View File
@@ -0,0 +1,9 @@
project pkg {
arches = ["x86_64"]
rpm {
spec = "legcord-nightly.spec"
}
labels {
nightly = 1
}
}
@@ -0,0 +1,91 @@
%global commit ddd87bf96716c553369c26a6de7137a3c70bc373
%global commit_date 20250214
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%define debug_package %nil
Name: legcord-nightly
Version: %commit_date.%shortcommit
Release: 1%?dist
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/LegCord/LegCord
Group: Applications/Internet
Source0: %url/archive/%commit/legcord-%commit.tar.gz
Source1: launch.sh
Packager: Owen <owen@fyralabs.com>
Requires: electron xdg-utils
Provides: armcord-nightly
Obsoletes: armcord < 3.3.2-1
Conflicts: legcord-bin
Conflicts: legcord
BuildArch: noarch
BuildRequires: anda-srpm-macros pnpm
%description
legcord is a custom client designed to enhance your Discord experience
while keeping everything lightweight.
%prep
%autosetup -n Legcord-%commit
cat <<EOF > legcord.desktop
[Desktop Entry]
Name=LegCord
Comment=%summary
GenericName=Internet Messenger
Type=Application
Exec=/usr/bin/legcord
Icon=legcord
Categories=Network;InstantMessaging;
StartupWMClass=legcord
Keywords=discord;armcord;legcord;vencord;shelter;electron;
EOF
%build
pnpm install --no-frozen-lockfile
pnpm run packageQuick
%install
install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar
install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord
install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop
install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png
ln -s %_datadir/legcord %buildroot%_datadir/armcord
# HACK: rpm bug for unability to replace existing files on system.
%pre
if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
echo "Found old %_datadir/armcord directory, removing"
rm -rf %_datadir/armcord
fi
%files
%doc README.md
%license license.txt
/usr/bin/legcord
/usr/share/applications/LegCord.desktop
/usr/share/pixmaps/legcord.png
/usr/share/legcord/app.asar
/usr/share/armcord
%changelog
* Fri Nov 22 2024 owen <owen@fyralabs.com> - 1.0.2-2
- Add nightly package.
* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
- Update to license.txt
* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
- Initial package
+5
View File
@@ -0,0 +1,5 @@
rpm.global("commit", gh_commit("Legcord/Legcord"));
if rpm.changed() {
rpm.release();
rpm.global("commit_date", date());
}
@@ -1,6 +1,6 @@
project pkg {
arches = ["x86_64"]
rpm {
spec = "armcord.spec"
spec = "legcord.spec"
}
}
+13
View File
@@ -0,0 +1,13 @@
#!/bin/sh
electron=/usr/bin/electron
CONFIG=${XDG_CONFIG_HOME:-~/.config}
FLAGS="$CONFIG/armcord-flags.conf"
# Allow users to override command-line options
if [ -f "$FLAGS" ]; then
USER_FLAGS="$(cat "$FLAGS")"
fi
# shellcheck disable=SC2086 # USER_FLAGS has to be unquoted
"$electron" /usr/share/armcord/app.asar $USER_FLAGS "$@"
+88
View File
@@ -0,0 +1,88 @@
%define debug_package %nil
# Exclude private libraries
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/(armcord|legcord)/.*\\.so
Name: legcord
Version: 1.1.0
Release: 1%?dist
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/LegCord/LegCord
Group: Applications/Internet
Source1: launch.sh
Packager: madonuko <mado@fyralabs.com>
Requires: electron xdg-utils
Provides: armcord
Obsoletes: armcord < 3.3.2-1
Conflicts: legcord-bin
Conflicts: legcord-nightly
BuildArch: noarch
BuildRequires: anda-srpm-macros pnpm
%description
legcord is a custom client designed to enhance your Discord experience
while keeping everything lightweight.
%prep
%git_clone %url v%version
cat <<EOF > legcord.desktop
[Desktop Entry]
Name=Legcord
Comment=%summary
GenericName=Internet Messenger
Type=Application
Exec=/usr/bin/legcord
Icon=legcord
Categories=Network;InstantMessaging;
StartupWMClass=legcord
Keywords=discord;armcord;legcord;vencord;shelter;electron;
EOF
%build
pnpm install --no-frozen-lockfile
pnpm run packageQuick
%install
install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/app.asar
install -Dm755 %SOURCE1 %buildroot/usr/bin/legcord
install -Dm644 legcord.desktop %buildroot/usr/share/applications/LegCord.desktop
install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/legcord.png
ln -s %_datadir/legcord %buildroot%_datadir/armcord
# HACK: rpm bug for unability to replace existing files on system.
%pre
if [ -d %_datadir/armcord ] && [ ! -L %_datadir/armcord ]; then
echo "Found old %_datadir/armcord directory, removing"
rm -rf %_datadir/armcord
fi
%files
%doc README.md
%license license.txt
/usr/bin/legcord
/usr/share/applications/LegCord.desktop
/usr/share/pixmaps/legcord.png
/usr/share/legcord/app.asar
/usr/share/armcord
%changelog
* Mon Oct 21 2024 madonuko <mado@fyralabs.com> - 1.0.2-2
- Rename to LegCord.
* Mon Aug 26 2024 madonuko <mado@fyralabs.com> - 3.3.0-1
- Update to license.txt
* Sat Jun 17 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.2.0-2
- Remove libnotify dependency.
- Fix desktop entry.
- Set as noarch package because there are not binary files.
* Sat May 6 2023 windowsboy111 <windowsboy111@fyralabs.com> - 3.1.7-1
- Initial package
+1
View File
@@ -0,0 +1 @@
rpm.version(gh("LegCord/LegCord"));
+4 -4
View File
@@ -1,7 +1,7 @@
%global commit f44c29b223d7f0187ccf938eb1651671c8e92cf3
%global commit 58f46e7f0bf8817b6c2d15126160386285e56e0d
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240821
%global ver 0.38.0
%global commit_date 20250214
%global ver 0.39.0
Name: mpv-nightly
Version: %ver^%commit_date.%shortcommit
@@ -42,6 +42,7 @@ BuildRequires: pkgconfig(libavutil) >= 57.24.100
BuildRequires: pkgconfig(libbluray)
BuildRequires: pkgconfig(libcdio)
BuildRequires: pkgconfig(libcdio_paranoia)
BuildRequires: pkgconfig(libdisplay-info)
BuildRequires: pkgconfig(libdrm)
BuildRequires: pkgconfig(libjpeg)
BuildRequires: pkgconfig(libpipewire-0.3) >= 0.3.19
@@ -182,7 +183,6 @@ sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
-Dvdpau-gl-x11=enabled \
-Dvdpau=enabled \
-Dvector=enabled \
-Dvulkan-interop=disabled \
-Dvulkan=enabled \
-Dwayland=enabled \
-Dwerror=false \
+11 -21
View File
@@ -1,4 +1,4 @@
%global ver 2024-08-28
%global ver 2025-02-14
%global goodver %(echo %ver | sed 's/-//g')
%global __brp_mangle_shebangs %{nil}
%bcond_without mold
@@ -16,7 +16,7 @@ URL: https://ruffle.rs/
Source0: https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-%ver.tar.gz
Provides: ruffle
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: anda-srpm-macros
BuildRequires: anda-srpm-macros mold
BuildRequires: gcc-c++ cmake java
BuildRequires: java-latest-openjdk-headless
BuildRequires: pkgconfig(alsa)
@@ -32,26 +32,15 @@ Packager: madonuko <mado@fyralabs.com>
%license LICENSE.md
%license LICENSE.dependencies
%_bindir/ruffle_desktop
%_datadir/applications/ruffle_desktop.desktop
%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
%_datadir/applications/rs.ruffle.Ruffle.desktop
%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
%prep
%autosetup -n ruffle-nightly-%ver
%autosetup -n ruffle-nightly-%ver -p1
%cargo_prep_online
cat<<EOF > ruffle_desktop.desktop
[Desktop Entry]
Version=1.0
Type=Application
Name=Ruffle Desktop
Comment=%summary
Exec=%_bindir/ruffle_desktop
Icon=ruffle_desktop
Terminal=false
StartupNotify=false
Categories=Application;
MimeType=application/x-shockwave-flash;
EOF
sed -iE 's@^Exec=ruffle %%u$@Exec=ruffle_desktop %%u@' desktop/packages/linux/rs.ruffle.Ruffle.desktop
cat desktop/packages/linux/rs.ruffle.Ruffle.desktop
%build
%{cargo_license_online} > LICENSE.dependencies
@@ -59,8 +48,9 @@ EOF
%install
cd desktop
%cargo_install
install -Dm644 assets/icon.svg %buildroot%_iconsdir/hicolor/scalable/apps/ruffle_desktop.svg
install -Dm644 ../ruffle_desktop.desktop %buildroot%_datadir/applications/ruffle_desktop.desktop
install -Dm644 packages/linux/rs.ruffle.Ruffle.svg %buildroot%_iconsdir/hicolor/scalable/apps/rs.ruffle.Ruffle.svg
install -Dm644 packages/linux/rs.ruffle.Ruffle.desktop %buildroot%_datadir/applications/rs.ruffle.Ruffle.desktop
install -Dm644 packages/linux/rs.ruffle.Ruffle.metainfo.xml %buildroot%_metainfodir/rs.ruffle.Ruffle.metainfo.xml
%changelog
* Mon Jul 29 2024 madonuko <mado@fyralabs.com>
@@ -1,16 +0,0 @@
--- sccache-0.8.1/Cargo.toml 1970-01-01T00:00:01+00:00
+++ sccache-0.8.1/Cargo.toml 2024-07-10T16:31:31.705674+00:00
@@ -403,13 +403,3 @@
[target."cfg(unix)".dependencies.daemonize]
version = "0.5"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = [
- "fileapi",
- "handleapi",
- "stringapiset",
- "winnls",
- "processenv",
- "std",
-]
+5
View File
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "sticky.spec"
}
}
@@ -0,0 +1,9 @@
diff --git a/usr/bin/sticky b/usr/bin/sticky
index 7425e9c..a00e755 100755
--- a/usr/bin/sticky
+++ b/usr/bin/sticky
@@ -1,3 +1,3 @@
#!/bin/bash
-/usr/lib/sticky/sticky.py $*
+/usr/lib/python3*/site-packages/sticky/sticky.py $*
@@ -0,0 +1,9 @@
diff --git a/meson.build b/meson.build
index b25d642..435a6f0 100644
--- a/meson.build
+++ b/meson.build
@@ -17,4 +17,3 @@ subdir('po')
install_subdir('etc', install_dir: sysconfdir, strip_directory: true)
install_subdir('usr', install_dir: prefix, strip_directory: true)
-meson.add_install_script('meson/meson-postinstall.sh')
+62
View File
@@ -0,0 +1,62 @@
%global debug_package %{nil}
Name: sticky
Version: 1.24
Release: 1%{?dist}
Summary: A sticky notes app for the Linux desktop
License: GPL-2.0
URL: https://github.com/linuxmint/sticky
Source0: %{url}/archive/%{version}.tar.gz
Patch0: remove-meson-postinstall-script.patch
Patch1: point-executable-to-sitepackages-directory.patch
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: meson
BuildRequires: gettext-devel
Requires: python3
Requires: glib2
Requires: gspell
Requires: gtk3
Requires: python3-gobject-base
Requires: python3-xapp
Requires: xapps
Packager: sadlerm <sad_lerm@hotmail.com>
%description
Sticky is a note-taking app for the Linux desktop that simulates traditional "sticky note" style stationery on your desktop. Some of its features include basic text formatting (bold, italics, monospaced, etc.), spell-checking, a tray icon for controlling note visibility, color notes, manual and automatic backups, and a manager to organize your notes into groups.
%prep
%autosetup -p1
%build
%meson
%meson_build
%install
%meson_install
mkdir -p %{buildroot}%{python3_sitelib}
mv -v %{buildroot}%{_prefix}/lib/%{name} %{buildroot}%{python3_sitelib}/%{name}
%files
%license COPYING
%doc README.md
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/glib-2.0/schemas/org.x.%{name}.gschema.xml
%{_datadir}/icons/hicolor/scalable/apps/%{name}*.svg
%{_datadir}/icons/hicolor/scalable/status/%{name}*.svg
%{_datadir}/locale/*/LC_MESSAGES/%{name}.mo
%{_datadir}/%{name}/*
%{_sysconfdir}/xdg/autostart/%{name}.desktop
%{_datadir}/dbus-1/services/org.x.%{name}.service
%{python3_sitelib}/%{name}/*.py
%{python3_sitelib}/%{name}/__pycache__/*.pyc
%changelog
* Thu Jan 16 2025 sadlerm4 <sad_lerm@hotmail.com>
- Initial package
@@ -0,0 +1,27 @@
From 44046bfbcb30a19c45416113a2a82a4d17a1a998 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Mon, 14 Aug 2023 14:06:45 +0200
Subject: [PATCH 01/10] main: update GPUs comment for dbus property
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
src/net.hadess.SwitcherooControl.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/net.hadess.SwitcherooControl.xml b/src/net.hadess.SwitcherooControl.xml
index e52bc1a..59a8896 100644
--- a/src/net.hadess.SwitcherooControl.xml
+++ b/src/net.hadess.SwitcherooControl.xml
@@ -38,7 +38,8 @@
will contain a user-facing name for the GPU, the "Environment" (as) key will
contain an array of even number of strings, each being an environment
variable to set to use the GPU, followed by its value, the "Default" (b) key
- will tag the default (usually integrated) GPU.
+ will tag the default GPU, the "Discrete" (b) key tags if the GPU is a
+ dedicated component.
-->
<property name="GPUs" type="aa{sv}" access="read"/>
--
2.46.0
@@ -0,0 +1,379 @@
From 4f31415cb61a50c2bcba1510a7511518417d0970 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Mon, 11 Sep 2023 15:21:46 +0200
Subject: [PATCH 02/10] main: add Discrete key
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
.gitlab-ci.yml | 1 +
data/30-discrete-gpu.rules.in | 3 +
data/meson.build | 7 ++
meson.build | 9 +++
meson_options.txt | 24 +++++++
src/discrete-detection/amdgpu.c | 46 +++++++++++++
src/discrete-detection/meson.build | 18 +++++
src/discrete-detection/nouveau.c | 105 +++++++++++++++++++++++++++++
src/meson.build | 4 +-
src/switcheroo-control.c | 16 +++++
10 files changed, 232 insertions(+), 1 deletion(-)
create mode 100644 data/30-discrete-gpu.rules.in
create mode 100644 src/discrete-detection/amdgpu.c
create mode 100644 src/discrete-detection/meson.build
create mode 100644 src/discrete-detection/nouveau.c
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a6aa3c7..a09fe20 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ image: fedora:rawhide
variables:
DEPENDENCIES: glib2-devel
libgudev-devel
+ libdrm-devel
gtk-doc
gcc
gcc-c++
diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in
new file mode 100644
index 0000000..a803ed4
--- /dev/null
+++ b/data/30-discrete-gpu.rules.in
@@ -0,0 +1,3 @@
+DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
+DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
+DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu"
diff --git a/data/meson.build b/data/meson.build
index 85e5c93..38cf96c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -17,3 +17,10 @@ install_data(
'30-pci-intel-gpu.hwdb',
install_dir: hwdb_dir,
)
+
+configure_file(
+ input: '30-discrete-gpu.rules.in',
+ output: '30-discrete-gpu.rules',
+ configuration: data_conf,
+ install_dir: rules_dir,
+)
diff --git a/meson.build b/meson.build
index b8f4bff..b3aaf0c 100644
--- a/meson.build
+++ b/meson.build
@@ -20,6 +20,9 @@ gnome = import('gnome')
glib = dependency('glib-2.0', version: '>= 2.56.0')
gio = dependency('gio-2.0', version: '>= 2.56.0')
gudev = dependency('gudev-1.0', version: '>= 232')
+libdrm = dependency('libdrm', version: '>= 2.4.97', required: get_option('libdrm'))
+libdrm_nouveau = dependency('libdrm_nouveau', version: '>= 2.4.97', required: get_option('libdrm_nouveau'))
+libdrm_amdgpu = dependency('libdrm_amdgpu', version: '>= 2.4.97', required: get_option('libdrm_amdgpu'))
systemd_systemunitdir = get_option('systemdsystemunitdir')
if systemd_systemunitdir == ''
@@ -32,6 +35,12 @@ if hwdb_dir == ''
hwdb_dir = udevdir / 'hwdb.d'
endif
+rules_dir = get_option('rulesdir')
+if rules_dir == ''
+ udevdir = dependency('udev').get_pkgconfig_variable('udevdir')
+ rules_dir = udevdir / 'rules.d'
+endif
+
# Make like license available in the build root for docs
configure_file(
input: 'COPYING',
diff --git a/meson_options.txt b/meson_options.txt
index c8d9619..b8d671a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -10,6 +10,12 @@ option('hwdbdir',
description: 'Directory for hwdb files',
)
+option('rulesdir',
+ type: 'string',
+ value: '',
+ description: 'Directory for ruke files',
+)
+
option('gtk_doc',
type: 'boolean',
value: false,
@@ -21,3 +27,21 @@ option('tests',
type: 'boolean',
value: false
)
+
+option('libdrm',
+ description: 'Whether libdrm should be used to probe GPUs',
+ type: 'feature',
+ value: 'auto'
+)
+
+option('libdrm_nouveau',
+ description: 'Whether libdrm_nouveau should be used to probe Nvidia GPUs',
+ type: 'feature',
+ value: 'auto'
+)
+
+option('libdrm_amdgpu',
+ description: 'Whether libdrm_amdgpu should be used to probe AMD GPUs',
+ type: 'feature',
+ value: 'auto'
+)
diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c
new file mode 100644
index 0000000..2d9804f
--- /dev/null
+++ b/src/discrete-detection/amdgpu.c
@@ -0,0 +1,46 @@
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <gio/gio.h>
+#include <gudev/gudev.h>
+
+#include <amdgpu.h>
+#include <amdgpu_drm.h>
+
+typedef int handle;
+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
+G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free);
+
+int main(int argc, char** argv)
+{
+ if (argc < 2)
+ {
+ puts ("check-discrete-amdgpu [DEVNAME]");
+ return EXIT_FAILURE;
+ }
+
+ const char *devname;
+ g_auto(handle) fd = -1;
+ g_autoptr(GUdevDevice) parent = NULL;
+ struct drm_amdgpu_info_device device_info = {0};
+ amdgpu_device_handle device = NULL;
+ uint32_t drm_major, drm_minor;
+
+ devname = argv[1];
+ fd = open (devname, O_RDWR);
+ if (fd < 0)
+ return EXIT_FAILURE;
+
+ if (amdgpu_device_initialize (fd, &drm_major, &drm_minor, &device))
+ return EXIT_FAILURE;
+
+ if (amdgpu_query_info (device, AMDGPU_INFO_DEV_INFO, sizeof(device_info), &device_info))
+ return EXIT_FAILURE;
+
+ /* AMDGPU_IDS_FLAGS_FUSION is set for all APUs */
+ if (device_info.ids_flags & AMDGPU_IDS_FLAGS_FUSION)
+ return EXIT_FAILURE;
+
+ return EXIT_SUCCESS;
+}
diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
new file mode 100644
index 0000000..3a6c03f
--- /dev/null
+++ b/src/discrete-detection/meson.build
@@ -0,0 +1,18 @@
+
+if libdrm_amdgpu.found()
+ executable('check-discrete-amdgpu',
+ files('amdgpu.c'),
+ dependencies: deps,
+ install: true,
+ install_dir: libexecdir,
+ )
+endif
+
+if libdrm.found() and libdrm_nouveau.found()
+ executable('check-discrete-nouveau',
+ files('nouveau.c'),
+ dependencies: deps,
+ install: true,
+ install_dir: libexecdir,
+ )
+endif
diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c
new file mode 100644
index 0000000..0a1f220
--- /dev/null
+++ b/src/discrete-detection/nouveau.c
@@ -0,0 +1,105 @@
+
+#include <fcntl.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <gio/gio.h>
+#include <gudev/gudev.h>
+
+#include <xf86drm.h>
+#include <nouveau_drm.h>
+#include <nouveau/nvif/ioctl.h>
+#include <nvif/cl0080.h>
+#include <nvif/class.h>
+
+typedef int handle;
+G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
+
+int main(int argc, char** argv)
+{
+ if (argc < 2)
+ {
+ puts ("check-discrete-nouveau [DEVNAME]");
+ return EXIT_FAILURE;
+ }
+
+ const char *devname;
+ g_auto(handle) fd = -1;
+
+ devname = argv[1];
+ fd = open (devname, O_RDWR);
+ if (fd < 0)
+ return EXIT_FAILURE;
+
+ g_autofree void *device = malloc(352);
+
+ /* Init device */
+ {
+ struct {
+ struct nvif_ioctl_v0 ioctl;
+ struct nvif_ioctl_new_v0 new;
+ struct nv_device_v0 dev;
+ } init_args = {
+ .ioctl = {
+ .object = 0,
+ .owner = NVIF_IOCTL_V0_OWNER_ANY,
+ .route = 0x00,
+ .type = NVIF_IOCTL_V0_NEW,
+ .version = 0,
+ },
+ .new = {
+ .handle = 0,
+ .object = (uintptr_t)device,
+ .oclass = NV_DEVICE,
+ .route = NVIF_IOCTL_V0_ROUTE_NVIF,
+ .token = (uintptr_t)device,
+ .version = 0,
+ },
+ .dev = {
+ .device = ~0ULL,
+ },
+ };
+
+ if (drmCommandWrite (fd, DRM_NOUVEAU_NVIF, &init_args, sizeof(init_args)))
+ return EXIT_FAILURE;
+ }
+
+ /* Query device info */
+ struct {
+ struct nvif_ioctl_v0 ioctl;
+ struct nvif_ioctl_mthd_v0 mthd;
+ struct nv_device_info_v0 info;
+ } args = {
+ .ioctl = {
+ .object = (uintptr_t)device,
+ .owner = NVIF_IOCTL_V0_OWNER_ANY,
+ .route = 0x00,
+ .type = NVIF_IOCTL_V0_MTHD,
+ .version = 0,
+ },
+ .mthd = {
+ .method = NV_DEVICE_V0_INFO,
+ .version = 0,
+ },
+ .info = {
+ .version = 0,
+ },
+ };
+
+ if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args)))
+ return EXIT_FAILURE;
+
+
+ switch (args.info.platform)
+ {
+ case NV_DEVICE_INFO_V0_IGP:
+ case NV_DEVICE_INFO_V0_SOC:
+ return EXIT_FAILURE;
+
+ case NV_DEVICE_INFO_V0_PCI:
+ case NV_DEVICE_INFO_V0_AGP:
+ case NV_DEVICE_INFO_V0_PCIE:
+ default:
+ return EXIT_SUCCESS;
+ }
+ return EXIT_FAILURE;
+}
diff --git a/src/meson.build b/src/meson.build
index ab3a77d..da4267f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,4 @@
-deps = [glib, gio, gudev]
+deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu]
sources = [
'info-cleanup.c',
@@ -34,3 +34,5 @@ configure_file(
configuration: switcherooctl_conf,
install_dir: get_option('bindir')
)
+
+subdir('discrete-detection')
diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
index abd8154..e407bfb 100644
--- a/src/switcheroo-control.c
+++ b/src/switcheroo-control.c
@@ -31,6 +31,7 @@ typedef struct {
char *name;
GPtrArray *env;
gboolean is_default;
+ gboolean is_discrete;
} CardData;
typedef struct {
@@ -94,6 +95,8 @@ build_gpus_variant (ControlData *data)
g_variant_new_strv ((const gchar * const *) card->env->pdata, card->env->len));
g_variant_builder_add (&asv_builder, "{sv}", "Default",
g_variant_new_boolean (card->is_default));
+ g_variant_builder_add (&asv_builder, "{sv}", "Discrete",
+ g_variant_new_boolean (card->is_discrete));
g_variant_builder_add (&builder, "a{sv}", &asv_builder);
}
@@ -312,6 +315,18 @@ get_card_is_default (GUdevDevice *d)
return g_udev_device_get_sysfs_attr_as_boolean (parent, "boot_vga");
}
+static gboolean
+get_card_is_discrete (GUdevDevice *d)
+{
+ const char * const * tags;
+ g_autoptr (GUdevDevice) platform_device = NULL;
+
+ tags = g_udev_device_get_tags (d);
+ if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu"))
+ return TRUE;
+ return FALSE;
+}
+
static CardData *
get_card_data (GUdevClient *client,
GUdevDevice *d)
@@ -328,6 +343,7 @@ get_card_data (GUdevClient *client,
data->name = get_card_name (d);
data->env = env;
data->is_default = get_card_is_default (d);
+ data->is_discrete = get_card_is_discrete (d);
return data;
}
--
2.46.0
@@ -0,0 +1,27 @@
From 1b115ed72e03ff1169cbfddd79ef10890baca133 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Tue, 12 Sep 2023 15:53:40 +0200
Subject: [PATCH 03/10] tests: fix integration tests without UMockdev
`gi.require_version` throws ValueError if the dependency cannot be found
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
tests/integration-test.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/integration-test.py b/tests/integration-test.py
index d8dea16..e3dd996 100755
--- a/tests/integration-test.py
+++ b/tests/integration-test.py
@@ -37,7 +37,7 @@ except ImportError as e:
try:
gi.require_version('UMockdev', '1.0')
from gi.repository import UMockdev
-except ImportError:
+except (ImportError, ValueError):
sys.stderr.write('Skipping tests, umockdev not available (https://github.com/martinpitt/umockdev)\n')
sys.exit(0)
--
2.46.0
@@ -0,0 +1,278 @@
From d933e96bdb15679ae7653f929461982aa66973ba Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Tue, 12 Sep 2023 15:58:16 +0200
Subject: [PATCH 04/10] tests: add tests for discrete detection with mock libs
Both tests have 4 different ways of testing: - Invalid Device - Unexpected
Device - Non Discrete GPU (iGPU/APU) - Discrete GPU
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
src/discrete-detection/meson.build | 4 +-
tests/discrete-detection/libdrm_amdgpu_mock.c | 57 +++++++++++++
.../discrete-detection/libdrm_nouveau_mock.c | 68 ++++++++++++++++
tests/discrete-detection/meson.build | 80 +++++++++++++++++++
tests/meson.build | 2 +
5 files changed, 209 insertions(+), 2 deletions(-)
create mode 100644 tests/discrete-detection/libdrm_amdgpu_mock.c
create mode 100644 tests/discrete-detection/libdrm_nouveau_mock.c
create mode 100644 tests/discrete-detection/meson.build
diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
index 3a6c03f..8eb8437 100644
--- a/src/discrete-detection/meson.build
+++ b/src/discrete-detection/meson.build
@@ -1,6 +1,6 @@
if libdrm_amdgpu.found()
- executable('check-discrete-amdgpu',
+ amdgpu_discrete = executable('check-discrete-amdgpu',
files('amdgpu.c'),
dependencies: deps,
install: true,
@@ -9,7 +9,7 @@ if libdrm_amdgpu.found()
endif
if libdrm.found() and libdrm_nouveau.found()
- executable('check-discrete-nouveau',
+ nouveau_discrete = executable('check-discrete-nouveau',
files('nouveau.c'),
dependencies: deps,
install: true,
diff --git a/tests/discrete-detection/libdrm_amdgpu_mock.c b/tests/discrete-detection/libdrm_amdgpu_mock.c
new file mode 100644
index 0000000..20fa4aa
--- /dev/null
+++ b/tests/discrete-detection/libdrm_amdgpu_mock.c
@@ -0,0 +1,57 @@
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include <amdgpu_drm.h>
+
+enum {
+ OTHER_GPU,
+ AMD_APU,
+ AMD_GPU,
+};
+
+/* Mock open(2) so we can test multiple devices configurations */
+int open(const char *pathname, int flags)
+{
+ if (!strcmp(pathname, "OTHER_GPU"))
+ return OTHER_GPU;
+ if (!strcmp (pathname, "AMD_APU"))
+ return AMD_APU;
+ if (!strcmp (pathname, "AMD_GPU"))
+ return AMD_GPU;
+
+ return -1;
+}
+
+/* open64 may be used for large file support */
+int open64(const char *pathname, int flags)
+{
+ return open (pathname, flags);
+}
+
+int amdgpu_device_initialize(int fd, uint32_t *major_version, uint32_t *minor_version, int *device_handle)
+{
+ // Store the fd in the device handle for access in query_info
+ *device_handle = fd;
+
+ if (fd != AMD_GPU && fd != AMD_APU)
+ return 1;
+
+ return 0;
+}
+
+int amdgpu_query_info(int device_handle, unsigned info_id, unsigned size, void *value)
+{
+ struct drm_amdgpu_info_device* device_info = value;
+
+ if (device_handle == AMD_GPU) {
+ device_info->ids_flags = 0;
+ return 0;
+ }
+ if (device_handle == AMD_APU) {
+ device_info->ids_flags = AMDGPU_IDS_FLAGS_FUSION;
+ return 0;
+ }
+
+ return 1;
+}
diff --git a/tests/discrete-detection/libdrm_nouveau_mock.c b/tests/discrete-detection/libdrm_nouveau_mock.c
new file mode 100644
index 0000000..cdbfda8
--- /dev/null
+++ b/tests/discrete-detection/libdrm_nouveau_mock.c
@@ -0,0 +1,68 @@
+#include <string.h>
+#include <stdint.h>
+#include <stdio.h>
+
+#include <xf86drm.h>
+#include <nouveau_drm.h>
+#include <nouveau/nvif/ioctl.h>
+#include <nvif/cl0080.h>
+#include <nvif/class.h>
+
+enum {
+ OTHER_GPU,
+ NVIDIA_IGPU,
+ NVIDIA_GPU,
+};
+
+/* Mock open(2) so we can test multiple devices configurations */
+int open(const char *pathname, int flags)
+{
+ if (!strcmp(pathname, "OTHER_GPU"))
+ return OTHER_GPU;
+ if (!strcmp (pathname, "NVIDIA_IGPU"))
+ return NVIDIA_IGPU;
+ if (!strcmp (pathname, "NVIDIA_GPU"))
+ return NVIDIA_GPU;
+
+ return -1;
+}
+
+/* open64 may be used for large file support */
+int open64(const char *pathname, int flags)
+{
+ return open (pathname, flags);
+}
+
+int drmCommandWrite(int fd, unsigned long drmCommandIndex, void *data, unsigned long size)
+{
+ if (drmCommandIndex != DRM_NOUVEAU_NVIF)
+ return 1;
+
+ if (fd != NVIDIA_GPU && fd != NVIDIA_IGPU)
+ return 1;
+
+ return 0;
+}
+
+int drmCommandWriteRead(int fd, unsigned long drmCommandIndex, void *data, unsigned long size)
+{
+ if (drmCommandIndex != DRM_NOUVEAU_NVIF)
+ return 1;
+
+ struct {
+ struct nvif_ioctl_v0 ioctl;
+ struct nvif_ioctl_mthd_v0 mthd;
+ struct nv_device_info_v0 info;
+ } *args = data;
+
+ if (fd == NVIDIA_GPU) {
+ args->info.platform = NV_DEVICE_INFO_V0_PCIE;
+ return 0;
+ }
+ if (fd == NVIDIA_IGPU) {
+ args->info.platform = NV_DEVICE_INFO_V0_IGP;
+ return 0;
+ }
+
+ return 1;
+}
\ No newline at end of file
diff --git a/tests/discrete-detection/meson.build b/tests/discrete-detection/meson.build
new file mode 100644
index 0000000..f01a014
--- /dev/null
+++ b/tests/discrete-detection/meson.build
@@ -0,0 +1,80 @@
+
+if libdrm_amdgpu.found()
+ amdgpu_mock_lib = shared_library(
+ 'drm_amdgpu_mock',
+ files('libdrm_amdgpu_mock.c'),
+ dependencies: libdrm_amdgpu
+ )
+
+ test(
+ 'test amdgpu detection with invalid device',
+ amdgpu_discrete,
+ args: ['NO_GPU'],
+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
+ should_fail: true
+ )
+
+ test(
+ 'test amdgpu detection with non-AMD GPU',
+ amdgpu_discrete,
+ args: ['OTHER_GPU'],
+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
+ should_fail: true
+ )
+
+ test(
+ 'test amdgpu detection with AMD APU',
+ amdgpu_discrete,
+ args: ['AMD_APU'],
+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
+ should_fail: true
+ )
+
+ test(
+ 'test amdgpu detection with AMD GPU',
+ amdgpu_discrete,
+ args: ['AMD_GPU'],
+ env: environment({'LD_PRELOAD': amdgpu_mock_lib.full_path()}),
+ should_fail: false
+ )
+endif
+
+if libdrm.found() and libdrm_nouveau.found()
+ nouveau_mock_lib = shared_library(
+ 'drm_nouveau_mock',
+ files('libdrm_nouveau_mock.c'),
+ dependencies: [libdrm, libdrm_nouveau]
+ )
+
+ test(
+ 'test nouveau detection with invalid device',
+ nouveau_discrete,
+ args: ['NO_GPU'],
+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
+ should_fail: true
+ )
+
+ test(
+ 'test nouveau detection with non-Nvidia GPU',
+ nouveau_discrete,
+ args: ['OTHER_GPU'],
+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
+ should_fail: true
+ )
+
+ test(
+ 'test nouveau detection with Nvidia iGPU',
+ nouveau_discrete,
+ args: ['NVIDIA_IGPU'],
+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
+ should_fail: true
+ )
+
+ test(
+ 'test nouveau detection with Nvidia GPU',
+ nouveau_discrete,
+ args: ['NVIDIA_GPU'],
+ env: environment({'LD_PRELOAD': nouveau_mock_lib.full_path()}),
+ should_fail: false
+ )
+endif
\ No newline at end of file
diff --git a/tests/meson.build b/tests/meson.build
index b0b7476..61ef00c 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -15,3 +15,5 @@ foreach ut: unit_tests
env: envs,
)
endforeach
+
+subdir('discrete-detection')
--
2.46.0
@@ -0,0 +1,39 @@
From c102b643945dc076d881497dd2ca5865938f7053 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Tue, 12 Sep 2023 15:57:47 +0200
Subject: [PATCH 05/10] main: remove leftover and fix typo
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
meson_options.txt | 2 +-
src/switcheroo-control.c | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/meson_options.txt b/meson_options.txt
index b8d671a..c77fea8 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -13,7 +13,7 @@ option('hwdbdir',
option('rulesdir',
type: 'string',
value: '',
- description: 'Directory for ruke files',
+ description: 'Directory for rule files',
)
option('gtk_doc',
diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
index e407bfb..0f6a548 100644
--- a/src/switcheroo-control.c
+++ b/src/switcheroo-control.c
@@ -319,7 +319,6 @@ static gboolean
get_card_is_discrete (GUdevDevice *d)
{
const char * const * tags;
- g_autoptr (GUdevDevice) platform_device = NULL;
tags = g_udev_device_get_tags (d);
if (tags && g_strv_contains (tags, "switcheroo-discrete-gpu"))
--
2.46.0
@@ -0,0 +1,48 @@
From f764db4eb565c19ba14155791fbfced3fb5d34c8 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Tue, 12 Sep 2023 15:58:27 +0200
Subject: [PATCH 06/10] main: move discrete dependencies out of main deps
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
src/discrete-detection/meson.build | 5 +++--
src/meson.build | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/discrete-detection/meson.build b/src/discrete-detection/meson.build
index 8eb8437..353316f 100644
--- a/src/discrete-detection/meson.build
+++ b/src/discrete-detection/meson.build
@@ -1,8 +1,9 @@
+discrete_deps = deps + [libdrm, libdrm_nouveau, libdrm_amdgpu]
if libdrm_amdgpu.found()
amdgpu_discrete = executable('check-discrete-amdgpu',
files('amdgpu.c'),
- dependencies: deps,
+ dependencies: discrete_deps,
install: true,
install_dir: libexecdir,
)
@@ -11,7 +12,7 @@ endif
if libdrm.found() and libdrm_nouveau.found()
nouveau_discrete = executable('check-discrete-nouveau',
files('nouveau.c'),
- dependencies: deps,
+ dependencies: discrete_deps,
install: true,
install_dir: libexecdir,
)
diff --git a/src/meson.build b/src/meson.build
index da4267f..22d69e7 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,4 +1,4 @@
-deps = [glib, gio, gudev, libdrm, libdrm_nouveau, libdrm_amdgpu]
+deps = [glib, gio, gudev]
sources = [
'info-cleanup.c',
--
2.46.0
@@ -0,0 +1,137 @@
From d2ecc29469d5572fd171926c9d1dbb1b851c7b09 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Tue, 12 Sep 2023 17:12:00 +0200
Subject: [PATCH 07/10] main: use glib for discrete command-line arguments
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
src/discrete-detection/amdgpu.c | 29 ++++++++++++++++++++---------
src/discrete-detection/nouveau.c | 29 ++++++++++++++++++++---------
2 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/src/discrete-detection/amdgpu.c b/src/discrete-detection/amdgpu.c
index 2d9804f..5a9a4ab 100644
--- a/src/discrete-detection/amdgpu.c
+++ b/src/discrete-detection/amdgpu.c
@@ -1,9 +1,10 @@
-
#include <fcntl.h>
#include <stdlib.h>
#include <stdio.h>
+#include <locale.h>
#include <gio/gio.h>
#include <gudev/gudev.h>
+#include <glib.h>
#include <amdgpu.h>
#include <amdgpu_drm.h>
@@ -12,22 +13,32 @@ typedef int handle;
G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
G_DEFINE_AUTOPTR_CLEANUP_FUNC(amdgpu_device_handle, free);
-int main(int argc, char** argv)
+int main (int argc, char** argv)
{
- if (argc < 2)
- {
- puts ("check-discrete-amdgpu [DEVNAME]");
- return EXIT_FAILURE;
- }
-
const char *devname;
g_auto(handle) fd = -1;
- g_autoptr(GUdevDevice) parent = NULL;
struct drm_amdgpu_info_device device_info = {0};
amdgpu_device_handle device = NULL;
uint32_t drm_major, drm_minor;
+ g_autoptr(GOptionContext) option_context = NULL;
+ g_autoptr(GError) error = NULL;
+ setlocale (LC_ALL, "");
+ option_context = g_option_context_new ("");
+
+ if (!g_option_context_parse (option_context, &argc, &argv, &error)) {
+ g_print ("Failed to parse arguments: %s\n", error->message);
+ return EXIT_FAILURE;
+ }
+
+ if (argc < 2)
+ {
+ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL));
+ return EXIT_FAILURE;
+ }
devname = argv[1];
+;
+
fd = open (devname, O_RDWR);
if (fd < 0)
return EXIT_FAILURE;
diff --git a/src/discrete-detection/nouveau.c b/src/discrete-detection/nouveau.c
index 0a1f220..1d61cbb 100644
--- a/src/discrete-detection/nouveau.c
+++ b/src/discrete-detection/nouveau.c
@@ -1,9 +1,10 @@
-
#include <fcntl.h>
#include <stdlib.h>
#include <stdio.h>
+#include <locale.h>
#include <gio/gio.h>
#include <gudev/gudev.h>
+#include <glib.h>
#include <xf86drm.h>
#include <nouveau_drm.h>
@@ -14,23 +15,34 @@
typedef int handle;
G_DEFINE_AUTO_CLEANUP_FREE_FUNC(handle, close, -1)
-int main(int argc, char** argv)
+int main (int argc, char** argv)
{
+ const gchar *devname = NULL;
+ g_auto(handle) fd = -1;
+ g_autofree void *device = NULL;
+ g_autoptr(GOptionContext) option_context = NULL;
+ g_autoptr(GError) error = NULL;
+
+ setlocale (LC_ALL, "");
+ option_context = g_option_context_new ("");
+
+ if (!g_option_context_parse (option_context, &argc, &argv, &error)) {
+ g_print ("Failed to parse arguments: %s\n", error->message);
+ return EXIT_FAILURE;
+ }
+
if (argc < 2)
{
- puts ("check-discrete-nouveau [DEVNAME]");
+ g_print ("%s\n", g_option_context_get_help (option_context, TRUE, NULL));
return EXIT_FAILURE;
}
-
- const char *devname;
- g_auto(handle) fd = -1;
-
devname = argv[1];
+
fd = open (devname, O_RDWR);
if (fd < 0)
return EXIT_FAILURE;
- g_autofree void *device = malloc(352);
+ device = malloc(352);
/* Init device */
{
@@ -88,7 +100,6 @@ int main(int argc, char** argv)
if (drmCommandWriteRead (fd, DRM_NOUVEAU_NVIF, &args, sizeof(args)))
return EXIT_FAILURE;
-
switch (args.info.platform)
{
case NV_DEVICE_INFO_V0_IGP:
--
2.46.0
@@ -0,0 +1,25 @@
From 462b09f02de37dfd2965d23cc7c4137bcf45a4ae Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Wed, 14 Feb 2024 20:25:42 +0100
Subject: [PATCH 08/10] main: add udev rule for i915 checking a lot of systems
has shown that the intel iGPU will always be available at `0000:00:02.0`.
Using ID_PATH would have been cleaner, but I couldn't get it to work.
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
data/30-discrete-gpu.rules.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/30-discrete-gpu.rules.in b/data/30-discrete-gpu.rules.in
index a803ed4..f30f315 100644
--- a/data/30-discrete-gpu.rules.in
+++ b/data/30-discrete-gpu.rules.in
@@ -1,3 +1,4 @@
DRIVERS=="amdgpu", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-amdgpu $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
DRIVERS=="nouveau", SUBSYSTEM=="drm", PROGRAM="@libexecdir@/check-discrete-nouveau $env{DEVNAME}", TAG+="switcheroo-discrete-gpu"
-DRIVERS=="nvidia", TAG+="switcheroo-discrete-gpu"
+DRIVERS=="nvidia", SUBSYSTEM=="drm", TAG+="switcheroo-discrete-gpu"
+DRIVERS=="i915", SUBSYSTEM=="drm", DEVPATH!="/devices/pci0000:00/0000:00:02.0/drm/*", TAG+="switcheroo-discrete-gpu"
--
2.46.0
@@ -0,0 +1,34 @@
From 55db3aeaeb962952881f73e94432f750cfb64fc8 Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Thu, 15 Feb 2024 16:24:00 +0100
Subject: [PATCH 09/10] main: use Discrete key in switcherooctl
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
src/switcherooctl.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/switcherooctl.in b/src/switcherooctl.in
index 96c21cc..c0e3f07 100755
--- a/src/switcherooctl.in
+++ b/src/switcherooctl.in
@@ -77,6 +77,7 @@ def print_gpu(gpu, index):
print('Device:', index)
print(' Name: ', gpu['Name'])
print(' Default: ', "yes" if gpu['Default'] else "no")
+ print(' Discrete: ', "yes" if gpu['Discrete'] else "no")
print(' Environment:', env_to_str(gpu['Environment']))
def _list():
@@ -126,7 +127,7 @@ def get_discrete_gpu():
return None
try:
- gpu = next(gpu for gpu in gpus if not gpu['Default'])
+ gpu = next(gpu for gpu in gpus if gpu['Discrete'])
except StopIteration:
return None
else:
--
2.46.0
@@ -0,0 +1,45 @@
From 4232c75fe41158bb5063d630d36b3ffd6a8a57ec Mon Sep 17 00:00:00 2001
From: Jan200101 <sentrycraft123@gmail.com>
Date: Fri, 6 Sep 2024 22:31:56 +0200
Subject: [PATCH 10/10] main: use new GPU list on uevent the amount of GPUs may
still be the same but underlying attributes may have changed On the ASUS TUF
Dash F15 running Fedora 40 6.10.7-200.fc40.x86_64 the udev tags are not
applied at the time switcheroo-control starts but at a later uevent they are
correct. Memory gets allocated anyways to check if the GPU count has changed,
so this shouldn't affect memory usage.
Signed-off-by: Jan200101 <sentrycraft123@gmail.com>
---
src/switcheroo-control.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/switcheroo-control.c b/src/switcheroo-control.c
index 0f6a548..01954c7 100644
--- a/src/switcheroo-control.c
+++ b/src/switcheroo-control.c
@@ -438,16 +438,12 @@ uevent_cb (GUdevClient *client,
cards = get_drm_cards (data);
num_gpus = cards->len;
- if (num_gpus != data->num_gpus) {
- g_debug ("GPUs added or removed (old: %d new: %d)",
- data->num_gpus, num_gpus);
- g_ptr_array_free (data->cards, TRUE);
- data->cards = cards;
- data->num_gpus = cards->len;
- send_dbus_event (data);
- } else {
- g_ptr_array_free (cards, TRUE);
- }
+ g_debug ("GPUs updated (old: %d new: %d)",
+ data->num_gpus, num_gpus);
+ g_ptr_array_free (data->cards, TRUE);
+ data->cards = cards;
+ data->num_gpus = cards->len;
+ send_dbus_event (data);
}
static void
--
2.46.0
+8
View File
@@ -0,0 +1,8 @@
project pkg {
rpm {
spec = "switcheroo-control.spec"
}
labels {
subrepo = "extras"
}
}
@@ -0,0 +1,194 @@
Name: switcheroo-control
Version: 2.6
Release: 8%{?dist}
Summary: D-Bus service to check the availability of dual-GPU
License: GPLv3
URL: https://gitlab.freedesktop.org/hadess/switcheroo-control/
# URL from https://gitlab.freedesktop.org/hadess/switcheroo-control/-/releases
Source0: https://gitlab.freedesktop.org/hadess/switcheroo-control/uploads/86ea54ac7ddb901b6bf6e915209151f8/switcheroo-control-2.6.tar.xz
Patch: 0001-main-update-GPUs-comment-for-dbus-property.patch
Patch: 0002-main-add-Discrete-key.patch
Patch: 0003-tests-fix-integration-tests-without-UMockdev.patch
Patch: 0004-tests-add-tests-for-discrete-detection-with-mock-lib.patch
Patch: 0005-main-remove-leftover-and-fix-typo.patch
Patch: 0006-main-move-discrete-dependencies-out-of-main-deps.patch
Patch: 0007-main-use-glib-for-discrete-command-line-arguments.patch
Patch: 0008-main-add-udev-rule-for-i915.patch
Patch: 0009-main-use-Discrete-key-in-switcherooctl.patch
Patch: 0010-main-use-new-GPU-list-on-uevent.patch
BuildRequires: gcc
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: gtk-doc
BuildRequires: meson
BuildRequires: systemd
BuildRequires: libdrm-devel
BuildRequires: python3-dbusmock
BuildRequires: umockdev
%{?systemd_requires}
%description
D-Bus service to check the availability of dual-GPU.
%package docs
Summary: Documentation for %{name}
BuildArch: noarch
%description docs
This package contains the documentation for %{name}.
%prep
%autosetup -p1
%build
%meson -Dgtk_doc=true
%meson_build
%install
%meson_install
%post
if [ $1 -eq 2 ] && [ -x /usr/bin/systemctl ] ; then
/usr/bin/systemctl daemon-reload
fi
%systemd_post switcheroo-control.service
%udev_hwdb_update
%preun
%systemd_preun switcheroo-control.service
%postun
%systemd_postun_with_restart switcheroo-control.service
%udev_hwdb_update
%files
%license COPYING
%doc NEWS README.md
%{_bindir}/switcherooctl
%{_datadir}/dbus-1/system.d/net.hadess.SwitcherooControl.conf
%{_unitdir}/switcheroo-control.service
%{_libexecdir}/switcheroo-control
%{_udevhwdbdir}/30-pci-intel-gpu.hwdb
%{_mandir}/man1/switcherooctl.1*
%{_libexecdir}/check-discrete-amdgpu
%{_libexecdir}/check-discrete-nouveau
%{_udevrulesdir}/30-discrete-gpu.rules
%files docs
%dir %{_datadir}/gtk-doc/
%dir %{_datadir}/gtk-doc/html/
%{_datadir}/gtk-doc/html/%{name}/
%changelog
* Fri Sep 06 2024 Jan200101 <sentrycraft123@gmail.com> - 2.6-8
- Update discrete patch
* Thu Feb 15 2024 Jan Drögehoff <sentrycraft123@gmail.com> - 2.6-7
- Update discrete patch
* Wed Feb 14 2024 Jan Drögehoff <sentrycraft123@gmail.com> - 2.6-6
- Add discrete patch
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Fri Jul 01 2022 Bastien Nocera <bnocera@redhat.com> - 2.6-1
+ switcheroo-control-2.6-1
- Update to 2.6
* Fri Apr 29 2022 Bastien Nocera <bnocera@redhat.com> - 2.5-1
+ switcheroo-control-2.5-1
- Update to 2.5
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.4-3
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Mon Jan 04 2021 Bastien Nocera <bnocera@redhat.com> - 2.4-1
+ switcheroo-control-2.4-1
- Update to 2.4
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Apr 27 2020 Bastien Nocera <bnocera@redhat.com> - 2.2-1
+ switcheroo-control-2.2-1
- Update to 2.2
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jan 02 2020 Bastien Nocera <bnocera@redhat.com> - 2.1-1
+ switcheroo-control-2.1-1
- Update to 2.1
- Fix crasher on startup (#1786846)
* Thu Nov 21 2019 Bastien Nocera <bnocera@redhat.com> - 2.0-2
+ switcheroo-control-2.0-2
- Fix post scripts not reloading service file
* Tue Nov 05 2019 Bastien Nocera <bnocera@redhat.com> - 2.0-1
+ switcheroo-control-2.0-1
- Update to 2.0
* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Mon Jun 17 2019 Bastien Nocera <bnocera@redhat.com> - 1.3.1-1
+ switcheroo-control-1.3.1-1
- Fix Secure Boot work-around
* Wed Jun 12 2019 Bastien Nocera <bnocera@redhat.com> - 1.3-1
+ switcheroo-control-1.3-1
- Update to 1.3
- Fix operation with SecureBoot enabled
* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Nov 04 2016 Bastien Nocera <bnocera@redhat.com> - 1.1-1
+ switcheroo-control-1.1-1
- Update to 1.1
- Don't throw errors when the machine doesn't have dual-GPU (#1391212)
* Fri Oct 21 2016 Kalev Lember <klember@redhat.com> - 1.0-1
- Initial Fedora packaging
+1
View File
@@ -0,0 +1 @@
rpm.version(gitlab("gitlab.freedesktop.org", "4339"));
@@ -6,7 +6,7 @@
Name: vencord-desktop
Provides: VencordDesktop = %{version}-%{release}
Version: 1.5.3
Version: 1.5.5
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
+2 -2
View File
@@ -6,14 +6,14 @@
# do not perform compression in cpio
%define _source_payload w0.ufdio
%define _binary_payload w0.gzdio
%define _binary_payload w19.zstdio
# Exclude private libraries
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Name: voicevox
Version: 0.20.0
Version: 0.22.4
Release: 1%?dist
Summary: Free Japanese text-to-speech editor
License: LGPL-3.0
+50
View File
@@ -0,0 +1,50 @@
Name: WoeUSB-ng
Version: 0.2.12
Release: 1%?dist
Summary: Simple tool that enable you to create your own usb stick with Windows installer
License: GPL-3.0-only
Requires: parted dosfstools ntfsprogs p7zip p7zip-plugins xdg-utils grub2-tools
URL: https://github.com/WoeUSB/WoeUSB-ng
Source: https://github.com/WoeUSB/WoeUSB-ng/archive/refs/tags/v%version.tar.gz
Patch0: https://patch-diff.githubusercontent.com/raw/WoeUSB/WoeUSB-ng/pull/79.patch
BuildArch: noarch
BuildRequires: python3-devel python3-installer
%global _description %{expand:
WoeUSB-ng is a simple tool that enable you to create your own usb stick windows installer from an iso image or a real DVD. This is a rewrite of original WoeUSB.}
%description %_description
%prep
%autosetup -p1
%generate_buildrequires
%pyproject_buildrequires
%build
%pyproject_wheel
%install
%pyproject_install
%pyproject_save_files WoeUSB
install -Dpm644 miscellaneous/WoeUSB-ng.desktop %buildroot%_datadir/applications/WoeUSB-ng.desktop
install -Dpm644 miscellaneous/com.github.woeusb.woeusb-ng.policy %buildroot%_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy
%check
#pyproject_check_import
%files -f %{pyproject_files}
%_bindir/woeusb
%_bindir/woeusbgui
%_datadir/applications/WoeUSB-ng.desktop
%_iconsdir/hicolor/scalable/apps/woeusb-logo.png
%_datadir/polkit-1/actions/com.github.woeusb.woeusb-ng.policy
%changelog
%autochangelog
+5
View File
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "WoeUSB-ng.spec"
}
}
+1
View File
@@ -0,0 +1 @@
rpm.version(gh_tag("WoeUSB/WoeUSB-ng"));
+4
View File
@@ -2,4 +2,8 @@ project pkg {
rpm {
spec = "youtube-music.spec"
}
labels = {
mock = 1
}
}
@@ -5,6 +5,6 @@ TryExec=/usr/bin/youtube-music
Icon=youtube-music
Terminal=false
Type=Application
StartupWMClass=YouTube Music
StartupWMClass=com.github.th_ch.youtube_music
Comment=YouTube Music Desktop App - including custom plugins
Categories=AudioVideo;
+16 -3
View File
@@ -1,12 +1,19 @@
%define debug_package %nil
# Exclude private libraries since this is bundled with electron
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
# macro shorthand for calling pnpm
%global pnpm npx pnpm@%{pnpm_version}
# Try to vendor PNPM directly from Fedora
# but if this fails, you can try setting this to 1 to vendor PNPM directly from upstream
%global vendor_pnpm 0
Name: youtube-music
Version: 3.5.1
Release: 1%{?dist}
Version: 3.7.2
Release: 3%?dist
Summary: YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
Source1: youtube-music.desktop
License: MIT
@@ -21,6 +28,10 @@ BuildRequires: git-core gcc make
# Required for usocket native module built with node-gyp
BuildRequires: python3 gcc-c++
%if !0%{?vendor_pnpm}
BuildRequires: pnpm nodejs20
%endif
%description
YouTube Music Desktop App bundled with custom plugins (and built-in ad blocker / downloader)
@@ -35,9 +46,11 @@ git checkout v%{version}
%build
# Vendor PNPM directly instead of installing from packages, because we need to somehow force PNPM to use Node.js 20
# We are not using Fedora's PNPM because we need to use `pnpm env`, which PNPM does not support when not vendored directly from upstream
%if 0%{?vendor_pnpm}
curl -fsSL https://get.pnpm.io/install.sh | sh -
source /builddir/.bashrc
source $HOME/.bashrc
pnpm env use --global 20
%endif
pnpm install
pnpm build
pnpm electron-builder --linux --dir
@@ -1,115 +1,113 @@
Name: budgie-extras
Version: 1.8.0
Release: 1%{?dist}
Name: budgie-extras
Version: 1.9.0
Release: 1%?dist
License: GPL-3.0
Summary: Additional Budgie Desktop enhancements for user experience
URL: https://ubuntubudgie.org/
License: GPL-3.0
Summary: Additional Budgie Desktop enhancements for user experience
URL: https://ubuntubudgie.org/
Source0: https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
Patch0: 0001-fix-weathershow-desktop-widget-icon-path.patch
Source0: https://github.com/UbuntuBudgie/budgie-extras/releases/download/v%{version}/budgie-extras-%{version}.tar.xz
BuildRequires: rpm_macro(fdupes)
BuildRequires: cmake
BuildRequires: meson
BuildRequires: vala
BuildRequires: intltool
BuildRequires: rpm_macro(fdupes)
BuildRequires: cmake
BuildRequires: meson
BuildRequires: vala
BuildRequires: intltool
BuildRequires: pkgconfig(budgie-1.0)
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gnome-settings-daemon)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(keybinder-3.0)
BuildRequires: pkgconfig(libgnome-menu-3.0)
BuildRequires: pkgconfig(libnm)
BuildRequires: pkgconfig(libnma)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libwnck-3.0)
BuildRequires: pkgconfig(budgie-1.0)
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gnome-settings-daemon)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(keybinder-3.0)
BuildRequires: pkgconfig(libgnome-menu-3.0)
BuildRequires: pkgconfig(libnm)
BuildRequires: pkgconfig(libnma)
BuildRequires: pkgconfig(libnotify)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libwnck-3.0)
BuildRequires: pkgconfig(appstream)
BuildRequires: pkgconfig(granite)
BuildRequires: pkgconfig(libhandy-1)
BuildRequires: pkgconfig(zeitgeist-2.0)
BuildRequires: pkgconfig(appstream)
BuildRequires: pkgconfig(granite)
BuildRequires: pkgconfig(libhandy-1)
BuildRequires: pkgconfig(zeitgeist-2.0)
Requires: budgie-applet-applications-menu
Requires: budgie-applet-weathershow
Requires: budgie-applet-app-launcher
Requires: budgie-applet-brightness-controller
Requires: budgie-applet-clockworks
Requires: budgie-applet-countdown
Requires: budgie-applet-dropby
Requires: budgie-applet-fuzzyclock
Requires: budgie-applet-hotcorners
Requires: budgie-applet-kangaroo
Requires: budgie-applet-keyboard-autoswitch
Requires: budgie-applet-network-manager
Requires: budgie-applet-quickchar
Requires: budgie-applet-quicknote
Requires: budgie-applet-recentlyused
Requires: budgie-applet-rotation-lock
Requires: budgie-applet-showtime
Requires: budgie-applet-takeabreak
Requires: budgie-applet-visualspace
Requires: budgie-applet-wallstreet
Requires: budgie-applet-window-shuffler
Requires: budgie-applet-workspace-stopwatch
Requires: budgie-applet-wpreviews
Requires: budgie-applet-wswitcher
Requires: budgie-applet-app-launcher
Requires: budgie-applet-applications-menu
Requires: budgie-applet-brightness-controller
Requires: budgie-applet-clockworks
Requires: budgie-applet-countdown
Requires: budgie-applet-dropby
Requires: budgie-applet-fuzzyclock
Requires: budgie-applet-hotcorners
Requires: budgie-applet-kangaroo
Requires: budgie-applet-keyboard-autoswitch
Requires: budgie-applet-network-manager
Requires: budgie-applet-quickchar
Requires: budgie-applet-quicknote
Requires: budgie-applet-recentlyused
Requires: budgie-applet-rotation-lock
Requires: budgie-applet-showtime
Requires: budgie-applet-takeabreak
Requires: budgie-applet-visualspace
Requires: budgie-applet-wallstreet
Requires: budgie-applet-weathershow
Requires: budgie-applet-window-shuffler
Requires: budgie-applet-workspace-stopwatch
Requires: budgie-applet-wpreviews
Requires: budgie-applet-wswitcher
# Fix for https://github.com/UbuntuBudgie/budgie-extras/issues/233, don't know how stenstorp did not notice this
Requires: xinput
Requires: xinput
%description
This is part of a suite of python3 and Vala based applets for the Budgie
Desktop that provide additional user orientated capabilities.
The applets can be used individually or as a set.
%package common
Requires: budgie-desktop
Summary: Shared component of budgie-extras applets
BuildArch: noarch
%description common
%package common
Requires: budgie-desktop
Summary: Shared component of budgie-extras applets
BuildArch: noarch
%description common
The shared component provides for capabilities that are utilised between
budgie-extra applets.
%package daemon
Summary: Manages keyboard shortcuts
Requires: budgie-extras-common
%description daemon
%package daemon
Summary: Manages keyboard shortcuts
Requires: budgie-extras-common
%description daemon
This on logon process manages keyboard shortcuts delivered via .bde files for
various extras-plugins.
%package -n budgie-applet-app-launcher
Requires: budgie-extras-common
Summary: Applet to provide an alternative means to launch applications
Requires: budgie-extras-common
Summary: Applet to provide an alternative means to launch applications
%description -n budgie-applet-app-launcher
The app-launcher applet allows the ability to add favorite apps to the
panel as well as finding and launching applications. The list of
applications listed can be easily configured to be visible or hidden.
%package -n budgie-applet-applications-menu
Requires: budgie-extras-common
Summary: Lightweight and stylish app launcher
Requires: budgie-extras-common
Summary: Lightweight and stylish app launcher
%description -n budgie-applet-applications-menu
%{summary}
%package -n budgie-applet-brightness-controller
Requires: budgie-extras-common
Summary: A Budgie Desktop applet for productivity
Requires: budgie-extras-common
Summary: A Budgie Desktop applet for productivity
%description -n budgie-applet-brightness-controller
%{summary}
%package -n budgie-applet-clockworks
Requires: budgie-extras-common
Summary: Applet to display clock across multiple time zones
Requires: budgie-extras-common
Summary: Applet to display clock across multiple time zones
%description -n budgie-applet-clockworks
The Clockworks applet displays the current time across multiple
time zones.
%package -n budgie-applet-countdown
Requires: budgie-extras-common
Summary: Applet providing a countdown capability on the Budgie Desktop
Requires: budgie-extras-common
Summary: Applet providing a countdown capability on the Budgie Desktop
%description -n budgie-applet-countdown
The Countdown applet provides the user the ability to start an
action when the countdown reaches 0 seconds. Actions include flashing
@@ -117,8 +115,8 @@ an icon in the panel, opening a notification window, sounding a
bell or running a custom command.
%package -n budgie-applet-dropby
Requires: budgie-extras-common
Summary: Applet to popup when a USB device is connected
Requires: budgie-extras-common
Summary: Applet to popup when a USB device is connected
%description -n budgie-applet-dropby
The DropBy applet pops up in the panel when connecting a usb device.
The applet subsequently offers the option(s) to mount, unmount/eject
@@ -126,29 +124,29 @@ and in case of a flash drive, to make a local copy of the drive's
content. The info shows the free space on the volume.
%package -n budgie-applet-fuzzyclock
Requires: budgie-extras-common
Summary: Shows the time in a Fuzzy Way
Requires: budgie-extras-common
Summary: Shows the time in a Fuzzy Way
%description -n budgie-applet-fuzzyclock
%{summary}
%package -n budgie-applet-hotcorners
Requires: budgie-extras-common
Summary: Applet providing hotcorners capabilities for the Budgie Desktop
Requires: budgie-extras-common
Summary: Applet providing hotcorners capabilities for the Budgie Desktop
%description -n budgie-applet-hotcorners
The hotcorners applet allow user defined commands to be executed
when the mouse cursor is pushed into a corner of the main desktop.
%package -n budgie-applet-kangaroo
Requires: budgie-extras-common
Summary: Applet to allow quick file-browsing
Requires: budgie-extras-common
Summary: Applet to allow quick file-browsing
%description -n budgie-applet-kangaroo
The kangaroo applet allows for quick & easy browsing, across
(possibly) many directory layers, without having to do a single mouse
click.
%package -n budgie-applet-keyboard-autoswitch
Requires: budgie-extras-common
Summary: Applet adding the ability to set a different keyboard layout per application
Requires: budgie-extras-common
Summary: Applet adding the ability to set a different keyboard layout per application
%description -n budgie-applet-keyboard-autoswitch
The Keyboard Auto Switcher applet provides the user the ability to set
a different keyboard layout per application. Exceptions to the default
@@ -156,50 +154,51 @@ layout can be set by simply choosing a different layout using the
Keyboard Layout applet.
%package -n budgie-applet-network-manager
Requires: budgie-extras-common
Summary: A fork of Wingpanel Network Indicator, ported to budgie desktop
Requires: budgie-extras-common
Summary: A fork of Wingpanel Network Indicator, ported to budgie desktop
%description -n budgie-applet-network-manager
%{summary}
%package -n budgie-applet-quickchar
Requires: budgie-extras-common
Summary: A mini-app to quickly choose and insert equivalents of ascii characters
Requires: budgie-extras-common
Requires: budgie-extras-daemon
Summary: A mini-app to quickly choose and insert equivalents of ascii characters
%description -n budgie-applet-quickchar
QuickChar is a mini-app to quickly choose and insert equivalents of ascii
characters. QuickChar is activated via the Budgie Menu.
%package -n budgie-applet-quicknote
Requires: budgie-extras-common
Summary: Applet providing simple notes capability for the Budgie Desktop
Requires: budgie-extras-common
Summary: Applet providing simple notes capability for the Budgie Desktop
%description -n budgie-applet-quicknote
The quicknote applet allows a user to record a text based note.
The applet supports multiple undo and redo capabilities.
%package -n budgie-applet-recentlyused
Requires: budgie-extras-common
Summary: Applet displays files recently accessed for the Budgie Desktop
Requires: budgie-extras-common
Summary: Applet displays files recently accessed for the Budgie Desktop
%description -n budgie-applet-recentlyused
The recentlyused applet displays the users files that have been opened
or created within a configurable period of time.
%package -n budgie-applet-rotation-lock
Requires: budgie-extras-common
Summary: Applet to lock or unlock the screen rotation
Requires: budgie-extras-common
Summary: Applet to lock or unlock the screen rotation
%description -n budgie-applet-rotation-lock
The Rotation Lock applet provides the user an easy way to lock or
unlock the screen rotation.
%package -n budgie-applet-showtime
Requires: budgie-extras-common
Summary: Applet displaying date and time on the Budgie Desktop
Requires: budgie-extras-common
Summary: Applet displaying date and time on the Budgie Desktop
%description -n budgie-applet-showtime
The ShowTime applet is a digital desktop clock, showing time and/or
date. Text color of both the displayed time and date can be set
separately from the applet's menu
%package -n budgie-applet-takeabreak
Requires: budgie-extras-common
Summary: A pomodoro-like applet, to make sure to take regular breaks from working
Requires: budgie-extras-common
Summary: A pomodoro-like applet, to make sure to take regular breaks from working
%description -n budgie-applet-takeabreak
Budgie TakeaBreak is a pomodoro- like applet, to make sure to take regular
breaks from working. Options from Budgie Settings include turning the screen
@@ -208,35 +207,36 @@ time. The applet can be accessed quickly from the panel to temporarily switch
it off.
%package -n budgie-applet-visualspace
Requires: budgie-extras-common
Summary: Shows the current workspace(s), as bullet(s)
Requires: budgie-extras-common
Summary: Shows the current workspace(s), as bullet(s)
%description -n budgie-applet-visualspace
Budgie VisualSpace shows the current workspace(s), as bullet(s). The applet
includes a menu to navigate to either one of the windows or their
corresponding workspace.
%package -n budgie-applet-wallstreet
Requires: budgie-extras-common
Summary: A mini-app to switch wallpapers on regular intervalls
Requires: budgie-extras-common
Summary: A mini-app to switch wallpapers on regular intervalls
%description -n budgie-applet-wallstreet
Budgie WallStreet is a mini-app to switch wallpapers on regular intervalls.
%package -n budgie-applet-weathershow
Requires: budgie-extras-common
Summary: Applet to display the weather and forecast
Requires: budgie-extras-common
Summary: Applet to display the weather and forecast
%description -n budgie-applet-weathershow
The weathershow applet displays daily and three hourly weather
forecasts on both the desktop and a Popover.
%package -n budgie-applet-window-shuffler
Requires: budgie-extras-common
Summary: Budgie Window Shuffler
Requires: budgie-extras-common
Requires: budgie-extras-daemon
Summary: Budgie Window Shuffler
%description -n budgie-applet-window-shuffler
%{summary}
%package -n budgie-applet-workspace-stopwatch
Requires: budgie-extras-common
Summary: An applet to keep track of usage per workspace
Requires: budgie-extras-common
Summary: An applet to keep track of usage per workspace
%description -n budgie-applet-workspace-stopwatch
Workspace Timer Applet is an applet to keep track of usage per workspace, e.g.
to find out how much minutes/hours were actually spent on a job. Workspaces can
@@ -246,14 +246,16 @@ onworkspace switch/clicking the icon for popup or else every 30 seconds. Time
during suspend is automatically retracted from a workspace' time.
%package -n budgie-applet-wpreviews
Requires: budgie-extras-common
Requires: budgie-extras-common
Requires: budgie-extras-daemon
Summary: Applet providing window previews capabilities for the Budgie Desktop
%description -n budgie-applet-wpreviews
The Previews applet shows an overview of windows in an expose like way.
%package -n budgie-applet-wswitcher
Requires: budgie-extras-common
Summary: An applet to show a different wallpaper on each of the workspaces
Requires: budgie-extras-common
Requires: budgie-extras-daemon
Summary: An applet to show a different wallpaper on each of the workspaces
%description -n budgie-applet-wswitcher
Budgie Wallpaper Workspace Switcher is an application (applet) to show a
different wallpaper on each of the workspaces. Usage is simple: add the applet
@@ -274,7 +276,7 @@ workspaces.
# Remove absolute symlink and replace with relative symlink
rm -f %{buildroot}%{_bindir}/quickchar
%fdupes %_libdir/budgie-desktop/plugins/budgie-weathershow/weather_icons
%fdupes %{buildroot}%{_datadir}/budgie-desktop/budgie-weathershow/weather_icons
%post
@@ -400,6 +402,8 @@ rm -f %{buildroot}%{_bindir}/quickchar
%files -n budgie-applet-weathershow
%{_libdir}/budgie-desktop/plugins/budgie-weathershow
%{_datadir}/budgie-desktop/budgie-weathershow/cities
%{_datadir}/budgie-desktop/budgie-weathershow/weather_icons/*
%{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.weathershow.gschema.xml
%{_datadir}/pixmaps/budgie-wticon-symbolic.svg
+1 -1
View File
@@ -1,4 +1,4 @@
%define _ubuntu_rel 22.10.20220822-0ubuntu12
%define _ubuntu_rel 22.10.20220822-0ubuntu13
%global _hardened_build 0
Name: compiz9
@@ -1,5 +1,5 @@
project pkg {
rpm {
spec = "nim.spec"
spec = "ctwm.spec"
}
}
}
+7
View File
@@ -0,0 +1,7 @@
[Desktop Entry]
Name=CTWM
Comment=Claude's Tab Window Manager
TryExec=ctwm
Exec=ctwm
Type=Xsession
Encoding=UTF-8
+55
View File
@@ -0,0 +1,55 @@
Summary: Lightweight window manager with virtual workspaces
Name: ctwm
Version: 4.1.0
Release: 1%?dist
URL: https://ctwm.org
BuildRequires: libjpeg-turbo-devel libX11-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXrandr-devel cmake gcc m4
Source0: https://www.ctwm.org/dist/%{name}-%{version}.tar.xz
Source1: %{name}.desktop
License: MIT
Requires: m4
# Derived from RPMSphere's packaging
%description
CTWM is a window manager based on TWM (with virtual workspaces added).
%prep
%setup -q
%build
%cmake
%cmake_build
%install
%cmake_install
%{__install} -Dm644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/%{name}.desktop
%files
%doc README.md CHANGES.md
%license COPYRIGHT
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*
%{_datadir}/xsessions/%{name}.desktop
%{_datadir}/ctwm
%{_datadir}/doc/ctwm/ctwm.1.html
%{_datadir}/examples/ctwm/system.ctwmrc
%changelog
* Tue Dec 17 2024 Owen Zimmerman <owen@fyralabs.com>
- Add .desktop and .rhai file, fix dependancies, and switch to .tar.xz source (smaller download)
* Thu Jun 27 2024 Jaiden Riordan <jade@fyralabs.com> - 4.1.0
- Rewrite for Terra, Thanks RPMSphere
* Tue Dec 24 2019 Wei-Lun Chao <bluebat@member.fsf.org> - 4.0.3
- Rebuilt for Fedora
* Sat Apr 9 2011 Agnelo de la Crotche <agnelo@unixversal.com>
- package for openSUSE 11.3/11.4
* Thu Feb 16 2006 Richard Levitte <richard@levitte.org>
- Release ctwm 3.8a.
* Wed May 4 2005 Rudolph T Maceyko <rm55@pobox.com>
- Tweaks. Added all .ctwmrc files as well as sound and VMS docs.
* Wed May 4 2005 Richard Levitte <richard@levitte.org>
- Changed some directory specifications to RedHat-ish standards.
* Tue May 3 2005 Richard Levitte <richard@levitte.org>
- Received the original from Johan Vromans. Adjusted it to become
an official .spec file.
+1
View File
@@ -0,0 +1 @@
rpm.version(find("<p>Current release: ([\\d.]+)</p>", get("https://www.ctwm.org/download.html"), 1));
@@ -1,99 +0,0 @@
diff --git a/src/Core/Package.vala b/src/Core/Package.vala
index 62d206fa..cbf05983 100644
--- a/src/Core/Package.vala
+++ b/src/Core/Package.vala
@@ -42,8 +42,29 @@ public enum RuntimeStatus {
}
public class AppCenterCore.Package : Object {
+ // locally installed packages
public const string APPCENTER_PACKAGE_ORIGIN = "appcenter";
- private const string ELEMENTARY_STABLE_PACKAGE_ORIGIN = "elementary-stable-jammy-main";
+
+ // Fedora repositories
+ private const string FEDORA_STABLE_PACKAGE_ORIGIN = "fedora";
+ private const string FEDORA_UPDATES_PACKAGE_ORIGIN = "updates";
+ private const string FEDORA_TESTING_PACKAGE_ORIGIN = "updates-testing";
+
+ // RPMFusion repositories
+ private const string RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-free";
+ private const string RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-free-updates";
+ private const string RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-free-updates-testing";
+ private const string RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-nonfree";
+ private const string RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates";
+ private const string RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates-testing";
+
+ // Ultramarine repositories
+ private const string ULTRAMARINE_PACKAGE_ORIGIN = "ultramarine";
+ private const string AKMODS_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:akmods-secureboot";
+ private const string KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:kmodtool-secureboot";
+
+ // Terra repositories
+ private const string TERRA_PACKAGE_ORIGIN = "terra";
public RuntimeStatus runtime_status { get; set; default = RuntimeStatus.UP_TO_DATE; }
@@ -216,8 +237,12 @@ public class AppCenterCore.Package : Object {
public bool is_native {
get {
switch (component.get_origin ()) {
- case APPCENTER_PACKAGE_ORIGIN:
- case ELEMENTARY_STABLE_PACKAGE_ORIGIN:
+ case FEDORA_STABLE_PACKAGE_ORIGIN:
+ case FEDORA_UPDATES_PACKAGE_ORIGIN:
+ case FEDORA_TESTING_PACKAGE_ORIGIN:
+ case ULTRAMARINE_PACKAGE_ORIGIN:
+ case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
+ case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
return true;
default:
return false;
@@ -328,12 +353,33 @@ public class AppCenterCore.Package : Object {
owned get {
unowned string origin = component.get_origin ();
if (backend is PackageKitBackend) {
- if (origin == APPCENTER_PACKAGE_ORIGIN) {
- return _("AppCenter");
- } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
- return _("elementary Updates");
- } else if (origin.has_prefix ("ubuntu-")) {
- return _("Ubuntu (non-curated)");
+ switch (origin) {
+ case FEDORA_STABLE_PACKAGE_ORIGIN:
+ return "Fedora";
+ case FEDORA_UPDATES_PACKAGE_ORIGIN:
+ return "Fedora Updates";
+ case FEDORA_TESTING_PACKAGE_ORIGIN:
+ return "Fedora Updates (Testing)";
+ case RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN:
+ return "RPMFusion";
+ case RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN:
+ return "RPMFusion Updates";
+ case RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN:
+ return "RPMFusion Updates (Testing)";
+ case RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN:
+ return "RPMFusion (Non-free Software)";
+ case RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN:
+ return "RPMFusion (Non-free Software) Updates";
+ case RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN:
+ return "RPMFusion (Non-free Software) Updates (Testing)";
+ case ULTRAMARINE_PACKAGE_ORIGIN:
+ return "Ultramarine";
+ case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
+ return "Secureboot support for akmods";
+ case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
+ return "Secureboot support for kmodtool";
+ case TERRA_PACKAGE_ORIGIN:
+ return "Terra";
}
} else if (backend is FlatpakBackend) {
var fp_package = this as FlatpakPackage;
@@ -342,8 +388,6 @@ public class AppCenterCore.Package : Object {
}
return fp_package.remote_title;
- } else if (backend is UbuntuDriversBackend) {
- return _("Ubuntu Drivers");
}
return _("Unknown Origin (non-curated)");
@@ -1,5 +0,0 @@
project pkg {
rpm {
spec = "elementary-appcenter.spec"
}
}
@@ -1,10 +0,0 @@
# false positives
addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*")
addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*")
# don't care about manpages
addFilter("W: no-manual-page-for-binary io.elementary.appcenter*")
# don't care about no documentation for sub-packages
addFilter("W: no-documentation*")
@@ -1,315 +0,0 @@
%global appname io.elementary.appcenter
Name: elementary-appcenter
Summary: Software Center from elementary
Version: 7.4.0
Release: 2%{?dist}
License: GPL-3.0
Provides: appcenter = %{version}-%{release}
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
BuildRequires: meson
BuildRequires: vala
BuildRequires: appstream-vala
BuildRequires: pkgconfig(appstream) >= 0.10.0
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(flatpak)
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(granite) >= 6.0.0
BuildRequires: pkgconfig(gtk+-3.0) >= 3.10
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libhandy-1)
BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(packagekit-glib2)
BuildRequires: pkgconfig(polkit-gobject-1)
Requires: PackageKit
Requires: hicolor-icon-theme
%description
AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
%package gnome-shell-search-provider
Summary: Software Center from elementary (gnome-shell search provider)
Provides: appcenter-gnome-shell-search-provider = %{version}-%{release}
Obsoletes: appcenter-gnome-shell-search-provider < 7.2.1-2
BuildArch: noarch
Requires: %{name} = %{version}-%{release}
Requires: gnome-shell
Supplements: (%{name} and gnome-shell)
%description gnome-shell-search-provider
AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
This package contains the gnome-shell search provider.
%prep
%autosetup -p1 -n appcenter-%version
%build
%meson -Dpayments=false -Dcurated=false -Dhide_upstream_distro_apps=false
%meson_build
%install
%meson_install
%find_lang %{appname}
# remove empty hidden apps file
rm -r %{buildroot}/%{_sysconfdir}/%{appname}/appcenter.hiddenapps
# create autostart entry symlink
mkdir -p %{buildroot}/%{_sysconfdir}/xdg/autostart/
ln -s %{_datadir}/applications/%{appname}-daemon.desktop \
%{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
%check
desktop-file-validate \
%{buildroot}/%{_datadir}/applications/%{appname}*.desktop
appstream-util validate-relax --nonet \
%{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
%files -f %{appname}.lang
%doc README.md
%license COPYING
%dir %{_sysconfdir}/%{appname}
%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
%{_bindir}/%{appname}
%{_datadir}/applications/%{appname}*.desktop
%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
%{_datadir}/icons/hicolor/*/apps/%{appname}{,-symbolic}.svg
%{_datadir}/metainfo/%{appname}.metainfo.xml
%{_datadir}/polkit-1/actions/%{appname}.policy
%files gnome-shell-search-provider
%{_datadir}/gnome-shell/search-providers/%{appname}.search-provider.ini
%changelog
* Tue Jun 07 2022 Fabio Valentini <decathorpe@gmail.com> - 3.10.0-1
- Update to version 3.10.0.
* Tue Dec 14 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.1-1
- Update to version 3.9.1.
* Wed Nov 24 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.0-1
- Update to version 3.9.0.
* Sat Oct 30 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.2-1
- Update to version 3.8.2.
* Wed Oct 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-1
- Update to version 3.8.1.
* Tue Sep 28 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.0-1
- Update to version 3.8.0.
* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-3
- Mark flatpak sources in the UI.
* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-2
- Hard-code Fedora instead of ubuntu repository names.
* Tue Aug 31 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-1
- Update to version 3.7.1.
* Fri Aug 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.0-1
- Update to version 3.7.0.
* Tue Aug 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.3-1
- Update to version 3.6.3.
* Wed Aug 11 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.2-1
- Update to version 3.6.2.
* Thu Aug 05 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.1-1
- Update to version 3.6.1.
* Fri Jul 16 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.0-1
- Update to version 3.6.0.
* Fri Oct 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.1-1
- Update to version 3.5.1.
* Wed Oct 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.0-1
- Update to version 3.5.0.
* Fri Aug 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.2-1
- Update to version 3.4.2.
* Thu Jul 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.1-1
- Update to version 3.4.1.
* Thu May 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.0-1
- Update to version 3.4.0.
* Thu Apr 30 2020 Fabio Valentini <decathorpe@gmail.com> - 3.3.0-1
- Update to version 3.3.0.
* Thu Apr 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.4-1
- Update to version 3.2.4.
* Thu Apr 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.3-1
- Update to version 3.2.3.
* Mon Mar 23 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-1
- Update to version 3.2.2.
* Fri Feb 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.1-1
- Update to version 3.2.1.
* Fri Feb 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.1-1
- Update to version 3.1.1.
* Wed Jan 02 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.0-1
- Update to version 3.1.0.
- Remove empty blacklist file.
* Fri Nov 30 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-2
- Drop elementaryOS blacklist in favor of the version shipped with appcenter.
* Thu Oct 25 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-1
- Update to version 3.0.1.
* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-2
- Add missing autostart entry symlink for the daemon.
* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-1
- Update to version 3.0.
- Add gnome-shell search provider sub-package.
- Explicitly disable payment system and curated applications.
- Update blacklist file to current version from elementaryOS.
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jun 13 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-2
- Rebuild for granite5 soname bump.
* Thu Mar 08 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-1
- Update to version 0.2.9.
- Add patch to fix build with the newer vala and PackageKit on f28+.
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Fri Jan 26 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.8-1
- Update to version 0.2.8.
* Tue Nov 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.7-1
- Update to version 0.2.7.
* Fri Nov 03 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-2
- Rebuild for granite soname bump.
* Mon Sep 18 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-1
- Update to version 0.2.6.
* Sat Aug 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.5-1
- Update to version 0.2.5.
- Include fedora-specific blacklist adapted from elementaryOS.
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Tue Jul 04 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.4-1
- Update to version 0.2.4.
* Thu Jun 01 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.3-1
- Update to version 0.2.3.
* Mon May 22 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.2-1
- Update to version 0.2.2.
* Sat May 20 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.1-1
- Update to version 0.2.1.
* Wed May 17 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2-1
- Update to version 0.2.
* Thu Mar 16 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.4-1
- Update to version 0.1.4.
- Depend on generic icon again, since it _should_ work.
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Jan 27 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-7
- Add patch to rename generic icon to something branded.
* Wed Jan 25 2017 Fabio Valentini <decathorpe@gmail.com>
- Remove explicit BR: /usr/bin/pkgconfig.
* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-6
- Explicitly depend on /usr/bin/pkg-config.
* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-5
- Add missing scriptlets.
* Sat Jan 21 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-4
- Include icon to fix appdata metadata generation.
* Tue Jan 10 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-3
- Clean up spec file.
* Sat Dec 24 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-2
- Enable libunity support.
* Mon Dec 05 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-1
- Update to version 0.1.3.
* Sun Nov 20 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-2
- Build out of tree.
* Sat Oct 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-1
- Update to version 0.1.2.
* Fri Oct 07 2016 Neal Gompa <ngompa13@gmail.com> - 0.1.1-4
- Add patch to support AppStream 0.10.0 in F25 (LP#1626398)
* Thu Sep 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-3
- Mass rebuild.
* Wed Sep 28 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-2
- Spec file cleanups.
* Tue Sep 27 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-1
- Update to version 0.1.1.
* Sat Sep 17 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-2
- Require PackageKit.
* Thu Aug 18 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-1
- Update to version 0.1.
@@ -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',
@@ -1 +0,0 @@
rpm.version(gh("elementary/appcenter"));
@@ -1,5 +0,0 @@
project pkg {
rpm {
spec = "contractor.spec"
}
}
@@ -1,58 +0,0 @@
Name: contractor
Version: 0.3.5
Release: 1%{?dist}
Summary: Desktop-wide extension service
License: GPL-3.0-or-later
URL: https://github.com/elementary/contractor
Source0: %{url}/archive/%{version}/contractor-%{version}.tar.gz
BuildRequires: gcc
BuildRequires: vala
BuildRequires: meson
# data/meson.build
BuildRequires: pkgconfig(dbus-1)
# src/meson.build
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
BuildRequires: pkgconfig(glib-2.0)
# For %%{_datadir}/dbus-1/services/ directory:
Requires: dbus-common
%description
An extension service that allows apps to use the exposed functionality
of registered apps. This way, apps don't have to have the functions hard
coded into them.
%prep
%autosetup
%build
%meson
%meson_build
%install
%meson_install
# Create the the directory where other programs put their contracts
mkdir -p %{buildroot}/%{_datadir}/contractor
%files
%doc README.md
%license COPYING
%{_bindir}/contractor
%dir %{_datadir}/contractor
%{_datadir}/dbus-1/services/org.elementary.contractor.service
%changelog
%autochangelog
@@ -1 +0,0 @@
rpm.version(gh("elementary/contractor"))

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