[arch-commits] Commit in libsavitar/repos/community-staging-x86_64 (4 files)

Evangelos Foutras foutrelis at archlinux.org
Wed Nov 11 15:10:20 UTC 2020


    Date: Wednesday, November 11, 2020 @ 15:10:19
  Author: foutrelis
Revision: 750932

archrelease: copy trunk to community-staging-x86_64

Added:
  libsavitar/repos/community-staging-x86_64/PKGBUILD
    (from rev 750931, libsavitar/trunk/PKGBUILD)
  libsavitar/repos/community-staging-x86_64/use_system_pugixml.patch
    (from rev 750931, libsavitar/trunk/use_system_pugixml.patch)
Deleted:
  libsavitar/repos/community-staging-x86_64/PKGBUILD
  libsavitar/repos/community-staging-x86_64/use_system_pugixml.patch

--------------------------+
 PKGBUILD                 |   82 ++++++++++++++++++++++-----------------------
 use_system_pugixml.patch |   44 ++++++++++++------------
 2 files changed, 63 insertions(+), 63 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-11 15:10:15 UTC (rev 750931)
+++ PKGBUILD	2020-11-11 15:10:19 UTC (rev 750932)
@@ -1,41 +0,0 @@
-# Maintainer: Jelle van der Waa <jelle at archlinux.org>
-# Contributor: neodarz <neodarz at neodarz.net>
-
-pkgname=libsavitar
-pkgver=4.7.1
-pkgrel=2
-pkgdesc="C++ implementation of 3mf loading with SIP python bindings"
-arch=('x86_64')
-url="https://github.com/Ultimaker/libsavitar"
-license=('AGPL')
-depends=('python' 'pugixml')
-makedepends=('cmake' 'python-sip' 'sip')
-source=($pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libSavitar//archive/${pkgver}.tar.gz use_system_pugixml.patch)
-sha512sums=('87fa67c90ab94ef9d2804f59b85f36ca9a9a443f6fc37ddd0f143f721269f7b5c9a0fd0d53c476f47bdee9a16fd8e604ac0fd157966762aab9ecbdfa79b349fb'
-            'b312dcf43bf334001da98da93388da99731eacf417fe3a9dff51831bdd1f0ab5487377925bebce05e227533be2680b1a45f3203b0a7b9de9a77280a206ec7b26')
-
-prepare() {
-  cd "libSavitar-${pkgver}"
-  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
-
-  # 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"/use_system_pugixml.patch
-}
-
-build() {
-  cd "libSavitar-${pkgver}"
-  mkdir  build && cd build
-  cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
-    -DCMAKE_BUILD_TYPE=Release
-  make
-}
-
-package() {
-  cd "libSavitar-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-}

Copied: libsavitar/repos/community-staging-x86_64/PKGBUILD (from rev 750931, libsavitar/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-11 15:10:19 UTC (rev 750932)
@@ -0,0 +1,41 @@
+# Maintainer: Jelle van der Waa <jelle at archlinux.org>
+# Contributor: neodarz <neodarz at neodarz.net>
+
+pkgname=libsavitar
+pkgver=4.7.1
+pkgrel=3
+pkgdesc="C++ implementation of 3mf loading with SIP python bindings"
+arch=('x86_64')
+url="https://github.com/Ultimaker/libsavitar"
+license=('AGPL')
+depends=('python' 'pugixml')
+makedepends=('cmake' 'python-sip' 'sip')
+source=($pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/libSavitar//archive/${pkgver}.tar.gz use_system_pugixml.patch)
+sha512sums=('87fa67c90ab94ef9d2804f59b85f36ca9a9a443f6fc37ddd0f143f721269f7b5c9a0fd0d53c476f47bdee9a16fd8e604ac0fd157966762aab9ecbdfa79b349fb'
+            'b312dcf43bf334001da98da93388da99731eacf417fe3a9dff51831bdd1f0ab5487377925bebce05e227533be2680b1a45f3203b0a7b9de9a77280a206ec7b26')
+
+prepare() {
+  cd "libSavitar-${pkgver}"
+  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
+
+  # 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"/use_system_pugixml.patch
+}
+
+build() {
+  cd "libSavitar-${pkgver}"
+  mkdir  build && cd build
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "libSavitar-${pkgver}/build"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: use_system_pugixml.patch
===================================================================
--- use_system_pugixml.patch	2020-11-11 15:10:15 UTC (rev 750931)
+++ use_system_pugixml.patch	2020-11-11 15:10:19 UTC (rev 750932)
@@ -1,22 +0,0 @@
-From b76fcd6da723cc725f2703d6c1b82b954a1bd03a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <feron.gabriel at gmail.com>
-Date: Tue, 18 Jun 2019 22:45:17 +0200
-Subject: [PATCH] Don't build pugixml
-
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eecd5e9..7ec2b2b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,8 +15,6 @@ if(BUILD_TESTS)
-     find_package(Threads QUIET)
- endif()
- 
--add_subdirectory(pugixml)
--
- if(BUILD_PYTHON)
-     list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
- 
--- 
-2.21.0
-

Copied: libsavitar/repos/community-staging-x86_64/use_system_pugixml.patch (from rev 750931, libsavitar/trunk/use_system_pugixml.patch)
===================================================================
--- use_system_pugixml.patch	                        (rev 0)
+++ use_system_pugixml.patch	2020-11-11 15:10:19 UTC (rev 750932)
@@ -0,0 +1,22 @@
+From b76fcd6da723cc725f2703d6c1b82b954a1bd03a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Gabriel=20F=C3=A9ron?= <feron.gabriel at gmail.com>
+Date: Tue, 18 Jun 2019 22:45:17 +0200
+Subject: [PATCH] Don't build pugixml
+
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index eecd5e9..7ec2b2b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,8 +15,6 @@ if(BUILD_TESTS)
+     find_package(Threads QUIET)
+ endif()
+ 
+-add_subdirectory(pugixml)
+-
+ if(BUILD_PYTHON)
+     list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+ 
+-- 
+2.21.0
+



More information about the arch-commits mailing list