Skip to content

Commit

Permalink
Merge branch 'frawhide' into zed-mold
Browse files Browse the repository at this point in the history
Signed-off-by: lea <[email protected]>
  • Loading branch information
lleyton authored Jul 27, 2024
2 parents dff7f58 + 831c2b2 commit 9d6bbc6
Show file tree
Hide file tree
Showing 36 changed files with 57 additions and 117 deletions.
1 change: 1 addition & 0 deletions .github/workflows/update-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@ jobs:
}
copy_over f39 || true
copy_over f40 || true
copy_over f41 || true
git push -u origin --all
fi
1 change: 1 addition & 0 deletions .github/workflows/update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,6 @@ jobs:
}
copy_over f39 || true
copy_over f40 || true
copy_over f41 || true
git push -u origin --all
fi
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
anda-build/
**/*.tar*
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-canary-openasar
Version: 0.0.460
Version: 0.0.462
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord-canary/discord-canary.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-canary
Version: 0.0.460
Version: 0.0.462
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers
URL: discord.com
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-ptb-openasar
Version: 0.0.95
Version: 0.0.96
Release: 1%?dist
Summary: A snappier Discord rewrite with features like further customization and theming
License: MIT AND https://discord.com/terms
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord-ptb/discord-ptb.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

Name: discord-ptb
Version: 0.0.95
Version: 0.0.96
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers.
URL: https://discord.com
Expand Down
3 changes: 2 additions & 1 deletion anda/apps/envision/envision.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global commit ce805c6b729ae4681fe83edc9e17ba19f437b195
%global commit c58d9560e729216a15be11624c9f615626386514
%global commit_date 20240726
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Expand All @@ -17,6 +17,7 @@ BuildRequires: pkgconfig(vte-2.91-gtk4) >= 0.72.0
BuildRequires: pkgconfig(libadwaita-1)
BuildRequires: pkgconfig(libusb-1.0)
BuildRequires: openssl-devel-engine
BuildRequires: openxr-devel
BuildRequires: libappstream-glib
BuildRequires: desktop-file-utils
BuildRequires: glib2-devel
Expand Down
4 changes: 2 additions & 2 deletions anda/apps/mpv/mpv-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit 3c7b6db205c027d3c4f12285719367792e471b57
%global commit 6107112b32e748c55dd2d344b8871ad60c0c504c
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240725
%global commit_date 20240727
%global ver 0.38.0

Name: mpv-nightly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-about
Summary: Switchboard System Information plug
Version: 6.2.0
Release: 3%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-about
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-applications
Summary: Switchboard Applications plug
Version: 7.0.1
Release: 1%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-applications
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-datetime
Summary: Switchboard Date & Time Plug
Version: 2.2.0
Release: 1%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-datetime
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-keyboard
Summary: Switchboard Keyboard plug
Version: 3.2.1
Release: 1%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-keyboard
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-locale
Summary: Switchboard Locale Plug
Version: 2.5.9
Release: 2%?dist
Version: 8.0.0
Release: 1%?dist
License: LGPL-3.0-or-later

URL: https://github.com/elementary/%name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-mouse-touchpad
Summary: Switchboard Mouse and Touchpad plug
Version: 7.0.0
Release: 1%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-mouse-touchpad
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-networking
Summary: Switchboard Networking plug
Version: 2.5.0
Release: 1%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-network
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-notifications
Summary: Switchboard Notifications plug
Version: 2.2.0
Release: 2%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-notifications
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

Name: switchboard-plug-onlineaccounts
Summary: Switchboard Online Accounts plug
Version: 6.5.3
Release: 1%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-onlineaccounts
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-parental-controls
Summary: Switchboard Screen Time & Limits Plug
Version: 6.0.1
Release: 2%?dist
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/%name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-power
Summary: Switchboard Power Plug
Version: 2.7.0
Release: 2%?dist
Version: 8.0.0
Release: 1%?dist
License: GPL-2.0-or-later

URL: https://github.com/elementary/%name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-printers
Summary: Switchboard Printers Plug
Version: 2.2.1
Release: 2%?dist
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later

URL: https://github.com/elementary/switchboard-plug-printers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-sharing
Summary: Switchboard Sharing Plug
Version: 2.1.6
Release: 1%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0

URL: https://github.com/elementary/switchboard-plug-sharing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-sound
Summary: Switchboard Sound Plug
Version: 2.3.3
Release: 1%{?dist}
Version: 8.0.0
Release: 1%?dist
License: LGPL-2.0-or-later

URL: https://github.com/elementary/switchboard-plug-sound
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-useraccounts
Summary: Switchboard User Accounts Plug
Version: 2.4.3
Release: 2%?dist
Version: 8.0.0
Release: 1%?dist
License: LGPL-3.0-or-later

URL: https://github.com/elementary/%name
Expand Down
4 changes: 2 additions & 2 deletions anda/devs/zed/nightly/zed-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit 479ffbbd51516c7741e2948e048ab13e5b010064
%global commit e9d0768e3c081d9c328f9c1811f783007e8bb489
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240726
%global commit_date 20240727
%global ver 0.147.0

%bcond_without check
Expand Down
2 changes: 1 addition & 1 deletion anda/devs/zed/preview/zed-preview.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%bcond_without check

%global ver 0.146.0
%global ver 0.146.1
# Exclude input files from mangling
%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
# Use Mold as the linker
Expand Down
2 changes: 1 addition & 1 deletion anda/games/osu-lazer/osu-lazer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%define __strip /bin/true

Name: osu-lazer
Version: 2024.726.0
Version: 2024.727.0
Release: 1%?dist
Summary: The future of osu! and the beginning of an open era! Commonly known by the codename osu!lazer. Pew pew.
ExclusiveArch: x86_64
Expand Down
4 changes: 2 additions & 2 deletions anda/langs/nim/nim-nightly/nim-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
%global commit 469a6044c00ce657d2f543f292678b3c71e0b037
%global commit 39629a1adcbcc822508acc3983f444328f90dd85
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global ver 2.1.9
%global commit_date 20240726
%global commit_date 20240727
%global debug_package %nil

Name: nim-nightly
Expand Down
4 changes: 3 additions & 1 deletion anda/langs/rust/rnote/rnote.spec
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
%global build_rustflags %build_rustflags -C link-arg=-fuse-ld=mold

Name: rnote
Version: 0.11.0
Release: 1%?dist
Expand All @@ -6,7 +8,7 @@ License: GPL-3.0
URL: https://github.com/flxzt/rnote
Source0: %{url}/archive/refs/tags/v%version.tar.gz
Requires: gtk4
BuildRequires: cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils
BuildRequires: cargo meson cmake libappstream-glib gcc-c++ pkgconfig(alsa) alsa-lib clang-devel python desktop-file-utils mold
BuildRequires: pkgconfig(glib-2.0) >= 2.66
BuildRequires: pkgconfig(gtk4) >= 4.7
BuildRequires: pkgconfig(libadwaita-1) >= 1.2
Expand Down
2 changes: 1 addition & 1 deletion anda/lib/libhelium/libhelium.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global ver 1.8.12-10
%global ver 1.8.12-11
%global sanitized_ver %(echo %{ver} | sed -E 's/-/~/g')
Summary: The Application Framework for tauOS apps
Name: libhelium
Expand Down
5 changes: 0 additions & 5 deletions anda/misc/opentabletdriver/anda.hcl

This file was deleted.

63 changes: 0 additions & 63 deletions anda/misc/opentabletdriver/opentabletdriver.spec

This file was deleted.

1 change: 0 additions & 1 deletion anda/misc/opentabletdriver/update.rhai

This file was deleted.

Binary file removed anda/misc/opentabletdriver/v0.6.3.0.tar.gz
Binary file not shown.
7 changes: 5 additions & 2 deletions anda/terra/mock-configs/terra-mock-configs.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: terra-mock-configs
Version: 1.0.0
Release: 1%{?dist}
Version: 1.1.0
Release: 1%?dist
Epoch: 1
Summary: Mock configs for Terra repos

Expand Down Expand Up @@ -37,6 +37,9 @@ cp -v *.cfg %{buildroot}%{_sysconfdir}/mock/
%config %{_sysconfdir}/mock/terra-*-i386.cfg

%changelog
* Fri Jul 26 2024 madonuko <[email protected]> - 1:1.1.0-1
- Include mock files for Terra 41

* Mon Jul 22 2024 Lleyton Gray <[email protected]> - 1:1.0.0-1
- Migrate to pulling configs from an external repository

Expand Down
2 changes: 1 addition & 1 deletion anda/themes/tau-helium/tau-helium.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global ver 1.8.12-10
%global ver 1.8.12-11

Summary: tauOS GTK/GNOME Shell Themes
Name: tau-helium
Expand Down

0 comments on commit 9d6bbc6

Please sign in to comment.