From 7e845ee9083f785ba605db741fa535964940c31e Mon Sep 17 00:00:00 2001 From: madomado Date: Mon, 25 Mar 2024 18:59:55 +0800 Subject: [PATCH] chore(sync): f39 -> f40 --- anda/apps/feishin/feishin.spec | 5 +- anda/apps/mpv/mpv-nightly.spec | 4 +- .../prismlauncher-nightly.spec | 4 +- .../prismlauncher-qt5-nightly.spec | 4 +- anda/langs/nim/nim-nightly/nim-nightly.spec | 43 ++++-- anda/langs/nim/nim/nim.spec | 45 ++++--- .../vala-language-server-nightly.spec | 4 +- .../vala-lint-nightly/vala-lint-nightly.spec | 2 +- .../langs/vala/vala-nightly/vala-nightly.spec | 2 +- .../vala-panel-appmenu.spec | 13 ++ anda/lib/apparmor/apparmor.spec | 4 - anda/lib/pqmarble/anda.hcl | 3 + anda/lib/pqmarble/pqmarble.spec | 4 +- anda/lib/pqmarble/update.rhai | 12 +- anda/lib/tdlib/tdlib-nightly.spec | 10 +- anda/lib/tdlib/update.rhai | 2 +- anda/system/avstplg/avstplg.spec | 2 +- anda/system/dfu-programmer/anda.hcl | 5 + .../dfu-programmer/dfu-programmer-c99.patch | 16 +++ .../system/dfu-programmer/dfu-programmer.spec | 37 +++++ anda/system/dfu-programmer/update.rhai | 1 + anda/system/nvidia-patch/nvidia-patch.spec | 2 +- anda/system/opentabletdriver/anda.hcl | 5 + .../opentabletdriver/opentabletdriver.spec | 70 ++++++++++ anda/system/opentabletdriver/update.rhai | 1 + anda/tools/yt-dlp/anda.hcl | 8 ++ anda/tools/yt-dlp/update.rhai | 8 ++ anda/tools/yt-dlp/yt-dlp-nightly.spec | 127 ++++++++++++++++++ 28 files changed, 378 insertions(+), 65 deletions(-) create mode 100644 anda/system/dfu-programmer/anda.hcl create mode 100644 anda/system/dfu-programmer/dfu-programmer-c99.patch create mode 100644 anda/system/dfu-programmer/dfu-programmer.spec create mode 100644 anda/system/dfu-programmer/update.rhai create mode 100644 anda/system/opentabletdriver/anda.hcl create mode 100644 anda/system/opentabletdriver/opentabletdriver.spec create mode 100644 anda/system/opentabletdriver/update.rhai create mode 100644 anda/tools/yt-dlp/anda.hcl create mode 100644 anda/tools/yt-dlp/update.rhai create mode 100644 anda/tools/yt-dlp/yt-dlp-nightly.spec diff --git a/anda/apps/feishin/feishin.spec b/anda/apps/feishin/feishin.spec index 5d6a704961..9815191298 100644 --- a/anda/apps/feishin/feishin.spec +++ b/anda/apps/feishin/feishin.spec @@ -38,9 +38,8 @@ Keywords=Music;Jellyfin;Audio;Stream;Sonixd EOF %build -npm i --legacy-peer-deps update-browserslist-db@latest -npm audit fix --force -npx update-browserslist-db@latest +npm install --legacy-peer-deps +npm run postinstall npm run build %ifarch x86_64 diff --git a/anda/apps/mpv/mpv-nightly.spec b/anda/apps/mpv/mpv-nightly.spec index 5e156ee302..a70281ecd9 100644 --- a/anda/apps/mpv/mpv-nightly.spec +++ b/anda/apps/mpv/mpv-nightly.spec @@ -1,6 +1,6 @@ -%global commit 3e42139e138a8cbb67a756dab2d6eaeb2a115223 +%global commit a46ce9e28cd97f7280c085649a79f85aa1d0fe70 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 20240227 +%global commit_date 20240325 %global ver v0.37.0 Name: mpv-nightly diff --git a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec index ac209a0bd5..f48a233d6f 100644 --- a/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec +++ b/anda/games/prismlauncher-nightly/prismlauncher-nightly.spec @@ -1,13 +1,13 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 3b0564f098c49be2fd3082928c91440c73df4d80 +%global commit df0280f52b68f4352d8da711136609c16ce4db7b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 -%global commit_date 20240311 +%global commit_date 20240325 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_without qt6 diff --git a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec index 4c7ae5ea53..6f29e162ca 100644 --- a/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec +++ b/anda/games/prismlauncher-qt5-nightly/prismlauncher-qt5-nightly.spec @@ -1,13 +1,13 @@ %global real_name prismlauncher %global nice_name PrismLauncher -%global commit 3b0564f098c49be2fd3082928c91440c73df4d80 +%global commit df0280f52b68f4352d8da711136609c16ce4db7b %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f %global quazip_commit 6117161af08e366c37499895b00ef62f93adc345 %global tomlplusplus_commit 7eb2ffcc09f8e9890dc0b77ff8ab00fc53b1f2b8 -%global commit_date 20240311 +%global commit_date 20240325 %global snapshot_info %{commit_date}.%{shortcommit} %bcond_with qt6 diff --git a/anda/langs/nim/nim-nightly/nim-nightly.spec b/anda/langs/nim/nim-nightly/nim-nightly.spec index 3596813834..054e300e4b 100644 --- a/anda/langs/nim/nim-nightly/nim-nightly.spec +++ b/anda/langs/nim/nim-nightly/nim-nightly.spec @@ -1,11 +1,12 @@ %global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10 -%global commit 78c834dd76f273d8813247647531005a1f7db1a6 +%global commit 33902d9dbb65fbfdfbd6e3b2a34c6e19eccb762f +%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global ver 2.1.1 -%global commit_date 20240312 +%global commit_date 20240322 %global debug_package %nil Name: nim-nighlty -Version: %ver^%commit_date.%commit +Version: %ver^%commit_date.%shortcommit Release: 1%?dist Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD @@ -36,6 +37,7 @@ order of priority). This package provides various tools, which help Nim programmers. +%ifarch x86_64 %package doc Summary: Documentation for Nim programming language BuildArch: noarch @@ -46,12 +48,15 @@ order of priority). This package provides documentation and reference manual for the language and its standard library. +%endif + %prep %autosetup -n Nim-%commit # hack cp /usr/bin/mold /usr/bin/ld + %build export CFLAGS="${CFLAGS} -Ofast" export CXXFLAGS="${CXXFLAGS} -Ofast" @@ -66,13 +71,18 @@ nimBuildCsourcesIfNeeded CFLAGS="${CFLAGS} -Ic_code -w -O3 -fno-strict-aliasing nim c --noNimblePath --skipUserCfg --skipParentCfg --hints:off -d:danger koch.nim koch boot -d:release -d:nimStrictMode --lib:lib +%ifarch x86_64 koch docs & +%endif (cd lib; nim c --app:lib -d:danger -d:createNimRtl -t:-fPIE -l:-pie nimrtl.nim) & koch tools --skipUserCfg --skipParentCfg --hints:off -d:release -t:-fPIE -l:-pie & nim c -d:danger -t:-fPIE -l:-pie nimsuggest/nimsuggest.nim & wait +%ifarch x86_64 sed -i '/ - 1.9.3^fcc383d89994241f1b73fe4f85ef38528c135e2e-1 -- Initial Package. +%autochangelog diff --git a/anda/langs/nim/nim/nim.spec b/anda/langs/nim/nim/nim.spec index 8a2ce0873e..bbf7132f31 100644 --- a/anda/langs/nim/nim/nim.spec +++ b/anda/langs/nim/nim/nim.spec @@ -3,7 +3,7 @@ Name: nim Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Imperative, multi-paradigm, compiled programming language License: MIT and BSD URL: https://nim-lang.org @@ -13,8 +13,7 @@ Source2: nimgrep.1 Source3: nimble.1 Source4: nimsuggest.1 BuildRequires: gcc mold git gcc-c++ nodejs openssl-devel pkgconfig(bash-completion) gc-devel pcre-devel -Requires: redhat-rpm-config gcc -Conflicts: choosenim +Requires: gcc %description @@ -32,7 +31,7 @@ order of priority). This package provides various tools, which help Nim programmers. - +%ifarch x86_64 %package doc Summary: Documentation for Nim programming language BuildArch: noarch @@ -43,10 +42,13 @@ order of priority). This package provides documentation and reference manual for the language and its standard library. +%endif + %prep %autosetup -n nim-%{version} + %build export CFLAGS="${CFLAGS} -Ofast" export CXXFLAGS="${CXXFLAGS} -Ofast" @@ -58,20 +60,24 @@ export PATH="$(pwd):$(pwd)/bin:${PATH}" mold -run nim c -d:danger koch.nim mold -run koch boot -d:useLinenoise -t:-fPIE -l:-pie -d:release -d:nativeStacktrace -d:useGnuReadline +%ifarch x86_64 mold -run koch docs & +%endif (cd lib && nim c --app:lib -d:createNimRtl -d:release nimrtl.nim) & mold -run koch tools -t:-fPIE -l:-pie & mold -run nim c -t:-fPIE -l:-pie -d:release nimsuggest/nimsuggest.nim & wait +%ifarch x86_64 sed -i '/ for the malloc function. + +Submitted upstream: + +diff --git a/src/atmel.c b/src/atmel.c +index 4ea794d17f65d8d0..491bbb16706e65a8 100644 +--- a/src/atmel.c ++++ b/src/atmel.c +@@ -19,6 +19,7 @@ + */ + + #include ++#include + #include + #include + #include diff --git a/anda/system/dfu-programmer/dfu-programmer.spec b/anda/system/dfu-programmer/dfu-programmer.spec new file mode 100644 index 0000000000..eaf3b427d5 --- /dev/null +++ b/anda/system/dfu-programmer/dfu-programmer.spec @@ -0,0 +1,37 @@ +Name: dfu-programmer +Version: 1.1.0 +Release: 1%?dist +Summary: A Device Firmware Update based USB programmer for Atmel chips +License: GPL-2.0-or-later +URL: https://github.com/dfu-programmer/dfu-programmer +Source0: %url/archive/refs/tags/v%version.tar.gz +Patch0: dfu-programmer-c99.patch +BuildRequires: pkgconfig(libusb-1.0) >= 1.0.0 +BuildRequires: make gcc autoconf automake + +%description +A linux based command-line programmer for Atmel chips with a USB +bootloader supporting ISP. This is a mostly Device Firmware Update +(DFU) 1.0 compliant user-space application. Supports all DFU enabled +Atmel chips with USB support. + +%prep +%autosetup -p1 +touch ./ChangeLog +autoreconf -fiv + +%build +%configure +%make_build + +%install +%make_install + +%files +%license COPYING +%doc AUTHORS ChangeLog NEWS README.md +%{_bindir}/%{name} +%{_mandir}/man1/%{name}.1* + +%changelog +%autochangelog diff --git a/anda/system/dfu-programmer/update.rhai b/anda/system/dfu-programmer/update.rhai new file mode 100644 index 0000000000..878b46cd6d --- /dev/null +++ b/anda/system/dfu-programmer/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("dfu-programmer/dfu-programmer")); diff --git a/anda/system/nvidia-patch/nvidia-patch.spec b/anda/system/nvidia-patch/nvidia-patch.spec index 639577ceec..e8f83e7901 100644 --- a/anda/system/nvidia-patch/nvidia-patch.spec +++ b/anda/system/nvidia-patch/nvidia-patch.spec @@ -1,7 +1,7 @@ %global debug_package %{nil} %global commit 564c0661a942f7163cb2cfa6cb1b14b4bcff3a30 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%global commit_date 240218 +%global commit_date 20240218 %global patches %{_datadir}/src/nvidia-patch diff --git a/anda/system/opentabletdriver/anda.hcl b/anda/system/opentabletdriver/anda.hcl new file mode 100644 index 0000000000..7e605aad0e --- /dev/null +++ b/anda/system/opentabletdriver/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "opentabletdriver.spec" + } +} \ No newline at end of file diff --git a/anda/system/opentabletdriver/opentabletdriver.spec b/anda/system/opentabletdriver/opentabletdriver.spec new file mode 100644 index 0000000000..c4e5dea8b5 --- /dev/null +++ b/anda/system/opentabletdriver/opentabletdriver.spec @@ -0,0 +1,70 @@ +# saves time so we don't have to download the thing manually +#undefine _disable_source_fetch +# We don't have debug symbols, because .NET +%define debug_package %{nil} +# We aren't using Mono but RPM expected Mono +%global __requires_exclude_from ^/usr/lib/opentabletdriver/.*$ +%global __os_install_post %{nil} + +Name: opentabletdriver +Version: 0.6.4.0 +Release: 1%{?dist} +Summary: A cross-platform open source tablet driver +License: LGPLv3 +URL: https://github.com/OpenTabletDriver/OpenTabletDriver +%define otddir OpenTabletDriver-%{version} + +BuildRequires: dotnet-sdk-6.0 git jq systemd-rpm-macros + +Requires: dotnet-runtime-6.0 +Requires: libevdev.so.2()(64bit) +Requires: gtk3 +Requires: gtk3 +Requires: udev +Suggests: libX11 +Suggests: libXrandr + +%description +OpenTabletDriver is an open source, cross platform, user mode tablet driver. The goal of OpenTabletDriver is to be cross platform as possible with the highest compatibility in an easily configurable graphical user interface. + +%prep +git clone -b v%version %url . + +%build +./eng/linux/package.sh --output bin + +%install +export DONT_STRIP=1 +PREFIX="%{_prefix}" ./eng/linux/package.sh --package Generic --build false +mkdir -p "%{buildroot}" +mv ./dist/files/* "%{buildroot}"/ +rm -rf ./dist +mkdir -p "%{buildroot}/%{_prefix}/lib/" +cp -r bin "%{buildroot}/%{_prefix}/lib/opentabletdriver" + +%post +%systemd_user_post %name.service + +%preun +%systemd_user_preun %name.service + +%postun +%systemd_user_postun_with_restart %name.service + +%files +%defattr(-,root,root) +%dir %{_prefix}/lib/opentabletdriver +%dir %{_prefix}/share/doc/opentabletdriver +%{_bindir}/otd +%{_bindir}/otd-daemon +%{_bindir}/otd-gui +%{_prefix}/lib/modprobe.d/99-opentabletdriver.conf +%{_prefix}/lib/modules-load.d/opentabletdriver.conf +%{_prefix}/lib/opentabletdriver/* +%{_prefix}/lib/systemd/user/opentabletdriver.service +%{_prefix}/lib/udev/rules.d/70-opentabletdriver.rules +%{_prefix}/share/applications/opentabletdriver.desktop +%{_prefix}/share/man/man8/opentabletdriver.8.gz +%{_prefix}/share/doc/opentabletdriver/LICENSE +%{_prefix}/share/pixmaps/otd.ico +%{_prefix}/share/pixmaps/otd.png diff --git a/anda/system/opentabletdriver/update.rhai b/anda/system/opentabletdriver/update.rhai new file mode 100644 index 0000000000..2fffd35bb4 --- /dev/null +++ b/anda/system/opentabletdriver/update.rhai @@ -0,0 +1 @@ +rpm.version(gh("OpenTabletDriver/OpenTabletDriver")); \ No newline at end of file diff --git a/anda/tools/yt-dlp/anda.hcl b/anda/tools/yt-dlp/anda.hcl new file mode 100644 index 0000000000..b585ff28c4 --- /dev/null +++ b/anda/tools/yt-dlp/anda.hcl @@ -0,0 +1,8 @@ +project pkg { + rpm { + spec = "yt-dlp-nightly.spec" + } + labels { + nightly = "1" + } +} diff --git a/anda/tools/yt-dlp/update.rhai b/anda/tools/yt-dlp/update.rhai new file mode 100644 index 0000000000..8bfba97bcf --- /dev/null +++ b/anda/tools/yt-dlp/update.rhai @@ -0,0 +1,8 @@ +if filters.contains("nightly") { + rpm.global("commit", gh_commit("yt-dlp/yt-dlp")); + if rpm.changed() { + rpm.global("ver", gh("yt-dlp/yt-dlp")); + rpm.global("commit_date", date()); + rpm.release(); + } +} diff --git a/anda/tools/yt-dlp/yt-dlp-nightly.spec b/anda/tools/yt-dlp/yt-dlp-nightly.spec new file mode 100644 index 0000000000..d74f8b3340 --- /dev/null +++ b/anda/tools/yt-dlp/yt-dlp-nightly.spec @@ -0,0 +1,127 @@ +#bcond_without tests +%global commit e5d4f11104ce7ea1717a90eea82c0f7d230ea5d5 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) +%global commit_date 20240325 +%global ver 2024.03.10 + +Name: yt-dlp-nightly +Version: %ver^%commit_date.%shortcommit +Release: 1%?dist +Summary: A command-line program to download videos from online video platforms + +License: Unlicense +URL: https://github.com/yt-dlp/yt-dlp +Source: %url/archive/%commit.tar.gz +# License of the specfile +Source: https://src.fedoraproject.org/rpms/yt-dlp/raw/rawhide/f/yt-dlp.spec.license + +BuildArch: noarch + +BuildRequires: python3-devel + +%if %{with tests} +# Needed for %%check +BuildRequires: %{py3_dist pytest} +%endif + +# Needed for docs +BuildRequires: pandoc +BuildRequires: make + +# ffmpeg-free is now available in Fedora. +Recommends: /usr/bin/ffmpeg +Recommends: /usr/bin/ffprobe + +Provides: yt-dlp +Conflicts: yt-dlp + +Suggests: python3dist(keyring) + +%global _description %{expand: +yt-dlp is a command-line program to download videos from many different online +video platforms, such as youtube.com. The project is a fork of youtube-dl with +additional features and fixes.} + +%description %{_description} + +%package bash-completion +Summary: Bash completion for yt-dlp +Requires: %{name} = %{version}-%{release} +Requires: bash-completion +Supplements: (%{name} and bash-completion) + +Provides: yt-dlp-bash-completion +Conflicts: yt-dlp-bash-completion + +%description bash-completion +Bash command line completion support for %{name}. + +%package zsh-completion +Summary: Zsh completion for %{name} +Requires: %{name} = %{version}-%{release} +Requires: zsh +Supplements: (%{name} and zsh) + +Provides: yt-dlp-zsh-completion +Conflicts: yt-dlp-zsh-completion + +%description zsh-completion +Zsh command line completion support for %{name}. + +%package fish-completion +Summary: Fish completion for %{name} +Requires: %{name} = %{version}-%{release} +Requires: fish +Supplements: (%{name} and fish) + +Provides: yt-dlp-fish-completion +Conflicts: yt-dlp-fish-completion + +%description fish-completion +Fish command line completion support for %{name}. + +%prep +%autosetup -n yt-dlp-%commit + +# Remove unnecessary shebangs +find -type f ! -executable -name '*.py' -print -exec sed -i -e '1{\@^#!.*@d}' '{}' + +# Relax version constraints +sed -i 's@"\(requests\|urllib3\|websockets\)>=.*"@"\1"@' pyproject.toml + +%generate_buildrequires +%pyproject_buildrequires -r + +%build +# Docs and shell completions +make yt-dlp.1 completion-bash completion-zsh completion-fish + +# Docs and shell completions are also included in the wheel. +%pyproject_wheel + +%install +%pyproject_install +%pyproject_save_files yt_dlp + +%check +%if %{with tests} +# See https://github.com/yt-dlp/yt-dlp/blob/master/devscripts/run_tests.sh +%pytest -m 'not download' +%endif + +%files -f %{pyproject_files} +%{_bindir}/yt-dlp +%{_mandir}/man1/yt-dlp.1* +%doc README.md +%license LICENSE + +%files bash-completion +%{bash_completions_dir}/yt-dlp + +%files zsh-completion +%{zsh_completions_dir}/_yt-dlp + +%files fish-completion +%{fish_completions_dir}/yt-dlp.fish + +%changelog +%autochangelog