summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorhaawda2018-04-16 13:51:52 +0200
committerhaawda2018-04-16 13:51:52 +0200
commit755f5e19d4346f66893adad6cb9194f8211fa0e2 (patch)
treeaf26b1e07c20e62b4069ab9ab9fa9fd6915d4f08
parent883cc8da85c2efb1dd9df306419a2f08ffe49585 (diff)
downloadaur-755f5e19d4346f66893adad6cb9194f8211fa0e2.tar.gz
remove obsolete patch
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD19
-rw-r--r--config.diff19
3 files changed, 9 insertions, 35 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7d044a3c6cb..2ea9ae5ec1d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Apr 16 11:51:18 UTC 2018
pkgbase = qtikz-git
pkgdesc = Small application helping you to create TikZ diagrams
pkgver = r316.972685a
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/fhackenberger/ktikz
arch = i686
arch = x86_64
@@ -13,9 +15,7 @@ pkgbase = qtikz-git
conflicts = qtikz
options = !makeflags
source = qtikz::git+https://github.com/fhackenberger/ktikz
- source = config.diff
md5sums = SKIP
- md5sums = b502697a2a75a7bcdda2979e0541d2f4
pkgname = qtikz-git
diff --git a/PKGBUILD b/PKGBUILD
index 7bc2b9425b2..cb3a22e29bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=qtikz-git
pkgver=r316.972685a
-pkgrel=1
+pkgrel=2
pkgdesc="Small application helping you to create TikZ diagrams"
arch=('i686' 'x86_64')
url="https://github.com/fhackenberger/ktikz"
@@ -11,30 +11,23 @@ depends=('poppler-qt5')
makedepends=('git' 'texlive-core')
provides=('qtikz')
conflicts=('qtikz')
-source=("qtikz::git+https://github.com/fhackenberger/ktikz" config.diff)
-md5sums=('SKIP'
- 'b502697a2a75a7bcdda2979e0541d2f4')
-_gitname=qtikz
+source=("qtikz::git+https://github.com/fhackenberger/ktikz")
+md5sums=('SKIP')
options=('!makeflags')
pkgver() {
- cd "$_gitname"
+ cd "${pkgname%-git}"
printf "r%s.%s" $(git rev-list --count HEAD) $(git rev-parse --short HEAD)
}
-prepare() {
- cd "$_gitname"/qmake
- patch -p2 < "$srcdir"/config.diff
-}
-
build() {
- cd "$_gitname"
+ cd "${pkgname%-git}"
qmake qtikz.pro
make
}
package() {
- cd "$_gitname"
+ cd "${pkgname%-git}"
make INSTALL_ROOT="$pkgdir" install
}
diff --git a/config.diff b/config.diff
deleted file mode 100644
index 412ff73b066..00000000000
--- a/config.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/qmake/qtikzconfig.pri b/qmake/qtikzconfig.pri
-index 22758c5..0927c34 100644
---- a/qmake/qtikzconfig.pri
-+++ b/qmake/qtikzconfig.pri
-@@ -46,11 +46,11 @@ CONFIG -= debug
- CONFIG += release
-
- # qmake command:
--#QMAKECOMMAND = qmake-qt4
-+QMAKECOMMAND = qmake-qt4
- # lrelease command:
--#LRELEASECOMMAND = lrelease-qt4
-+LRELEASECOMMAND = lrelease-qt4
- # qcollectiongenerator command:
--#QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator
-+QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator-qt4
-
- # TikZ documentation default file path:
- TIKZ_DOCUMENTATION_DEFAULT = "/usr/share/doc/texmf/pgf/pgfmanual.pdf.gz"