[neon/kde/kblocks/Neon/release] /: update for new kf5 snap
Jonathan Riddell
null at kde.org
Wed Feb 10 14:33:39 GMT 2021
Git commit 72eb07b24206d371f81f6594171d46d3faf27c09 by Jonathan Riddell.
Committed on 10/02/2021 at 14:33.
Pushed by jriddell into branch 'Neon/release'.
update for new kf5 snap
D +0 -44 snap/gui/kblocks.svg
D +0 -107 snap/gui/org.kde.kblocks.desktop
M +25 -4 snapcraft.yaml
https://invent.kde.org/neon/kde/kblocks/commit/72eb07b24206d371f81f6594171d46d3faf27c09
diff --git a/snap/gui/kblocks.svg b/snap/gui/kblocks.svg
deleted file mode 100644
index 799a76e..0000000
--- a/snap/gui/kblocks.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48" version="1.1">
- <defs>
- <linearGradient id="linearGradient4405">
- <stop style="stop-color:#000000;stop-opacity:1;" offset="0"/>
- <stop style="stop-color:#000000;stop-opacity:0;" offset="1"/>
- </linearGradient>
- <linearGradient id="linearGradient4393">
- <stop offset="0" style="stop-color:#cb2525;stop-opacity:1"/>
- <stop offset="1" style="stop-color:#e05e4c;stop-opacity:1"/>
- </linearGradient>
- <linearGradient id="linearGradient4337">
- <stop style="stop-color:#ffa92d;stop-opacity:1" offset="0"/>
- <stop style="stop-color:#ffc169;stop-opacity:1" offset="1"/>
- </linearGradient>
- <linearGradient id="linearGradient4329">
- <stop style="stop-color:#375a7d;stop-opacity:1;" offset="0"/>
- <stop style="stop-color:#54a3d8;stop-opacity:1" offset="1"/>
- </linearGradient>
- <linearGradient xlink:href="#linearGradient4393" id="linearGradient4327" x1="-44" y1="10" x2="-32" y2="10" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4329" id="linearGradient4335" x1="-44" y1="24" x2="-32" y2="24" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4337" id="linearGradient4343" x1="-44" y1="38" x2="-32" y2="38" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4329" id="linearGradient4351" x1="-30" y1="10" x2="-18" y2="10" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4337" id="linearGradient4359" x1="-30" y1="24" x2="-18" y2="24" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4393" id="linearGradient4367" x1="-30" y1="38" x2="-18" y2="38" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4329" id="linearGradient4375" x1="-16" y1="10" x2="-4" y2="10" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4393" id="linearGradient4383" x1="-16" y1="24" x2="-4" y2="24" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4337" id="linearGradient4391" x1="-16" y1="38" x2="-4" y2="38" gradientUnits="userSpaceOnUse"/>
- <linearGradient xlink:href="#linearGradient4405" id="linearGradient4411" x1="18.577" y1="18.216" x2="38.551" y2="38.959" gradientUnits="userSpaceOnUse"/>
- </defs>
- <g>
- <rect style="opacity:1;fill:#33393e;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" width="39" height="39" x="4.5" y="4.5" rx="1.258" ry="1.182"/>
- <rect ry="1" rx="1" y="18" x="-16" height="12" width="12" style="fill:url(#linearGradient4383);fill-opacity:1.0;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="matrix(0,-1,1,0,0,0)"/>
- <rect style="fill:url(#linearGradient4391);fill-opacity:1.0;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" width="12" height="12" x="-16" y="32" rx="1" ry="1" transform="matrix(0,-1,1,0,0,0)"/>
- <rect ry="1" rx="1" y="4" x="-16" height="12" width="12" style="fill:url(#linearGradient4375);fill-opacity:1.0;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="matrix(0,-1,1,0,0,0)"/>
- <rect style="fill:url(#linearGradient4367);fill-opacity:1.0;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" width="12" height="12" x="-30" y="32" rx="1" ry="1" transform="matrix(0,-1,1,0,0,0)"/>
- <rect style="fill:url(#linearGradient4351);fill-opacity:1.0;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" width="12" height="12" x="-30" y="4" rx="1" ry="1" transform="matrix(0,-1,1,0,0,0)"/>
- <rect ry="1" rx="1" y="4" x="-44" height="12" width="12" style="fill:url(#linearGradient4327);fill-opacity:1;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="matrix(0,-1,1,0,0,0)"/>
- <rect style="fill:url(#linearGradient4343);fill-opacity:1;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" width="12" height="12" x="-44" y="32" rx="1" ry="1" transform="matrix(0,-1,1,0,0,0)"/>
- <rect ry="1" rx="1" y="18" x="-44" height="12" width="12" style="fill:url(#linearGradient4335);fill-opacity:1;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="matrix(0,-1,1,0,0,0)"/>
- <path style="opacity:0.3;fill:url(#linearGradient4411);fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M 29.732422 18.314453 L 24.697266 20.599609 L 19.144531 25.353516 L 18.267578 29.685547 L 32.582031 44 L 44 44 L 44 32.582031 L 29.732422 18.314453 z"/>
- <rect ry="1" rx="1" y="18" x="-30" height="12" width="12" style="fill:url(#linearGradient4359);fill-opacity:1.0;stroke:#808080;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="matrix(0,-1,1,0,0,0)"/>
- </g>
-</svg>
diff --git a/snap/gui/org.kde.kblocks.desktop b/snap/gui/org.kde.kblocks.desktop
deleted file mode 100644
index 73de9fb..0000000
--- a/snap/gui/org.kde.kblocks.desktop
+++ /dev/null
@@ -1,107 +0,0 @@
-[Desktop Entry]
-Name=KBlocks
-Name[ast]=KBlocks
-Name[bs]=KBlocks
-Name[ca]=KBlocks
-Name[ca at valencia]=KBlocks
-Name[cs]=KBlocks
-Name[da]=KBlocks
-Name[de]=KBlocks
-Name[el]=KBlocks
-Name[en_GB]=KBlocks
-Name[es]=KBlocks
-Name[et]=KBlocks
-Name[eu]=KBlocks
-Name[fi]=KBlocks
-Name[fr]=KBlocks
-Name[ga]=KBlocks
-Name[gl]=KBlocks
-Name[hne]=के-बाक्स
-Name[hu]=KBlocks
-Name[is]=K-Blokkir
-Name[it]=KBlocks
-Name[ja]=KBlocks
-Name[kk]=KBlocks
-Name[km]=KBlocks
-Name[ko]=KBlocks
-Name[lt]=KBlocks
-Name[lv]=KBlocks
-Name[mr]=के-ब्लॉक्स
-Name[nb]=KBlocks
-Name[nds]=KBlocks
-Name[nl]=KBlocks
-Name[nn]=KBlocks
-Name[pl]=KBloki
-Name[pt]=KBlocks
-Name[pt_BR]=KBlocks
-Name[ro]=KBlocuri
-Name[ru]=KBlocks
-Name[sk]=KBlocks
-Name[sl]=KBlocks
-Name[sq]=KBlocks
-Name[sr]=К‑блокови
-Name[sr at ijekavian]=К‑блокови
-Name[sr at ijekavianlatin]=K‑blokovi
-Name[sr at latin]=K‑blokovi
-Name[sv]=Kblock
-Name[tr]=KBlocks
-Name[ug]=KBlocks
-Name[uk]=KBlocks
-Name[wa]=KBlocks
-Name[x-test]=xxKBlocksxx
-Name[zh_CN]=KBlocks
-Name[zh_TW]=KBlocks
-Icon=kblocks
-Exec=kblocks -qwindowtitle %c
-Type=Application
-X-DocPath=kblocks/index.html
-GenericName=Falling Blocks Game
-GenericName[bs]=Igra padajući blokovi
-GenericName[ca]=Joc de blocs que cauen
-GenericName[ca at valencia]=Joc de blocs que cauen
-GenericName[da]=Faldende blokke-spil
-GenericName[de]=„Tetris“-Spiel
-GenericName[el]=Παιχνίδι με τούβλα που πέφτουν
-GenericName[en_GB]=Falling Blocks Game
-GenericName[es]=Juego de bloques en cascada
-GenericName[et]=Langevate klotside mäng
-GenericName[fi]=Putoavien palojen peli
-GenericName[fr]=Jeu de blocs qui tombent
-GenericName[ga]=Cluiche le bloic atá ag titim
-GenericName[gl]=Xogo no que caen bloques
-GenericName[hu]=Játék lehulló elemekkel
-GenericName[it]=Gioco di blocchi che cadono
-GenericName[ja]=落下するブロックのゲーム
-GenericName[kk]=Тетрис - тектес ойыны
-GenericName[km]=ល្បែងប្លុកធ្លាក់
-GenericName[ko]=떨어지는 블록 게임
-GenericName[lt]=Krentančių blokų žaidimas
-GenericName[lv]=Krītošo bloku spēle
-GenericName[mr]=पडणाऱ्या ब्लॉक्सचा खेळ
-GenericName[nb]=Spill med fallende brikker
-GenericName[nds]=Speel mit fallen Blöck
-GenericName[nl]=Vallende blokken-spel
-GenericName[nn]=Spel med fallande brikker
-GenericName[pl]=Gra w spadające bloki
-GenericName[pt]=Jogo de Blocos em Queda
-GenericName[pt_BR]=Jogo estilo Tetris
-GenericName[ro]=Joc de blocuri căzătoare
-GenericName[ru]=Тетрис
-GenericName[sk]=Hra s padajúcimi blokmi
-GenericName[sl]=Igra padajočih kock
-GenericName[sr]=Игра падајућих блокова
-GenericName[sr at ijekavian]=Игра падајућих блокова
-GenericName[sr at ijekavianlatin]=Igra padajućih blokova
-GenericName[sr at latin]=Igra padajućih blokova
-GenericName[sv]=Spel med fallande block
-GenericName[tr]=Sütun Düşürme Oyunu
-GenericName[ug]=چۈشۈۋاتقان بۆلەك ئويۇنى
-GenericName[uk]=Гра з блоками, що падають
-GenericName[wa]=On djeu avou des blokes ki tcheyèt
-GenericName[x-test]=xxFalling Blocks Gamexx
-GenericName[zh_CN]=俄罗斯方块游戏
-GenericName[zh_TW]=類似俄羅斯方塊遊戲
-StartupNotify=true
-X-DBUS-StartupType=Multi
-Categories=Qt;KDE;Game;ArcadeGame;
-X-DBUS-ServiceName=org.kde.kblocks
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 2d2ea1d..ddd3549 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,6 +1,5 @@
---
name: kblocks
-version: 20.12.2
confinement: strict
grade: stable
base: core20
@@ -33,18 +32,40 @@ plugs:
default-provider: kde-frameworks-5-qt-5-15-core20/latest/candidate
target: kf5
parts:
+ libkdegames:
+ after:
+ - kde-frameworks-5-env
+ plugin: cmake
+ build-packages:
+ - libopenal-dev
+ - libsndfile1-dev
+ build-snaps:
+ - kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
+ filesets:
+ exclusion:
+ - "-usr/lib/*/libKF5KDEGamesPrivate.so"
+ - "-usr/include/KF5/KF5KDEGames/libkdegamesprivate/*"
+ prime:
+ - "$exclusion"
+ source: https://download.kde.org/stable/release-service/20.12.2/src/libkdegames-20.12.2.tar.xz
+ cmake-parameters:
+ - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
+ - "-DCMAKE_INSTALL_PREFIX=/usr"
+ - "-DCMAKE_BUILD_TYPE=Release"
+ - "-DENABLE_TESTING=OFF"
+ - "-DBUILD_TESTING=OFF"
+ - "-DKDE_SKIP_TEST_SETTINGS=ON"
+ - "-DCMAKE_FIND_ROOT_PATH=/snap/kde-frameworks-5-qt-5-15-core20-sdk/current"
kblocks:
after:
- kde-frameworks-5-env
+ - libkdegames
plugin: cmake
build-packages:
- kdoctools-dev
- libkf5kdegames-dev
build-snaps:
- kde-frameworks-5-qt-5-15-core20-sdk/latest/candidate
- stage-packages:
- - libkf5kdegamesprivate1
- - libkf5kdegames7
filesets:
exclusion:
- "-usr/lib/*/cmake/*"
More information about the Neon-commits
mailing list