From 2e75dc93cd03f0003bf5617f8886dd536889b724 Mon Sep 17 00:00:00 2001 From: Carl Smedstad <carsme@archlinux.org> Date: Fri, 24 Jan 2025 09:41:21 +0100 Subject: [PATCH] upgpkg: 3.2.0-2: Build with webp support & use upstream desktop entry Resolves #1 Resolves #2 --- .SRCINFO | 5 ++--- PKGBUILD | 13 +++++-------- dillo.desktop | 10 ---------- 3 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 dillo.desktop diff --git a/.SRCINFO b/.SRCINFO index ecb5244..00b888b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = dillo pkgdesc = A small, fast graphical web browser built on FLTK pkgver = 3.2.0 - pkgrel = 1 + pkgrel = 2 url = https://www.dillo.org arch = x86_64 license = GPL-3.0-or-later @@ -10,6 +10,7 @@ pkgbase = dillo depends = glibc depends = libjpeg-turbo depends = libpng + depends = libwebp depends = libx11 depends = openssl depends = perl @@ -20,10 +21,8 @@ pkgbase = dillo backup = etc/dillo/keysrc source = https://github.com/dillo-browser/dillo/releases/download/v3.2.0/dillo-3.2.0.tar.gz source = https://github.com/dillo-browser/dillo/releases/download/v3.2.0/dillo-3.2.0.tar.gz.asc - source = dillo.desktop validpgpkeys = 32E65EC501A1B6FDF8190D293EE6BA977EB2A253 sha256sums = ed685168397c7b333d25c21208fcf1313ffede59b44f526b7c9b6ee41ebccabd sha256sums = SKIP - sha256sums = e94ead3a359c2eceb934b07af0fac4864251b9721fa7f4855331daa017b66202 pkgname = dillo diff --git a/PKGBUILD b/PKGBUILD index 7277366..3a2e4b2 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ pkgname=dillo pkgver=3.2.0 -pkgrel=1 +pkgrel=2 pkgdesc="A small, fast graphical web browser built on FLTK" arch=(x86_64) url="https://www.dillo.org" @@ -15,6 +15,7 @@ depends=( 'glibc' 'libjpeg-turbo' 'libpng' + 'libwebp' 'libx11' 'openssl' 'perl' @@ -26,13 +27,9 @@ backup=( etc/dillo/dpidrc etc/dillo/keysrc ) -source=( - "https://github.com/dillo-browser/dillo/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"{,.asc} - dillo.desktop -) +source=("https://github.com/dillo-browser/dillo/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz"{,.asc}) sha256sums=('ed685168397c7b333d25c21208fcf1313ffede59b44f526b7c9b6ee41ebccabd' - 'SKIP' - 'e94ead3a359c2eceb934b07af0fac4864251b9721fa7f4855331daa017b66202') + 'SKIP') validpgpkeys=('32E65EC501A1B6FDF8190D293EE6BA977EB2A253') # Rodrigo Arias Mallo <rodarima@gmail.com> build() { @@ -50,5 +47,5 @@ package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install install -vDm644 -t "$pkgdir/usr/share/pixmaps" icons/128x128/dillo.png - install -vDm644 -t "$pkgdir/usr/share/applications" ../dillo.desktop + install -vDm644 -t "$pkgdir/usr/share/applications" dillo.desktop } diff --git a/dillo.desktop b/dillo.desktop deleted file mode 100644 index 84d4e04..0000000 --- a/dillo.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=Dillo -GenericName=Web Browser -Comment=Very small and fast GUI web browser -Exec=dillo %U -Icon=dillo -Terminal=false -Type=Application -Categories=Network;WebBrowser; -MimeType=text/html;application/xhtml+xml; -- GitLab