diff options
| author | Xwang | 2016-04-30 16:44:18 +0200 |
|---|---|---|
| committer | Xwang | 2016-04-30 16:44:18 +0200 |
| commit | fe8432840cccd20e00338e4be2fae8e0f1c4d28c (patch) | |
| tree | d416df56c1eb3d220d3a81872d86ad97e3445cf9 | |
| parent | 0b64611ad016b06fe474e0c42327a2fd332e8f93 (diff) | |
| download | aur-fe8432840cccd20e00338e4be2fae8e0f1c4d28c.tar.gz | |
Added omedit.patch to solve OMEdit crash bug and upgrade release version
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | omedit.patch | 20 |
3 files changed, 29 insertions, 8 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Sat Apr 9 13:02:40 UTC 2016 pkgbase = openmodelica-git pkgdesc = The Open Source Modelica Suite pkgver = 1.10.0.dev.r329.g314a0a3 - pkgrel = 1 + pkgrel = 2 url = https://openmodelica.org arch = i686 arch = x86_64 @@ -41,6 +39,8 @@ pkgbase = openmodelica-git provides = openmodelica conflicts = openmodelica conflicts = openmodelica-svn + source = omedit.patch + md5sums = 79376887eb1c754893b2e1cf01720145 pkgname = openmodelica-git @@ -1,7 +1,7 @@ # Maintainer: Xwang <xwaang1976@gmail.com> pkgname=openmodelica-git pkgver=1.10.0.dev.r329.g314a0a3 -pkgrel=1 +pkgrel=2 pkgdesc="The Open Source Modelica Suite" arch=('i686' 'x86_64') url="https://openmodelica.org" @@ -14,11 +14,9 @@ makedepends=('autoconf' 'automake' 'libtool' 'gcc' 'gcc-fortran-multilib' 'boost provides=('openmodelica') conflicts=('openmodelica' 'openmodelica-svn') -#source=($pkgname::git+https://github.com/OpenModelica/OpenModelica) -#md5sums=('SKIP') +source=("omedit.patch") +md5sums=('79376887eb1c754893b2e1cf01720145') -source=() -md5sums=() prepare() { # clone all submodules @@ -31,6 +29,9 @@ prepare() { sed -i 's,../,https://github.com/OpenModelica/,g' .gitmodules git submodule sync git submodule update --init --recursive + cd "$srcdir" + patch -p1 < ${srcdir}/omedit.patch + cd "$srcdir/$pkgname" } pkgver() { diff --git a/omedit.patch b/omedit.patch new file mode 100644 index 000000000000..2ea6e999a173 --- /dev/null +++ b/omedit.patch @@ -0,0 +1,20 @@ +--- src/openmodelica-git/OMEdit/qjson/CMakeLists.txt 2016-04-30 15:46:03.528157798 +0200
++++ src/openmodelica-git/OMEdit/qjson/CMakeLists.txt 2016-04-30 11:23:51.000000000 +0200
+@@ -40,12 +40,12 @@
+ # (This will have no effect with CMake < 2.8)
+ SET(QT_USE_IMPORTED_TARGETS TRUE)
+
+-option(QT4_BUILD "Force building with Qt4 even if Qt5 is found")
+-IF (WIN32)
++#option(QT4_BUILD "Force building with Qt4 even if Qt5 is found")
++#IF (WIN32)
+ # set(QT4_BUILD ON)
+-ELSE(WIN32)
+-set(QT4_BUILD ON)
+-ENDIF(WIN32)
++#ELSE(WIN32)
++#set(QT4_BUILD ON)
++#ENDIF(WIN32)
+
+ IF (NOT QT4_BUILD)
+ FIND_PACKAGE( Qt5Core QUIET )
|