Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] recoll: update to 1.32.7.
@ 2022-08-25 11:52 dmarto
  2022-08-25 17:06 ` [PR REVIEW] " classabbyamp
                   ` (22 more replies)
  0 siblings, 23 replies; 24+ messages in thread
From: dmarto @ 2022-08-25 11:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 609 bytes --]

There is a new pull request by dmarto against master on the void-packages repository

https://github.com/dmarto/void-packages recoll
https://github.com/void-linux/void-packages/pull/38902

recoll: update to 1.32.7.
#### Testing the changes
- I tested the changes in this PR: **YES**

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)

---

- enable python module 
- update version check page
- explicit conf args
- proper (host)makedepends
- update musl patches

A patch file from https://github.com/void-linux/void-packages/pull/38902.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-recoll-38902.patch --]
[-- Type: text/x-diff, Size: 4280 bytes --]

From 1f27bc691138fe1c6ce217fc2b3358bba5b6dc59 Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Thu, 25 Aug 2022 03:30:03 +0300
Subject: [PATCH] recoll: update to 1.32.7.

- enable python module
- update version check page
- explicit conf args
- proper (host)makedepends
- update musl patches
---
 srcpkgs/recoll/patches/musl.patch | 39 ++++++++++++++++++++++---------
 srcpkgs/recoll/template           | 19 ++++++++-------
 srcpkgs/recoll/update             |  2 +-
 3 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/srcpkgs/recoll/patches/musl.patch b/srcpkgs/recoll/patches/musl.patch
index c83d0f553c8a..d633e92b9df1 100644
--- a/srcpkgs/recoll/patches/musl.patch
+++ b/srcpkgs/recoll/patches/musl.patch
@@ -1,5 +1,5 @@
-Index: utils/fstreewalk.cpp
-===================================================================
+diff --git a/utils/fstreewalk.cpp b/utils/fstreewalk.cpp
+index fc43edc..5e28d6e 100644
 --- a/utils/fstreewalk.cpp
 +++ b/utils/fstreewalk.cpp
 @@ -17,6 +17,7 @@
@@ -10,16 +10,33 @@ Index: utils/fstreewalk.cpp
  #include <stdio.h>
  
  #include <errno.h>
-Index: utils/pxattr.cpp
-===================================================================
---- a/utils/pxattr.cpp	2017-07-03 14:14:46.000000000 +0200
-+++ b/utils/pxattr.cpp	2017-12-17 14:34:29.955674837 +0100
-@@ -44,7 +44,7 @@
- // just let the methods return errors (like they would on a non-xattr
- // fs on e.g. linux)
+diff --git a/utils/pxattr.cpp b/utils/pxattr.cpp
+index 3a1f8f5..dcb93fc 100644
+--- a/utils/pxattr.cpp
++++ b/utils/pxattr.cpp
+@@ -46,7 +46,7 @@
  
--#if defined(__DragonFly__) || defined(__OpenBSD__)
-+#if defined(__DragonFly__) || defined(__OpenBSD__) || !defined(__GLIBC__)
+ // Not exactly true for win32, but makes my life easier by avoiding ifdefs in recoll (the calls just
+ // fail, which is expected)
+-#if defined(__DragonFly__) || defined(__OpenBSD__) || defined(_WIN32)
++#if defined(__DragonFly__) || defined(__OpenBSD__) || defined(_WIN32) || !defined(__GLIBC__)
  #define HAS_NO_XATTR
  #endif
+
+diff --git a/common/conf_post.h b/common/conf_post.h
+index 7093ead..0ecd56b 100644
+--- a/common/conf_post.h
++++ b/common/conf_post.h
+@@ -73,12 +73,4 @@ typedef int ssize_t;
+ #define REAL_GCC   __GNUC__ // probably
+ #endif
  
+-#ifdef REAL_GCC
+-// Older gcc versions pretended to supply std::regex, but the resulting programs mostly crashed.
+-#include <features.h>
+-#if ! __GNUC_PREREQ(6,0)
+-#define NO_STD_REGEX 1
+-#endif
+-#endif
+-
+ #endif /* INCLUDED */
diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template
index 8c5de6966a46..61cf006d7a0f 100644
--- a/srcpkgs/recoll/template
+++ b/srcpkgs/recoll/template
@@ -1,18 +1,21 @@
 # Template file for 'recoll'
 pkgname=recoll
-version=1.30.0
+version=1.32.7
 revision=1
 build_style=gnu-configure
 build_helper=qmake
-configure_args="--disable-python-module --disable-python-chm
- --enable-recollq --disable-x11mon"
-hostmakedepends="automake libtool gettext-devel qt5-qmake pkg-config
- qt5-host-tools"
-makedepends="xapian-core-devel zlib-devel libuuid-devel qt5-webkit-devel qt5-devel
- aspell-devel libxslt-devel libxml2-devel"
+configure_args="--enable-recollq --disable-python-chm --disable-x11mon
+ --disable-webkit --without-systemd"
+hostmakedepends="pkg-config gettext-devel qt5-qmake qt5-host-tools
+ which python3-setuptools python3-devel"
+makedepends="libxslt-devel xapian-core-devel zlib-devel qt5-devel"
 short_desc="Full text search tool based on Xapian backend"
 maintainer="Rui Abreu Ferreira <raf-ep@gmx.com>"
 license="GPL-2.0-or-later"
 homepage="https://www.lesbonscomptes.com/recoll/"
 distfiles="https://www.lesbonscomptes.com/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=17a8e684a8d5560dc7b44cd4b2962cb46476a75bdc107f622051235076d11885
+checksum=ca08a6f4bb0b519bf915a062a9b7aadc4f343473cc1f07895708208d66337dba
+
+if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ]; then
+	nocross="setup.py can not configure proper cross"
+fi
diff --git a/srcpkgs/recoll/update b/srcpkgs/recoll/update
index dcc285e571f0..afe7c791114e 100644
--- a/srcpkgs/recoll/update
+++ b/srcpkgs/recoll/update
@@ -1 +1 @@
-site="https://www.lesbonscomptes.com/recoll/download.html"
+site="https://www.lesbonscomptes.com/recoll/pages/download.html"

^ permalink raw reply	[flat|nested] 24+ messages in thread
end of thread, other threads:[~2022-08-30 16:38 UTC | newest]

Thread overview: 24+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-25 11:52 [PR PATCH] recoll: update to 1.32.7 dmarto
2022-08-25 17:06 ` [PR REVIEW] " classabbyamp
2022-08-25 17:09 ` classabbyamp
2022-08-25 17:11 ` classabbyamp
2022-08-25 17:33 ` dmarto
2022-08-25 17:33 ` dmarto
2022-08-25 17:35 ` [PR PATCH] [Updated] " dmarto
2022-08-25 17:35 ` [PR REVIEW] " dmarto
2022-08-25 17:37 ` dmarto
2022-08-25 17:38 ` dmarto
2022-08-25 17:38 ` classabbyamp
2022-08-25 18:02 ` dmarto
2022-08-25 18:03 ` classabbyamp
2022-08-25 18:20 ` classabbyamp
2022-08-25 18:20 ` classabbyamp
2022-08-25 19:11 ` [PR PATCH] [Updated] " dmarto
2022-08-25 19:12 ` [PR REVIEW] " dmarto
2022-08-25 19:12 ` dmarto
2022-08-25 19:15 ` dmarto
2022-08-30  3:29 ` [PR REVIEW] " classabbyamp
2022-08-30  3:29 ` classabbyamp
2022-08-30 11:40 ` [PR PATCH] [Updated] " dmarto
2022-08-30 11:48 ` [PR REVIEW] " dmarto
2022-08-30 16:38 ` [PR PATCH] [Merged]: " classabbyamp

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).