Version 0.1.7-1

3 files changed, 8 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66cae92b2e4e..e4dc4e5a7215 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = librepcb
 	pkgdesc = A free EDA software to develop printed circuit boards
-	pkgver = 0.1.6
-	pkgrel = 3
+	pkgver = 0.1.7
+	pkgrel = 1
 	url = https://librepcb.org/
 	arch = x86_64
 	arch = i686
@@ -15,12 +15,10 @@ pkgbase = librepcb
 	depends = muparser
 	depends = polyclipping
 	depends = quazip
-	source = https://download.librepcb.org/releases/0.1.6/librepcb-0.1.6-source.zip
-	source = https://download.librepcb.org/releases/0.1.6/librepcb-0.1.6-source.zip.asc
-	source = cmake-muparser-fix.patch
+	source = https://download.librepcb.org/releases/0.1.7/librepcb-0.1.7-source.zip
+	source = https://download.librepcb.org/releases/0.1.7/librepcb-0.1.7-source.zip.asc
 	validpgpkeys = D6F9AF572228C5BCD6B538407EF3061F5C8D5E25
-	sha256sums = 8c7bf475ed59eb5b5e4b13073b96b9468ee01fb6980ef2b3471b1fbb39c46721
+	sha256sums = 4c9e90ca61c94e537cab0632e684350873673d693f1c8837c916001d8896a6ad
 	sha256sums = SKIP
-	sha256sums = a59a830a77f7401c5dea02172eaee54ba40953b04404a393cf2314e4002410eb
 
 pkgname = librepcb
diff --git a/PKGBUILD b/PKGBUILD
index 8842206c79e5..818901f70748 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,9 +7,9 @@
 # See https://wiki.archlinux.org/index.php/Makepkg#Signature_checking
 # for more details # on package signing.
 pkgname=librepcb
-pkgver=0.1.6
+pkgver=0.1.7
 _pkgver=${pkgver/_/-}
-pkgrel=3
+pkgrel=1
 pkgdesc="A free EDA software to develop printed circuit boards"
 arch=('x86_64' 'i686')
 url="https://librepcb.org/"
@@ -30,23 +30,15 @@ makedepends=(
 source=(
   "https://download.librepcb.org/releases/${_pkgver}/librepcb-${_pkgver}-source.zip"
   "https://download.librepcb.org/releases/${_pkgver}/librepcb-${_pkgver}-source.zip.asc"
-  "cmake-muparser-fix.patch"
 )
 sha256sums=(
-  '8c7bf475ed59eb5b5e4b13073b96b9468ee01fb6980ef2b3471b1fbb39c46721'
+  '4c9e90ca61c94e537cab0632e684350873673d693f1c8837c916001d8896a6ad'
   'SKIP'
-  'a59a830a77f7401c5dea02172eaee54ba40953b04404a393cf2314e4002410eb'
 )
 validpgpkeys=('D6F9AF572228C5BCD6B538407EF3061F5C8D5E25')
 
 prepare() {
   cd "${srcdir}/librepcb-${_pkgver}/"
-
-  # Patch muparser include path
-  sed -i 's/muparser\/include\/muParser.h/muParser.h/' libs/librepcb/common/utils/mathparser.cpp
-
-  # Apply CMake fix (https://github.com/LibrePCB/LibrePCB/pull/970)
-  patch -p1 < "${srcdir}/cmake-muparser-fix.patch"
 }
 
 build() {
diff --git a/cmake-muparser-fix.patch b/cmake-muparser-fix.patch
deleted file mode 100644
index 5299878ac824..000000000000
--- a/cmake-muparser-fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b65dc1b766fc54da3117d44f612f6a93d5caa602 Mon Sep 17 00:00:00 2001
-From: Danilo Bargen <mail@dbrgn.ch>
-Date: Mon, 18 Apr 2022 21:05:43 +0200
-Subject: [PATCH] CMake: Add alias for muparser target
-
-Building LibrePCB with unbundled MuParser on Arch Linux currently fails,
-because the target `MuParser::MuParser` is not defined. Because this
-used to work before, I assume the target was renamed from
-`MuParser::MuParser` to `muparser::muparser` some time ago.
-
-To fix this, add an alias if the CMake package was found, but the pascal
-case alias isn't defined yet.
----
- cmake/FindMuParser.cmake | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/cmake/FindMuParser.cmake b/cmake/FindMuParser.cmake
-index 193898d8c..2e113d084 100644
---- a/cmake/FindMuParser.cmake
-+++ b/cmake/FindMuParser.cmake
-@@ -37,6 +37,11 @@ find_package(muparser 2.0 QUIET)
- if(muparser_FOUND)
-   message(STATUS "Using system MuParser")
- 
-+  # Add uppercase alias if only the lowercase target is defined
-+  if(NOT TARGET MuParser::MuParser)
-+    add_library(MuParser::MuParser ALIAS muparser::muparser)
-+  endif()
-+
-   # Stop here, we're done
-   return()
- endif()