[packages/aegisub] - updated to latest buildable snapshot, rel 18
baggins
baggins at pld-linux.org
Sun Jan 23 11:54:05 CET 2022
commit b23cdd31c80dbb5d42cf4ae9d5be3de0f953a23b
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Jan 23 11:53:42 2022 +0100
- updated to latest buildable snapshot, rel 18
aegisub-boost-1.70.patch | 44 --------------------------------------------
aegisub-icu.patch | 10 ----------
aegisub-icu64.patch | 43 -------------------------------------------
aegisub.spec | 47 ++++++++++++++++++++++++++---------------------
pthread.patch | 11 -----------
5 files changed, 26 insertions(+), 129 deletions(-)
---
diff --git a/aegisub.spec b/aegisub.spec
index 441bd45..4043f0e 100644
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -7,20 +7,20 @@
# Conditional build:
%bcond_without ffms2 # build ffms2 A/V provider
+%define snap 85f711f
+%define gitrev 85f711fccc75f01fd44f25537b8777df10c4b3d1
+
Summary: Subtitle editor
Summary(pl.UTF-8): Edytor napisów
Name: aegisub
Version: 3.2.2
-Release: 17
+Release: 18
License: BSD
Group: X11/Applications
-Source0: http://ftp.aegisub.org/pub/releases/%{name}-%{version}.tar.xz
-# Source0-md5: d80e852c34811add358c06d77f5cd40d
-Patch0: pthread.patch
-Patch1: %{name}-icu.patch
-Patch2: %{name}-icu64.patch
-Patch3: %{name}-boost-1.70.patch
-Patch4: make-4.3.patch
+#Source0: http://ftp.aegisub.org/pub/releases/%{name}-%{version}.tar.xz
+Source0: https://github.com/Aegisub/Aegisub/archive/%{snap}/%{name}-%{version}-%{snap}.tar.gz
+# Source0-md5: ecb9b5441ead4135c9b1baec0abdec49
+Patch0: make-4.3.patch
URL: http://www.aegisub.org/
# AC_AGI_COMPILE tries to run test program which tries to open device and most likely fails
#BuildRequires: OpenAL-devel >= 0.0.8
@@ -43,7 +43,8 @@ BuildRequires: pkgconfig >= 1:0.20
BuildRequires: portaudio-devel >= 19
BuildRequires: pulseaudio-devel >= 0.5
BuildRequires: tar >= 1:1.22
-BuildRequires: wxGTK2-unicode-gl-devel >= 3.0.0
+BuildRequires: uchardet-devel
+BuildRequires: wxGTK3-unicode-gl-devel >= 3.0.0
BuildRequires: wxWidgets-devel >= 3.0.0
BuildRequires: xz
BuildRequires: zlib-devel
@@ -84,25 +85,31 @@ napisach, poza samym powiązaniem z czasem. Celem Aegisubs jest łatwa
obsługa tych zaawansowanych funkcji.
%prep
-%setup -q
+%setup -q -n Aegisub-%{gitrev}
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+cat <<'EOF' >build/git_version.h
+#define BUILD_GIT_VERSION_NUMBER 9010
+#define BUILD_GIT_VERSION_STRING "3.2.2.6f546951b"
+#define TAGGED_RELEASE 0
+#define INSTALLER_VERSION "0.0.0"
+#define RESOURCE_BASE_VERSION 0, 0, 0
+EOF
%{__mv} vendor{,.keep}
mkdir vendor
-%{__mv} vendor.keep/{luabins,luajit,universalchardet} vendor
+%{__mv} vendor.keep/{luabins,luajit} vendor
%build
+./autogen.sh
+export C
%configure \
--disable-compiler-flags \
--disable-update-checker \
%{__with_without ffms2} \
--without-oss \
--with-player-audio=PulseAudio \
- --with-wx-config=wx-gtk2-unicode-config
+ --with-wx-config=wx-gtk3-unicode-config
%{__make}
@@ -111,15 +118,13 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-ln -s %{name}-3.2 $RPM_BUILD_ROOT%{_bindir}/%{name}
-
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{fr_FR,fr}
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{pt_PT,pt}
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr_RS,sr}
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{sr_RS,sr}@latin
%{__mv} $RPM_BUILD_ROOT%{_localedir}/{uk_UA,uk}
-%find_lang %{name}-32
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -132,11 +137,11 @@ rm -rf $RPM_BUILD_ROOT
%update_desktop_database
%update_icon_cache hicolor
-%files -f %{name}-32.lang
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc LICENCE README.md
%attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_bindir}/%{name}-3.2
%{_datadir}/%{name}
%{_desktopdir}/%{name}.desktop
+%{_datadir}/metainfo/aegisub.appdata.xml
%{_iconsdir}/hicolor/*/apps/%{name}.*
diff --git a/aegisub-boost-1.70.patch b/aegisub-boost-1.70.patch
deleted file mode 100644
index a3bed95..0000000
--- a/aegisub-boost-1.70.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- aegisub-3.2.2/src/colour_button.cpp.orig 2019-04-15 08:43:16.415251576 +0200
-+++ aegisub-3.2.2/src/colour_button.cpp 2019-04-15 08:44:56.040476824 +0200
-@@ -18,7 +18,7 @@
-
- #include "dialogs.h"
-
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
-
- wxDEFINE_EVENT(EVT_COLOR, wxThreadEvent);
-
---- aegisub-3.2.2/src/subtitles_provider_libass.cpp~ 2014-12-08 01:07:09.000000000 +0100
-+++ aegisub-3.2.2/src/subtitles_provider_libass.cpp 2019-04-15 08:49:46.265809744 +0200
-@@ -50,7 +50,7 @@
- #include <libaegisub/util.h>
-
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
-
---- aegisub-3.2.2/src/video_frame.cpp~ 2014-12-08 01:07:09.000000000 +0100
-+++ aegisub-3.2.2/src/video_frame.cpp 2019-04-15 09:02:28.425810852 +0200
-@@ -16,7 +16,7 @@
-
- #include "video_frame.h"
-
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
-
- namespace {
---- aegisub-3.2.2/src/video_provider_dummy.cpp~ 2014-12-08 01:07:09.000000000 +0100
-+++ aegisub-3.2.2/src/video_provider_dummy.cpp 2019-04-15 09:03:44.153106555 +0200
-@@ -46,7 +46,7 @@
- #include <boost/algorithm/string/split.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
-
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/aegisub-icu.patch b/aegisub-icu.patch
deleted file mode 100644
index 7576c1b..0000000
--- a/aegisub-icu.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- aegisub-3.2.2/src/utils.cpp.orig 2014-12-08 01:07:09.000000000 +0100
-+++ aegisub-3.2.2/src/utils.cpp 2017-04-26 17:47:31.087418818 +0200
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
diff --git a/aegisub-icu64.patch b/aegisub-icu64.patch
deleted file mode 100644
index 1f359f2..0000000
--- a/aegisub-icu64.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- aegisub-3.2.2/libaegisub/common/character_count.cpp~ 2014-12-08 01:07:09.000000000 +0100
-+++ aegisub-3.2.2/libaegisub/common/character_count.cpp 2019-04-15 08:12:10.451191386 +0200
-@@ -36,7 +36,7 @@
- static std::once_flag token;
- std::call_once(token, [&] {
- UErrorCode status = U_ZERO_ERROR;
-- bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+ bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- });
-
-@@ -58,7 +58,7 @@
-
- size_t count = 0;
- auto pos = character_bi.first();
-- for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+ for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- if (!mask)
- ++count;
- else {
-@@ -143,7 +143,7 @@
- auto& bi = get_break_iterator(&str[0], str.size());
-
- for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
-- if (end == BreakIterator::DONE)
-+ if (end == icu::BreakIterator::DONE)
- return str.size();
- if (n == 0)
- return pos;
---- aegisub-3.2.2/src/utils.cpp~ 2019-04-15 08:06:15.502668259 +0200
-+++ aegisub-3.2.2/src/utils.cpp 2019-04-15 09:01:36.733106091 +0200
-@@ -265,9 +265,9 @@
- }
-
- wxString LocalizedLanguageName(wxString const& lang) {
-- Locale iculoc(lang.c_str());
-+ icu::Locale iculoc(lang.c_str());
- if (!iculoc.isBogus()) {
-- UnicodeString ustr;
-+ icu::UnicodeString ustr;
- iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
- return wxString(ustr.getBuffer());
diff --git a/pthread.patch b/pthread.patch
deleted file mode 100644
index c7bb22a..0000000
--- a/pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- aegisub-3.2.2/tools/Makefile~ 2014-12-08 01:07:09.000000000 +0100
-+++ aegisub-3.2.2/tools/Makefile 2015-11-21 15:55:34.835987973 +0100
-@@ -6,7 +6,7 @@
- PROGRAM += $(d)osx-bundle-restart-helper
- endif
-
--repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
-+repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a -lpthread
- repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU)
- repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/aegisub.git/commitdiff/b23cdd31c80dbb5d42cf4ae9d5be3de0f953a23b
More information about the pld-cvs-commit
mailing list