summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormydongistiny2017-12-13 14:15:53 -0800
committermydongistiny2017-12-13 14:15:53 -0800
commit7c6344fb0a700a6c7ec86b94014fd994e40f2508 (patch)
treef3cde394525a610addd9eb20aeb108cfe27fa615
parent7f8c6276c71b2a88d27961b3444ca268ca222dc8 (diff)
downloadaur-7c6344fb0a700a6c7ec86b94014fd994e40f2508.tar.gz
Update git source link
Signed-off-by: mydongistiny <jaysonedson@gmail.com>
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD11
2 files changed, 8 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f4504725d94..2f0297cc0770 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = meld-git
pkgdesc = Visual diff and merge tool
- pkgver = 3.16.0.184.g18ff8a6
+ pkgver = 3.18.0.121.gbd9936eb
pkgrel = 1
url = http://meldmerge.org/
install = meld.install
@@ -19,10 +19,9 @@ pkgbase = meld-git
depends = python-cairo>=1.10.0-6
optdepends = python-dbus: open a new tab in an already running instance
provides = meld
- conflicts = meld
- replaces = meld
+ conflicts = meld meld-dev
options = !emptydirs
- source = git://git.gnome.org/meld
+ source = git+https://gitlab.gnome.org/GNOME/meld.git
sha256sums = SKIP
pkgname = meld-git
diff --git a/PKGBUILD b/PKGBUILD
index 540e2e9405df..e5279e0601cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
_pkgname=meld
pkgname=$_pkgname-git
-pkgver=3.16.0.184.g18ff8a6
+pkgver=3.18.0.121.gbd9936eb
pkgrel=1
-_realver=3.16.0.16
+_realver=3.18.0.121
pkgdesc='Visual diff and merge tool'
arch=('any')
url='http://meldmerge.org/'
@@ -18,12 +18,11 @@ depends=('python>=3.3'
'python-cairo>=1.10.0-6')
makedepends=('intltool' 'gnome-doc-utils' 'git' 'itstool')
optdepends=('python-dbus: open a new tab in an already running instance')
-replaces=('meld')
-provides=("meld=${_realver}")
-conflicts=('meld-dev')
+conflicts=('meld','meld-dev')
+provides=('meld')
install=meld.install
options=('!emptydirs')
-source=("git://git.gnome.org/meld")
+source=("git+https://gitlab.gnome.org/GNOME/meld.git")
sha256sums=('SKIP')
pkgver() {