tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://framagit.org/medoc92/recoll

Browse Source
This commit is contained in:
Jean-Francois Dockes 2021-10-07 19:39:30 +02:00
commit ffcd856353
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packaging/mac/make-recoll-dmg.sh
View File

@ -12,13 +12,16 @@ usage()
# Adjustable things # Adjustable things
top=~/Recoll top=~/Recoll
qtversion=5.14.2 # The possibly bogus version we have in paths (may be harcoded in the .pro)
qtpathversion=5.14.2
# Will probably need adjustment on M1 # Will probably need adjustment on M1
path_clang=clang_64 path_clang=clang_64
# The real version for finding macdeployqt
qtversion=5.15.2
deploy=~/Qt/${qtversion}/${path_clang}/bin/macdeployqt deploy=~/Qt/${qtversion}/${path_clang}/bin/macdeployqt
qt_ver_sion=`echo $qtpathversion | sed -e 's/\./_/g'`
qt_ver_sion=`echo $qtversion | sed -e 's/\./_/g'`
toprecoll=$top/recoll/src toprecoll=$top/recoll/src
appdir=$toprecoll/build-recoll-win-Desktop_Qt_${qt_ver_sion}_${path_clang}bit-Release/recoll.app appdir=$toprecoll/build-recoll-win-Desktop_Qt_${qt_ver_sion}_${path_clang}bit-Release/recoll.app
@ -28,7 +31,7 @@ datadir=$appdir/Contents/Resources
dmg=$appdir/../recoll.dmg dmg=$appdir/../recoll.dmg
version=`cat $toprecoll/VERSION` version=`cat $toprecoll/RECOLL-VERSION.txt`
test -d $appdir || fatal Must first have built recoll in $appdir test -d $appdir || fatal Must first have built recoll in $appdir

4
src/common/autoconfig-mac.h
View File

@ -125,7 +125,7 @@
#define PACKAGE_NAME "Recoll" #define PACKAGE_NAME "Recoll"
/* Define to the full name and version of this package. */ /* Define to the full name and version of this package. */
#define PACKAGE_STRING "Recoll 1.30.2" #define PACKAGE_STRING "Recoll 1.31.1pre1"
/* Define to the one symbol short name of this package. */ /* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "recoll" #define PACKAGE_TARNAME "recoll"
@ -134,7 +134,7 @@
#define PACKAGE_URL "" #define PACKAGE_URL ""
/* Define to the version of this package. */ /* Define to the version of this package. */
#define PACKAGE_VERSION "1.30.2" #define PACKAGE_VERSION "1.31.1pre1"
/* putenv parameter is const */ /* putenv parameter is const */
/* #undef PUTENV_ARG_CONST */ /* #undef PUTENV_ARG_CONST */

8
src/qtgui/recoll-win.pro
View File

@ -5,10 +5,10 @@ TEMPLATE = app
LANGUAGE = C++ LANGUAGE = C++
TARGET = recoll TARGET = recoll
DEFINES += USING_WEBKIT #DEFINES += USING_WEBKIT
QT += webkit webkitwidgets #QT += webkit webkitwidgets
#QT += widgets webenginewidgets DEFINES += USING_WEBENGINE
#DEFINES += USING_WEBENGINE QT += widgets webenginewidgets
QT += xml printsupport QT += xml printsupport