diff --git a/mingw-w64-openscad/01-glew-library.patch b/mingw-w64-openscad/01-glew-library.patch deleted file mode 100644 index 8586f355e8..0000000000 --- a/mingw-w64-openscad/01-glew-library.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur openscad-2014.03-orig/glew.pri openscad-2014.03/glew.pri ---- openscad-2014.03-orig/glew.pri 2014-02-06 08:21:04.000000000 +0300 -+++ openscad-2014.03/glew.pri 2014-12-16 08:01:54.342600000 +0300 -@@ -9,6 +9,6 @@ - } - - unix:LIBS += -lGLEW -- win32:LIBS += -lglew32s -+ win32:LIBS += -lglew32 - CONFIG(mingw-cross-env):DEFINES += GLEW_STATIC - } diff --git a/mingw-w64-openscad/PKGBUILD b/mingw-w64-openscad/PKGBUILD index f2b4b9f073..c570842750 100644 --- a/mingw-w64-openscad/PKGBUILD +++ b/mingw-w64-openscad/PKGBUILD @@ -2,7 +2,7 @@ _realname=openscad pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}" -pkgver=2014.03 +pkgver=2015.03 pkgrel=1 pkgdesc="The programmers solid 3D CAD modeller (mingw-w64)" arch=('any') @@ -18,16 +18,12 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-eigen3" "${MINGW_PACKAGE_PREFIX}-imagemagick") options=(!strip staticlibs !buildflags) -source=("http://files.openscad.org/${_realname}-${pkgver}.src.tar.gz" - 01-glew-library.patch) -md5sums=('38bebd02bce365fe39e695a07411ab73' - '0096cdf8865d85115713a28c12b81bd8') +source=("http://files.openscad.org/${_realname}-${pkgver}.src.tar.gz") +md5sums=('d1daed0ba048141bb910cfcadf8838e3') prepare() { cd "${srcdir}/${_realname}-${pkgver}" rm -f libraries/MCAD/*.py - - patch -p1 -i ${srcdir}/01-glew-library.patch } build() { @@ -37,8 +33,7 @@ build() { EIGENDIR=${MINGW_PREFIX} \ GLEWDIR=${MINGW_PREFIX} \ OPENCSGDIR=${MINGW_PREFIX} \ - OPENSCAD_LIBRARIES=${MINGW_PREFIX} \ - ${MINGW_PREFIX}/bin/qmake PREFIX="${MINGW_PREFIX}" VERSION="$pkgver" + ${MINGW_PREFIX}/bin/qmake CONFIG+=release PREFIX="${pkgdir}${MINGW_PREFIX}" VERSION="${pkgver}" make -j1 convert "icons/${_realname}.png" -resize 128x128\> "icons/${_realname}-128.png" @@ -46,6 +41,6 @@ build() { package() { cd ${srcdir}/${_realname}-${pkgver} - make INSTALL_ROOT="$pkgdir" install + make INSTALL_ROOT= install install -Dm644 "icons/${_realname}.xml" "${pkgdir}${MINGW_PREFIX}/share/mime/packages/${_realname}.xml" }