diff options
| author | Adrien Prost-Boucle | 2016-12-03 13:42:52 +0100 |
|---|---|---|
| committer | Adrien Prost-Boucle | 2016-12-03 13:42:52 +0100 |
| commit | 9fe2d648f6481f9b5d2f25ddd3d614be6118b32b (patch) | |
| tree | b78c7443b80a797ef5cd1b672cf3513a70952d74 | |
| parent | 7a3b42fd2076eb727a12a8a2bdf8c0d2a8d15271 (diff) | |
| download | aur-kactus2-git.tar.gz | |
Remove patches that are fixed upstream
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | IPlugin.h.patch | 11 | ||||
| -rw-r--r-- | Kactus2.pri.patch | 11 | ||||
| -rw-r--r-- | PKGBUILD | 14 |
4 files changed, 4 insertions, 40 deletions
@@ -1,8 +1,8 @@ # Generated by mksrcinfo v8 -# Sat Nov 26 22:18:07 UTC 2016 +# Sat Dec 3 12:42:25 UTC 2016 pkgbase = kactus2-git pkgdesc = Open source IP-XACT-based tool for ASIC, FPGA and embedded systems design - pkgver = 3.2.225.0.svn2627 + pkgver = 3.2.298.0.svn2649 pkgrel = 1 url = http://funbase.cs.tut.fi/ arch = any @@ -11,12 +11,8 @@ pkgbase = kactus2-git depends = qt5-base depends = qt5-xmlpatterns source = svn://svn.code.sf.net/p/kactus2/code/trunk - source = Kactus2.pri.patch - source = IPlugin.h.patch source = Makefile.patch md5sums = SKIP - md5sums = 71f78b07b45d926833160a251da484cc - md5sums = 0463894cd56b192df5e42b231f86874f md5sums = 4f6cd25d0891c11dd4adca5610d3ef55 pkgname = kactus2-git diff --git a/IPlugin.h.patch b/IPlugin.h.patch deleted file mode 100644 index 785c855fafcd..000000000000 --- a/IPlugin.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Plugins/PluginSystem/IPlugin.h -+++ Plugins/PluginSystem/IPlugin.h -@@ -12,7 +12,7 @@ - #ifndef IPLUGIN_H
- #define IPLUGIN_H
-
--#include "QWidget.h"
-+#include <QWidget>
- #include "PluginSettingsModel.h"
-
- #include <QString>
diff --git a/Kactus2.pri.patch b/Kactus2.pri.patch deleted file mode 100644 index 28cd07713675..000000000000 --- a/Kactus2.pri.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Kactus2.pri -+++ Kactus2.pri -@@ -433,8 +433,6 @@ - ./editors/ComponentEditor/treeStructure/SingleDesignInstantiationItem.h \
- ./editors/ComponentEditor/treeStructure/componenteditorrootitem.h \
- ./editors/ComponentEditor/treeStructure/componenteditorswpropertiesitem.h \
-- ./editors/ComponentEditor/treeStructure/componenteditorswviewitem.h \
-- ./editors/ComponentEditor/treeStructure/componenteditorswviewsitem.h \
- ./editors/ComponentEditor/treeStructure/ComponentEditorSystemViewItem.h \
- ./editors/ComponentEditor/treeStructure/ComponentEditorSystemViewsItem.h \
- ./editors/ComponentEditor/treeStructure/componenteditortreemodel.h \
@@ -1,7 +1,7 @@ # Maintainer: Adrien Prost-Boucle <adrien.prost-boucle@laposte.net> pkgname=kactus2-git -pkgver=3.2.225.0.svn2627 +pkgver=3.2.298.0.svn2649 pkgrel=1 pkgdesc="Open source IP-XACT-based tool for ASIC, FPGA and embedded systems design" @@ -14,14 +14,10 @@ makedepends=('qt5-tools') source=( 'svn://svn.code.sf.net/p/kactus2/code/trunk' - 'Kactus2.pri.patch' - 'IPlugin.h.patch' 'Makefile.patch' ) md5sums=( 'SKIP' - '71f78b07b45d926833160a251da484cc' - '0463894cd56b192df5e42b231f86874f' '4f6cd25d0891c11dd4adca5610d3ef55' ) @@ -36,18 +32,12 @@ pkgver() { echo $_distver.svn$_svnver; } -prepare() { - cd "trunk" - - patch -p0 -N -i "${startdir}"/Kactus2.pri.patch || true - patch -p0 -N -i "${startdir}"/IPlugin.h.patch || true -} - build() { cd "trunk" ./configure --prefix=/usr + # Patch the generated Makefile: fix some install recipes patch -p0 -N -i "${startdir}"/Makefile.patch make |