media-video/aegisub: revbump to 3.0.4-r1 to restore -fno-strict-aliasing

Package-Manager: portage-2.2.27

diff --git a/media-video/aegisub/aegisub-3.0.4.ebuild b/media-video/aegisub/aegisub-3.0.4-r1.ebuild
similarity index 100%
rename from media-video/aegisub/aegisub-3.0.4.ebuild
rename to media-video/aegisub/aegisub-3.0.4-r1.ebuild

diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
index 59927d30a7fdc005fbe31f853655c5ca7e0bdde1..3eda0da81bb0015aa3e5e055eb2dd5bc8049eda4 100644 (file)
--- a/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch
@@ -9,7 +9,7 @@ index 0b73bde..957c123 100644
 +++ b/aegisub/po/Makefile
 @@ -38,11 +38,13 @@ all: $(MO)
        $(BIN_MSGFMT) -o $@ $<
- 
+
  install:
 +ifdef PO
        @$(BIN_MKDIR) -p $(addsuffix /LC_MESSAGES/, $(addprefix $(DESTDIR)$(P_LOCALE)/, $(basename $(PO))))
@@ -18,6 +18,6 @@ index 0b73bde..957c123 100644
                $(BIN_INSTALL) $$i.mo $(DESTDIR)$(P_LOCALE)/$$i/LC_MESSAGES/$(AEGISUB_CATALOG).mo; \
        done
 +endif
- 
- 
+
+
  CLEANFILES = $(MO)

diff --git a/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
index c7f7e32b74cbb62867ef821d76a02228ebfcd530..253fb3e4ab76cd5a3724f8556ebf8565f308de71 100644 (file)
--- a/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
+++ b/media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch
@@ -5,7 +5,7 @@ index d961bd6..17df012 100644
 @@ -369,7 +369,7 @@ AC_ARG_WITH(lua,
              AS_HELP_STRING([--without-lua],
                             [build without lua 5.1 (auto4)]))
- 
+
 -AS_IF([test x$with_lua = xno], [$with_auto4_lua="no"; lua_disabled="(disabled)"], [
 +AS_IF([test x$with_lua = xno], [with_auto4_lua="no"; lua_disabled="(disabled)"], [
    # First try pkg-config with several names

diff --git a/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
index 80e1eb9bde197aa8341d166519b7ae1831c92a6f..408fb8d071fee293e186c1961c649525ad578c4b 100644 (file)
--- a/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
+++ b/media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch
@@ -1,8 +1,8 @@
 diff --git a/aegisub/configure.ac b/aegisub/configure.ac
-index d961bd6..8922042 100644
+index d961bd6..e0bdc46 100644
 --- a/aegisub/configure.ac
 +++ b/aegisub/configure.ac
-@@ -157,23 +157,17 @@ AS_IF([test x$enable_compiler_flags != xno], [
+@@ -157,23 +157,18 @@ AS_IF([test x$enable_compiler_flags != xno], [
    AC_C_FLAG([-Wextra],[AC_C_FLAG([-W])])
    AC_C_FLAG([-Wno-unused-parameter])
    AC_C_FLAG([-std=gnu99])
@@ -12,10 +12,10 @@ index d961bd6..8922042 100644
    AC_CXX_FLAG([-Wextra],[AC_CXX_FLAG([-W])])
    AC_CXX_FLAG([-Wno-unused-parameter])
    AC_CXX_FLAG([-Wno-long-long])
--  AC_CXX_FLAG([-fno-strict-aliasing])
+   AC_CXX_FLAG([-fno-strict-aliasing])
 -  AC_CXX_FLAG([-pipe])
 -  AC_CXX_FLAG([-g])
- 
+
    # -O* messes with debugging.
    AS_IF([test x$enable_debug = xyes], [
      AC_C_FLAG([-O0])
@@ -27,4 +27,4 @@ index d961bd6..8922042 100644
 +    AC_CXX_FLAG([-g])
    ])
  ])
- 
+