<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2c827c6432ea75095eaae8e7e1342aeefe35b3f9">https://github.com/macports/macports-ports/commit/2c827c6432ea75095eaae8e7e1342aeefe35b3f9</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2c827c6432e pdfgrep: Update to 2.1.2 and fix build on <= 10.7
</span>2c827c6432e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2c827c6432ea75095eaae8e7e1342aeefe35b3f9
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 2 19:22:23 2021 -0600
<span style='display:block; white-space:pre;color:#404040;'> pdfgrep: Update to 2.1.2 and fix build on <= 10.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/62108
</span>---
textproc/pdfgrep/Portfile | 18 +++++++------
textproc/pdfgrep/files/scandir.patch | 50 ++++++++++++++++++++++++++++++++++++
2 files changed, 60 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pdfgrep/Portfile b/textproc/pdfgrep/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bbe5324a188..90e8f3e18e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/pdfgrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/pdfgrep/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,12 @@
</span> PortSystem 1.0
name pdfgrep
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.1.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 59fe7845f96c988a3f96cf324a0bb72fcc6d8b97 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0ef3dca1d749323f08112ffe68e6f4eb7bc25f56f90a2e933db477261b082aba \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 197289
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> conflicts pdfgrep-legacy
categories textproc
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,12 +16,8 @@ description A tool to search text in PDF files.
</span> long_description \
Pdfgrep is a tool to search text in PDF files. It works similar to grep.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://pdfgrep.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://pdfgrep.org/download/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ef5df881b370e0342f33f9775cb156adb796027d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2c8155f30fe5d9d8ec4340e48133ed0b241496bbebe29498931f975c67a10c0b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 196526
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://pdfgrep.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}/download/
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,6 +26,8 @@ depends_lib port:poppler \
</span> port:pcre \
port:libgcrypt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles scandir.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --without-unac
variant unac description {Use unac to remove accents and ligatures before searching} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/pdfgrep/files/scandir.patch b/textproc/pdfgrep/files/scandir.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e9c0a788239
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/pdfgrep/files/scandir.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,50 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The prototype of scandir changed in the 10.8 SDK. Use the old prototype on old SDKs.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.com/pdfgrep/pdfgrep/-/merge_requests/14
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cache.cc.orig 2018-11-19 05:44:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cache.cc 2021-12-02 18:31:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,6 +35,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <errno.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <string.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define HAVE_NEW_SCANDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < 1080)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef HAVE_NEW_SCANDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using namespace std;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Cache::Cache(string cache_file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -86,9 +95,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // I feel so bad...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static const char *cache_directory;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int agesort(const struct dirent ** a, const struct dirent **b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::string A = string(cache_directory) + "/" + (*a)->d_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::string B = string(cache_directory) + "/" + (*b)->d_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_NEW_SCANDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int agesort(const struct dirent **a, const struct dirent **b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int agesort(const void *a, const void *b) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::string A = string(cache_directory) + "/" + (*(const struct dirent **)a)->d_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::string B = string(cache_directory) + "/" + (*(const struct dirent **)b)->d_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat bufa, bufb;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (stat(A.c_str(), &bufa) != 0) return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,7 +110,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return bufb.st_mtime - bufa.st_mtime;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-static int agefilter(const struct dirent * a) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef HAVE_NEW_SCANDIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int agefilter(const struct dirent *a) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static int agefilter(struct dirent *a) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (a->d_name[0] == '.') return false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string A = string(cache_directory) + "/" + a->d_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct stat bufa;
</span></pre><pre style='margin:0'>
</pre>