From 9cb80b44aa8c9eacd484e340f2f43b3755c14ced Mon Sep 17 00:00:00 2001
From: CharonXin <91298205+MengXinxin1@users.noreply.github.com>
Date: Fri, 7 Jul 2023 22:55:25 +0800
Subject: [PATCH] pdfhummus: add 4.5.7 (#2283)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add v4.5.7 for pdfhummus

* Revert "add v4.5.7 for pdfhummus"

This reverts commit 07f1165ee9806e4e98b942e2df019f27d226151e.

* add 4.5.7 version for pdfhummus

* modify some details

* pkgconf: Update urls

* Update xmake.lua

* libaesgm: fix compilation on Windows ARM

* Update xmake.lua

* Update xmake.lua

---------

Co-authored-by: Jérôme Leclercq <lynix680@gmail.com>
---
 packages/l/libaesgm/xmake.lua  |  8 ++++++++
 packages/p/pdfhummus/xmake.lua |  1 +
 packages/p/pkgconf/xmake.lua   | 19 +++++++++++++------
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/packages/l/libaesgm/xmake.lua b/packages/l/libaesgm/xmake.lua
index da8f3e369..826944cee 100644
--- a/packages/l/libaesgm/xmake.lua
+++ b/packages/l/libaesgm/xmake.lua
@@ -7,6 +7,14 @@ package("libaesgm")
     add_versions("2013.1.1", "102353a486126c91ccab791c3e718d056d8fbb1be488da81b26561bc7ef4f363")
 
     on_install("linux", "macosx", "windows", "mingw", function (package)
+        if package:is_plat("windows", "mingw") and package:is_arch("arm", "arm64") then
+            -- Windows is always little endian
+            io.replace("brg_endian.h", [[
+#elif 0     /* **** EDIT HERE IF NECESSARY **** */
+#  define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN]], [[
+#elif 1     /* Edited: Windows ARM is little endian */
+#  define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN]], { plain = true })
+        end
         local configs = {}
         io.writefile("xmake.lua", [[
             add_rules("mode.release", "mode.debug")
diff --git a/packages/p/pdfhummus/xmake.lua b/packages/p/pdfhummus/xmake.lua
index fe846b1bc..a89d43530 100644
--- a/packages/p/pdfhummus/xmake.lua
+++ b/packages/p/pdfhummus/xmake.lua
@@ -8,6 +8,7 @@ package("pdfhummus")
              "https://github.com/galkahana/PDF-Writer.git")
     add_versions("4.1", "0c0d860b0ecea928709b9e4642fa21926eb2f626f702699c3b87afa2965b4857")
     add_versions("4.5.6", "72a4f3fbbc39d4f169911454e9977ef8dd882bd5c0a305bd3133347903cff705")
+    add_versions("4.5.7", "191f39dcc61522c50a3bee96b3f0ccef208c27968fd22d5ab474acb512c24d10")
 
     add_deps("freetype", "zlib", "libaesgm")
 
diff --git a/packages/p/pkgconf/xmake.lua b/packages/p/pkgconf/xmake.lua
index b270d2566..72615fdcf 100644
--- a/packages/p/pkgconf/xmake.lua
+++ b/packages/p/pkgconf/xmake.lua
@@ -1,13 +1,20 @@
 package("pkgconf")
-
     set_kind("binary")
     set_homepage("http://pkgconf.org")
     set_description("A program which helps to configure compiler and linker flags for development frameworks.")
 
-    add_urls("https://distfiles.dereferenced.org/pkgconf/pkgconf-$(version).tar.xz")
-    add_versions("1.7.4", "d73f32c248a4591139a6b17777c80d4deab6b414ec2b3d21d0a24be348c476ab")
-    add_versions("1.8.0", "ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf")
-    add_versions("1.9.3", "5fb355b487d54fb6d341e4f18d4e2f7e813a6622cf03a9e87affa6a40565699d")
+    add_urls("https://distfiles.ariadne.space/pkgconf/pkgconf-$(version).tar.xz", {alias = "tarball"})
+    add_urls("https://github.com/pkgconf/pkgconf.git", {alias = "git"})
+    add_versions("tarball:1.7.4", "d73f32c248a4591139a6b17777c80d4deab6b414ec2b3d21d0a24be348c476ab")
+    add_versions("tarball:1.8.0", "ef9c7e61822b7cb8356e6e9e1dca58d9556f3200d78acab35e4347e9d4c2bbaf")
+    add_versions("tarball:1.9.3", "5fb355b487d54fb6d341e4f18d4e2f7e813a6622cf03a9e87affa6a40565699d")
+    add_versions("tarball:1.9.4", "daccf1bbe5a30d149b556c7d2ffffeafd76d7b514e249271abdd501533c1d8ae")
+    add_versions("tarball:1.9.5", "1ac1656debb27497563036f7bffc281490f83f9b8457c0d60bcfb638fb6b6171")
+    add_versions("git:1.7.4", "pkgconf-1.7.4")
+    add_versions("git:1.8.0", "pkgconf-1.8.0")
+    add_versions("git:1.9.3", "pkgconf-1.9.3")
+    add_versions("git:1.9.4", "pkgconf-1.9.4")
+    add_versions("git:1.9.5", "pkgconf-1.9.5")
 
     on_load(function (package)
         if not package:is_precompiled() and is_host("windows") then
@@ -20,7 +27,7 @@ package("pkgconf")
     end)
 
     on_install("@windows", function(package)
-        import("package.tools.meson").install(package, {"-Dtests=false"})
+        import("package.tools.meson").install(package, {"-Dtests=disabled"})
         local bindir = package:installdir("bin")
         os.cp(path.join(bindir, "pkgconf.exe"), path.join(bindir, "pkg-config.exe"))
     end)