[neon/kde/gwenview/Neon/release] /: update snap for core20

Jonathan Riddell null at kde.org
Wed Mar 17 12:21:23 GMT 2021 

Git commit b8bd978127152f462fcae5fd53059e4b413a8d82 by Jonathan Riddell.
Committed on 17/03/2021 at 12:21.
Pushed by jriddell into branch 'Neon/release'.

update snap for core20

M  +1    -0    debian/control
M  +11   -3    debian/tests/control
D  +-    --    setup/gui/icon.png
D  +0    -193  setup/gui/org.kde.gwenview.desktop
M  +11   -18   snapcraft.yaml

https://invent.kde.org/neon/kde/gwenview/commit/b8bd978127152f462fcae5fd53059e4b413a8d82

diff --git a/debian/control b/debian/control
index 91e3685..212259e 100644
--- a/debian/control
+++ b/debian/control
@@ -30,6 +30,7 @@ Build-Depends: baloo-kf5-dev (>= 5.13) [linux-any],
                libqt5opengl5-dev (>= 5.6.0~),
                libqt5svg5-dev (>= 5.6.0~),
                libqt5x11extras5-dev (>= 5.6.0~),
+               libtiff-dev,
                pkg-config,
                pkg-kde-tools (>> 0.15.15),
                qtbase5-dev (>= 5.6.0~),
diff --git a/debian/tests/control b/debian/tests/control
index 36f8f90..487fb2d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,13 @@
 Tests: testsuite
-Depends: @, @builddeps@, build-essential,
-         xvfb, xauth, dbus, xserver-xephyr,
-         kinit, kded5, kio-extras, plasma-workspace
+Depends: build-essential,
+         dbus,
+         kded5,
+         kinit,
+         kio-extras,
+         plasma-workspace,
+         xauth,
+         xserver-xephyr,
+         xvfb,
+         @,
+         @builddeps@
 Restrictions: build-needed, needs-recommends
diff --git a/setup/gui/icon.png b/setup/gui/icon.png
deleted file mode 100644
index 841609e..0000000
Binary files a/setup/gui/icon.png and /dev/null differ
diff --git a/setup/gui/org.kde.gwenview.desktop b/setup/gui/org.kde.gwenview.desktop
deleted file mode 100644
index c526bb4..0000000
--- a/setup/gui/org.kde.gwenview.desktop
+++ /dev/null
@@ -1,193 +0,0 @@
-[Desktop Entry]
-Name=Gwenview
-Name[ar]=جوِينفيو
-Name[ast]=Gwenview
-Name[be]=Gwenview
-Name[bg]=Gwenview
-Name[bs]=Gwenview
-Name[ca]=Gwenview
-Name[ca at valencia]=Gwenview
-Name[cs]=Gwenview
-Name[da]=Gwenview
-Name[de]=Gwenview
-Name[el]=Gwenview
-Name[en_GB]=Gwenview
-Name[eo]=Gwenview
-Name[es]=Gwenview
-Name[et]=Gwenview
-Name[eu]=Gwenview
-Name[fa]=Gwenview
-Name[fi]=Gwenview
-Name[fr]=Gwenview
-Name[ga]=Gwenview
-Name[gl]=Gwenview
-Name[hi]=ग्वेन-व्यू
-Name[hne]=ग्वेन-व्यू
-Name[hr]=Gwenview
-Name[hu]=Gwenview
-Name[ia]=Gwenview
-Name[id]=Gwenview
-Name[is]=Gwenview
-Name[it]=Gwenview
-Name[ja]=Gwenview
-Name[kk]=Gwenview
-Name[km]=Gwenview
-Name[ko]=Gwenview
-Name[ku]=Gwenview
-Name[lt]=Gwenview
-Name[lv]=Gwenview
-Name[mr]=ग्वेनव्यु
-Name[nb]=Gwenview
-Name[nds]=Gwenview
-Name[ne]=जीवेनभ्यू
-Name[nl]=Gwenview
-Name[nn]=Gwenview
-Name[oc]=Gwenview
-Name[pa]=ਜੀਵੀਨ-ਵਿਊ
-Name[pl]=Gwenview
-Name[pt]=Gwenview
-Name[pt_BR]=Gwenview
-Name[ro]=Gwenview
-Name[ru]=Gwenview
-Name[si]=Gwenview
-Name[sk]=Gwenview
-Name[sl]=Gwenview
-Name[sr]=Гвенвју
-Name[sr at ijekavian]=Гвенвју
-Name[sr at ijekavianlatin]=GwenView
-Name[sr at latin]=GwenView
-Name[sv]=Gwenview
-Name[th]=เกวนวิว
-Name[tr]=Gwenview
-Name[ug]=Gwenview
-Name[uk]=Gwenview
-Name[vi]=Gwenview
-Name[x-test]=xxGwenviewxx
-Name[zh_CN]=Gwenview
-Name[zh_TW]=影像檢視_Gwenview
-GenericName=KDE Image Viewer
-GenericName[ar]=عارض صور كدي
-GenericName[bg]=Преглед на изображения в KDE
-GenericName[bs]=KDE Prikazivač slika
-GenericName[ca]=Visor d'imatges del KDE
-GenericName[ca at valencia]=Visor d'imatges del KDE
-GenericName[cs]=Prohlížeč obrázků KDE
-GenericName[da]=KDE billedfremviser
-GenericName[de]=KDE-Bildbetrachter
-GenericName[el]=Προβολέας εικόνων του KDE
-GenericName[en_GB]=KDE Image Viewer
-GenericName[es]=Visor de imágenes de KDE
-GenericName[et]=KDE pildinäitaja
-GenericName[fa]=مشاهده‌گر تصویر کی‌دی‌ای
-GenericName[fi]=KDE:n kuvankatselin
-GenericName[fr]=Afficheur d'images de KDE
-GenericName[ga]=Amharcán Íomhánna KDE
-GenericName[gl]=Visor de imaxes de KDE
-GenericName[he]=מציג תמונות של KDE
-GenericName[hu]=KDE képnézegető
-GenericName[ia]=Visor de imagine de KDE
-GenericName[id]=Penampil Gambar KDE
-GenericName[is]=Myndskoðari fyrir KDE
-GenericName[it]=Visore di immagini per KDE
-GenericName[ja]=KDE 画像ビューア
-GenericName[kk]=KDE кескін қарау құралы
-GenericName[ko]=KDE 그림 뷰어
-GenericName[lt]=KDE Paveikslėlių žiūryklė
-GenericName[mr]=केडीई प्रतिमा प्रदर्शक
-GenericName[nb]=KDE bildeviser
-GenericName[nds]=KDE-Bildkieker
-GenericName[nl]=KDE afbeeldingenviewer
-GenericName[nn]=Biletvisar for KDE
-GenericName[pa]=ਕੇਡੀਈ ਚਿੱਤਰ ਦਰਸ਼ਕ
-GenericName[pl]=Przeglądarka obrazów
-GenericName[pt]=Visualizador de Imagens do KDE
-GenericName[pt_BR]=Visualizador de imagens do KDE
-GenericName[ro]=Vizualizor de imagini pentru KDE
-GenericName[ru]=Программа просмотра изображений
-GenericName[sk]=Prehliadač obrázkov KDE
-GenericName[sl]=Pregledovalnik slik za KDE
-GenericName[sr]=КДЕ приказивач слика
-GenericName[sr at ijekavian]=КДЕ приказивач слика
-GenericName[sr at ijekavianlatin]=KDE prikazivač slika
-GenericName[sr at latin]=KDE prikazivač slika
-GenericName[sv]=Bildvisare för KDE
-GenericName[tr]=KDE Resim Gösterici
-GenericName[uk]=Переглядач зображень KDE
-GenericName[x-test]=xxKDE Image Viewerxx
-GenericName[zh_CN]=KDE 图像查看器
-GenericName[zh_TW]=KDE 影像檢視程式
-Comment=A simple image viewer
-Comment[ar]=عارض صور بسيط
-Comment[bg]=Програма за преглед на изображения
-Comment[bs]=Jednostavan prikazivač slika
-Comment[ca]=Un visualitzador d'imatges senzill
-Comment[ca at valencia]=Un visualitzador d'imatges senzill
-Comment[cs]=Jednoduchý prohlížeč obrázků
-Comment[da]=Simpel billedfremviser
-Comment[de]=Ein einfacher Bildbetrachter
-Comment[el]=Ένας απλός προβολέας εικόνων
-Comment[en_GB]=A simple image viewer
-Comment[eo]=Simpla bildorigardilo
-Comment[es]=Un visor de imágenes sencillo
-Comment[et]=Lihtne pildinäitaja
-Comment[eu]=Irudi ikustaile bakuna
-Comment[fa]=مشاهده‌گر تصویر  ساده
-Comment[fi]=Yksinkertainen kuvankatselin
-Comment[fr]=Un afficheur simple d'images
-Comment[ga]=Amharcán simplí íomhánna
-Comment[gl]=Un visor de imaxes sinxelo
-Comment[he]=מציג תמונות פשוט
-Comment[hi]=एक सरल चित्र प्रदर्शक
-Comment[hne]=एक सरल फोटू प्रदर्सक
-Comment[hr]=Jednostavni preglednik slika
-Comment[hu]=Egyszerű képnézegető
-Comment[ia]=Un simplice visor de imagine
-Comment[id]=Sebuah penampil gambar sederhana
-Comment[is]=Einfaldur myndskoðari
-Comment[it]=Un semplice visore di immagini
-Comment[ja]=シンプルな画像ビューア
-Comment[kk]=Қарапайым кескінді қарау құралы
-Comment[km]=កម្មវិធី​មើល​រូបភាព​ធម្មតា
-Comment[ko]=간단한 그림 뷰어
-Comment[ku]=Nîşanderê wêneyan yê hêsanî
-Comment[lt]=Paprasta paveikslėlių žiūryklė
-Comment[lv]=Vienkāršs attēlu skatītājs
-Comment[mr]=एक सोपा प्रतिमा प्रदर्शक
-Comment[nb]=En enkel bildeviser
-Comment[nds]=En eenfach Bildkieker
-Comment[nl]=Een eenvoudige afbeeldingenviewer
-Comment[nn]=Ein enkel biletvisar
-Comment[pa]=ਇੱਕ ਸਧਾਰਨ ਚਿੱਤਰ ਦਰਸ਼ਕ
-Comment[pl]=Prosta przeglądarka obrazów
-Comment[pt]=Um visualizador de imagens simples
-Comment[pt_BR]=Um visualizador de imagens simples
-Comment[ro]=Un vizualizator de imagini simplu
-Comment[ru]=Просмотр изображений
-Comment[si]=සරල පිංතූර දසුන
-Comment[sk]=Jednoduchý prehliadač obrázkov
-Comment[sl]=Preprost pregledovalnik slik
-Comment[sr]=Једноставан приказивач слика
-Comment[sr at ijekavian]=Једноставан приказивач слика
-Comment[sr at ijekavianlatin]=Jednostavan prikazivač slika
-Comment[sr at latin]=Jednostavan prikazivač slika
-Comment[sv]=En enkel bildvisare
-Comment[th]=เครื่องมือแสดงภาพแบบพื้นฐาน
-Comment[tr]=Basit bir resim gösterici
-Comment[ug]=ئاددىي سۈرەت كۆرگۈ
-Comment[uk]=Простий переглядач зображень
-Comment[vi]=Bộ xem ảnh đơn giản
-Comment[x-test]=xxA simple image viewerxx
-Comment[zh_CN]=简单图像查看器
-Comment[zh_TW]=一個簡單的影像檢視程式
-Exec=gwenview %U
-Terminal=false
-Icon=gwenview
-Type=Application
-Categories=Qt;KDE;Graphics;Viewer;Photography;
-MimeType=inode/directory;image/gif;image/jpeg;image/png;image/bmp;image/x-eps;image/x-icns;image/x-ico;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-xbitmap;image/x-xpixmap;image/tiff;image/x-psd;image/x-webp;image/webp;
-X-DocPath=gwenview/index.html
-# InitialPreference should be greater than Okular so that Gwenview is the
-# primary application associated with images, but less than Konqueror or Dolphin
-# so that Gwenview is not the primary applications for folders.
-InitialPreference=8
-X-DBUS-ServiceName=org.kde.gwenview
diff --git a/snapcraft.yaml b/snapcraft.yaml
index f50699e..2c42c43 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -48,6 +48,8 @@ parts:
         after:
         - kde-frameworks-5-env
         plugin: cmake
+        build-environment:
+        - CMAKE_BUILD_PARALLEL_LEVEL: "4"
         build-packages:
         - libexiv2-dev
         - libjpeg-dev
@@ -58,11 +60,15 @@ parts:
         - libphonon4qt5-dev
         - libphonon4qt5experimental-dev
         - libpng-dev
-        - pkg-config
+        - libkf5doctools-dev
+        - libkf5purpose-dev
+        - libtiff-dev
         stage-packages:
-        - libkf5kdcraw-dev
-        - libkf5kipi-dev
-        - libcfitsio-dev
+        - libkf5kdcraw5
+        - libkf5kipi32.0.0
+        - libcfitsio8
+        - libkf5purpose5
+        - libkf5purpose-bin
         source: http://download.kde.org/stable/release-service/20.12.3/src/gwenview-20.12.3.tar.xz
         cmake-parameters:
         - "-DKDE_INSTALL_USE_QT_SYS_PATHS=ON"
@@ -87,18 +93,5 @@ parts:
         prime:
         - "$exclusion"
     kde-frameworks-5-env:
-        filesets:
-            exclusion:
-            - "-usr/lib/*/cmake/*"
-            - "-usr/include/*"
-            - "-usr/share/ECM/*"
-            - "-usr/share/doc/*"
-            - "-usr/share/man/*"
-            - "-usr/share/icons/breeze-dark*"
-            - "-usr/bin/X11"
-            - "-usr/lib/gcc/x86_64-linux-gnu/6.0.0"
-            - "-usr/lib/aspell/*"
-        prime:
-        - "$exclusion"
         plugin: dump
-        source: https://anongit.kde.org/snap-kf5-launcher.git
+        source: https://invent.kde.org/packaging/snap-kf5-launcher.git

More information about the Neon-commits mailing list