diff options
| author | Chris Severance | 2016-09-18 00:11:59 -0400 |
|---|---|---|
| committer | Chris Severance | 2016-09-18 00:11:59 -0400 |
| commit | ab8713d3c2eb2d86559fc51e14ea8c3e44a51422 (patch) | |
| tree | 95138172ac081bba01c06cfaef8ce2c5d66084e6 | |
| parent | b24cec9fba35395196699a6cb72c9a85101e285e (diff) | |
| download | aur-ab8713d3c2eb2d86559fc51e14ea8c3e44a51422.tar.gz | |
Update to 2.0.34
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 7 |
2 files changed, 8 insertions, 5 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Fri Aug 12 18:48:08 UTC 2016 +# Sun Sep 18 04:11:05 UTC 2016 pkgbase = urbackup-server-git pkgdesc = Client/Server network backup for Windows and Linux, builds server or client - pkgver = 2.0.32.r2.g85303a6 + pkgver = 2.0.34.r14.gac76992 pkgrel = 1 url = https://www.urbackup.org/ install = urbackup-server.install @@ -15,7 +15,7 @@ pkgbase = urbackup-server-git depends = crypto++ depends = fuse optdepends = btrfs-progs: compressed and subvolume assisted backups - provides = urbackup-server=2.0.32 + provides = urbackup-server=2.0.34 conflicts = urbackup-server source = git+https://github.com/uroni/urbackup_backend.git source = git+https://github.com/uroni/urbackup_frontend_wx.git @@ -45,7 +45,7 @@ else _pkgname='urbackup-server' fi pkgname="${_pkgname}-git" -pkgver=2.0.32.r2.g85303a6 +pkgver=2.0.34.r14.gac76992 pkgrel=1 pkgdesc='Client/Server network backup for Windows and Linux, builds server or client' arch=('i686' 'x86_64') @@ -143,12 +143,14 @@ prepare() { sed -i -e 's:/usr/sbin/:/usr/bin/:g' 'urbackupserver/doc/admin_guide.tex' 'urbackup-server.service' sed -i -e 's,L"C:\\\\urbackup",\n#ifdef _WIN32\n&\n#else\nL"/urbackup"\n#endif\n,g' 'urbackupserver/server_settings.cpp' # Irksome bug! +if ! :; then # Quick patches for gcc 6. These need to be fixed by upstream. sed -i -e '# Always use static until you are forced to remove it!' \ -e 's:^const char array:static &:g' \ -e '# Something conflcts with gcc 6.0' \ -e 's:array\[:html_array\[:g' 'stringtools.cpp' sed -i -e 's:^#define _exit exit:// &:g' 'cryptoplugin/dllmain.cpp' +fi # fix the build scripts #sed -i -e 's:response.readall():response.read():g' 'build/replace_versions.py' # python was always a bad choice for these text replacements. As of Python 3.5 this script doesn't work at all and read() is not a proper replacement for readall(). @@ -169,7 +171,8 @@ prepare() { -e "# Version updates are now done here in PKGBUILD" \ -e 's:^python3 :#&:g' \ -e "# Instruct wget to resume our complete download" \ - -e 's:^\s\+wget :&--continue :g' \ + -e '#s:^\s\+wget :&--continue :g' \ + -e 's:^\s\+wget :#&:g' \ 'build_server.Arch.sh' 'build_client.Arch.sh' # Dymanic downloads in configure are bad! |