summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Martin2015-08-19 13:33:56 -0500
committerStephen Martin2015-08-19 13:33:56 -0500
commit929c6685e393273293e710eeecb00565e6d5bd88 (patch)
tree5b06c58ebfe1a935cdfc6c98cc100522b98c9082
parent556538a42734dc283506369ccba682c2270bf6db (diff)
downloadaur-929c6685e393273293e710eeecb00565e6d5bd88.tar.gz
Removed .ico and added .svg
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD17
-rw-r--r--jasp-desktop.svg85
3 files changed, 92 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ef68da21ed0..d9f73c4a168 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -24,9 +24,11 @@ pkgbase = jasp-desktop-git
source = jasp-desktop::git+https://github.com/jasp-stats/jasp-desktop.git
source = https://static.jasp-stats.org/development/R%20U1410%20for%20JASP%20%282015-02-19%29.zip
source = rbundle.R
+ source = jasp-desktop.svg
md5sums = SKIP
md5sums = 03a719ec42763bed930fe265c8cd3b41
md5sums = 21deab63134207840ff88bdc39504ef1
+ md5sums = bcaf403001283553bb63b72c268d0290
pkgname = jasp-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index eb61d9f0312..f0acc2820a3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,8 @@ provides=('jasp' 'jasp-desktop')
conflicts=('jasp' 'jasp-desktop')
source=("$_pkgname::git+https://github.com/jasp-stats/$_pkgname.git"
"https://static.jasp-stats.org/development/R%20U1410%20for%20JASP%20%282015-02-19%29.zip"
- "rbundle.R")
+ "rbundle.R"
+ "jasp-desktop.svg")
options=("!strip" "debug")
pkgver() {
@@ -58,8 +59,6 @@ prepare() {
echo "Restoring previously created R bundle"
cp -r $srcdir/RBundle/* ./R
fi
- #term.h needs #include <vector>
- #sed -i -e '5i\#include <vector>\n' $srcdir/$_pkgname/JASP-Desktop/term.h
echo "Creating Makefile"
qmake PREFIX=/usr ../$_pkgname
@@ -68,13 +67,6 @@ prepare() {
build() {
cd $srcdir/$_buildname
make
-
- #Grab icon
- cd $srcdir/$_pkgname/JASP-Desktop/
- mkdir imgs
- icoutils -x -o imgs -w 256 icon.ico
- cd imgs
- mv icon_1_256x256x32.png jasp-desktop.png
}
package() {
@@ -85,7 +77,7 @@ package() {
#Install icon
mkdir -p $pkgdir/usr/share/pixmaps/
- cp $srcdir/$_pkgname/JASP-Desktop/imgs/jasp-desktop.png $pkgdir/usr/share/pixmaps
+ cp $srcdir/jasp-desktop.svg $pkgdir/usr/share/pixmaps/
#Install .desktop file
mkdir -p $pkgdir/usr/share/applications
@@ -102,4 +94,5 @@ EOF
}
md5sums=('SKIP'
'03a719ec42763bed930fe265c8cd3b41'
- '21deab63134207840ff88bdc39504ef1')
+ '21deab63134207840ff88bdc39504ef1'
+ 'bcaf403001283553bb63b72c268d0290')
diff --git a/jasp-desktop.svg b/jasp-desktop.svg
new file mode 100644
index 00000000000..fa437fdfe4e
--- /dev/null
+++ b/jasp-desktop.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="800px" height="800px" viewBox="0 0 800 800" enable-background="new 0 0 800 800" xml:space="preserve">
+<polygon fill="#FFFFFF" stroke="#1CA8E1" stroke-width="10" stroke-miterlimit="10" points="268.597,505.337 246.086,631.396
+ 185.28,458.838 186.011,458.6 185.449,458.282 189.678,450.796 177.21,454.854 248.083,655.981 274.397,508.619 "/>
+<polygon fill="#1CA8E1" points="181.245,456.846 286.57,422.567 247.085,643.689 "/>
+<polygon fill="#1CA8E1" points="180.612,460.454 153.493,614.559 333.904,712.194 512.908,647.016 "/>
+<polygon fill="#FFFFFF" stroke="#FFFFFF" stroke-width="4" stroke-miterlimit="10" points="212.18,450.084 282.553,427.181
+ 268.38,504.148 274.181,507.431 290.587,417.954 204.762,445.887 "/>
+<path fill="#FFFFFF" d="M140.966,620.614l31.286-177.784l192.992,107.927l-0.066,0.374l174.694,98.079l-206.876,75.327
+ L140.966,620.614z M334.812,699.852l151.132-55.028L349.896,568.44l0.062-0.356l-160.988-90.006l-22.952,130.425L334.812,699.852z"
+ />
+<path fill="#1CA8E1" d="M175.957,450.63l183.747,102.757l-0.065,0.368l-1.891-1.062l-2.249,12.76l-170.232-95.175L160.47,611.186
+ l173.94,94.135l163.479-59.525l-142.453-79.979l0.064-0.362l1.891,1.057l2.249-12.755l168.289,94.483L333.4,719.07L146.515,617.932
+ L175.957,450.63 M168.548,435.029l-2.44,13.867l-29.441,167.302l-1.249,7.098l6.338,3.431l186.883,101.139l3.955,2.141l4.227-1.539
+ l194.529-70.831l20.468-7.452l-18.993-10.664l-162.105-91.012l0.067-0.381l-6.2-3.467L180.837,441.902L168.548,435.029
+ L168.548,435.029z M171.568,605.821l21.108-119.944l151.743,84.837l-0.062,0.352l6.184,3.472L474,643.85l-138.786,50.534
+ L171.568,605.821L171.568,605.821z"/>
+<polygon fill="#1CA8E1" points="340.214,706.865 439.436,143.689 618.524,78.549 519.219,641.698 "/>
+<path fill="#FFFFFF" d="M426.67,132.977l210.406-76.531L531.983,652.408l-210.318,76.566L426.67,132.977z M358.763,684.755
+ l147.691-53.768l93.519-530.335l-147.771,53.75L358.763,684.755z"/>
+<path fill="#1CA8E1" d="M630.648,64.104L527.561,648.697l-199.469,72.617l103.001-584.626L630.648,64.104 M606.4,92.994
+ L447.778,150.69l-95.442,541.726l158.541-57.718L606.4,92.994 M643.504,48.787l-16.272,5.919L427.675,127.29l-5.428,1.975
+ l-1.003,5.688l-103,584.626l-3.005,17.057l16.273-5.925l199.47-72.617l5.425-1.975l1.002-5.687L640.496,65.84L643.504,48.787
+ L643.504,48.787z M456.625,158.114l136.92-49.803l-91.514,518.965l-136.842,49.817L456.625,158.114L456.625,158.114z"/>
+<path fill="#FFFFFF" d="M202.252,461.984c-2.077,11.761-13.3,19.628-25.059,17.551c-11.77-2.079-19.629-13.299-17.561-25.068
+ c2.08-11.771,13.3-19.621,25.071-17.543C196.473,438.992,204.323,450.215,202.252,461.984z"/>
+<path fill="#1CA8E1" d="M180.973,486.155c-1.624,0-3.264-0.146-4.874-0.43c-15.159-2.678-25.324-17.188-22.66-32.348
+ c2.362-13.374,13.916-23.076,27.473-23.076c1.627,0,3.271,0.146,4.884,0.431c7.342,1.29,13.744,5.366,18.022,11.479
+ c4.275,6.107,5.918,13.518,4.626,20.862C206.083,476.449,194.53,486.155,180.973,486.155z M180.913,442.878
+ c-7.445,0-13.791,5.334-15.089,12.683c-1.464,8.33,4.126,16.312,12.463,17.783c0.89,0.157,1.793,0.236,2.686,0.236
+ c7.444,0,13.79-5.336,15.088-12.689c0.71-4.035-0.193-8.11-2.544-11.469c-2.35-3.356-5.866-5.597-9.902-6.306
+ C182.717,442.958,181.81,442.878,180.913,442.878z"/>
+<path fill="#FFFFFF" d="M175.256,615.088c-2.067,11.769-13.291,19.628-25.061,17.56c-11.76-2.068-19.629-13.3-17.551-25.061
+ c2.069-11.77,13.301-19.631,25.07-17.55C169.475,592.105,177.335,603.327,175.256,615.088z"/>
+<path fill="#1CA8E1" d="M153.969,639.265c-1.62,0-3.256-0.144-4.862-0.426c-7.343-1.292-13.745-5.369-18.025-11.479
+ c-4.282-6.113-5.926-13.523-4.628-20.866c2.351-13.369,13.904-23.076,27.471-23.076c1.628,0,3.271,0.146,4.885,0.43
+ c7.337,1.291,13.737,5.366,18.016,11.477c4.279,6.108,5.92,13.519,4.623,20.86C179.099,629.555,167.542,639.265,153.969,639.265z
+ M153.924,595.99c-7.45,0-13.794,5.335-15.087,12.686c-0.714,4.038,0.19,8.108,2.543,11.469c2.353,3.359,5.871,5.602,9.904,6.311
+ c0.889,0.156,1.792,0.234,2.684,0.234c7.455,0,13.803-5.337,15.095-12.688c0.714-4.039-0.188-8.109-2.539-11.466
+ c-2.351-3.357-5.866-5.597-9.899-6.306C155.727,596.07,154.82,595.99,153.924,595.99z"/>
+<path fill="#FFFFFF" d="M552.463,648.012c-2.388,13.557-15.312,22.605-28.854,20.207c-13.557-2.382-22.606-15.303-20.217-28.858
+ c2.393-13.545,15.312-22.585,28.867-20.204C545.806,621.543,554.854,634.457,552.463,648.012z"/>
+<path fill="#1CA8E1" d="M527.974,674.892c-1.819,0-3.657-0.161-5.463-0.48c-8.202-1.441-15.357-5.996-20.141-12.823
+ s-6.618-15.107-5.17-23.318c2.638-14.938,15.554-25.78,30.712-25.78c1.811,0,3.639,0.16,5.435,0.476
+ c8.21,1.447,15.361,6.002,20.142,12.826c4.779,6.826,6.614,15.106,5.167,23.315C556.021,664.046,543.119,674.892,527.974,674.892z
+ M527.912,625.062c-9.046,0-16.754,6.473-18.329,15.39c-0.864,4.901,0.231,9.846,3.086,13.92c2.854,4.075,7.125,6.793,12.026,7.654
+ c1.091,0.192,2.19,0.29,3.277,0.29c9.031,0,16.727-6.476,18.297-15.396c0.865-4.902-0.229-9.845-3.082-13.918
+ s-7.121-6.792-12.021-7.656C530.092,625.158,528.995,625.062,527.912,625.062z"/>
+<path fill="#FFFFFF" d="M645.185,76.427c-2.39,13.555-15.312,22.599-28.857,20.209c-13.558-2.39-22.604-15.307-20.214-28.863
+ c2.39-13.545,15.312-22.589,28.868-20.205C638.524,49.959,647.574,62.876,645.185,76.427z"/>
+<path fill="#1CA8E1" d="M620.682,103.307c-1.814,0-3.647-0.161-5.446-0.479c-16.945-2.988-28.302-19.203-25.313-36.146
+ c2.635-14.94,15.55-25.782,30.708-25.782c1.812,0,3.645,0.16,5.44,0.476c16.942,2.99,28.294,19.203,25.307,36.143
+ C648.742,92.461,635.833,103.307,620.682,103.307z M620.629,53.475c-9.045,0-16.752,6.473-18.325,15.392
+ c-1.781,10.114,4.997,19.795,15.114,21.579c1.081,0.191,2.179,0.288,3.264,0.288c9.037,0,16.738-6.476,18.312-15.397
+ c1.783-10.112-4.993-19.791-15.105-21.575C622.812,53.571,621.714,53.475,620.629,53.475z"/>
+<path fill="#FFFFFF" d="M364.312,711.118c-2.854,16.168-18.271,26.967-34.442,24.114c-16.171-2.844-26.979-18.277-24.125-34.441
+ c2.854-16.162,18.277-26.969,34.45-24.114C356.358,679.529,367.154,694.945,364.312,711.118z"/>
+<path fill="#1CA8E1" d="M335.069,741.977c-2.097,0-4.213-0.186-6.292-0.553c-9.473-1.665-17.731-6.925-23.254-14.81
+ c-5.522-7.886-7.642-17.443-5.97-26.916c3.045-17.248,17.95-29.767,35.441-29.767c2.097,0,4.214,0.187,6.293,0.554
+ c19.546,3.448,32.653,22.166,29.217,41.721C367.46,729.458,352.558,741.977,335.069,741.977z M334.995,682.507
+ c-11.378,0-21.076,8.149-23.06,19.377c-1.088,6.164,0.292,12.386,3.888,17.518c3.595,5.133,8.97,8.556,15.135,9.64
+ c1.363,0.24,2.745,0.362,4.111,0.362c11.375,0,21.069-8.149,23.052-19.377c2.236-12.728-6.295-24.911-19.02-27.157
+ C337.743,682.629,336.361,682.507,334.995,682.507z"/>
+<path fill="#FFFFFF" d="M469.145,146.486c-2.854,16.167-18.277,26.963-34.449,24.111c-16.161-2.848-26.96-18.269-24.115-34.436
+ c2.852-16.172,18.268-26.969,34.438-24.121C461.19,114.893,471.995,130.314,469.145,146.486z"/>
+<path fill="#1CA8E1" d="M439.895,177.341c-2.097,0-4.214-0.186-6.291-0.552c-19.552-3.446-32.657-22.16-29.217-41.717
+ c3.042-17.253,17.946-29.774,35.438-29.774c2.094,0,4.208,0.186,6.284,0.551c19.563,3.451,32.675,22.171,29.227,41.729
+ C472.291,164.824,457.386,177.341,439.895,177.341z M439.825,117.872c-11.378,0-21.074,8.151-23.056,19.381
+ c-2.238,12.729,6.291,24.91,19.016,27.152c1.361,0.24,2.743,0.362,4.109,0.362c11.379,0,21.075-8.148,23.059-19.374
+ c2.243-12.729-6.292-24.914-19.027-27.161C442.57,117.993,441.189,117.872,439.825,117.872z"/>
+<g>
+ <path fill="#FFFFFF" d="M283.158,443.443c-1.015,0-2.04-0.09-3.046-0.268c-4.584-0.806-8.585-3.352-11.26-7.166
+ c-2.676-3.816-3.705-8.444-2.896-13.03c1.471-8.354,8.691-14.417,17.167-14.417c1.016,0,2.04,0.09,3.046,0.267
+ c4.575,0.802,8.569,3.342,11.24,7.152c2.677,3.818,3.706,8.453,2.895,13.05C298.831,437.383,291.62,443.443,283.158,443.443z"/>
+ <path fill="#1CA8E1" d="M283.124,414.562c0.661,0,1.331,0.057,2.004,0.176c6.225,1.091,10.364,7.032,9.268,13.251
+ c-0.979,5.551-5.793,9.454-11.238,9.454c-0.661,0-1.33-0.057-2.003-0.176c-6.225-1.095-10.386-7.03-9.29-13.246
+ C272.844,418.463,277.675,414.562,283.124,414.562 M283.124,402.562L283.124,402.562c-11.395,0-21.1,8.149-23.077,19.378
+ c-1.087,6.163,0.295,12.384,3.892,17.514c3.595,5.127,8.971,8.548,15.137,9.632c1.342,0.237,2.717,0.357,4.082,0.357
+ c11.379,0,21.075-8.146,23.056-19.369c1.089-6.178-0.293-12.405-3.891-17.537c-3.591-5.123-8.962-8.539-15.123-9.619
+ C285.863,402.683,284.488,402.562,283.124,402.562L283.124,402.562z"/>
+</g>
+</svg>