From 9b62977908d153622e6b259f2278aa50b4c0f6192c499f899d4bf70334980a57 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 2 Jul 2015 14:39:02 +0000 Subject: [PATCH] Accepting request 314406 from home:tjcw:branches:multimedia:apps Added fix for build break OBS-URL: https://build.opensuse.org/request/show/314406 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/aegisub?expand=0&rev=29 --- Makefile.inc.in.patch | 11 +++++++++++ aegisub.changes | 6 ++++++ aegisub.spec | 2 ++ 3 files changed, 19 insertions(+) create mode 100644 Makefile.inc.in.patch diff --git a/Makefile.inc.in.patch b/Makefile.inc.in.patch new file mode 100644 index 0000000..e3f25fa --- /dev/null +++ b/Makefile.inc.in.patch @@ -0,0 +1,11 @@ +--- aegisub-3.2.2/Makefile.inc.in.orig 2015-06-29 14:44:02.998996223 +0100 ++++ aegisub-3.2.2/Makefile.inc.in 2015-06-29 14:44:37.957948716 +0100 +@@ -28,7 +28,7 @@ + CPPFLAGS = @CPPFLAGS@ + CFLAGS_DEP = -MMD -MP + LIBS = @LIBS@ +-LDFLAGS = @LDFLAGS@ ++LDFLAGS = @LDFLAGS@ -pthread + INSTALL_FLAGS = -m 644 + LIB_SHARED_LINK = -shared -Wl,-soname -Wl,$(LIB_SHARED_FULL) + LIB_SHARED_LINK_OSX = -dynamiclib -Wl,-undefined -Wl,dynamic_lookup -compatibility_version $(LIB_VERSION) -current_version $(LIB_VERSION) -Wl,-single_module -mmacosx-version-min=10.7 -install_name ${CURDIR}/$(LIB_SHARED_FULL) diff --git a/aegisub.changes b/aegisub.changes index 29f8ade..92f3518 100644 --- a/aegisub.changes +++ b/aegisub.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 29 14:49:33 UTC 2015 - tjcw@physics.org + +- Fix build break by adding -pthread to LDFLAGS + * Makefile.inc.in.patch + ------------------------------------------------------------------- Tue Feb 10 19:58:33 UTC 2015 - benoit.monin@gmx.fr diff --git a/aegisub.spec b/aegisub.spec index bcd5437..fba28cf 100644 --- a/aegisub.spec +++ b/aegisub.spec @@ -27,6 +27,7 @@ Group: Productivity/Multimedia/Video/Editors and Convertors Url: http://www.aegisub.net/ Source0: http://ftp.aegisub.org/pub/releases/aegisub-%{version}.tar.xz Patch0: aegisub-old_wc.patch +Patch1: Makefile.inc.in.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel >= 1.50 @@ -65,6 +66,7 @@ functions with ease. %prep %setup -q %patch0 -p1 +%patch1 -p1 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/version.cpp FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')