summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Maclennan2020-02-12 09:49:49 +0300
committerCaleb Maclennan2020-02-12 10:21:44 +0300
commit07877c369ad5e7418d0aa2969a17b8226823879f (patch)
treed70746ce3a94f5577f9997466afea1512a5d3a25
parentd7764c3ee178b5bf1d84bc55f260385c9c4c05f7 (diff)
downloadaur-07877c369ad5e7418d0aa2969a17b8226823879f.tar.gz
Leave it to -git package to setup conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD5
2 files changed, 2 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index faa6f4580006..ed48e26801c9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = zerobrane-studio
pkgdesc = A lightweight Lua-based IDE for Lua
pkgver = 1.90
- pkgrel = 1
+ pkgrel = 2
url = https://studio.zerobrane.com/
arch = any
license = MIT
@@ -10,8 +10,6 @@ pkgbase = zerobrane-studio
depends = lua-socket
depends = hicolor-icon-theme
optdepends = love: to debug love programs
- provides = zerobrane-studio
- conflicts = zerobrane-studio-git
source = zerobrane-studio-1.90.tar.gz::https://github.com/pkulchenko/ZeroBraneStudio/archive/1.90.tar.gz
source = zbstudio.patch
source = getbitmap.patch
diff --git a/PKGBUILD b/PKGBUILD
index fed5b6fd58f4..0de0eb2c7058 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,15 +6,13 @@
pkgname=zerobrane-studio
_pkgname=ZeroBraneStudio
pkgver=1.90
-pkgrel=1
+pkgrel=2
pkgdesc="A lightweight Lua-based IDE for Lua"
arch=(any)
url='https://studio.zerobrane.com/'
license=('MIT')
depends=('wxlua' 'lua-socket' 'hicolor-icon-theme')
makedepends=('cmake')
-provides=('zerobrane-studio')
-conflicts=('zerobrane-studio-git')
optdepends=('love: to debug love programs')
source=("$pkgname-$pkgver.tar.gz::https://github.com/pkulchenko/$_pkgname/archive/$pkgver.tar.gz"
"zbstudio.patch"
@@ -33,7 +31,6 @@ prepare() {
build() {
cd "$_pkgname-$pkgver/build"
- # sed -e '/check_lua_module(wx TRUE)/ s/^#*/#/' -i CMakeLists.txt
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
make
}