summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Tumaykin <itumaykin@gmail.com>2016-02-10 19:17:55 +0300
committerIlya Tumaykin <itumaykin@gmail.com>2016-02-10 19:19:06 +0300
commitb6b27ad742a9770b78fad3ee853388f9d1846825 (patch)
treefcc64b70e416890fa1fc68e60f32e9a86c5ca327 /media-video/aegisub/files
parentdev-python/pyopencl: Fix deps (diff)
downloadgentoo-b6b27ad742a9770b78fad3ee853388f9d1846825.tar.gz
gentoo-b6b27ad742a9770b78fad3ee853388f9d1846825.tar.bz2
gentoo-b6b27ad742a9770b78fad3ee853388f9d1846825.zip
media-video/aegisub: revbump to 3.0.4-r1 to restore -fno-strict-aliasing
Package-Manager: portage-2.2.27
Diffstat (limited to 'media-video/aegisub/files')
-rw-r--r--media-video/aegisub/files/aegisub-3.0.4-fix-install-with-empty-LINGUAS.patch6
-rw-r--r--media-video/aegisub/files/aegisub-3.0.4-fix-lua-macro.patch2
-rw-r--r--media-video/aegisub/files/aegisub-3.0.4-respect-user-compiler-flags.patch10
3 files changed, 9 insertions, 9 deletions
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 59927d30a7fd..3eda0da81bb0 100644
--- 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 c7f7e32b74cb..253fb3e4ab76 100644
--- 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 80e1eb9bde19..408fb8d071fe 100644
--- 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])
])
])
-
+