[arch-commits] Commit in libsavitar (repos/community-x86_64/PKGBUILD trunk/PKGBUILD)
Eli Schwartz
eschwartz at archlinux.org
Wed Sep 5 15:17:02 UTC 2018
Date: Wednesday, September 5, 2018 @ 15:17:01
Author: eschwartz
Revision: 376949
fix mismatched checksums due to git diffstat differences in header
also use unique download filename
add comment clarifying why this patch exists
Modified:
libsavitar/repos/community-x86_64/PKGBUILD
libsavitar/trunk/PKGBUILD
---------------------------------+
repos/community-x86_64/PKGBUILD | 9 ++++++---
trunk/PKGBUILD | 9 ++++++---
2 files changed, 12 insertions(+), 6 deletions(-)
Modified: repos/community-x86_64/PKGBUILD
===================================================================
--- repos/community-x86_64/PKGBUILD 2018-09-05 15:09:31 UTC (rev 376948)
+++ repos/community-x86_64/PKGBUILD 2018-09-05 15:17:01 UTC (rev 376949)
@@ -11,7 +11,7 @@
depends=('python' 'pugixml')
makedepends=('cmake' 'python-sip' 'sip')
source=($pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libSavitar//archive/${pkgver}.tar.gz
- pugixml.patch::https://github.com/Ultimaker/libSavitar/commit/91aa70c6320461ae65600dce954b5ffb905b7039.patch)
+ https://github.com/Ultimaker/libSavitar/pull/8/commits/91aa70c6320461ae65600dce954b5ffb905b7039.patch)
prepare() {
cd "libSavitar-${pkgver}"
@@ -18,7 +18,10 @@
sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages,DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura),DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura),g' CMakeLists.txt
- patch -Np1 -i $srcdir/pugixml.patch
+ # don't install a second system pugixml; WONTFIX upstream due to:
+ # "It's been decided that an external dependency makes setting up your
+ # development environment for Cura needlessly difficult."
+ patch -Np1 -i "$srcdir"/91aa70c6320461ae65600dce954b5ffb905b7039.patch
}
build() {
@@ -36,4 +39,4 @@
make DESTDIR="${pkgdir}" install
}
md5sums=('39ae53b073b5856dcebdeeaa43ca3b3b'
- '4df1132abcbc1955adac77d4713dfdf7')
+ '8cb2ef4a8ff551114ac8520c6be42ec6')
Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD 2018-09-05 15:09:31 UTC (rev 376948)
+++ trunk/PKGBUILD 2018-09-05 15:17:01 UTC (rev 376949)
@@ -11,7 +11,7 @@
depends=('python' 'pugixml')
makedepends=('cmake' 'python-sip' 'sip')
source=($pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libSavitar//archive/${pkgver}.tar.gz
- pugixml.patch::https://github.com/Ultimaker/libSavitar/commit/91aa70c6320461ae65600dce954b5ffb905b7039.patch)
+ https://github.com/Ultimaker/libSavitar/pull/8/commits/91aa70c6320461ae65600dce954b5ffb905b7039.patch)
prepare() {
cd "libSavitar-${pkgver}"
@@ -18,7 +18,10 @@
sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages,DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages,g' CMakeLists.txt
sed -i 's,DESTINATION lib/python${PYTHON_VERSION_MAJOR}/dist-packages/cura),DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/cura),g' CMakeLists.txt
- patch -Np1 -i $srcdir/pugixml.patch
+ # don't install a second system pugixml; WONTFIX upstream due to:
+ # "It's been decided that an external dependency makes setting up your
+ # development environment for Cura needlessly difficult."
+ patch -Np1 -i "$srcdir"/91aa70c6320461ae65600dce954b5ffb905b7039.patch
}
build() {
@@ -36,4 +39,4 @@
make DESTDIR="${pkgdir}" install
}
md5sums=('39ae53b073b5856dcebdeeaa43ca3b3b'
- '4df1132abcbc1955adac77d4713dfdf7')
+ '8cb2ef4a8ff551114ac8520c6be42ec6')
More information about the arch-commits
mailing list