summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO39
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD54
-rw-r--r--config.linux-ia32.json5
-rw-r--r--config.linux-x64.json5
-rw-r--r--index-electron.html.patch12
-rw-r--r--player.html.patch10
-rwxr-xr-xsozi.desktop8
-rw-r--r--sozi.pngbin23008 -> 0 bytes
9 files changed, 65 insertions, 69 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5243a722d90a..848dfa425d70 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue May 16 07:02:00 UTC 2017
+# Thu Jul 27 20:06:21 UTC 2017
pkgbase = sozi
pkgdesc = A zooming presentation based on SVG, using JavaScript
- pkgver = 17.02
- pkgrel = 3
+ pkgver = 17.06
+ pkgrel = 1
url = http://sozi.baierouge.fr/
arch = i686
arch = x86_64
@@ -11,10 +11,11 @@ pkgbase = sozi
makedepends = npm
makedepends = bower
makedepends = nodejs-grunt-cli
+ makedepends = ttf-droid
makedepends = jq
makedepends = semver
- noextract = electron-v1.2.0-linux-x64.zip
- noextract = electron-v1.2.0-linux-ia32.zip
+ noextract = electron-v1.6.6-linux-x64.zip
+ noextract = electron-v1.6.6-linux-ia32.zip
noextract = fontawesome-v4.7.0.tar.gz
noextract = grunt-install-dependencies-senshu.zip
noextract = grunt-jspot-senshu.zip
@@ -652,12 +653,10 @@ pkgbase = sozi
noextract = yauzl-2.4.1.tgz
noextract = zip-stream-1.1.1.tgz
options = !strip
- source = https://github.com/senshu/Sozi/archive/17.02.tar.gz
- source = http://www.1001freefonts.com/d/5854/droid_sans.zip
+ source = https://github.com/senshu/Sozi/archive/17.06.tar.gz
+ source = https://github.com/electron/electron/releases/download/v1.6.6/SHASUMS256.txt
source = sozi-package-json.patch
- source = sozi.png
- source = sozi.desktop
- source = player.html.patch
+ source = index-electron.html.patch
source = texts2paths.patch
source = fontawesome-v4.7.0.tar.gz::https://github.com/FortAwesome/Font-Awesome/archive/v4.7.0.tar.gz
source = grunt-install-dependencies-senshu.zip::https://github.com/senshu/grunt-install-dependencies/archive/0599d6298499d55b5ad7bda20f32dff095ec0f91.zip
@@ -1295,12 +1294,10 @@ pkgbase = sozi
source = https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz
source = https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz
source = https://registry.npmjs.org/zip-stream/-/zip-stream-1.1.1.tgz
- sha1sums = 2554484cfa63dcafd29fde01e533ae7ec7419ee3
- sha1sums = 265b6cc7b7cea7bcfb74eec52bc9c0e44f039740
+ sha1sums = f8c9db7f3315bfb9e0002a70618886b27b7280b0
+ sha1sums = 9aae9284c2a6fc0f3ddefdea2f59ffe428f39c75
sha1sums = a10b5cad0c35caa7cfa412f95b58d81f6150173a
- sha1sums = 230b60efe9de03b2418c8a10c040491bf7899f43
- sha1sums = 04adcecb5bfc696ed7e9d5b8c111017725bd62b1
- sha1sums = 75bd3f6f4f4c0064a55b43b50cfc2024b132fc80
+ sha1sums = 81cb22c9207dbc1fe78e273eafadf087568da020
sha1sums = ebaf4c68d77391a701b3acfc21282eb78d8077fd
sha1sums = 7a94b1800202e20c382d9847cdf51e8d1c106b7e
sha1sums = 4659b22d75a30e54197684ff4219090dc1e8d9e4
@@ -1938,14 +1935,14 @@ pkgbase = sozi
sha1sums = 03088e9ebf9e756b69751611d2a5ef591482c995
sha1sums = 9528f442dab1b2284e58b4379bb194e22e0c4005
sha1sums = 5216b48bbb4d2651f64d5c6e6f09eb4a7399d557
- source_i686 = https://github.com/electron/electron/releases/download/v1.2.0/electron-v1.2.0-linux-ia32.zip
+ source_i686 = https://github.com/electron/electron/releases/download/v1.6.6/electron-v1.6.6-linux-ia32.zip
source_i686 = config.linux-ia32.json
- sha1sums_i686 = c582f02e070de9e11abfd7ad64962a61d604b4b7
- sha1sums_i686 = 3ee3e039972f0744c84511d82c4f5d5dc23ad3db
- source_x86_64 = https://github.com/electron/electron/releases/download/v1.2.0/electron-v1.2.0-linux-x64.zip
+ sha1sums_i686 = 6f2f8a7a7bda727370c383cc87952a430b322443
+ sha1sums_i686 = 6920e964fc11b746450264036e2b82c7dcc76814
+ source_x86_64 = https://github.com/electron/electron/releases/download/v1.6.6/electron-v1.6.6-linux-x64.zip
source_x86_64 = config.linux-x64.json
- sha1sums_x86_64 = d6a061bbb8106a68a0f0ce7c64302269b81059f6
- sha1sums_x86_64 = 195143cfaca94c84070964830cb10cbbd039a6cc
+ sha1sums_x86_64 = 2d4a85623cdb17b4485cd2780232ad56a59d1f68
+ sha1sums_x86_64 = 1faf77f8153ef858eaa71d816dcca38ba9491a39
pkgname = sozi
depends = gconf
diff --git a/.gitignore b/.gitignore
index 715b07ecccf6..21079acba40d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
src/
pkg/
droid_sans.zip
+SHASUMS256.txt
diff --git a/PKGBUILD b/PKGBUILD
index c0c2657e802f..897f43a37ef8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,11 +7,11 @@ pkgname=('sozi'
'sozi-tools_texts2paths'
'sozi-extras_media')
-pkgver=17.02
+pkgver=17.06
# the build version is obtained from [here](https://github.com/senshu/Sozi/releases)
-_buildver=17.02.072116
+_buildver=17.06.021848
_pkgverpostfix=""
-pkgrel=3
+pkgrel=1
pkgdesc="A zooming presentation based on SVG, using JavaScript"
url="http://sozi.baierouge.fr/"
@@ -20,34 +20,31 @@ arch=('i686' 'x86_64')
license=('custom:MPL2.0')
makedepends=('npm' 'bower' 'nodejs-grunt-cli'
+ 'ttf-droid'
'jq' 'semver')
source=("https://github.com/senshu/Sozi/archive/${pkgver}${_pkgverpostfix}.tar.gz"
- "http://www.1001freefonts.com/d/5854/droid_sans.zip"
+ "https://github.com/electron/electron/releases/download/v1.6.6/SHASUMS256.txt"
"sozi-package-json.patch"
- "sozi.png"
- "sozi.desktop"
- "player.html.patch"
+ "index-electron.html.patch"
"texts2paths.patch")
-sha1sums=('2554484cfa63dcafd29fde01e533ae7ec7419ee3'
- '265b6cc7b7cea7bcfb74eec52bc9c0e44f039740'
+sha1sums=('f8c9db7f3315bfb9e0002a70618886b27b7280b0'
+ '9aae9284c2a6fc0f3ddefdea2f59ffe428f39c75'
'a10b5cad0c35caa7cfa412f95b58d81f6150173a'
- '230b60efe9de03b2418c8a10c040491bf7899f43'
- '04adcecb5bfc696ed7e9d5b8c111017725bd62b1'
- '75bd3f6f4f4c0064a55b43b50cfc2024b132fc80'
+ '81cb22c9207dbc1fe78e273eafadf087568da020'
'ebaf4c68d77391a701b3acfc21282eb78d8077fd')
-source_i686=('https://github.com/electron/electron/releases/download/v1.2.0/electron-v1.2.0-linux-ia32.zip'
+source_i686=('https://github.com/electron/electron/releases/download/v1.6.6/electron-v1.6.6-linux-ia32.zip'
'config.linux-ia32.json')
-sha1sums_i686=('c582f02e070de9e11abfd7ad64962a61d604b4b7'
- '3ee3e039972f0744c84511d82c4f5d5dc23ad3db')
-source_x86_64=('https://github.com/electron/electron/releases/download/v1.2.0/electron-v1.2.0-linux-x64.zip'
+sha1sums_i686=('6f2f8a7a7bda727370c383cc87952a430b322443'
+ '6920e964fc11b746450264036e2b82c7dcc76814')
+source_x86_64=('https://github.com/electron/electron/releases/download/v1.6.6/electron-v1.6.6-linux-x64.zip'
'config.linux-x64.json')
-sha1sums_x86_64=('d6a061bbb8106a68a0f0ce7c64302269b81059f6'
- '195143cfaca94c84070964830cb10cbbd039a6cc')
+sha1sums_x86_64=('2d4a85623cdb17b4485cd2780232ad56a59d1f68'
+ '1faf77f8153ef858eaa71d816dcca38ba9491a39')
-noextract=('electron-v1.2.0-linux-x64.zip'
- 'electron-v1.2.0-linux-ia32.zip')
+noextract=('electron-v1.6.6-linux-x64.zip'
+ 'electron-v1.6.6-linux-ia32.zip')
options=(!strip)
@@ -64,21 +61,22 @@ prepare() {
cp package.original.json package.json
patch package.json "${srcdir}/sozi-package-json.patch"
- install -D -m644 "${srcdir}/DroidSans.ttf" "vendor/DroidSans/DroidSans.ttf"
- install -D -m644 "${srcdir}/DroidSans-Bold.ttf" "vendor/DroidSans/DroidSans-Bold.ttf"
+ install -D -m644 "/usr/share/fonts/TTF/DroidSans.ttf" "vendor/DroidSans/DroidSans.ttf"
+ install -D -m644 "/usr/share/fonts/TTF/DroidSans-Bold.ttf" "vendor/DroidSans/DroidSans-Bold.ttf"
rm -rf "cache" "dist"
mkdir -p "cache/"
if [[ $CARCH == "x86_64" ]]; then
- cp "${srcdir}/electron-v1.2.0-linux-x64.zip" "cache/"
+ cp "${srcdir}/electron-v1.6.6-linux-x64.zip" "cache/"
cp "${srcdir}/config.linux-x64.json" "config.default.json"
else
- cp "${srcdir}/electron-v1.2.0-linux-ia32.zip" "cache/"
+ cp "${srcdir}/electron-v1.6.6-linux-ia32.zip" "cache/"
cp "${srcdir}/config.linux-ia32.json" "config.default.json"
fi
+ cp "${srcdir}/SHASUMS256.txt" "cache/SHASUMS256.txt-1.6.6"
patch -p1 < "${srcdir}/texts2paths.patch"
- patch -p1 < "${srcdir}/player.html.patch"
+ patch -p1 < "${srcdir}/index-electron.html.patch"
}
bestmatch() {
@@ -318,15 +316,15 @@ package_sozi() {
mkdir -p "${pkgdir}/opt/sozi-${pkgver}${_pkgverpostfix}/"
cp -a * "${pkgdir}/opt/sozi-${pkgver}${_pkgverpostfix}/"
+ install -D -m644 "install/sozi.png" "${pkgdir}/usr/share/pixmaps/sozi.png"
+ install -D -m755 "install/sozi.desktop" "${pkgdir}/usr/share/applications/sozi.desktop"
+
mkdir -p "${pkgdir}/usr/bin/"
cd "${pkgdir}/usr/bin/"
ln -s "/opt/sozi-${pkgver}${_pkgverpostfix}/Sozi" sozi
cd "${srcdir}/Sozi-${pkgver}${_pkgverpostfix}/"
install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/MPL2.0"
-
- install -D -m644 "${srcdir}/sozi.png" "${pkgdir}/opt/sozi-${pkgver}${_pkgverpostfix}/sozi.png"
- install -D -m755 "${srcdir}/sozi.desktop" "${pkgdir}/usr/share/applications/sozi.desktop"
}
package_sozi-tools_texts2paths() {
diff --git a/config.linux-ia32.json b/config.linux-ia32.json
index 06ab9f7c3284..bb6093af4f5d 100644
--- a/config.linux-ia32.json
+++ b/config.linux-ia32.json
@@ -2,5 +2,8 @@
"platforms": [
"linux-ia32"
],
- "electronVersion": "1.2.0"
+ "electronVersion": "1.6.6",
+ "installable": [
+ "linux"
+ ]
}
diff --git a/config.linux-x64.json b/config.linux-x64.json
index 3abc731d27b5..44e05c4b7b11 100644
--- a/config.linux-x64.json
+++ b/config.linux-x64.json
@@ -2,5 +2,8 @@
"platforms": [
"linux-x64"
],
- "electronVersion": "1.2.0"
+ "electronVersion": "1.6.6",
+ "installable": [
+ "linux"
+ ]
}
diff --git a/index-electron.html.patch b/index-electron.html.patch
new file mode 100644
index 000000000000..e5d9ff2163e7
--- /dev/null
+++ b/index-electron.html.patch
@@ -0,0 +1,12 @@
+diff -ruN sozi-org/index-electron.html sozi-new/index-electron.html
+--- sozi-org/index-electron.html 2017-06-07 11:52:06.000000000 +0430
++++ sozi-new/index-electron.html 2017-07-27 21:32:01.736255103 +0430
+@@ -15,8 +15,6 @@
+ <link rel="stylesheet" href="css/sozi.editor.view.Timeline.css">
+ <link rel="stylesheet" href="css/sozi.editor.view.Toolbar.css">
+
+- <script src="https://apis.google.com/js/client.js" defer></script>
+-
+ <script>
+ require("./js/editor.js");
+ </script>
diff --git a/player.html.patch b/player.html.patch
deleted file mode 100644
index 79663dec3208..000000000000
--- a/player.html.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Sozi-17.02/templates/player.html 2017-02-05 18:45:21.000000000 +0330
-+++ Sozi-17.02.new/templates/player.html.new 2017-05-10 09:59:28.629724903 +0430
-@@ -108,6 +108,6 @@
- <div class="sozi-blank-screen"></div>
- <script>var soziPresentationData = {{ json }};</script>
- {% endraw %}
-- <script>{{ playerJs }}</script>
-+ <script>{{'{% raw %}'}}{{ playerJs|safe }}{{'{% endraw %}'}}</script>
- </body>
- </html>
diff --git a/sozi.desktop b/sozi.desktop
deleted file mode 100755
index 2467aaf43532..000000000000
--- a/sozi.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Sozi
-Comment=A zooming presentation editor and player
-Exec=sozi
-Icon=/opt/sozi-17.02/sozi.png
-Terminal=false
-Type=Application
-StartupNotify=false
diff --git a/sozi.png b/sozi.png
deleted file mode 100644
index e0244dd29c0d..000000000000
--- a/sozi.png
+++ /dev/null
Binary files differ