[arch-commits] Commit in libappimage/trunk (PKGBUILD libappimage-gcc10.patch)

[Antonio Rojas]

    Date: Friday, January 21, 2022 @ 15:41:42
  Author: arojas
Revision: 434857

Update to 1.0.4

Modified:
  libappimage/trunk/PKGBUILD
Deleted:
  libappimage/trunk/libappimage-gcc10.patch

-------------------------+
 PKGBUILD                |   18 +++++-----------
 libappimage-gcc10.patch |   50 ----------------------------------------------
 2 files changed, 6 insertions(+), 62 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-21 15:26:56 UTC (rev 434856)
+++ PKGBUILD	2022-01-21 15:41:42 UTC (rev 434857)
@@ -1,23 +1,17 @@
 # Maintainer: Antonio Rojas <arojas at archlinux.org>
 
 pkgname=libappimage
-pkgver=1.0.3
-pkgrel=5
-pkgdesc="Reference implementation of the AppImage specification"
+pkgver=1.0.4
+pkgrel=1
+pkgdesc='Reference implementation of the AppImage specification'
 arch=(x86_64)
-url="https://appimage.org/"
+url='https://appimage.org/'
 license=(GPL)
 depends=(libarchive squashfuse boost-libs librsvg)
 makedepends=(cmake wget vim desktop-file-utils boost xdg-utils-cxx)
-source=($pkgname-$pkgver.tar.gz::"https://github.com/AppImage/libappimage/archive/v$pkgver.tar.gz"
-        libappimage-gcc10.patch)
-sha256sums=('36a2a3c5a158301d7ed6d6996a82ac953549c99232b5b88d116e99f42175bc6b'
-            'bd2eb7a270c5e75f55d5d2be1aba4e9b12815c1ad826eb403a66f111e89dcca9')
+source=(https://github.com/AppImage/libappimage/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha256sums=('2af2adb682e8bf67dd726e79b3bc3af5a0d7c1533848bda56efa5cafa0dac931')
 
-prepare() {
-  patch -d $pkgname-$pkgver -p1 -i ../libappimage-gcc10.patch # Fix build with GCC 10
-}
-
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \

Deleted: libappimage-gcc10.patch
===================================================================
--- libappimage-gcc10.patch	2022-01-21 15:26:56 UTC (rev 434856)
+++ libappimage-gcc10.patch	2022-01-21 15:41:42 UTC (rev 434857)
@@ -1,50 +0,0 @@
-diff --git a/src/libappimage/utils/StringSanitizer.cpp b/src/libappimage/utils/StringSanitizer.cpp
-index fee9f7d..521d82e 100644
---- a/src/libappimage/utils/StringSanitizer.cpp
-+++ b/src/libappimage/utils/StringSanitizer.cpp
-@@ -13,6 +13,20 @@ std::string StringSanitizer::sanitizeForPath() {
-     std::vector<std::string::value_type> buffer{};
-     buffer.reserve(input_.size());
- 
-+    // these three lists can be used to compose alphabets for sanitization
-+    static constexpr std::initializer_list<std::string::value_type> asciiLetters_ = {
-+        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
-+        'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-+        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-+        'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-+    };
-+    static constexpr std::initializer_list<std::string::value_type> asciiDigits_ = {
-+        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
-+    };
-+    static constexpr std::initializer_list<std::string::value_type> pathSafeChars_ = {
-+        '.', '-', '_'
-+    };
-+
-     // first of all, we compose an alphabet of safe characters
-     // all characters not contained in this alphabet will be replaced by some safe character, e.g., an underscore (_)
-     std::vector<std::string::value_type> safeAlphabet{asciiDigits_.size() + asciiLetters_.size() + pathSafeChars_.size()};
-diff --git a/src/libappimage/utils/StringSanitizer.h b/src/libappimage/utils/StringSanitizer.h
-index 5301ec1..9919ed6 100644
---- a/src/libappimage/utils/StringSanitizer.h
-+++ b/src/libappimage/utils/StringSanitizer.h
-@@ -10,20 +10,6 @@ class StringSanitizer {
- private:
-     std::string input_;
- 
--    // these three lists can be used to compose alphabets for sanitization
--    static constexpr std::initializer_list<std::string::value_type> asciiLetters_ = {
--        'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm',
--        'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
--        'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
--        'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
--    };
--    static constexpr std::initializer_list<std::string::value_type> asciiDigits_ = {
--        '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
--    };
--    static constexpr std::initializer_list<std::string::value_type> pathSafeChars_ = {
--        '.', '-', '_'
--    };
--
- public:
-     /**
-      * Default constructor.