- do not override optimization CFLAGS

- rel 14

diff --git a/aegisub.spec b/aegisub.spec
index e2401ee131be8bb20ff5e82cfefd61858841a711..4e238f221fd5f8e5dfa58c45c700477d334b52e4 100644 (file)
--- a/aegisub.spec
+++ b/aegisub.spec
@@ -11,7 +11,7 @@ Summary:      Subtitle editor
 Summary(pl.UTF-8):     Edytor napisów
 Name:          aegisub
 Version:       3.2.2
-Release:       13
+Release:       14
 License:       BSD
 Group:         X11/Applications
 Source0:       http://ftp.aegisub.org/pub/releases/%{name}-%{version}.tar.xz
@@ -20,6 +20,7 @@ Patch0:               pthread.patch
 Patch1:                %{name}-icu.patch
 Patch2:                %{name}-icu64.patch
 Patch3:                %{name}-boost-1.70.patch
+Patch4:                cflags.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
@@ -90,12 +91,16 @@ obsługa tych zaawansowanych funkcji.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__mv} vendor{,.keep}
 mkdir vendor
 %{__mv} vendor.keep/{luabins,luajit,universalchardet} vendor
 
 %build
+%{__aclocal} -I m4macros
+%{__autoconf}
+%{__autoheader}
 %configure \
        --disable-update-checker \
        %{__with_without ffms2} \

diff --git a/cflags.patch b/cflags.patch
new file mode 100644 (file)
index 0000000..4aa2ebc
--- /dev/null
+++ b/cflags.patch
@@ -0,0 +1,22 @@
+--- aegisub-3.2.2/configure.ac~        2014-12-08 01:07:09.000000000 +0100
++++ aegisub-3.2.2/configure.ac 2020-03-18 14:58:15.307035878 +0100
+@@ -142,7 +142,7 @@
+   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
+   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
+   AC_CXX_FLAG([-std=c++11])
+-  AC_CXX_FLAG([-Wno-c++11-narrowing])
++  AC_CXX_FLAG([-Wno-narrowing])
+   AC_C_FLAG([-Wno-unused-local-typedefs])
+   AC_CXX_FLAG([-Wno-unused-local-typedefs])
+ 
+@@ -151,8 +151,8 @@
+     CFLAGS="$CFLAGS -O0"
+     CXXFLAGS="$CXXFLAGS -O0"
+   ], [
+-    CFLAGS="$CFLAGS -O3"
+-    CXXFLAGS="$CXXFLAGS -O3"
++    CFLAGS="$CFLAGS"
++    CXXFLAGS="$CXXFLAGS"
+   ])
+ ])
+