Github messages for voidlinux
 help / color / mirror / Atom feed
From: ScrelliCopter <ScrelliCopter@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] fsearch: update to 0.1.4 & fix unresolvable shlib
Date: Sat, 09 Jul 2022 12:48:29 +0200	[thread overview]
Message-ID: <20220709104829.NYoINHMMb8exy0Mo-vrWj3Hzw_Ld7bI_8yH01U9WE0Y@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37935@inbox.vuxu.org>

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

There is an updated pull request by ScrelliCopter against master on the void-packages repository

https://github.com/ScrelliCopter/void-packages fsearch-0.1.4
https://github.com/void-linux/void-packages/pull/37935

fsearch: update to 0.1.4 & fix unresolvable shlib
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**


Also fixed me not being able to update due to ```fsearch-0.1.2_2: broken, unresolvable shlib `libicuuc.so.70'``` introduced since last revbump.

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

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

From d71f18f5841f7d5814b09ad19efa55f6e7360ff2 Mon Sep 17 00:00:00 2001
From: a dinosaur <nick@a-dinosaur.com>
Date: Sat, 9 Jul 2022 19:43:43 +1000
Subject: [PATCH] fsearch: update to 0.1.4

---
 .../fsearch/patches/musl-no-malloc_trim.diff  | 38 ++++++++++++++++---
 srcpkgs/fsearch/template                      | 17 +++------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/srcpkgs/fsearch/patches/musl-no-malloc_trim.diff b/srcpkgs/fsearch/patches/musl-no-malloc_trim.diff
index fd6c7304fc32..49403a2c5f79 100644
--- a/srcpkgs/fsearch/patches/musl-no-malloc_trim.diff
+++ b/srcpkgs/fsearch/patches/musl-no-malloc_trim.diff
@@ -1,11 +1,39 @@
-diff -ruN fsearch-0.1/src/fsearch_database.c fsearch-0.1-musl/src/fsearch_database.c
---- fsearch-0.1/src/fsearch_database.c	2021-09-25 02:41:49.000000000 +1000
-+++ fsearch-0.1-musl/src/fsearch_database.c	2021-09-25 21:42:00.187684634 +1000
-@@ -1454,7 +1454,9 @@
+diff --git a/meson.build b/meson.build
+index 0e26bf5..9114af6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -12,7 +12,10 @@ cc = meson.get_compiler('c')
+ gnome = import('gnome')
+ i18n = import('i18n')
+ 
++have_malloc_trim = cc.has_function('malloc_trim')
++
+ config_h = configuration_data()
++config_h.set('HAVE_MALLOC_TRIM', have_malloc_trim)
+ config_h.set_quoted('APP_ID', app_id)
+ config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
+ config_h.set_quoted('VERSION', meson.project_version())
+diff --git a/src/fsearch_database.c b/src/fsearch_database.c
+index 8dcc9d0..80518b7 100644
+--- a/src/fsearch_database.c
++++ b/src/fsearch_database.c
+@@ -25,7 +25,11 @@
+ #include <fcntl.h>
+ #include <fnmatch.h>
+ #include <glib/gi18n.h>
++
++#ifdef HAVE_MALLOC_TRIM
+ #include <malloc.h>
++#endif
++
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <string.h>
+@@ -1459,7 +1463,9 @@ db_free(FsearchDatabase *db) {
  
      g_clear_pointer(&db, free);
  
-+#ifdef __GLIBC__
++#ifdef HAVE_MALLOC_TRIM
      malloc_trim(0);
 +#endif
  
diff --git a/srcpkgs/fsearch/template b/srcpkgs/fsearch/template
index cdf4e8056ec4..32d5cb6b4bc0 100644
--- a/srcpkgs/fsearch/template
+++ b/srcpkgs/fsearch/template
@@ -1,18 +1,13 @@
 # Template file for 'fsearch'
 pkgname=fsearch
-version=0.1.2
-revision=2
-build_style=gnu-configure
-hostmakedepends="autogen automake libtool pkg-config autoconf-archive
- gettext-devel glib-devel"
+version=0.1.4
+revision=1
+build_style=meson
+hostmakedepends="libtool pkg-config glib-devel gettext-devel"
 makedepends="gtk+3-devel"
 short_desc="Fast file search utility based on GTK+3"
-maintainer="a dinosaur <nick@a-dinosaur.com>"
+maintainer="a dinosaur <dino@a-dinosaur.com>"
 license="GPL-2.0-or-later"
 homepage="https://cboxdoerfer.github.io/fsearch/"
 distfiles="https://github.com/cboxdoerfer/fsearch/archive/${version}.tar.gz"
-checksum=f80e10922812169e8437476d5fbe6d05249997c49b98f991d382a6d5566551b4
-
-pre_configure() {
-	./autogen.sh
-}
+checksum=289c19136f89712100ff8f6ad4e7cbbdfbd2938a7c076c85c45658f5c36fc7fd

  parent reply	other threads:[~2022-07-09 10:48 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-09  9:52 [PR PATCH] " ScrelliCopter
2022-07-09  9:57 ` paper42
2022-07-09  9:57 ` paper42
2022-07-09 10:48 ` ScrelliCopter [this message]
2022-07-09 10:49 ` ScrelliCopter
2022-10-08  2:13 ` fsearch: update to 0.1.4 github-actions
2022-10-08  3:48 ` [PR PATCH] [Closed]: " ScrelliCopter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220709104829.NYoINHMMb8exy0Mo-vrWj3Hzw_Ld7bI_8yH01U9WE0Y@z \
    --to=screllicopter@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).