summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052023-08-24 17:12:45 +0800
committerzxp198210052023-08-24 17:12:45 +0800
commit8cd1794fe20aceeb2bae9f8b53f186b5637dc332 (patch)
tree6527ce808bb43ce306a0f10f9d057654a82f8c77
parent2fde442733ea7f0720cb7308983331fc478cdedb (diff)
downloadaur-8cd1794fe20aceeb2bae9f8b53f186b5637dc332.tar.gz
fix errors
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
2 files changed, 4 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 579988ab4815..842c99ab2067 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -32,6 +32,8 @@ pkgbase = slimjet
depends = cairo
optdepends = kdialog: needed for file dialogs in KDE
optdepends = ttf-liberation: fix fonts for some PDFs
+ conflicts = slimjet
+ conflicts = slimjet-beta
conflicts = slimjet35
options = !emptydirs
options = !strip
diff --git a/PKGBUILD b/PKGBUILD
index 3391369ca564..aee973ee1c23 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ license=('custom:freeware')
depends=('libxcb' 'at-spi2-core' 'libxdamage' 'libxcomposite' 'pango' 'gcc-libs' 'libxkbcommon' 'libxrandr' 'alsa-lib' 'sh' 'libxext'\
'libcups' 'glib2' 'dbus' 'nspr' 'nss' 'libdrm' 'hicolor-icon-theme' 'libxfixes' 'expat' 'glibc' 'libx11' 'mesa' 'cairo')
optdepends=('kdialog: needed for file dialogs in KDE' 'ttf-liberation: fix fonts for some PDFs')
-conflicts=("${pkgname}35")
+conflicts=("${pkgname}" "${pkgname}-beta" "${pkgname}35")
install="${pkgname}.install"
options=('!emptydirs' '!strip')
source=("${pkgname}-${pkgver}_amd64.deb::${_downurl}/release/${pkgname}_amd64.deb"
@@ -29,7 +29,7 @@ sha256sums=('97b58cbecc2ffe1b7cd20f33de7336be9aa10016edafe137b120ab6536daf263'
'2bfc097100279ec967fe51bd413140dfd10e095ac8005729455f9fef884723c8')
prepare() {
bsdtar -xf "${srcdir}/data.tar.xz"
- sed "s|/usr/bin/flashpeak-${pkgname}|flashpeak-${pkgname}|g;s|Icon=flashpeak-${pkgname}|${pkgname}|g" \
+ sed "s|/usr/bin/flashpeak-${pkgname}|flashpeak-${pkgname}|g;s|Icon=flashpeak-${pkgname}|Icon=${pkgname}|g" \
-i "${srcdir}/usr/share/applications/${pkgname}.desktop"
}
package() {