summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorvantu5z2017-09-15 15:04:49 +0300
committervantu5z2017-09-15 15:04:49 +0300
commit3a1941eab1a25b9408514db0c318b98a700593bc (patch)
tree4fd74dd555e915132d14cc0ca513e7e6f3d5b4ff
parentfd9d6f71c44392ad3f09ea0791f5e8c08454ef15 (diff)
downloadaur-3a1941eab1a25b9408514db0c318b98a700593bc.tar.gz
change patch method
-rw-r--r--.SRCINFO2
-rwxr-xr-xPKGBUILD20
-rw-r--r--SConstruct.patch20
3 files changed, 30 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 235cd7a5a9d..c52bfa37c6d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = rhvoice-git
pkgdesc = free and open source speech synthesizer for Russian and other languages
- pkgver = 20170622
+ pkgver = 20170711
pkgrel = 1
url = https://github.com/Olga-Yakovleva/RHVoice
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 572f7aa82b0..08664b71682 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
pkgname=rhvoice-git
-pkgver=20170622
+pkgver=20170711
pkgrel=1
pkgdesc="free and open source speech synthesizer for Russian and other languages"
arch=('i686' 'x86_64')
@@ -27,17 +27,15 @@ build() {
fi
msg "GIT checkout done or server timeout"
+
+ msg2 "Patching source"
+ cd "${srcdir}"
+ for p in ../*.patch; do
+ msg2 "Applying patch: $p"
+ patch -p1 -i "$p" --binary
+ done
+
msg "Starting build..."
-cat << EOF | patch "$srcdir/$_gitname/SConstruct"
-161c161
-< env.AppendUnique(CXXFLAGS=["-std=c++03"])
----
-> env.AppendUnique(CXXFLAGS=["-std=c++11"])
-216c216
-< # has_giomm=conf.CheckPKG("giomm-2.4")
----
-> has_giomm=conf.CheckPKG("giomm-2.4")
-EOF
cd "$srcdir/$_gitname"
scons prefix="/usr" sysconfdir="/etc" || return 1
diff --git a/SConstruct.patch b/SConstruct.patch
new file mode 100644
index 00000000000..07820f41acc
--- /dev/null
+++ b/SConstruct.patch
@@ -0,0 +1,20 @@
+--- SConstruct.orig 2017-06-29 09:16:49.422957000 +0300
++++ /RHVoice/SConstruct 2017-09-15 09:17:27.345414000 +0300
+@@ -158,7 +158,7 @@
+ env.AppendUnique(CXXFLAGS=["/EHsc"])
+ if "gcc" in env["TOOLS"]:
+ env.MergeFlags("-pthread")
+- env.AppendUnique(CXXFLAGS=["-std=c++03"])
++ env.AppendUnique(CXXFLAGS=["-std=c++11"])
+ if sys.platform.startswith("linux"):
+ env.Append(SHLINKFLAGS="-Wl,-soname,${TARGET.file}.${libversion.split('.')[0]}")
+ return env
+@@ -213,7 +213,7 @@
+ env["audio_libs"].add("libao")
+ if conf.CheckPKG("portaudio-2.0"):
+ env["audio_libs"].add("portaudio")
+-# has_giomm=conf.CheckPKG("giomm-2.4")
++ has_giomm=conf.CheckPKG("giomm-2.4")
+ if env["PLATFORM"]=="win32":
+ env.AppendUnique(LIBS="kernel32")
+ conf.Finish()