Skip to content

Commit

Permalink
Merge branch 'frawhide' into mado/w/x264
Browse files Browse the repository at this point in the history
  • Loading branch information
madonuko authored Oct 22, 2024
2 parents b472425 + 1f6ebff commit 9aa9149
Show file tree
Hide file tree
Showing 90 changed files with 3,826 additions and 182 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/autobuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,15 +94,15 @@ jobs:
subatomic-cli upload --prune \
--server https://subatomic.fyralabs.com \
--token ${{ secrets.SUBATOMIC_TOKEN }} \
terra${{ matrix.pkg.labels['extra'] && '-extra' }}${{ matrix.version }} anda-build/rpm/rpms/*
terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }} 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.pkg.labels['extra'] && '-extra' }}${{ matrix.version }}-source anda-build/rpm/srpm/*
terra${{ matrix.version }}${{ matrix.pkg.labels['extra'] && '-extras' }}-source anda-build/rpm/srpm/*
- name: Notify Madoguchi (Success)
if: success() && github.event_name == 'push'
Expand Down
5 changes: 0 additions & 5 deletions anda/apps/armcord-bin/anda.hcl

This file was deleted.

78 changes: 0 additions & 78 deletions anda/apps/armcord-bin/armcord-bin.spec

This file was deleted.

1 change: 0 additions & 1 deletion anda/apps/armcord-bin/update.rhai

This file was deleted.

1 change: 0 additions & 1 deletion anda/apps/armcord/update.rhai

This file was deleted.

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.501
Version: 0.0.506
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.501
Version: 0.0.506
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-openasar/discord-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-openasar
Version: 0.0.71
Version: 0.0.72
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-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.109
Version: 0.0.112
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.109
Version: 0.0.112
Release: 1%?dist
Summary: Free Voice and Text Chat for Gamers.
URL: https://discord.com
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/discord/discord.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
Version: 0.0.71
Version: 0.0.72
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 27b01d0ffcade38db0f850d9feea574df25aea6b
%global commit_date 20241010
%global commit c40a4ad05a8e6ea99eed4a7d7d2098a08686e065
%global commit_date 20241021
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Name: envision
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/feishin/feishin.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: feishin
Version: 0.10.1
Version: 0.11.1
Release: 1%?dist
Summary: A modern self-hosted music player
License: GPL-3.0
Expand Down
2 changes: 1 addition & 1 deletion anda/apps/fontviewer/fontviewer.spec
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ A platform-agnostic GTK+ 3 alternative to GNOME's Font Viewer
%meson_install

install -m 0755 -vd %{buildroot}%{_datadir}/applications
install -m 0755 -vp data/%{name}.desktop %{buildroot}%{_datadir}/applications/
install -m 0644 -vp data/%{name}.desktop %{buildroot}%{_datadir}/applications/

%files
%license LICENSE
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.59.0
Version: 1.60.0
%forgemeta
Release: 1%?dist
Summary: A manga reader for GNOME
Expand Down
5 changes: 5 additions & 0 deletions anda/apps/legcord-bin/anda.hcl
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
project pkg {
rpm {
spec = "legcord-bin.spec"
}
}
85 changes: 85 additions & 0 deletions anda/apps/legcord-bin/legcord-bin.spec
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
%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/.*\\.so

Name: legcord-bin
Version: 1.0.2
Release: 2%?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: electron xdg-utils
BuildRequires: unzip
ExclusiveArch: x86_64 aarch64 armv7l
Conflicts: legcord
BuildRequires: add-determinism

%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
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/

%files
%doc README.md
%_datadir/legcord
%_bindir/legcord
%_datadir/applications/LegCord.desktop
%_datadir/pixmaps/legcord.png

%changelog
* Mon Oct 21 2024 madonuko <[email protected]> - 1.0.2-2
- Rename to LegCord.

* Sat Jun 17 2023 madonuko <[email protected]> - 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 <[email protected]> - 3.1.7-1
- Initial package
File renamed without changes
1 change: 1 addition & 0 deletions anda/apps/legcord-bin/update.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rpm.version(gh("LegCord/LegCord"));
2 changes: 1 addition & 1 deletion anda/apps/armcord/anda.hcl → anda/apps/legcord/anda.hcl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project pkg {
arches = ["x86_64"]
rpm {
spec = "armcord.spec"
spec = "legcord.spec"
}
}
File renamed without changes.
45 changes: 25 additions & 20 deletions anda/apps/armcord/armcord.spec → anda/apps/legcord/legcord.spec
Original file line number Diff line number Diff line change
@@ -1,39 +1,41 @@
%define debug_package %nil

Name: armcord
Version: 3.3.1
Release: 1%?dist
Name: legcord
Version: 1.0.2
Release: 2%?dist
License: OSL-3.0
Summary: Custom lightweight Discord client designed to enhance your experience
URL: https://github.com/ArmCord/ArmCord
URL: https://github.com/LegCord/LegCord
Group: Applications/Internet
Source1: launch.sh
Packager: madonuko <[email protected]>
Requires: electron xdg-utils
BuildRequires: git-core add-determinism pnpm
Conflicts: armcord-bin
Provides: armcord
Obsoletes: armcord
Conflicts: legcord-bin
BuildArch: noarch

%description
ArmCord is a custom client designed to enhance your Discord experience
legcord 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
cat <<EOF > legcord.desktop
[Desktop Entry]
Name=ArmCord
Name=LegCord
Comment=%summary
GenericName=Internet Messenger
Type=Application
Exec=/usr/bin/armcord
Icon=armcord
Exec=/usr/bin/legcord
Icon=legcord
Categories=Network;InstantMessaging;
StartupWMClass=armcord
Keywords=discord;armcord;vencord;shelter;electron;
StartupWMClass=legcord
Keywords=discord;armcord;legcord;vencord;shelter;electron;
EOF


Expand All @@ -43,21 +45,24 @@ pnpm run packageQuick


%install
install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/armcord/app.asar
install -Dm644 dist/*-unpacked/resources/app.asar %buildroot/usr/share/legcord/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
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

%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
/usr/bin/legcord
/usr/share/applications/LegCord.desktop
/usr/share/pixmaps/legcord.png
/usr/share/legcord/app.asar

%changelog
* Mon Oct 21 2024 madonuko <[email protected]> - 1.0.2-2
- Rename to LegCord.

* Mon Aug 26 2024 madonuko <[email protected]> - 3.3.0-1
- Update to license.txt

Expand Down
1 change: 1 addition & 0 deletions anda/apps/legcord/update.rhai
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
rpm.version(gh("LegCord/LegCord"));
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 e09278cfb92d7e1cc5e4380c88e04d6502eec3f7
%global commit 25ccae9216190b944011832a35359d2c2bbe5cc5
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20241010
%global commit_date 20241022
%global ver 0.39.0

Name: mpv-nightly
Expand Down
Loading

0 comments on commit 9aa9149

Please sign in to comment.