commit: 70ee8e9fac24055830b264113bd86841ffd2fed1
Author: Ilya Tumaykin <itumaykin <AT> gmail <DOT> com>
AuthorDate: Mon Mar 7 15:05:40 2016 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Mon Mar 7 16:25:12 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ee8e9f
media-video/aegisub: remove unneeded pthread-flags patch from 9999
Merged upstream.
Package-Manager: portage-2.2.27
media-video/aegisub/aegisub-9999.ebuild | 1 -
.../aegisub-9999-add-missing-pthread-flags.patch | 44 ----------------------
2 files changed, 45 deletions(-)
diff --git a/media-video/aegisub/aegisub-9999.ebuild
b/media-video/aegisub/aegisub-9999.ebuild
index 6677686..7a83307 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -60,7 +60,6 @@ REQUIRED_USE="
# Thus unbundling luabins is not worth the effort.
PATCHES=(
"${FILESDIR}/${P}-unbundle-luajit.patch"
- "${FILESDIR}/${P}-add-missing-pthread-flags.patch"
"${FILESDIR}/${PN}-3.2.2-r1-respect-user-compiler-flags.patch"
)
diff --git
a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
b/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
deleted file mode 100644
index 9f41ee5..0000000
--- a/media-video/aegisub/files/aegisub-9999-add-missing-pthread-flags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-http://devel.aegisub.org/ticket/1902
-http://devel.aegisub.org/ticket/1903
-http://devel.aegisub.org/ticket/1911
-
-diff --git a/Makefile.inc.in b/Makefile.inc.in
-index 5a52d25..86f93d1 100644
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -100,7 +100,7 @@ LIBS_LIBPULSE = @LIBPULSE_LIBS@
- LIBS_LUA = $(TOP)vendor/luajit/src/libluajit.a
- LIBS_OPENAL = @OPENAL_LIBS@
- LIBS_PORTAUDIO = @PORTAUDIO_LIBS@
--LIBS_PTHREAD = @PTHREAD_LIBS@
-+LIBS_PTHREAD = @PTHREAD_LIBS@ -lpthread
- LIBS_UCHARDET = @UCHARDET_LIBS@
-
- ifeq (yes, $(BUILD_DARWIN))
-diff --git a/libaegisub/Makefile b/libaegisub/Makefile
-index b021523..77a18ec 100644
---- a/libaegisub/Makefile
-+++ b/libaegisub/Makefile
-@@ -44,7 +44,8 @@ aegisub_OBJ += $(d)common/dispatch.o
- endif
-
- aegisub_PCH := $(d)lagi_pre.h
--aegisub_CPPFLAGS := -I$(d)include -I$(TOP) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
-+aegisub_CPPFLAGS := -I$(d)include -I$(TOP) \
-+ $(CFLAGS_PTHREAD) $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
-
- $(d)common/charset.o_FLAGS := $(CFLAGS_UCHARDET)
- $(d)common/charset_conv.o_FLAGS := $(CFLAGS_ICONV)
-diff --git a/tools/Makefile b/tools/Makefile
-index cbf985a..d9f64b8 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -7,7 +7,7 @@ PROGRAM += $(d)osx-bundle-restart-helper
- endif
-
- repack-thes-dict_OBJ := $(d)repack-thes-dict.o $(TOP)lib/libaegisub.a
--repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(PTHREAD_LIBS)
-+repack-thes-dict_LIBS := $(LIBS_BOOST) $(LIBS_ICU) $(LIBS_PTHREAD)
- repack-thes-dict_CPPFLAGS := -I$(TOP) -I$(TOP)libaegisub/include $(CFLAGS_ICU)
-
- PROGRAM += $(d)repack-thes-dict
