Skip to content

Commit

Permalink
Merge branch 'frawhide' into pr/gamescope-sdl
Browse files Browse the repository at this point in the history
Signed-off-by: Cappy Ishihara <[email protected]>
  • Loading branch information
korewaChino authored Aug 20, 2024
2 parents 741f472 + b49c9d3 commit 467dad8
Show file tree
Hide file tree
Showing 57 changed files with 305 additions and 274 deletions.
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.471
Version: 0.0.472
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.471
Version: 0.0.472
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.99
Version: 0.0.100
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.99
Version: 0.0.100
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers.
URL: https://discord.com
Expand Down
4 changes: 2 additions & 2 deletions anda/apps/envision/envision.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global commit 58ceb44984ffbace79ed5eddf5c426362ad23ae7
%global commit_date 20240814
%global commit 6ff4bc2cd57628c95aacd2f5a07305fd83e197e4
%global commit_date 20240820
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Name: envision
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/komikku/komikku.spec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
%global pure_protobuf_version 2.0.0

Name: komikku
Version: 1.53.0
Version: 1.55.0
%forgemeta
Release: 1%?dist
Summary: A manga reader for GNOME
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 acc69e082fff67398834de3045ef48d33d2f4d54
%global commit 67e087dcae35fa9f74a6dced588629fcdf075182
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240814
%global commit_date 20240820
%global ver 0.38.0

Name: mpv-nightly
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/ruffle/ruffle-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%global ver 2024-08-15
%global ver 2024-08-20
%global goodver %(echo %ver | sed 's/-//g')
%global __brp_mangle_shebangs %{nil}
%bcond_without mold
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ BuildRequires: fdupes
BuildRequires: pkgconfig(gee-0.8)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(granite) >= 6.0.0
BuildRequires: pkgconfig(granite-7)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-pbutils-1.0)
BuildRequires: pkgconfig(gtk+-3.0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

Name: elementary-shortcut-overlay
Summary: Native, OS-wide shortcut overlay
Version: 8.0.0
Version: 8.0.1
Release: 1%?dist
License: GPL-3.0

Expand Down
4 changes: 2 additions & 2 deletions anda/desktops/elementary/gala/gala.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

Name: gala
Summary: Gala window manager
Version: 7.1.3
Release: 2%{?dist}
Version: 8.0.0
Release: 1%?dist
License: GPL-3.0-or-later
Epoch: 1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@

Name: switchboard-plug-display
Summary: Switchboard Display 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-display
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Name: switchboard-plug-pantheon-shell
Summary: Switchboard Pantheon Shell plug
Version: 8.0.0
Version: 8.0.1
Release: 1%?dist
License: GPL-3.0

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-app-launch
%global commit af441bdb31bb76b207119a8c91eef3fa93c0c078
%global commit a057a37b56b96efddc7f42577407a3a08a0575cf
%forgemeta

Name: lomiri-app-launch
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global forgeurl https://gitlab.com/ubports/development/core/lomiri-system-settings
%global commit 8d7e90d1e1e4f807584834ab2448618d0b67c860
%global commit 4c819ca69476a43cf6ec7539094684f7e0ba4598
%forgemeta

Name: lomiri-system-settings
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
%define _ubuntu_rel 1ubuntu4
%define _ubuntu_rel 7ubuntu1

Name: unity-session
Summary: Lightdm profile for Unity 7
Expand Down
2 changes: 1 addition & 1 deletion anda/devs/codium/codium.spec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
%endif

Name: codium
Version: 1.92.1.24225
Version: 1.92.2.24228
Release: 1%?dist
Summary: Code editing. Redefined.
License: MIT
Expand Down
4 changes: 2 additions & 2 deletions anda/devs/flow/flow-control-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit 3dd9efa66e7f745cd57920361a892aa4a4411387
%global commit 82720a40d7066e8457c906490c937ea09dd22ee9
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240815
%global commit_date 20240820

Name: flow-control-nightly
Version: %commit_date.%shortcommit
Expand Down
6 changes: 3 additions & 3 deletions anda/devs/zed/nightly/zed-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global commit 4c390b82fbe1c512932cce4d65ddb0fdc0d985b0
%global commit 395a68133d988a9d5eec7f218f8d3f0bc5eae696
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240815
%global ver 0.150.0
%global commit_date 20240820
%global ver 0.151.0

%bcond_with check

Expand Down
1 change: 0 additions & 1 deletion anda/devs/zed/preview/update.rhai
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
for release in releases {
let tag = release.tag_name;
tag.pop(4); // remove the "-pre" suffix
tag.crop(1); // remove "v"
rpm.global("ver", tag);
break;
Expand Down
8 changes: 4 additions & 4 deletions anda/devs/zed/preview/zed-preview.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%bcond_with check

%global ver 0.1
%global ver 0.149.3-pre
# Exclude input files from mangling
%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
# Use Mold as the linker
Expand All @@ -10,13 +10,13 @@
%global app_id dev.zed.Zed-Preview

Name: zed-preview
Version: %ver
Version: %(echo %ver | sed 's/-/~/')
Release: pre1%?dist
Summary: Zed is a high-performance, multiplayer code editor

License: MIT
URL: https://zed.dev/
Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz
Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}.tar.gz

Conflicts: zed
Provides: zed
Expand Down Expand Up @@ -44,7 +44,7 @@ BuildRequires: vulkan-loader
Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

%prep
%autosetup -n %{crate}-%{ver}-pre -p1
%autosetup -n %{crate}-%{ver} -p1
%cargo_prep_online

export DO_STARTUP_NOTIFY="true"
Expand Down
2 changes: 1 addition & 1 deletion anda/docker/moby-compose/moby-compose.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define debug_package %{nil}

Name: moby-compose
Version: 2.29.1
Version: 2.29.2
Release: 1%?dist
Summary: Define and run multi-container applications with Docker

Expand Down
2 changes: 1 addition & 1 deletion anda/fonts/sarasa-gothic/sarasa-gothic-fonts.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Name: sarasa-gothic-fonts
Version: 1.0.18
Version: 1.0.19
Release: 1%?dist
URL: https://github.com/be5invis/Sarasa-Gothic
Source0: %url/releases/download/v%version/Sarasa-TTC-%version.7z
Expand Down
1 change: 0 additions & 1 deletion anda/games/gamescope/terra-gamescope.spec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
%global _default_patch_fuzz 2
%global gamescope_tag 3.15.0


Name: terra-gamescope
Version: 100.%{gamescope_tag}
Release: 1%?dist
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.731.0
Version: 2024.817.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/games/prismlauncher-nightly/prismlauncher-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
%global real_name prismlauncher
%global nice_name PrismLauncher

%global commit d6a825dd4704172c6115919ff8550d3074b950f9
%global commit 1b756b99bb75b27d82ba537b5f3feb762b2bcb50
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f

%global commit_date 20240814
%global commit_date 20240820
%global snapshot_info %{commit_date}.%{shortcommit}

%bcond_without qt6
Expand Down
2 changes: 1 addition & 1 deletion anda/langs/crystal/crystal/crystal.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define debug_package %nil

Name: crystal
Version: 1.13.1
Version: 1.13.2
Release: 1%?dist
Summary: The Crystal Programming Language
License: Apache-2.0
Expand Down
2 changes: 1 addition & 1 deletion anda/langs/dart/dart.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define debug_package %{nil}

Name: dart
Version: 3.5.0
Version: 3.5.1
Release: 1%?dist
Summary: The Dart Language
License: BSD-3-Clause
Expand Down
6 changes: 3 additions & 3 deletions anda/langs/kotlin/kotlin-native/kotlin-native.spec
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ExclusiveArch: x86_64

License: ASL 2.0
URL: https://kotlinlang.org/docs/reference/native-overview.html
Source0: https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-linux-x86_64-%version.tar.gz
Source0: https://github.com/JetBrains/kotlin/releases/download/v%version/kotlin-native-prebuilt-linux-x86_64-%version.tar.gz

BuildRequires: tar
BuildRequires: sed
Expand All @@ -28,15 +28,15 @@ Kotlin compiler and native implementation of the Kotlin standard library.


%prep
tar -xf %{SOURCE0} && cd kotlin-native-linux-x86_64-%{version}
tar -xf %{SOURCE0} && cd kotlin-native-prebuilt-linux-x86_64-%{version}
sed -i "s|\(DIR *= *\).*|\1%{_bindir}|" bin/*
sed -i "s|\(KONAN_HOME *= *\).*|\1%{_datadir}/%{name}|" bin/*


%build

%install
rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-linux-x86_64-%{version}
rm -rf %{buildroot} && mkdir -p %{buildroot}%{_bindir}/ && cd kotlin-native-prebuilt-linux-x86_64-%{version}
install -m 0755 bin/cinterop %{buildroot}%{_bindir}/
install -m 0755 bin/generate-platform %{buildroot}%{_bindir}/
install -m 0755 bin/jsinterop %{buildroot}%{_bindir}/
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 2a046e648756b6a36acf580c9c0289319cd697d7
%global commit a4dff1a03e514946b419fd9af0ac08b7a4b40a50
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global ver 2.1.9
%global commit_date 20240815
%global commit_date 20240820
%global debug_package %nil

Name: nim-nightly
Expand Down
2 changes: 1 addition & 1 deletion anda/langs/python/ruff/python3-ruff.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%define debug_package %{nil}

Name: python3-ruff
Version: 0.6.0
Version: 0.6.1
Release: 1%?dist
Summary: An extremely fast Python linter, written in Rust
License: MIT
Expand Down
4 changes: 2 additions & 2 deletions anda/langs/rust/bandwhich/rust-bandwhich.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
%global crate bandwhich

Name: rust-bandwhich
Version: 0.22.2
Release: 1%{?dist}
Version: 0.23.0
Release: 1%?dist
Summary: Display current network utilization by process, connection and remote IP/hostname

License: MIT
Expand Down
5 changes: 5 additions & 0 deletions anda/langs/rust/bottom/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "rust-bottom.spec"
}
}
48 changes: 48 additions & 0 deletions anda/langs/rust/bottom/bottom-fix-metadata-auto.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
--- bottom-0.10.2/Cargo.toml 1970-01-01T00:00:01+00:00
+++ bottom-0.10.2/Cargo.toml 2024-08-18T14:28:49.594610+00:00
@@ -354,15 +354,6 @@
[target.'cfg(all(target_arch = "x86_64", target_os = "linux"))'.dev-dependencies.portable-pty]
version = "0.8.1"

-[target.'cfg(target_os = "freebsd")'.dependencies.filedescriptor]
-version = "0.8.2"
-
-[target.'cfg(target_os = "freebsd")'.dependencies.serde_json]
-version = "1.0.120"
-
-[target.'cfg(target_os = "freebsd")'.dependencies.sysctl]
-version = "0.5.5"
-
[target.'cfg(target_os = "linux")'.dependencies.rustix]
version = "0.38.34"
features = [
@@ -370,24 +361,6 @@
"param",
]

-[target.'cfg(target_os = "macos")'.dependencies.core-foundation]
-version = "0.9.4"
-
-[target.'cfg(target_os = "macos")'.dependencies.mach2]
-version = "0.4.2"
-
-[target.'cfg(target_os = "windows")'.dependencies.windows]
-version = "0.58.0"
-features = [
- "Win32_Foundation",
- "Win32_Security",
- "Win32_Storage_FileSystem",
- "Win32_System_IO",
- "Win32_System_Ioctl",
- "Win32_System_ProcessStatus",
- "Win32_System_Threading",
-]
-
[target."cfg(unix)".dependencies.libc]
version = "0.2.155"

@@ -402,3 +375,4 @@
[lints.rustdoc]
broken_intra_doc_links = "deny"
missing_crate_level_docs = "deny"
+
Loading

0 comments on commit 467dad8

Please sign in to comment.