pyrox.dev / nixpkgs
lol
fork atom

recoll: 1.39.1 -> 1.43.2 (#414547)

authored by

Peder Bergebakken Sundt and committed by
GitHub 36c9fc5a 9541941f

+13 -43
unified split
+11 -25
pkgs/applications/search/recoll/0001-no-qtgui-darwin-bundle.patch
··· 1 - From 9a0102fe1da038ebe08107ead991964df11b0271 Mon Sep 17 00:00:00 2001 2 - From: annalee <150648636+a-n-n-a-l-e-e@users.noreply.github.com> 3 - Date: Mon, 19 Feb 2024 03:31:20 +0000 4 - Subject: [PATCH] no qtgui darwin bundle 5 - 6 - --- 7 - qtgui/recoll.pro.in | 11 +++++++++-- 8 - 1 file changed, 9 insertions(+), 2 deletions(-) 9 - 10 - diff --git a/qtgui/recoll.pro.in b/qtgui/recoll.pro.in 11 - index a0ef314..6dbc3b5 100644 12 --- a/qtgui/recoll.pro.in 13 +++ b/qtgui/recoll.pro.in 14 - @@ -180,7 +180,7 @@ windows { 15 - } 16 } 17 18 - -macx: { 19 +if (false) { 20 - QCBUILDLOC=Qt_6_4_2_for_macOS 21 - 22 - # QT += webkit webkitwidgets 23 - @@ -375,7 +375,7 @@ macx: { 24 QMAKE_BUNDLE_DATA = APP_EXAMPLES APP_EXAMPLES_MAC APP_FILTERS APP_IMAGES APP_DOC 25 } 26 27 - -unix:!macx { 28 +unix { 29 30 VPATH = @srcdir@ 31 - 32 - @@ -400,6 +400,13 @@ VPATH = @srcdir@ 33 SOURCES += crontool.cpp \ 34 rtitool.cpp 35 36 - + macx { 37 + SOURCES += ../utils/closefrom.cpp \ 38 + ../utils/execmd.cpp \ 39 + ../utils/netcon.cpp \ ··· 43 FORMS += crontool.ui \ 44 rtitool.ui 45 46 - -- 47 - 2.43.0 48 -
··· 1 --- a/qtgui/recoll.pro.in 2 +++ b/qtgui/recoll.pro.in 3 + @@ -192,7 +192,7 @@ 4 + } 5 } 6 7 + -macx:macxbundlebuild() { 8 +if (false) { 9 + QCBUILDLOC=Qt_6_7_3_for_macOS 10 + RECOLLDEPS = $$PWD/../../.. 11 + QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64 12 + @@ -402,7 +402,7 @@ 13 QMAKE_BUNDLE_DATA = APP_EXAMPLES APP_EXAMPLES_MAC APP_FILTERS APP_IMAGES APP_DOC 14 } 15 16 + -unix:!macxbundlebuild() { 17 +unix { 18 19 VPATH = @srcdir@ 20 + # For SingleApplication 21 + @@ -425,6 +425,13 @@ 22 SOURCES += crontool.cpp \ 23 rtitool.cpp 24 25 + + macxbundlebuild() { 26 + SOURCES += ../utils/closefrom.cpp \ 27 + ../utils/execmd.cpp \ 28 + ../utils/netcon.cpp \ ··· 32 FORMS += crontool.ui \ 33 rtitool.ui 34
+2 -5
pkgs/applications/search/recoll/default.nix
··· 75 76 mkDerivation rec { 77 pname = "recoll"; 78 - version = "1.39.1"; 79 80 src = fetchurl { 81 url = "https://www.recoll.org/${pname}-${version}.tar.gz"; 82 - hash = "sha256-Eeadj/AnuztCb7VIYEy4hKbduH3CzK53tADvI9+PWmQ="; 83 }; 84 85 mesonFlags = ··· 107 ]; 108 109 env.NIX_CFLAGS_COMPILE = toString [ 110 - "-DNIXPKGS" 111 "-fpermissive" # libxml2-2.12 changed const qualifiers 112 ]; 113 114 patches = [ 115 - # fix "No/bad main configuration file" error 116 - ./fix-datadir.patch 117 # use the same configure based build for darwin as linux 118 ./0001-no-qtgui-darwin-bundle.patch 119 ];
··· 75 76 mkDerivation rec { 77 pname = "recoll"; 78 + version = "1.43.2"; 79 80 src = fetchurl { 81 url = "https://www.recoll.org/${pname}-${version}.tar.gz"; 82 + hash = "sha256-FbDXknumjktcikOfAe4FKtPmggJGGHasq8dpD+8mNzE="; 83 }; 84 85 mesonFlags = ··· 107 ]; 108 109 env.NIX_CFLAGS_COMPILE = toString [ 110 "-fpermissive" # libxml2-2.12 changed const qualifiers 111 ]; 112 113 patches = [ 114 # use the same configure based build for darwin as linux 115 ./0001-no-qtgui-darwin-bundle.patch 116 ];
-13
pkgs/applications/search/recoll/fix-datadir.patch
··· 1 - diff --git a/utils/rclutil.cpp b/utils/rclutil.cpp 2 - index 6bafc119..d997cd17 100644 3 - --- a/utils/rclutil.cpp 4 - +++ b/utils/rclutil.cpp 5 - @@ -279,7 +279,7 @@ const string& path_pkgdatadir() 6 - "a subfolder of the installation directory. \n" 7 - "Please set the RECOLL_DATADIR environment variable to point to it\n" 8 - "(e.g. setx RECOLL_DATADIR \"C:/Program Files (X86)/Recoll/Share)\"\n"; 9 - -#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE) 10 - +#elif defined(__APPLE__) && defined(RECOLL_AS_MAC_BUNDLE) && defined(NIXPKGS) 11 - // The package manager builds (Macports, Homebrew, Nixpkgs ...) all arrange to set a proper 12 - // compiled value for RECOLL_DATADIR. We can't do this when building a native bundle with 13 - // QCreator, in which case we use the executable location.
···