summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Husmann2016-11-23 06:32:49 +0100
committerStefan Husmann2016-11-23 06:32:49 +0100
commit63371d1ac8c66b7a0575e8e61df05eac20819dc3 (patch)
tree3b915e98563b8cdc5622d31253e86fb3ac7d2b5b
parentd6231e956f86b4329492af144b8153cdb8f31f54 (diff)
downloadaur-63371d1ac8c66b7a0575e8e61df05eac20819dc3.tar.gz
use qt4, remove makefile .diff, change cinfig.diff
-rw-r--r--.SRCINFO16
-rw-r--r--PKGBUILD18
-rw-r--r--config.diff2
-rw-r--r--makefile.diff108
4 files changed, 16 insertions, 128 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d3598d938db..75ac6aef774 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,23 @@
# Generated by mksrcinfo v8
-# Wed Jun 8 18:38:58 UTC 2016
+# Wed Nov 23 05:31:46 UTC 2016
pkgbase = qtikz-git
pkgdesc = Small application helping you to create TikZ diagrams
- pkgver = r196.ab7bd73
- pkgrel = 3
+ pkgver = r202.be66c8b
+ pkgrel = 1
url = https://github.com/fhackenberger/ktikz
arch = i686
arch = x86_64
license = GPL
makedepends = git
makedepends = texlive-core
- makedepends = qt5-tools
- depends = poppler-qt5
- depends = shared-mime-info
- depends = desktop-file-utils
+ depends = poppler-qt4
provides = qtikz
conflicts = qtikz
+ options = !makeflags
source = qtikz::git+https://github.com/fhackenberger/ktikz
source = config.diff
- source = makefile.diff
md5sums = SKIP
- md5sums = ff93a529fe32d095a6390a629c51bece
- md5sums = 4eb8ee23d0762037887d1003daf55c30
+ md5sums = 97d5fd5f3cfdf691101c39ae35f69753
pkgname = qtikz-git
diff --git a/PKGBUILD b/PKGBUILD
index e3ad08da20c..95bf39425be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,21 @@
# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
pkgname=qtikz-git
-pkgver=r196.ab7bd73
-pkgrel=3
+pkgver=r202.be66c8b
+pkgrel=1
pkgdesc="Small application helping you to create TikZ diagrams"
arch=('i686' 'x86_64')
url="https://github.com/fhackenberger/ktikz"
license=('GPL')
-depends=('poppler-qt5' 'shared-mime-info' 'desktop-file-utils')
-makedepends=('git' 'texlive-core' 'qt5-tools')
+depends=('poppler-qt4')
+makedepends=('git' 'texlive-core')
provides=('qtikz')
conflicts=('qtikz')
-source=("qtikz::git+https://github.com/fhackenberger/ktikz" config.diff makefile.diff)
+source=("qtikz::git+https://github.com/fhackenberger/ktikz" config.diff)
md5sums=('SKIP'
- 'ff93a529fe32d095a6390a629c51bece'
- '4eb8ee23d0762037887d1003daf55c30')
+ '97d5fd5f3cfdf691101c39ae35f69753')
_gitname=qtikz
+options=('!makeflags')
pkgver() {
cd "$_gitname"
@@ -29,8 +29,8 @@ prepare() {
build() {
cd "$_gitname"
- qmake qtikz.pro
- patch -p0 -F3 < "$srcdir"/makefile.diff
+ qmake-qt4 qtikz.pro
+
make
}
diff --git a/config.diff b/config.diff
index 5863b7b8d45..4b9d91cc446 100644
--- a/config.diff
+++ b/config.diff
@@ -5,7 +5,7 @@
#install documentation here:
-#DOCUMENTATION_INSTALL_DIR=$${RESOURCES_INSTALL_DIR}/documentation
-+DOCUMENTATION_INSTALL_DIR=$${RESOURCES_INSTALL_DIR}/doc
++DOCUMENTATION_INSTALL_DIR=/usr/share/doc/qtikz-git
#install templates here:
#TEMPLATES_INSTALL_DIR=$${RESOURCES_INSTALL_DIR}/templates
diff --git a/makefile.diff b/makefile.diff
deleted file mode 100644
index 75a6d65481a..00000000000
--- a/makefile.diff
+++ /dev/null
@@ -1,108 +0,0 @@
---- Makefile 2016-02-05 21:39:51.293133952 +0100
-+++ Makefile.new 2016-02-05 21:41:24.989214136 +0100
-@@ -19,12 +19,12 @@
- QMAKE = /usr/lib/qt/bin/qmake
- DEL_FILE = rm -f
- CHK_DIR_EXISTS= test -d
--MKDIR = mkdir -p
-+MKDIR = install -d
- COPY = cp -f
- COPY_FILE = cp -f
- COPY_DIR = cp -f -R
--INSTALL_FILE = install -m 644 -p
--INSTALL_PROGRAM = install -m 755 -p
-+INSTALL_FILE = install -m 644
-+INSTALL_PROGRAM = install -m 755
- INSTALL_DIR = cp -f -R
- DEL_FILE = rm -f
- SYMLINK = ln -f -s
-@@ -726,7 +726,7 @@
- (cd `dirname $(DISTDIR)` && $(TAR) $(DISTNAME).tar $(DISTNAME) && $(COMPRESS) $(DISTNAME).tar) && $(MOVE) `dirname $(DISTDIR)`/$(DISTNAME).tar.gz . && $(DEL_FILE) -r $(DISTDIR)
-
- distdir: FORCE
-- @test -d $(DISTDIR) || mkdir -p $(DISTDIR)
-+ @test -d $(DISTDIR) || install -d $(DISTDIR)
- $(COPY_FILE) --parents $(DIST) $(DISTDIR)/
- $(COPY_FILE) --parents translations/cs/qtikz_cs.ts translations/de/qtikz_de.ts translations/es/qtikz_es.ts translations/fr/qtikz_fr.ts $(DISTDIR)/
- $(COPY_FILE) --parents doc/qtikz.qhcp $(DISTDIR)/
-@@ -1496,7 +1496,7 @@
- ####### Install
-
- install_target: first FORCE
-- @test -d $(INSTALL_ROOT)/usr/bin || mkdir -p $(INSTALL_ROOT)/usr/bin
-+ @test -d $(INSTALL_ROOT)/usr/bin || install -d $(INSTALL_ROOT)/usr/bin
- -$(INSTALL_PROGRAM) $(QMAKE_TARGET) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)
- -$(STRIP) $(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)
-
-@@ -1506,7 +1506,7 @@
-
-
- install_translations: first FORCE
-- @test -d $(INSTALL_ROOT)/usr/share/qtikz/locale || mkdir -p $(INSTALL_ROOT)/usr/share/qtikz/locale
-+ @test -d $(INSTALL_ROOT)/usr/share/qtikz/locale || install -d $(INSTALL_ROOT)/usr/share/qtikz/locale
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/locale/qtikz_cs.qm $(INSTALL_ROOT)/usr/share/qtikz/locale/
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/locale/qtikz_de.qm $(INSTALL_ROOT)/usr/share/qtikz/locale/
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/locale/qtikz_es.qm $(INSTALL_ROOT)/usr/share/qtikz/locale/
-@@ -1521,7 +1521,7 @@
-
-
- install_documentation: first FORCE
-- @test -d $(INSTALL_ROOT)/doc || mkdir -p $(INSTALL_ROOT)/doc
-+ @test -d $(INSTALL_ROOT)/doc || install -d $(INSTALL_ROOT)/doc
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/doc/qtikz.qch $(INSTALL_ROOT)/doc/
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/doc/qtikz.qhc $(INSTALL_ROOT)/doc/
-
-@@ -1532,7 +1532,7 @@
-
-
- install_man: first FORCE
-- @test -d $(INSTALL_ROOT)/usr/share/man/man1 || mkdir -p $(INSTALL_ROOT)/usr/share/man/man1
-+ @test -d $(INSTALL_ROOT)/usr/share/man/man1 || install -d $(INSTALL_ROOT)/usr/share/man/man1
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/qtikz.1 $(INSTALL_ROOT)/usr/share/man/man1/
-
- uninstall_man: FORCE
-@@ -1541,7 +1541,7 @@
-
-
- install_desktop: first FORCE
-- @test -d $(INSTALL_ROOT)/usr/share/applications || mkdir -p $(INSTALL_ROOT)/usr/share/applications
-+ @test -d $(INSTALL_ROOT)/usr/share/applications || install -d $(INSTALL_ROOT)/usr/share/applications
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/qtikz.desktop $(INSTALL_ROOT)/usr/share/applications/
-
- uninstall_desktop: FORCE
-@@ -1550,7 +1550,7 @@
-
-
- install_templates: first FORCE
-- @test -d $(INSTALL_ROOT)/usr/share/qtikz/templates || mkdir -p $(INSTALL_ROOT)/usr/share/qtikz/templates
-+ @test -d $(INSTALL_ROOT)/usr/share/qtikz/templates || install -d $(INSTALL_ROOT)/usr/share/qtikz/templates
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/data/examples/template_example.pgs $(INSTALL_ROOT)/usr/share/qtikz/templates/
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/data/examples/template_example2.pgs $(INSTALL_ROOT)/usr/share/qtikz/templates/
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/data/examples/beamer-example-template.pgs $(INSTALL_ROOT)/usr/share/qtikz/templates/
-@@ -1563,7 +1563,7 @@
-
-
- install_resources: first FORCE
-- @test -d $(INSTALL_ROOT)/usr/share/qtikz || mkdir -p $(INSTALL_ROOT)/usr/share/qtikz
-+ @test -d $(INSTALL_ROOT)/usr/share/qtikz || install -d $(INSTALL_ROOT)/usr/share/qtikz
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/app/icons/qtikz-128.png $(INSTALL_ROOT)/usr/share/qtikz/
-
- uninstall_resources: FORCE
-@@ -1572,7 +1572,7 @@
-
-
- install_mimetype: first FORCE
-- @test -d $(INSTALL_ROOT)/usr/share/mime/packages || mkdir -p $(INSTALL_ROOT)/usr/share/mime/packages
-+ @test -d $(INSTALL_ROOT)/usr/share/mime/packages || install -d $(INSTALL_ROOT)/usr/share/mime/packages
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/data/qtikz.xml $(INSTALL_ROOT)/usr/share/mime/packages/
-
- uninstall_mimetype: FORCE
-@@ -1581,7 +1581,7 @@
-
-
- install_license: first FORCE
-- @test -d $(INSTALL_ROOT)/usr/share/qtikz || mkdir -p $(INSTALL_ROOT)/usr/share/qtikz
-+ @test -d $(INSTALL_ROOT)/usr/share/qtikz || install -d $(INSTALL_ROOT)/usr/share/qtikz
- -$(INSTALL_FILE) /home/haawda/paketierung/meine_Pakete/qtikz-git/src/qtikz/LICENSE.GPL2 $(INSTALL_ROOT)/usr/share/qtikz/
-
- uninstall_license: FORCE