summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorusername2272024-03-25 18:50:00 -0400
committerusername2272024-03-25 18:50:00 -0400
commite000e8b0ee7118b4fa8d11f4b8ecd01c6dbb3f81 (patch)
treed111aad699564e61d2c35790c08d01d2b8d3516e
parenta1b25eede03b8745460a544d69dbf7563b01b53f (diff)
downloadaur-e000e8b0ee7118b4fa8d11f4b8ecd01c6dbb3f81.tar.gz
add conflicts line
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD1
2 files changed, 2 insertions, 0 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 349c31b24106..e83ff8d7c8c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -21,6 +21,7 @@ pkgbase = trgui-ng
depends = libsoup
depends = openssl
depends = webkit2gtk
+ conflicts = trgui-ng-git
noextract = dbip.mmdb
options = !lto
source = git+https://github.com/openscopeproject/TrguiNG#tag=v1.2.0
diff --git a/PKGBUILD b/PKGBUILD
index e5e94d753441..87bf7a0c2ad0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,6 +10,7 @@ arch=('x86_64')
license=('AGPL-3.0')
depends=('alsa-lib' 'cairo' 'desktop-file-utils' 'fontconfig' 'gdk-pixbuf2' 'glib2' 'gtk3' 'hicolor-icon-theme' 'libayatana-appindicator' 'libsoup' 'openssl' 'webkit2gtk')
makedepends=('rust>=1.69.0' 'nodejs>=16.0.0' 'npm' 'git')
+conflicts=('trgui-ng-git')
source=("git+https://github.com/openscopeproject/TrguiNG#tag=v$pkgver"
"https://github.com/openscopeproject/TrguiNG/releases/download/v$pkgver/dbip.mmdb"
"TrguiNG.desktop"::"https://raw.githubusercontent.com/flathub/org.openscopeproject.TrguiNG/master/org.openscopeproject.TrguiNG.desktop")