[arch-commits] Commit in spice-up (5 files)

Balló György bgyorgy at archlinux.org
Sat Jul 4 12:02:35 UTC 2020


    Date: Saturday, July 4, 2020 @ 12:02:35
  Author: bgyorgy
Revision: 657680

archrelease: copy trunk to community-x86_64

Added:
  spice-up/repos/
  spice-up/repos/community-x86_64/
  spice-up/repos/community-x86_64/0001-Add-missing-icons.patch
    (from rev 657679, spice-up/trunk/0001-Add-missing-icons.patch)
  spice-up/repos/community-x86_64/0001-Fix-build-with-vala-0.46.patch
    (from rev 657679, spice-up/trunk/0001-Fix-build-with-vala-0.46.patch)
  spice-up/repos/community-x86_64/PKGBUILD
    (from rev 657679, spice-up/trunk/PKGBUILD)

-------------------------------------+
 0001-Add-missing-icons.patch        |   90 ++++++++++++++++++++++++++++++++++
 0001-Fix-build-with-vala-0.46.patch |   67 +++++++++++++++++++++++++
 PKGBUILD                            |   45 +++++++++++++++++
 3 files changed, 202 insertions(+)

Copied: spice-up/repos/community-x86_64/0001-Add-missing-icons.patch (from rev 657679, spice-up/trunk/0001-Add-missing-icons.patch)
===================================================================
--- repos/community-x86_64/0001-Add-missing-icons.patch	                        (rev 0)
+++ repos/community-x86_64/0001-Add-missing-icons.patch	2020-07-04 12:02:35 UTC (rev 657680)
@@ -0,0 +1,90 @@
+From 0a169a4fd535fe2b55a177c62357df483b5d6154 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Sat, 4 Jul 2020 12:31:53 +0200
+Subject: [PATCH] Add missing icons
+
+These icons are missing from the default Adwaita icon theme. Add them from Elementary to provide fallback.
+---
+ data/assets.gresource.xml               |  3 +++
+ data/icons/document-export-symbolic.svg |  6 ++++++
+ data/icons/selection-lower-symbolic.svg | 15 +++++++++++++++
+ data/icons/selection-raise-symbolic.svg | 15 +++++++++++++++
+ 4 files changed, 39 insertions(+)
+ create mode 100644 data/icons/document-export-symbolic.svg
+ create mode 100644 data/icons/selection-lower-symbolic.svg
+ create mode 100644 data/icons/selection-raise-symbolic.svg
+
+diff --git a/data/assets.gresource.xml b/data/assets.gresource.xml
+index 52abb47..0c4d3d9 100644
+--- a/data/assets.gresource.xml
++++ b/data/assets.gresource.xml
+@@ -8,6 +8,9 @@
+     <file alias="color-palette-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/color-palette-symbolic.svg</file>
+     <file alias="gradient-palette-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/gradient-palette-symbolic.svg</file>
+     <file alias="custom-color-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/custom-color-symbolic.svg</file>
++    <file alias="selection-lower-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/selection-lower-symbolic.svg</file>
++    <file alias="selection-raise-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/selection-raise-symbolic.svg</file>
++    <file alias="document-export-symbolic.svg" compressed="true" preprocess="xml-stripblanks">icons/document-export-symbolic.svg</file>
+     <file alias="shape-symbolic.svg" compressed="false" preprocess="">icons/shape-symbolic.svg</file>
+     <file alias="align-top-symbolic" compressed="false" preprocess="xml-stripblanks">icons/align-top-symbolic.svg</file>
+     <file alias="align-middle-symbolic" compressed="false" preprocess="xml-stripblanks">icons/align-middle-symbolic.svg</file>
+diff --git a/data/icons/document-export-symbolic.svg b/data/icons/document-export-symbolic.svg
+new file mode 100644
+index 0000000..d21e70e
+--- /dev/null
++++ b/data/icons/document-export-symbolic.svg
+@@ -0,0 +1,6 @@
++<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg">
++    <g color="#bebebe" transform="translate(-533 35)">
++        <path d="M546-33s1 0 1 1v2.633l-1-.832V-31.5s0-.5-.5-.5h-9s-.5 0-.5.5v9c0 .5.5.5.5.5h9s.5 0 .5-.5v-1.3l1-.833V-22c0 1-1 1-1 1h-10s-1 0-1-1v-10c0-1 1-1 1-1zm-1.42 3.035a.423.423 0 0 1 .249.09l3 2.5a.522.522 0 0 1 0 .75l-3 2.5c-.288.23-.801-.006-.813-.375V-26h-3.5a.517.517 0 0 1-.5-.406.489.489 0 0 1 0-.094v-1c0-.262.239-.5.5-.5h3.5v-1.5c.008-.277.298-.478.565-.465z" fill="#666" overflow="visible" style="marker:none"/>
++        
++    </g>
++</svg>
+\ No newline at end of file
+diff --git a/data/icons/selection-lower-symbolic.svg b/data/icons/selection-lower-symbolic.svg
+new file mode 100644
+index 0000000..b1ad7dc
+--- /dev/null
++++ b/data/icons/selection-lower-symbolic.svg
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" id="svg18">
++  <metadata id="metadata24">
++    <rdf:RDF>
++      <cc:Work rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
++        <dc:title/>
++      </cc:Work>
++    </rdf:RDF>
++  </metadata>
++  <defs id="defs22"/>
++  <path id="path846" d="M 11.451172 -0.001953125 A 0.489 0.489 0 0 0 11.40625 0 C 11.17725 0.044 10.996 0.267 11 0.5 L 11 4 L 9.5 4 C 9.131 4.011 8.894 4.5235 9.125 4.8125 L 11.625 7.8125 A 0.522 0.522 0 0 0 12.375 7.8125 L 14.875 4.8125 A 0.418 0.418 0 0 0 14.964844 4.5664062 C 14.977848 4.2994093 14.777 4.008 14.5 4 L 13 4 L 13 0.5 A 0.52 0.52 0 0 0 12.5 0 L 11.5 0 A 0.489 0.489 0 0 0 11.451172 -0.001953125 z M 0.5 9 C 0.223 9 0 9.223 0 9.5 L 0 10.5 C 0 10.777 0.223 11 0.5 11 L 15.5 11 C 15.777 11 16 10.777 16 10.5 L 16 9.5 C 16 9.223 15.777 9 15.5 9 L 0.5 9 z " style="opacity:1;vector-effect:none;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal"/>
++  <path id="path844" d="M 0.5 1 C 0.223 1 0 1.223 0 1.5 L 0 2.5 C 0 2.777 0.223 3 0.5 3 L 7.5 3 C 7.777 3 8 2.777 8 2.5 L 8 1.5 C 8 1.223 7.777 1 7.5 1 L 0.5 1 z M 0.5 5 C 0.223 5 0 5.2230001 0 5.5 L 0 6.5 C 0 6.777 0.223 7 0.5 7 L 7.5 7 C 7.777 7 8 6.777 8 6.5 L 8 5.5 C 8 5.2230001 7.777 5 7.5 5 L 0.5 5 z M 0.5 13 C 0.223 13 0 13.223 0 13.5 L 0 14.5 C 0 14.777 0.223 15 0.5 15 L 7.5 15 C 7.777 15 8 14.777 8 14.5 L 8 13.5 C 8 13.223 7.777 13 7.5 13 L 0.5 13 z " style="opacity:0.5;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;font-variant-east_asian:normal;paint-order:normal"/>
++</svg>
+\ No newline at end of file
+diff --git a/data/icons/selection-raise-symbolic.svg b/data/icons/selection-raise-symbolic.svg
+new file mode 100644
+index 0000000..76046f6
+--- /dev/null
++++ b/data/icons/selection-raise-symbolic.svg
+@@ -0,0 +1,15 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" id="svg18">
++  <metadata id="metadata24">
++    <rdf:RDF>
++      <cc:Work rdf:about="">
++        <dc:format>image/svg+xml</dc:format>
++        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
++        <dc:title/>
++      </cc:Work>
++    </rdf:RDF>
++  </metadata>
++  <defs id="defs22"/>
++  <path id="path824" d="M 0.5 0.99804688 C 0.223 0.99804688 1e-07 1.2210469 0 1.4980469 L 0 2.4980469 C 0 2.7750469 0.223 2.9980469 0.5 2.9980469 L 7.5 2.9980469 C 7.777 2.9980469 8 2.7750469 8 2.4980469 L 8 1.4980469 C 8 1.2210469 7.777 0.99804688 7.5 0.99804688 L 0.5 0.99804688 z M 0.5 8.9980469 C 0.223 8.9980469 1e-07 9.2210469 0 9.4980469 L 0 10.498047 C 0 10.775047 0.223 10.998047 0.5 10.998047 L 7.5 10.998047 C 7.777 10.998047 8 10.775047 8 10.498047 L 8 9.4980469 C 8 9.2210469 7.777 8.9980469 7.5 8.9980469 L 0.5 8.9980469 z M 0.5 12.998047 C 0.223 12.998047 1e-07 13.221047 0 13.498047 L 0 14.498047 C 0 14.775047 0.223 14.998047 0.5 14.998047 L 7.5 14.998047 C 7.777 14.998047 8 14.775047 8 14.498047 L 8 13.498047 C 8 13.221047 7.777 12.998047 7.5 12.998047 L 0.5 12.998047 z " style="opacity:0.5;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke
 -opacity:1;marker:none"/>
++  <path id="path822" d="M 0.5 4.9980469 C 0.2230001 4.9980469 0 5.2210469 0 5.4980469 L 0 6.4980469 C 0 6.7750469 0.2230001 6.9980469 0.5 6.9980469 L 15.5 6.9980469 C 15.777 6.9980469 16 6.7750469 16 6.4980469 L 16 5.4980469 C 16 5.2210469 15.777 4.9980469 15.5 4.9980469 L 0.5 4.9980469 z M 12 8.0253906 A 0.522 0.522 0 0 0 11.625 8.1855469 L 9.125 11.185547 C 8.894 11.474547 9.131 11.987047 9.5 11.998047 L 11 11.998047 L 11 15.498047 C 10.996 15.731047 11.17725 15.954047 11.40625 15.998047 A 0.489 0.489 0 0 0 11.5 15.998047 L 12.5 15.998047 A 0.52 0.52 0 0 0 13 15.498047 L 13 11.998047 L 14.5 11.998047 C 14.777 11.990047 14.977844 11.698641 14.964844 11.431641 A 0.418 0.418 0 0 0 14.875 11.185547 L 12.375 8.1855469 A 0.522 0.522 0 0 0 12 8.0253906 z " style="opacity:1;vector-effect:none;fill:#555761;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"/>
++</svg>
+\ No newline at end of file
+-- 
+2.27.0
+

Copied: spice-up/repos/community-x86_64/0001-Fix-build-with-vala-0.46.patch (from rev 657679, spice-up/trunk/0001-Fix-build-with-vala-0.46.patch)
===================================================================
--- repos/community-x86_64/0001-Fix-build-with-vala-0.46.patch	                        (rev 0)
+++ repos/community-x86_64/0001-Fix-build-with-vala-0.46.patch	2020-07-04 12:02:35 UTC (rev 657680)
@@ -0,0 +1,67 @@
+From edd7c2ea499338829470eec18f359f66503254df Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor at gmail.com>
+Date: Sat, 4 Jul 2020 12:37:26 +0200
+Subject: [PATCH] Fix build with vala 0.46
+
+---
+ src/Tests/ColorItem/MockedCanvasItem.vala | 2 +-
+ src/Tests/ImageItem/MockedCanvasItem.vala | 2 +-
+ src/Tests/TextItem/MockedCanvasItem.vala  | 2 +-
+ src/Widgets/CanvasItems/CanvasItem.vala   | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/src/Tests/ColorItem/MockedCanvasItem.vala b/src/Tests/ColorItem/MockedCanvasItem.vala
+index 7197596..e0515d3 100644
+--- a/src/Tests/ColorItem/MockedCanvasItem.vala
++++ b/src/Tests/ColorItem/MockedCanvasItem.vala
+@@ -6,7 +6,7 @@ public abstract class Spice.CanvasItem : Gtk.EventBox {
+     public Canvas canvas { get; set; }
+     protected Gtk.Grid? grid = null;
+ 
+-    public CanvasItem (Canvas canvas, Json.Object save_data) {
++    protected CanvasItem (Canvas canvas, Json.Object save_data) {
+         Object (canvas: _canvas, save_data: _save_data);
+     }
+ 
+diff --git a/src/Tests/ImageItem/MockedCanvasItem.vala b/src/Tests/ImageItem/MockedCanvasItem.vala
+index 7197596..e0515d3 100644
+--- a/src/Tests/ImageItem/MockedCanvasItem.vala
++++ b/src/Tests/ImageItem/MockedCanvasItem.vala
+@@ -6,7 +6,7 @@ public abstract class Spice.CanvasItem : Gtk.EventBox {
+     public Canvas canvas { get; set; }
+     protected Gtk.Grid? grid = null;
+ 
+-    public CanvasItem (Canvas canvas, Json.Object save_data) {
++    protected CanvasItem (Canvas canvas, Json.Object save_data) {
+         Object (canvas: _canvas, save_data: _save_data);
+     }
+ 
+diff --git a/src/Tests/TextItem/MockedCanvasItem.vala b/src/Tests/TextItem/MockedCanvasItem.vala
+index 7197596..e0515d3 100644
+--- a/src/Tests/TextItem/MockedCanvasItem.vala
++++ b/src/Tests/TextItem/MockedCanvasItem.vala
+@@ -6,7 +6,7 @@ public abstract class Spice.CanvasItem : Gtk.EventBox {
+     public Canvas canvas { get; set; }
+     protected Gtk.Grid? grid = null;
+ 
+-    public CanvasItem (Canvas canvas, Json.Object save_data) {
++    protected CanvasItem (Canvas canvas, Json.Object save_data) {
+         Object (canvas: _canvas, save_data: _save_data);
+     }
+ 
+diff --git a/src/Widgets/CanvasItems/CanvasItem.vala b/src/Widgets/CanvasItems/CanvasItem.vala
+index 8ec7ee3..592648c 100644
+--- a/src/Widgets/CanvasItems/CanvasItem.vala
++++ b/src/Widgets/CanvasItems/CanvasItem.vala
+@@ -86,7 +86,7 @@ public abstract class Spice.CanvasItem : Gtk.EventBox {
+ 
+     public unowned Canvas? canvas { protected get; construct; }
+ 
+-    public CanvasItem (Spice.Canvas? _canvas, Json.Object _save_data) {
++    protected CanvasItem (Spice.Canvas? _canvas, Json.Object _save_data) {
+         Object (canvas: _canvas, save_data: _save_data);
+     }
+ 
+-- 
+2.27.0
+

Copied: spice-up/repos/community-x86_64/PKGBUILD (from rev 657679, spice-up/trunk/PKGBUILD)
===================================================================
--- repos/community-x86_64/PKGBUILD	                        (rev 0)
+++ repos/community-x86_64/PKGBUILD	2020-07-04 12:02:35 UTC (rev 657680)
@@ -0,0 +1,45 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: NicoHood <archlinux {cat} nicohood {dog} de>
+# Contributor: btd1337
+
+pkgname=spice-up
+pkgver=1.8.2
+pkgrel=1
+pkgdesc="Create simple and beautiful presentations"
+arch=(x86_64)
+url="https://github.com/Philip-Scott/Spice-up"
+license=(GPL3)
+depends=(granite libevdev)
+makedepends=(cmake vala)
+checkdepends=(xorg-server-xvfb)
+source=("https://github.com/Philip-Scott/Spice-up/archive/$pkgver/Spice-up-$pkgver.tar.gz"
+        "0001-Fix-build-with-vala-0.46.patch"
+        "0001-Add-missing-icons.patch")
+sha256sums=('67783d7fb8f7a4756f4312e8a43d4d9c9d60524956dd3de9076506a2da513c17'
+            '482cec26f089f13e2bcf3edf427535cfabc840681eb2f754469828a0c1ac359b'
+            '460d16cab1cd4ed7c8722e1dbf9d934b8ecdc8494d05e9b7448be3ef8630fd0d')
+
+prepare() {
+  [[ -d build ]] || mkdir build
+  cd Spice-up-$pkgver
+  patch -Np1 -i ../0001-Fix-build-with-vala-0.46.patch
+  patch -Np1 -i ../0001-Add-missing-icons.patch
+}
+
+build() {
+  cd build
+  cmake -G "Unix Makefiles" ../Spice-up-$pkgver/ \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+check() {
+  cd build
+  dbus-run-session xvfb-run -s '-screen 0 1920x1080x24 -nolisten local' \
+    make test CTEST_OUTPUT_ON_FAILURE=1
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}


More information about the arch-commits mailing list