Index: branches/2018Q4/deskutils/pinot/Makefile =================================================================== --- branches/2018Q4/deskutils/pinot/Makefile (revision 483777) +++ branches/2018Q4/deskutils/pinot/Makefile (revision 483778) @@ -1,102 +1,103 @@ # Created by: Thierry Thomas # $FreeBSD$ PORTNAME= pinot PORTVERSION= 1.09 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= deskutils MAINTAINER= thierry@FreeBSD.org COMMENT= Personal search and metasearch for the Free Desktop LICENSE= GPLv2 BUILD_DEPENDS= desktop-file-install:devel/desktop-file-utils \ update-mime-database:misc/shared-mime-info LIB_DEPENDS= libxapian.so:databases/xapian-core \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libexttextcat-2.0.so:textproc/libexttextcat \ libdbus-glib-1.so:devel/dbus-glib \ libdbus-1.so:devel/dbus \ libxml++-2.6.so:textproc/libxml++26 \ libboost_thread.so:devel/boost-libs \ + libnotify.so:devel/libnotify \ libexif.so:graphics/libexif \ libexiv2.so:graphics/exiv2 \ libgmime-2.4.so:mail/gmime24 \ libtag.so:audio/taglib \ libcurl.so:ftp/curl RUN_DEPENDS= update-mime-database:misc/shared-mime-info \ antiword:textproc/antiword \ xdg-open:devel/xdg-utils \ catppt:textproc/catdoc \ unrtf:textproc/unrtf \ catdvi:print/catdvi \ bash:shells/bash \ ${LOCALBASE}/libexec/xpdf/pdftotext:graphics/xpdf USE_GITHUB= yes GH_ACCOUNT= FabriceColin GH_TAGNAME= c14d6d5 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive \ - --enable-mempool=no -CONFIGURE_ENV= MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0" -CPPFLAGS+= -I${LOCALBASE}/include -LIBS+= -L${LOCALBASE}/lib -lboost_system - -USES= compiler:c++11-lang autoreconf gettext libarchive \ +USES= compiler:c++11-lang autoreconf gettext gnome libarchive \ libtool pkgconfig python shebangfix sqlite:3 ssl USE_CXXSTD= c++11 USE_XORG= pixman USE_GNOME= atkmm cairo cairomm glibmm gtk20 gtkmm24 libsigc++20 libxml2 pangomm USE_LDCONFIG= ${PREFIX}/lib/pinot/backends ${PREFIX}/lib/pinot/filters SHEBANG_FILES= scripts/bash/*.sh + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-http=curl --with-ssl=${OPENSSLBASE} --enable-libarchive \ + --enable-mempool=no --enable-libnotify +CONFIGURE_ENV= MKDIR_P="${MKDIR}" TEXTCAT_LIBS="-lexttextcat-2.0" +CPPFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib -lboost_system OPTIONS_DEFINE= DEBUG CHMLIB DOCS OPTIONS_SUB= yes DEBUG_CONFIGURE_ON= --enable-debug=yes CHMLIB_CONFIGURE_ON= --enable-chmlib=yes CHMLIB_CONFIGURE_OFF= --disable-chmlib CHMLIB_LIB_DEPENDS= libchm.so:misc/chmlib INSTALLS_ICONS= yes DOCS= AUTHORS ChangeLog ChangeLog-dijon INSTALL NEWS README TODO LM2FIX= textcat_conf.txt textcat3_conf.txt textcat31_conf.txt textcat32_conf.txt SHR2FIX= Core/pinot-search.1 README UL2FIX= Utils/xdgmime/xdgmime.c post-extract: # remove pre-generated messages catalogs ${FIND} ${WRKSRC}/po -name "*.gmo" -delete post-patch: ${REINPLACE_CMD} -e \ '//s|pdftotext|${LOCALBASE}/libexec/xpdf/pdftotext|' \ ${WRKSRC}/Tokenize/filters/external-filters.xml pre-configure: ${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${LM2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e 's|libtextcat/|libtextcat/LM/|' \ ${WRKSRC}/textcat_conf.txt ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${UL2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \ ${SHR2FIX:S|^|${WRKSRC}/|} ${REINPLACE_CMD} -e 's|Icon=pinot.png|Icon=pinot|g' \ ${WRKSRC}/*.desktop post-install: ${TOUCH} ${STAGEDIR}${DATADIR}/stopwords/.empty_file post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Index: branches/2018Q4/deskutils/pinot/files/patch-openssl =================================================================== --- branches/2018Q4/deskutils/pinot/files/patch-openssl (nonexistent) +++ branches/2018Q4/deskutils/pinot/files/patch-openssl (revision 483778) @@ -0,0 +1,102 @@ +Description: Catch up with current glib and OpenSSL +Author: FabriceColin +Bug-Debian: https://bugs.debian.org/828503 +Forwarded: yes +Last-Update: 2018-06-14 + +diff --git Collect/DownloaderInterface.cpp Collect/DownloaderInterface.cpp +index 10f4f66..f084f50 100644 +--- Collect/DownloaderInterface.cpp ++++ Collect/DownloaderInterface.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright 2005-2008 Fabrice Colin ++ * Copyright 2005-2017 Fabrice Colin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -33,7 +33,8 @@ using namespace std; + + #ifdef USE_SSL + // OpenSSL multi-thread support, required by Curl +-static pthread_mutex_t locksTable[CRYPTO_NUM_LOCKS]; ++static unsigned int g_lockArrayCount = 0; ++static pthread_mutex_t *g_pLockArray = NULL; + + // OpenSSL locking functiom + static void lockingCallback(int mode, int n, const char *file, int line) +@@ -42,7 +43,7 @@ static void lockingCallback(int mode, int n, const char *file, int line) + + if (mode & CRYPTO_LOCK) + { +- status = pthread_mutex_lock(&(locksTable[n])); ++ status = pthread_mutex_lock(&(g_pLockArray[n])); + #ifdef DEBUG + if (status != 0) + { +@@ -52,7 +53,7 @@ static void lockingCallback(int mode, int n, const char *file, int line) + } + else + { +- status = pthread_mutex_unlock(&(locksTable[n])); ++ status = pthread_mutex_unlock(&(g_pLockArray[n])); + #ifdef DEBUG + if (status != 0) + { +@@ -82,9 +83,15 @@ void DownloaderInterface::initialize(void) + pthread_mutexattr_settype(&mutexAttr, PTHREAD_MUTEX_ERRORCHECK); + + // Initialize the OpenSSL mutexes +- for (unsigned int lockNum = 0; lockNum < CRYPTO_NUM_LOCKS; ++lockNum) ++#ifdef CRYPTO_num_locks ++ g_lockArrayCount = CRYPTO_num_locks(); ++#else ++ g_lockArrayCount = CRYPTO_NUM_LOCKS; ++#endif ++ g_pLockArray = (pthread_mutex_t *)OPENSSL_malloc(g_lockArrayCount * sizeof(pthread_mutex_t)); ++ for (unsigned int lockNum = 0; lockNum < g_lockArrayCount; ++lockNum) + { +- pthread_mutex_init(&(locksTable[lockNum]), &mutexAttr); ++ pthread_mutex_init(&(g_pLockArray[lockNum]), &mutexAttr); + } + // Set the callbacks + CRYPTO_set_locking_callback(lockingCallback); +@@ -103,10 +110,13 @@ void DownloaderInterface::shutdown(void) + CRYPTO_set_locking_callback(NULL); + + // Free the mutexes +- for (unsigned int lockNum = 0; lockNum < CRYPTO_NUM_LOCKS; ++lockNum) ++ for (unsigned int lockNum = 0; lockNum < g_lockArrayCount; ++lockNum) + { +- pthread_mutex_destroy(&(locksTable[lockNum])); ++ pthread_mutex_destroy(&(g_pLockArray[lockNum])); + } ++ OPENSSL_free(g_pLockArray); ++ g_pLockArray = NULL; ++ g_lockArrayCount = 0; + #endif + } + +diff --git Utils/MIMEScanner.cpp Utils/MIMEScanner.cpp +index e02215c..50ceb3d 100644 +--- Utils/MIMEScanner.cpp ++++ Utils/MIMEScanner.cpp +@@ -1,5 +1,5 @@ + /* +- * Copyright 2005-2012 Fabrice Colin ++ * Copyright 2005-2017 Fabrice Colin + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -456,9 +456,10 @@ MIMEScanner::~MIMEScanner() + bool MIMEScanner::initialize(const string &userPrefix, const string &systemPrefix) + { + #ifdef USE_GIO ++#if !GLIB_CHECK_VERSION(2,35,0) + // Initialize the GType system + g_type_init(); +- ++#endif + return true; + #else + list desktopFilesPaths; Property changes on: branches/2018Q4/deskutils/pinot/files/patch-openssl ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q4 =================================================================== --- branches/2018Q4 (revision 483777) +++ branches/2018Q4 (revision 483778) Property changes on: branches/2018Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r482166