public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/aegisub] rawhide: feat: Update to v3.5.0-beta
@ 2026-08-01 5:24 EL_File4138
0 siblings, 0 replies; only message in thread
From: EL_File4138 @ 2026-08-01 5:24 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/aegisub
Branch : rawhide
Commit : 853c49e62049da390f4daf9d8d139d4344fea759
Author : EL_File4138 <elfile4138@elfile4138.moe>
Date : 2026-08-01T13:22:42+08:00
Stats : +20/-48 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/aegisub/c/853c49e62049da390f4daf9d8d139d4344fea759?branch=rawhide
Log:
feat: Update to v3.5.0-beta
---
diff --git a/.gitignore b/.gitignore
index b380f95..b79fef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/aegisub-3.4.2.tar.xz
+/aegisub-3.5.0-beta.tar.xz
diff --git a/0001-fix-Fallback-to-X11-if-lacks-EGL-support.patch b/0001-fix-Fallback-to-X11-if-lacks-EGL-support.patch
deleted file mode 100644
index 4f8871c..0000000
--- a/0001-fix-Fallback-to-X11-if-lacks-EGL-support.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 17ea2947a24ed87df5a6842deb561b01c9643601 Mon Sep 17 00:00:00 2001
-From: EL_File4138 <elfile4138@elfile4138.moe>
-Date: Mon, 12 May 2025 00:48:35 +0200
-Subject: [PATCH] fix: Fallback to X11 if lacks EGL support
-
-This should fix #233. It's recurring and is hard to fix in the downstream package.
-Fixing is trivial.
----
- src/main.cpp | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 65dbb4529c..c5d7e50ab1 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -95,6 +95,18 @@ void AegisubApp::OnAssertFailure(const wxChar *file, int line, const wxChar *fun
- AegisubApp::AegisubApp() {
- // http://trac.wxwidgets.org/ticket/14302
- wxSetEnv("UBUNTU_MENUPROXY", "0");
-+
-+ // Fallback to X11 if wxGTK implementation is build without Wayland EGL support
-+ // Fix https://github.com/TypesettingTools/Aegisub/issues/233
-+ #if defined(__WXGTK__) && !wxUSE_GLCANVAS_EGL
-+ wxString xdg_session_type = wxGetenv("XDG_SESSION_TYPE");
-+ wxString wayland_display = wxGetenv("WAYLAND_DISPLAY");
-+
-+ if (xdg_session_type == "wayland" || wayland_display.Contains("wayland")) {
-+ wxSetEnv("GDK_BACKEND", "x11");
-+ }
-+ #endif
-+
- }
-
- namespace {
diff --git a/aegisub.spec b/aegisub.spec
index 8d4bfdc..0909ce0 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -1,13 +1,15 @@
%global altname Aegisub
Name: aegisub
-Version: 3.4.2
+Version: 3.5.0~beta
Release: %autorelease
Summary: Tool for creating and modifying subtitles
License: BSD-3-Clause AND ISC AND MIT
# BSD-3-Clause license except the following file:
# ISC:
-# ./tools/*
+# ./tools/* except the following BSD-3-Clause:
+# - ./tools/combine-config.py
+# - ./tools/respack.py
# ./tests/*
# ./libaegisub/* except the following BSD-3-Clause:
# - ./libaegisub/common/cajun/{elements,reader}.cpp
@@ -93,14 +95,14 @@ License: BSD-3-Clause AND ISC AND MIT
# ./src/include/aegisub/toolbar.h
# ./src/initial_line_state.cpp
# ./src/initial_line_state.h
-# ./src/libass_gdi_fontselect.cpp
# ./src/libresrc/libresrc.cpp
# ./src/libresrc/libresrc.h
# ./src/menu.cpp
# ./src/mkv_wrap.h
# ./src/options.h
# ./src/osx/osx_utils.mm
-# ./src/osx/retina_helper.mm
+# ./src/osx/scintilla_ime.mm
+# ./src/osx/screenpicker.mm
# ./src/pen.cpp
# ./src/pen.h
# ./src/persist_location.cpp
@@ -117,7 +119,6 @@ License: BSD-3-Clause AND ISC AND MIT
# ./src/res/strings.rc
# ./src/resolution_resampler.cpp
# ./src/resolution_resampler.h
-# ./src/retina_helper.h
# ./src/search_replace_engine.cpp
# ./src/search_replace_engine.h
# ./src/selection_controller.cpp
@@ -144,6 +145,7 @@ License: BSD-3-Clause AND ISC AND MIT
# ./src/thesaurus.cpp
# ./src/thesaurus.h
# ./src/toolbar.cpp
+# ./src/tooltip_binding.{cpp,h}
# ./src/validators.cpp
# ./src/validators.h
# ./src/value_event.h
@@ -172,6 +174,7 @@ License: BSD-3-Clause AND ISC AND MIT
# ./src/visual_tool_vector_clip.h
# ./src/visual_tool.cpp
# ./src/visual_tool.h
+# ./src/xdg_desktop_portal_utils.{cpp,h}
#
# MIT:
# ./subprojects/luabins/
@@ -185,12 +188,13 @@ License: BSD-3-Clause AND ISC AND MIT
# Licensed to BSDL with permission from the author:
# ./src/MatroskaParser.{c,h}
+%global upstream_version %{gsub %{version} ~ -}
+%global upstream_package_version %{gsub %{version} %~.*$ %{quote:}}
+%global upstream_tag v%{upstream_version}
+
URL: https://github.com/TypesettingTools/%{name}
-Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# https://github.com/TypesettingTools/Aegisub/pull/375
-# Merged in main, will be incorporated in source in next release
-Patch1: 0001-fix-Fallback-to-X11-if-lacks-EGL-support.patch
+Source0: %{url}/releases/download/%{upstream_tag}/%{name}-%{upstream_version}.tar.xz
BuildRequires: boost-devel
BuildRequires: desktop-file-utils
@@ -216,18 +220,19 @@ BuildRequires: pkgconfig(luajit)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(portaudio-2.0)
BuildRequires: pkgconfig(uchardet)
+BuildRequires: pkgconfig(libportal-gtk3)
Requires: hicolor-icon-theme
# luajit does not support ppc64le
-# FTBFS on s390x due to upstream endianness bug (fedora#2367466)
-ExcludeArch: ppc64le s390x
+ExcludeArch: ppc64le
# Heavily modified upon the original project
Provides: bundled(cajun-jsonapi) = 2.0.1
# Major ABI change making patching out impossible
Provides: bundled(lua-lpeg) = 0.1.0
# Discontinued project, not included in Fedora Package registry
+# Has been deprecated upstream, will be removed in future release
Provides: bundled(lua-luabins) = 0.3
%description
@@ -236,14 +241,14 @@ subtitles, timing, and editing of subtitle files. It supports a wide range
of formats and provides powerful visual typesetting tools.
%prep
-%autosetup -n %{altname}-%{version} -p1
+%autosetup -n %{altname}-%{upstream_package_version}
# Strip out unused bundled library
find subprojects/ -mindepth 1 -depth ! -path "subprojects/luabins*" -exec rm -rv {} +
# Bundled: src/gl/glext.h (Provided by `libglvnd-devel`, unable to patch out due to upstream cross-platform modification)
# Strip unused packaging artifacts for other platform, which contains GPL code
rm -rv packages/{osx_bundle,osx_dmg,win_installer}
-rm -rv tools/{osx-*,apply-manifest.py,*.ps1}
+rm -rv tools/{osx-*,*.ps1}
rm -rv osx-bundle.sed
# ./docs consists of project related document and tools, but not application manual
rm -rv docs/
diff --git a/sources b/sources
index 912ab38..b0a7e89 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (aegisub-3.4.2.tar.xz) = ecc455c8f141c77840d23c9fb436d549b22ad28f9e78b25f356f27ae737a9bca300258fbe99cb59eae1da58dd03284ff82b0c4105df7a9190455b425d9917190
+SHA512 (aegisub-3.5.0-beta.tar.xz) = eaf9af3893f6f82d44824d9ea48d374012aae0adcee8769077f745675e1d2d71f879aa9635fd81985d3934adda04d94b5cb60f7eb333cac9109c866a3cc098e7
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-08-01 5:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-01 5:24 [rpms/aegisub] rawhide: feat: Update to v3.5.0-beta EL_File4138
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox