SHA256
1
0
forked from pool/aegisub

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
This commit is contained in:
Takashi Iwai 2015-07-02 14:39:02 +00:00 committed by Git OBS Bridge
parent b2e7695dbe
commit 9b62977908
3 changed files with 19 additions and 0 deletions

11
Makefile.inc.in.patch Normal file
View File

@ -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)

View File

@ -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

View File

@ -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')