From cfae89eff7d850d27203ef41d107a1e7512d595c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 23 Oct 2022 11:18:17 +0200 Subject: [PATCH 1/4] Remove obsolete install and gitignore files --- .SRCINFO | 1 - PKGBUILD | 1 - florence.install | 16 ---------------- 3 files changed, 18 deletions(-) delete mode 100644 florence.install diff --git a/.SRCINFO b/.SRCINFO index a06a7f7..b2e443a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -3,7 +3,6 @@ pkgbase = florence pkgver = 0.6.3 pkgrel = 2 url = http://sourceforge.net/projects/florence/ - install = florence.install arch = i686 arch = x86_64 license = GPL diff --git a/PKGBUILD b/PKGBUILD index ae4994b..3f17f17 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -12,7 +12,6 @@ url="http://sourceforge.net/projects/${pkgname}/" license=('GPL') depends=('gtk3' 'libxml2' 'librsvg' 'libxtst' 'gettext' 'gstreamer>=1.0') # http://florence.sourceforge.net/english/install.html makedepends=('intltool>=0.23' 'gnome-doc-utils') -install="${pkgname}.install" source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") sha256sums=('422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e') diff --git a/florence.install b/florence.install deleted file mode 100644 index 414e7a2..0000000 --- a/florence.install +++ /dev/null @@ -1,16 +0,0 @@ -_update() { - glib-compile-schemas '/usr/share/glib-2.0/schemas/' - update-desktop-database -q -} - -post_install() { - _update -} - -post_upgrade() { - _update -} - -post_remove() { - _update -} From 82ba62503579da769ac2ab3e059fb3677006ed56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Wed, 9 Nov 2022 18:56:35 +0100 Subject: [PATCH 2/4] upgpkg: florence 0.6.3-3 Don't generate docs and remove gnome-doc-utils dependency to not require python2 for build process --- .SRCINFO | 3 +-- PKGBUILD | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index b2e443a..bdb10fa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,12 @@ pkgbase = florence pkgdesc = A configurable on-screen virtual keyboard pkgver = 0.6.3 - pkgrel = 2 + pkgrel = 3 url = http://sourceforge.net/projects/florence/ arch = i686 arch = x86_64 license = GPL makedepends = intltool>=0.23 - makedepends = gnome-doc-utils depends = gtk3 depends = libxml2 depends = librsvg diff --git a/PKGBUILD b/PKGBUILD index 3f17f17..0f6f8d5 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,13 +5,13 @@ pkgname=florence pkgver=0.6.3 -pkgrel=2 +pkgrel=3 pkgdesc='A configurable on-screen virtual keyboard' arch=('i686' 'x86_64') url="http://sourceforge.net/projects/${pkgname}/" license=('GPL') depends=('gtk3' 'libxml2' 'librsvg' 'libxtst' 'gettext' 'gstreamer>=1.0') # http://florence.sourceforge.net/english/install.html -makedepends=('intltool>=0.23' 'gnome-doc-utils') +makedepends=('intltool>=0.23') source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") sha256sums=('422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e') @@ -24,7 +24,8 @@ build() { --with-panelapplet \ --with-xtst \ --with-docs \ - --disable-static + --disable-static \ + --without-docs make -j1 } From 8f81ae9ac5e5050e823775cfc425cc9fc1d65df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 8 Apr 2024 23:10:35 +0200 Subject: [PATCH 3/4] Replace checksums with sha512 --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index bdb10fa..8c5fde2 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -14,6 +14,6 @@ pkgbase = florence depends = gettext depends = gstreamer>=1.0 source = http://sourceforge.net/projects/florence/files/florence/0.6.3/florence-0.6.3.tar.bz2 - sha256sums = 422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e + sha512sums = c527e8c40c9a594106420a6187945d79dfa7ddb4f628805cd188c8a37f79f42cbc1f74b80e21186f104a79c4d5e90c7a9d93cbe35bf1c6ebfe874db047fbef3c pkgname = florence diff --git a/PKGBUILD b/PKGBUILD index 0f6f8d5..3b64907 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -13,7 +13,7 @@ license=('GPL') depends=('gtk3' 'libxml2' 'librsvg' 'libxtst' 'gettext' 'gstreamer>=1.0') # http://florence.sourceforge.net/english/install.html makedepends=('intltool>=0.23') source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2") -sha256sums=('422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944c5091e') +sha512sums=('c527e8c40c9a594106420a6187945d79dfa7ddb4f628805cd188c8a37f79f42cbc1f74b80e21186f104a79c4d5e90c7a9d93cbe35bf1c6ebfe874db047fbef3c') build() { cd "${srcdir}/${pkgname}-${pkgver}" From e75d783a9b6cae1a396b408b79f2aafe52b9ed4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 21 Jul 2024 07:32:40 +0200 Subject: [PATCH 4/4] Adopt SPDX identifiers for license fields --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8c5fde2..c362466 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -5,7 +5,7 @@ pkgbase = florence url = http://sourceforge.net/projects/florence/ arch = i686 arch = x86_64 - license = GPL + license = GPL-2.0-or-later makedepends = intltool>=0.23 depends = gtk3 depends = libxml2 diff --git a/PKGBUILD b/PKGBUILD index 3b64907..fd0e1bf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=3 pkgdesc='A configurable on-screen virtual keyboard' arch=('i686' 'x86_64') url="http://sourceforge.net/projects/${pkgname}/" -license=('GPL') +license=('GPL-2.0-or-later') depends=('gtk3' 'libxml2' 'librsvg' 'libxtst' 'gettext' 'gstreamer>=1.0') # http://florence.sourceforge.net/english/install.html makedepends=('intltool>=0.23') source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2")