diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 9800f36cac..3720348bb3 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -6,7 +6,7 @@ jobs: lint: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:main + image: ghcr.io/terrapkg/builder:f38 steps: - name: Checkout repository uses: actions/checkout@v3 diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml.bak similarity index 95% rename from .github/workflows/sync.yml rename to .github/workflows/sync.yml.bak index a98efeea15..48f66660ec 100644 --- a/.github/workflows/sync.yml +++ b/.github/workflows/sync.yml.bak @@ -4,13 +4,14 @@ on: types: - closed branches: - - f39 + - f38 jobs: sync: strategy: matrix: - branch: ["f37", "f38"] + branch: ["f37"] + fail-fast: false if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync') runs-on: ubuntu-latest steps: diff --git a/.github/workflows/update-comps.yml b/.github/workflows/update-comps.yml index f8afc492fc..70df7eded0 100644 --- a/.github/workflows/update-comps.yml +++ b/.github/workflows/update-comps.yml @@ -3,7 +3,6 @@ name: Push comps updates on: push: branches: - - f39 - f38 - f37 paths: @@ -14,7 +13,7 @@ jobs: update-comps: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:main + image: ghcr.io/terrapkg/builder:38 steps: - uses: actions/checkout@v3 - id: get-branch diff --git a/.github/workflows/update-nightly.yml b/.github/workflows/update-nightly.yml index 6039147fab..dceda6d9e9 100644 --- a/.github/workflows/update-nightly.yml +++ b/.github/workflows/update-nightly.yml @@ -8,7 +8,7 @@ jobs: autoupdate: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:main + image: ghcr.io/terrapkg/builder:38 options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 345d42fcfa..15100884db 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -8,7 +8,7 @@ jobs: autoupdate: runs-on: ubuntu-latest container: - image: ghcr.io/terrapkg/builder:main + image: ghcr.io/terrapkg/builder:f38 options: --cap-add=SYS_ADMIN --privileged steps: - name: Checkout @@ -39,14 +39,10 @@ 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^ - git checkout f38 - git apply *.patch || true - git add anda - git commit -S -a -m "$msg" - git checkout f37 - git apply *.patch || true - git add anda - git commit -S -a -m "$msg" + # git format-patch HEAD^ + # git checkout f37 + # git apply *.patch || true + # git add * + # git commit -S -a -m "$msg" git push -u origin --all fi diff --git a/.gitignore b/.gitignore index 79b8e8a9dd..e35d328cee 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -anda-build/ \ No newline at end of file +anda-build/ +*.patch diff --git a/anda/apps/anki/anki.spec b/anda/apps/anki/anki.spec index ff6b1f1cc2..1d2da46b00 100644 --- a/anda/apps/anki/anki.spec +++ b/anda/apps/anki/anki.spec @@ -8,7 +8,7 @@ BuildRequires: python3-devel python3-setuptools python3-waitress python3-protob BuildRequires: python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson BuildRequires: python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc 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 +Requires: python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-qt5-webengine Obsoletes: anki <= 2.1.15 BuildArch: noarch Conflicts: anki-qt5 diff --git a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec index 85b8103ddd..dd51bab150 100644 --- a/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec +++ b/anda/apps/discord-ptb-openasar/discord-ptb-openasar.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: discord-ptb-openasar -Version: 0.0.41 +Version: 0.0.42 Release: 1%{?dist} Summary: OpenAsar is a rewrite of part of Discord's desktop code, making it snappier and include more features like further customization and theming License: MIT AND https://discord.com/terms diff --git a/anda/apps/discord-ptb/discord-ptb.spec b/anda/apps/discord-ptb/discord-ptb.spec index 3e0ac16c92..5fc9b5eff2 100644 --- a/anda/apps/discord-ptb/discord-ptb.spec +++ b/anda/apps/discord-ptb/discord-ptb.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: discord-ptb -Version: 0.0.41 +Version: 0.0.42 Release: 1%{?dist} Summary: Free Voice and Text Chat for Gamers. URL: discord.com diff --git a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec index 6d449ce6b5..79c462b85b 100644 --- a/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec +++ b/anda/fonts/iosevka-fusion/iosevka-fusion-fonts.spec @@ -2,7 +2,7 @@ %global debug_package %{nil} Name: iosevka-fusion-fonts -Version: 22.0.2 +Version: 22.1.0 Release: 1%{?dist} Summary: A custom font based on iosevka diff --git a/anda/indicators/ayatana-indicator-session/anda.hcl b/anda/indicators/ayatana-indicator-session/anda.hcl new file mode 100644 index 0000000000..808301c44a --- /dev/null +++ b/anda/indicators/ayatana-indicator-session/anda.hcl @@ -0,0 +1,5 @@ +project "pkg" { + rpm { + spec = "ayatana-indicator-session.spec" + } +} diff --git a/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec b/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec new file mode 100644 index 0000000000..8197832758 --- /dev/null +++ b/anda/indicators/ayatana-indicator-session/ayatana-indicator-session.spec @@ -0,0 +1,64 @@ +Name: ayatana-indicator-session +Summary: Ayatana Indicator Session Applet +Version: 22.9.1 +Release: %autorelease +License: GPLv3 +URL: https://github.com/AyatanaIndicators/ayatana-indicator-session +Source0: %{url}/archive/refs/tags/%{version}.tar.gz + +BuildRequires: cmake +BuildRequires: cmake-extras +BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(libayatana-common) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(dbustest-1) +BuildRequires: pkgconfig(gee-0.8) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: intltool + +%description +The Ayatana Indicators project is the continuation of Application Indicators and System Indicators, +two technologies developed by Canonical Ltd. for the Unity7 desktop and Lomiri desktop. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +This package contains the development header files for %{name}. + +%prep +%autosetup -n %{name}-%{version} + +%build +%cmake -DENABLE_TESTS=ON \ + -DENABLE_COVERAGE=OFF +%cmake_build + +%install +%cmake_install +%find_lang %{name} + +%files -f %{name}.lang +%license COPYING +%{_sysconfdir}/xdg/autostart/ayatana-indicator-session.desktop +%{_userunitdir}/ayatana-indicator-session.service +%dir %{_libexecdir}/ayatana-indicator-session +%{_libexecdir}/ayatana-indicator-session/ayatana-indicator-session-service +%{_datadir}/ayatana/indicators/org.ayatana.indicator.session +%{_datadir}/glib-2.0/schemas/org.ayatana.indicator.session.gschema.xml +%{_datadir}/icons/hicolor/scalable/status/*.svg +%{_datadir}/icons/hicolor/scalable/actions/*.svg +%{_datadir}/icons/hicolor/16x16/actions/*.png +%{_datadir}/icons/hicolor/16x16/status/*.png +%{_datadir}/icons/hicolor/22x22/actions/*.png +%{_datadir}/icons/hicolor/22x22/status/*.png +%{_datadir}/icons/hicolor/24x24/status/*.png +%{_datadir}/icons/hicolor/24x24/actions/*.png +%{_datadir}/icons/hicolor/32x32/actions/*.png +%{_datadir}/icons/hicolor/32x32/status/*.png + +%changelog +%autochangelog diff --git a/anda/kotlin/kotlin-native/kotlin-native.spec b/anda/kotlin/kotlin-native/kotlin-native.spec index c935ab1381..f70d5ed9b1 100644 --- a/anda/kotlin/kotlin-native/kotlin-native.spec +++ b/anda/kotlin/kotlin-native/kotlin-native.spec @@ -2,7 +2,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Name: kotlin-native -Version: 1.8.20 +Version: 1.8.21 Release: 1%{?dist} Summary: LLVM backend for the Kotlin compiler ExclusiveArch: x86_64 diff --git a/anda/kotlin/kotlin/kotlin.spec b/anda/kotlin/kotlin/kotlin.spec index 90824e1561..9726c2c9ae 100644 --- a/anda/kotlin/kotlin/kotlin.spec +++ b/anda/kotlin/kotlin/kotlin.spec @@ -1,7 +1,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Name: kotlin -Version: 1.8.20 +Version: 1.8.21 Release: 1%{?dist} Summary: Statically typed programming language diff --git a/anda/python/ruff/python3-ruff.spec b/anda/python/ruff/python3-ruff.spec index 69f8585b4d..1dd248b1a9 100644 --- a/anda/python/ruff/python3-ruff.spec +++ b/anda/python/ruff/python3-ruff.spec @@ -1,7 +1,7 @@ %define debug_package %{nil} Name: python3-ruff -Version: 0.0.262 +Version: 0.0.263 Release: 1%{?dist} Summary: An extremely fast Python linter, written in Rust License: MIT diff --git a/anda/rust/felix/rust-felix.spec b/anda/rust/felix/rust-felix.spec index 738425d09c..0e3850be82 100644 --- a/anda/rust/felix/rust-felix.spec +++ b/anda/rust/felix/rust-felix.spec @@ -2,8 +2,8 @@ %global crate felix Name: rust-felix -Version: 2.2.5 -Release: %autorelease +Version: 2.2.6 +Release: 1%{?dist} Summary: Tui file manager with vim-like key mapping License: MIT diff --git a/anda/rust/rnote/rnote.spec b/anda/rust/rnote/rnote.spec index 9f0436d5ce..1e2e63c3e2 100644 --- a/anda/rust/rnote/rnote.spec +++ b/anda/rust/rnote/rnote.spec @@ -1,5 +1,5 @@ Name: rnote -Version: 0.5.18 +Version: 0.6.0 Release: 1%{?dist} Summary: Sketch and take handwritten notes. License: GPL-3.0