summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Husmann2016-02-05 22:07:34 +0100
committerStefan Husmann2016-02-05 22:07:34 +0100
commit92973a4a6e96481272be1cdcc236cea9503496d7 (patch)
tree53858d7fa719ce6a6a497b65af1ec5e7560acefc
parent3313e8f9221cd6b6293d6b5df4c6c406e38947c9 (diff)
downloadaur-92973a4a6e96481272be1cdcc236cea9503496d7.tar.gz
add two patches
-rw-r--r--.SRCINFO2
-rw-r--r--config.diff23
-rw-r--r--makefile.diff108
3 files changed, 132 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e6b9ae710bc..fbdce171ef0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Fri Feb 5 20:55:42 UTC 2016
+# Fri Feb 5 21:06:32 UTC 2016
pkgbase = qtikz-git
pkgdesc = Small application helping you to create TikZ diagrams
pkgver = r196.ab7bd73
diff --git a/config.diff b/config.diff
new file mode 100644
index 00000000000..5863b7b8d45
--- /dev/null
+++ b/config.diff
@@ -0,0 +1,23 @@
+--- qtikzconfig.pri 2016-02-02 18:52:16.990065588 +0100
++++ qtikzconfig.pri.new 2016-02-05 19:20:14.849508464 +0100
+@@ -28,7 +28,7 @@
+ #MIME_INSTALL_DIR = /usr/share/mime/packages
+
+ #install documentation here:
+-#DOCUMENTATION_INSTALL_DIR=$${RESOURCES_INSTALL_DIR}/documentation
++DOCUMENTATION_INSTALL_DIR=$${RESOURCES_INSTALL_DIR}/doc
+
+ #install templates here:
+ #TEMPLATES_INSTALL_DIR=$${RESOURCES_INSTALL_DIR}/templates
+@@ -46,9 +46,9 @@
+ CONFIG += release
+
+ # qmake command:
+-#QMAKECOMMAND = qmake-qt4
++QMAKECOMMAND = qmake
+ # lrelease command:
+-#LRELEASECOMMAND = lrelease-qt4
++LRELEASECOMMAND = lrelease
+ # qcollectiongenerator command:
+ #QCOLLECTIONGENERATORCOMMAND = qcollectiongenerator
+
diff --git a/makefile.diff b/makefile.diff
new file mode 100644
index 00000000000..75a6d65481a
--- /dev/null
+++ b/makefile.diff
@@ -0,0 +1,108 @@
+--- 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