Sergej Pupykin pushed to branch main at Arch Linux / Packaging / Packages / 
recoll


Commits:
84fd1193 by Sergej Pupykin at 2024-06-29T20:33:33+03:00
upgpkg: 1.39.1-1

- - - - -


2 changed files:

- .SRCINFO
- PKGBUILD


Changes:

=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
 pkgbase = recoll
        pkgdesc = Full text search tool based on Xapian backend
-       pkgver = 1.37.5
+       pkgver = 1.39.1
        pkgrel = 1
        url = https://www.recoll.org
        arch = x86_64
@@ -10,6 +10,7 @@ pkgbase = recoll
        makedepends = qt6-tools
        makedepends = cmake
        makedepends = extra-cmake-modules
+       makedepends = meson
        depends = xapian-core>=1.0.15-1
        depends = qt6-base
        depends = openssl
@@ -29,7 +30,7 @@ pkgbase = recoll
        optdepends = python-lxml: indexing spreadsheets
        optdepends = python-pychm: CHM filter
        optdepends = aspell-en: English stemming support
-       source = https://www.recoll.org/recoll-1.37.5.tar.gz
-       sha512sums = 
594a81de809a2f2f08986ef1220ea2d7df8292923f55cf41c5813eb50be9ca63aa9f77c38bd27466486e72b030f2df28a093bca32dae1682d514acbb11a76382
+       source = https://www.recoll.org/recoll-1.39.1.tar.gz
+       sha512sums = 
65f09f9728b4888f2eb8bd27a3aa6b6505e8e0f0a29e44da028b6d5c0e0c711d28de091e89c144ade3d14a6ffeaf3e0d39bcac31f6255dbec6e1bc6fbd6d1a6c
 
 pkgname = recoll


=====================================
PKGBUILD
=====================================
@@ -5,7 +5,7 @@
 # Contributor: Robert Emil Berge <filokte...@linuxophic.org>
 
 pkgname=recoll
-pkgver=1.37.5
+pkgver=1.39.1
 pkgrel=1
 pkgdesc="Full text search tool based on Xapian backend"
 arch=('x86_64')
@@ -14,7 +14,7 @@ license=('GPL')
 depends=('xapian-core>=1.0.15-1' 'qt6-base' 'openssl' 'hicolor-icon-theme' 
'qt6-webengine'
         'chmlib' 'aspell')
 makedepends=('python' 'python-setuptools' 'qt6-tools'
-            'cmake' 'extra-cmake-modules')
+            'cmake' 'extra-cmake-modules' 'meson')
 optdepends=('libxslt: for XML based formats (fb2,etc)'
            'unzip: for the OpenOffice.org documents'
            'poppler: for pdf'
@@ -34,43 +34,27 @@ optdepends=('libxslt: for XML based formats (fb2,etc)'
 #          'krunner5: KDE plugins'
            'aspell-en: English stemming support')
 source=("https://www.recoll.org/$pkgname-${pkgver/_/}.tar.gz";)
-sha512sums=('594a81de809a2f2f08986ef1220ea2d7df8292923f55cf41c5813eb50be9ca63aa9f77c38bd27466486e72b030f2df28a093bca32dae1682d514acbb11a76382')
+sha512sums=('65f09f9728b4888f2eb8bd27a3aa6b6505e8e0f0a29e44da028b6d5c0e0c711d28de091e89c144ade3d14a6ffeaf3e0d39bcac31f6255dbec6e1bc6fbd6d1a6c')
 
 prepare() {
   cd "$srcdir/$pkgname-${pkgver/_/}"
   sed -i '1,1i#include <QAbstractItemView>' qtgui/ssearch_w.cpp
+  sed -i '/int res3 = SWIG_TMPOBJ/d' python/pychm/recollchm/swig_chm.c
 }
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/}"
-  QMAKE=qmake6 ./configure \
+  export PATH="/usr/lib/qt6/bin:$PATH"
+  meson setup \
     --prefix=/usr \
-    --mandir=/usr/share/man \
-    --enable-recollq \
-    --disable-webkit \
-    --enable-webengine \
-    --enable-publiclib
-  make
-
-#  KDE Applets not ported to KF6 yet
-#  pushd kde/kioslave/kio_recoll
-#  mkdir -p build
-#  cd build
-#  cmake -DCMAKE_INSTALL_PREFIX=/usr -DRECOLL_PUBLIC_LIB=ON 
-DQT_MAJOR_VERSION=6 ..
-#  make
-#  popd
-
-#  pushd kde/krunner
-#  mkdir -p build
-#  cd build
-#  cmake -DCMAKE_INSTALL_PREFIX=/usr -DRECOLL_PUBLIC_LIB=ON 
-DQT_MAJOR_VERSION=6 ..
-#  make
-#  popd
+    -Drecollq=true \
+    -Dwebkit=false \
+    -Dwebengine=true \
+    build
+  ninja -C build
 }
 
 package() {
   cd "$srcdir/$pkgname-${pkgver/_/}"
-  make DESTDIR="$pkgdir" install
-#  make -C "kde/kioslave/kio_recoll/build" DESTDIR="$pkgdir" install
-#  make -C "kde/krunner/build" DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C build install
 }



View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/recoll/-/commit/84fd119366be1a2ae4b3cc9bb628f46fb74ff98a

-- 
View it on GitLab: 
https://gitlab.archlinux.org/archlinux/packaging/packages/recoll/-/commit/84fd119366be1a2ae4b3cc9bb628f46fb74ff98a
You're receiving this email because of your account on gitlab.archlinux.org.


Reply via email to