summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsL1pKn072017-09-01 22:57:01 +0200
committersL1pKn072017-09-01 22:57:01 +0200
commit9a443a673499783a0c8853a2ee1cfee3a500c8e9 (patch)
tree20374dd0c40aec2d52d394598e0b2a2878ec8698
parent642b6c771b39b3f2c0beace511ad53c1399bf8ca (diff)
downloadaur-9a443a673499783a0c8853a2ee1cfee3a500c8e9.tar.gz
seems git pull generate random hash commit. then use patch instead
-rw-r--r--.SRCINFO24
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD8
3 files changed, 19 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c5cc83ad342..a0f70fdb82f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Fri Sep 1 20:45:46 UTC 2017
+# Fri Sep 1 20:55:25 UTC 2017
pkgbase = eiskaltdcpp-git
pkgdesc = EiskaltDC++: DC and ADC client based on dcpp core. (GIT Version)
- pkgver = 2.2.10.168.g35edb672
+ pkgver = 2.2.10.167.geca99308
pkgrel = 1
url = http://code.google.com/p/eiskaltdc
arch = i686
@@ -32,8 +32,10 @@ pkgbase = eiskaltdcpp-git
options = !emptydirs
source = git+https://github.com/eiskaltdcpp/eiskaltdcpp.git
source = esee.patch
+ source = https://patch-diff.githubusercontent.com/raw/eiskaltdcpp/eiskaltdcpp/pull/367.patch
sha256sums = SKIP
- sha256sums = SKIP
+ sha256sums = b68a4def7204214d418efabfe130393e6b8481a3b348defeb9050bbb2693fa54
+ sha256sums = 57d4278e9670cff5c01231bcc727d6fe12018f80d74750aaa34e636f77a7c04f
pkgname = eiskaltdcpp-core-git
pkgdesc = EiskaltDC++ Core. (GIT Version)
@@ -43,13 +45,13 @@ pkgname = eiskaltdcpp-core-git
depends = attr
depends = boost-libs
depends = miniupnpc
- provides = eiskaltdcpp-core=2.2.10.168.g35edb672
+ provides = eiskaltdcpp-core=2.2.10.167.geca99308
conflicts = eiskaltdcpp-core
pkgname = eiskaltdcpp-qt-git
pkgdesc = Qt5-based DC and ADC client for EiskaltDC++ core. (GIT Version)
- depends = eiskaltdcpp-core-git=2.2.10.168.g35edb672
- depends = eiskaltdcpp-data-git=2.2.10.168.g35edb672
+ depends = eiskaltdcpp-core-git=2.2.10.167.geca99308
+ depends = eiskaltdcpp-data-git=2.2.10.167.geca99308
depends = aspell
depends = qt5-multimedia
depends = qt5-script
@@ -62,8 +64,8 @@ pkgname = eiskaltdcpp-qt-git
pkgname = eiskaltdcpp-gtk-git
pkgdesc = Gtk-based DC and ADC client for EiskaltDC++ core. (GIT Version)
- depends = eiskaltdcpp-core-git=2.2.10.168.g35edb672
- depends = eiskaltdcpp-data-git=2.2.10.168.g35edb672
+ depends = eiskaltdcpp-core-git=2.2.10.167.geca99308
+ depends = eiskaltdcpp-data-git=2.2.10.167.geca99308
depends = gtk3
depends = libnotify
depends = desktop-file-utils
@@ -74,7 +76,7 @@ pkgname = eiskaltdcpp-gtk-git
pkgname = eiskaltdcpp-daemon-git
pkgdesc = DC and ADC daemon for EiskaltDC++ core. (GIT Version)
- depends = eiskaltdcpp-core-git=2.2.10.168.g35edb672
+ depends = eiskaltdcpp-core-git=2.2.10.167.geca99308
depends = jsoncpp
provides = eiskaltdcpp-daemon
conflicts = eiskaltdcpp-daemon
@@ -82,7 +84,7 @@ pkgname = eiskaltdcpp-daemon-git
pkgname = eiskaltdcpp-cli-git
pkgdesc = CLI interface for EiskaltDC++ Daemon. (GIT Version)
arch = any
- depends = eiskaltdcpp-daemon-git=2.2.10.168.g35edb672
+ depends = eiskaltdcpp-daemon-git=2.2.10.167.geca99308
depends = perl-json
depends = perl-json-rpc
provides = eiskaltdcpp-cli
@@ -91,7 +93,7 @@ pkgname = eiskaltdcpp-cli-git
pkgname = eiskaltdcpp-web-git
pkgdesc = Web interface for EiskaltDC++ Daemon. (GIT Version)
arch = any
- depends = eiskaltdcpp-daemon-git=2.2.10.168.g35edb672
+ depends = eiskaltdcpp-daemon-git=2.2.10.167.geca99308
provides = eiskaltdcpp-web
conflicts = eiskaltdcpp-web
diff --git a/.gitignore b/.gitignore
index 05c6d4d4c97..300a542d856 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
!.gitignore
!.SRCINFO
!PKGBUILD
+!esee.patch
diff --git a/PKGBUILD b/PKGBUILD
index 3f1408fc505..2b099d2e0a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgname=('eiskaltdcpp-core-git'
'eiskaltdcpp-web-git'
'eiskaltdcpp-data-git'
)
-pkgver=2.2.10.168.g35edb672
+pkgver=2.2.10.167.geca99308
pkgrel=1
pkgdesc="EiskaltDC++: DC and ADC client based on dcpp core. (GIT Version)"
license=('GPL3')
@@ -20,9 +20,11 @@ conflicts=('eiskaltdcpp')
options=('!emptydirs')
source=('git+https://github.com/eiskaltdcpp/eiskaltdcpp.git'
'esee.patch'
+ 'https://patch-diff.githubusercontent.com/raw/eiskaltdcpp/eiskaltdcpp/pull/367.patch'
)
sha256sums=('SKIP'
- 'SKIP'
+ 'b68a4def7204214d418efabfe130393e6b8481a3b348defeb9050bbb2693fa54'
+ '57d4278e9670cff5c01231bcc727d6fe12018f80d74750aaa34e636f77a7c04f'
)
makedepends=('git'
'cmake'
@@ -60,7 +62,7 @@ prepare() {
# Bleh patch for set right version
patch -p1 -i "${srcdir}/esee.patch"
# Fix Close the Qt GUI
- git pull --no-edit origin pull/367/head
+ patch -p1 -i "${srcdir}/367.patch"
}
build() {