summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Wellnitz2019-02-02 06:59:04 +0900
committerPhilip Wellnitz2019-02-02 06:59:04 +0900
commit5b344478559e3f9f2cb31e356d54013814b4f29b (patch)
tree9dd3765bf022de63a522a74a472beb98ac90d729
parent0eb4711b5e5c8764019e70595235453cfc8a5d63 (diff)
downloadaur-5b344478559e3f9f2cb31e356d54013814b4f29b.tar.gz
update PKGBUILD
-rw-r--r--PKGBUILD51
-rw-r--r--pgf.patch45
2 files changed, 73 insertions, 23 deletions
diff --git a/PKGBUILD b/PKGBUILD
index b1332757c36b..2bd0171cd674 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,34 @@
pkgname=cms-germany-git
-pkgver=r3802.4d519c16
-pkgrel=4
+pkgver=r4412.5c5be9dd
+pkgrel=1
pkgdesc="CMS, or Contest Management System, is a distributed system for running and (to some extent) organizing a programming contest. This is a fork used for the German IOI team selection process."
arch=('i686' 'x86_64')
url="https://github.com/ioi-germany/cms"
license=('AGPL3')
depends=(
- 'python2'
- 'python2-tornado'
- 'python2-psycopg2'
- 'python2-sqlalchemy'
- 'python2-netifaces'
- 'python2-crypto'
- 'python2-pytz'
- 'python2-psutil'
- 'python2-six'
- 'python2-requests'
- 'python2-gevent'
- 'python2-werkzeug'
- 'patool-py2'
- 'python2-bcrypt'
- 'python2-chardet'
- 'python2-ipaddress'
- 'python2-yaml'
+ 'python'
+ 'python-tornado'
+ 'python-psycopg2'
+ 'python-sqlalchemy'
+ 'python-netifaces'
+ 'python-crypto'
+ 'python-pytz'
+ 'python-psutil'
+ 'python-six'
+ 'python-requests'
+ 'python-gevent'
+ 'python-werkzeug'
+# 'patool-py3'
+ 'python-bcrypt'
+ 'python-chardet'
+# 'python-ipaddress'
+ 'python-yaml'
+ 'python-future'
+ 'python-jinja'
+ 'python-xdg'
'postgresql'
'postgresql-client'
- 'libcgroup'
+# 'libcgroup'
'iso-codes'
'shared-mime-info'
'python2-pathlib'
@@ -46,6 +49,7 @@ optdepends=(
makedepends=(
'asciidoc'
'python2-setuptools'
+ 'python-babel'
)
provides=('cms-germany' 'isolate-germany')
@@ -53,7 +57,7 @@ conflicts=('cms' 'isolate')
install=$pkgname.install
source=(
- 'git://github.com/ioi-germany/cms.git'
+ 'git://github.com/ioi-germany/cms.git#branch=master'
'git://github.com/ioi-germany/isolate.git'
)
sha256sums=(
@@ -103,8 +107,9 @@ package() {
install -d -m755 $pkgdir/usr/include/cms
ln -s /usr/include/testlib.h $pkgdir/usr/include/cms/testlib.h
- python2 prerequisites.py build_l10n --as-root
- python2 setup.py install --root="$pkgdir" --optimize=1
+ python3 prerequisites.py --as-root build
+ echo blablabla
+ python3 setup.py install --root="$pkgdir" --optimize=1
install -d $pkgdir/var/local/log
install -d $pkgdir/var/local/cache
diff --git a/pgf.patch b/pgf.patch
new file mode 100644
index 000000000000..0b178245b58c
--- /dev/null
+++ b/pgf.patch
@@ -0,0 +1,45 @@
+--- cmscontrib/gerpythonformat/templates/lg/graphdrawing.tex 2019-02-01 20:37:11.175618929 +0100
++++ /tmp/graphdrawing.tex 2019-02-01 20:45:34.593613925 +0100
+@@ -2,6 +2,42 @@
+ \usetikzlibrary{graphs}
+ \usetikzlibrary{graphdrawing}
+
++\usepackage{luacode}
++\begin{luacode}
++ function pgf_lookup_and_require(name)
++ local sep = '/'
++ if string.find(os.getenv('PATH'),';') then
++ sep = '\string\\'
++ end
++ local function lookup(name)
++ local sub = name:gsub('%.',sep)
++ local find_func = function (name, suffix)
++ if resolvers then
++ local n = resolvers.findfile (name.."."..suffix, suffix) -- changed
++ return (not (n == '')) and n or nil
++ else
++ return kpse.find_file(name,suffix)
++ end
++ end
++ if find_func(sub, 'lua') then
++ require(name)
++ elseif find_func(sub, 'clua') then
++ collectgarbage('stop')
++ require(name)
++ collectgarbage('restart')
++ else
++ return false
++ end
++ return true
++ end
++ return
++ lookup('pgf.gd.' .. name .. '.library') or
++ lookup('pgf.gd.' .. name) or
++ lookup(name .. '.library') or
++ lookup(name)
++ end
++\end{luacode}
++
+ \usegdlibrary{force, layered}
+
+ \directlua{require("graphdrawing.lua")}