Ticket #30077: strigi-Portfile.diff

File strigi-Portfile.diff, 5.5 KB (added by nerdling (Jeremy Lavergne), 13 years ago)

patch to update strigi

  • files/strigi-fix-check-gcc-visibility-macro-ccache.patch

     
    1 diff -uNr strigi-0.5.7.orig/cmake/MacroCheckGccVisibility.cmake strigi-0.5.7/cmake/MacroCheckGccVisibility.cmake
    2 --- strigi-0.5.7.orig/cmake/MacroCheckGccVisibility.cmake       2007-10-26 08:25:39.000000000 -0400
    3 +++ strigi-0.5.7/cmake/MacroCheckGccVisibility.cmake    2008-05-19 01:28:13.000000000 -0400
    4 @@ -13,7 +13,7 @@
    5     check_cxx_compiler_flag(-fvisibility=hidden ${GccVisibility})
    6  
    7     # get the gcc version
    8 -   exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
    9 +   exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} --version OUTPUT_VARIABLE _gcc_version_info)
    10  
    11     string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
    12     # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the patch level, handle this here:

  • files/strigi-dbus-types.patch

     
    1 --- strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.horig        2009-09-23 21:37:10 +0200
    2 +++ strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.h    2009-09-23 21:38:03 +0200
    3 @@ -60,10 +60,10 @@ public:
    4      DBusMessageReader& operator>>(std::vector<int32_t>& s);
    5      DBusMessageReader& operator>>(std::vector<uint32_t>& s);
    6      DBusMessageReader& operator>>(std::string& s);
    7 -    DBusMessageReader& operator>>(dbus_int32_t& s);
    8 -    DBusMessageReader& operator>>(dbus_uint32_t& s);
    9 -    DBusMessageReader& operator>>(dbus_uint64_t& s);
    10 -    DBusMessageReader& operator>>(dbus_int64_t& s);
    11 +    DBusMessageReader& operator>>(int32_t& s);
    12 +    DBusMessageReader& operator>>(uint32_t& s);
    13 +    DBusMessageReader& operator>>(uint64_t& s);
    14 +    DBusMessageReader& operator>>(int64_t& s);
    15      DBusMessageReader& operator>>(std::multimap<int, std::string>&);
    16      DBusMessageReader& operator>>(std::vector<std::pair<bool, std::string> >&);
    17      bool isOk() const { return ok; }
    18 --- strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.cpporig      2009-09-23 21:37:07 +0200
    19 +++ strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.cpp  2009-09-23 21:37:47 +0200
    20 @@ -29,7 +29,7 @@ DBusMessageReader::DBusMessageReader(DBu
    21      }
    22  }
    23  DBusMessageReader&
    24 -DBusMessageReader::operator>>(dbus_uint32_t& s) {
    25 +DBusMessageReader::operator>>(uint32_t& s) {
    26      if (!isOk()) return *this;
    27      if (DBUS_TYPE_UINT32 != dbus_message_iter_get_arg_type(&it)
    28              && DBUS_TYPE_BOOLEAN != dbus_message_iter_get_arg_type(&it)) {
    29 @@ -52,7 +52,7 @@ DBusMessageReader::operator>>(int32_t& s
    30      return *this;
    31  }
    32  DBusMessageReader&
    33 -DBusMessageReader::operator>>(dbus_uint64_t& s) {
    34 +DBusMessageReader::operator>>(uint64_t& s) {
    35      if (!isOk()) return *this;
    36      if (DBUS_TYPE_UINT64 != dbus_message_iter_get_arg_type(&it)) {
    37          close();

  • Portfile

     
    22# $Id$
    33
    44PortSystem  1.0
    5 PortGroup   cmake 1.0
    6 if {[variant_isset qt4]} {
    7     PortGroup       qt4 1.0
    8 }
     5PortGroup       kde4 1.1
    96
    107name            strigi
    11 version         0.6.4
     8version         0.7.5
    129categories      devel
    1310maintainers     gmail.com:clubjuggler openmaintainer
    1411description     Fastest and smallest desktop searching program
    … …  
    1714homepage        http://strigi.sourceforge.net/
    1815master_sites    sourceforge
    1916use_bzip2       yes
    20 patchfiles      strigi-fix-check-gcc-visibility-macro-ccache.patch strigi-dbus-types.patch
    21 patch.pre_args  -p1
    2217
    2318depends_lib     port:bzip2 \
    2419                port:clucene \
    2520                port:dbus \
    2621                port:libxml2 \
     22                port:ffmpeg \
    2723                port:zlib
    2824
    29 checksums           md5     324fd9606ac77765501717ff92c04f9a \
    30                     sha1    e91f31cc59fdfc303b662a8af899efe1365643bf \
    31                     rmd160  4b72de166b077778caa2b3ff31c2168a62155bd1
     25checksums           sha1    0aa3632e07c58f2ab5c515004b790bda6cfefbf5 \
     26                    rmd160  2cf9fa372de2bc06abcee25d0f41fa5f4916fa3c
    3227
    3328configure.args-append   -DICONV_INCLUDE_DIR:PATH=${prefix}/include \
    34                         -DICONV_LIBRARIES:FILEPATH=${prefix}/lib/libiconv.dylib \
    35                         -DLIBXML2_INCLUDE_DIR:PATH=${prefix}/include/libxml2 \
    36                         -DLIBXML2_LIBRARIES:FILEPATH=${prefix}/lib/libxml2.dylib \
    37                         -DENABLE_QT4:BOOL=OFF
     29                        -DLOG4CXX_INCLUDE_DIR=${prefix}/include/log4cxx \
     30                        -DICONV_LIBRARIES:FILEPATH=${prefix}/lib/libiconv.dylib
    3831
    3932# Best practice for CMake dictates that builds should be out of source.
    4033# However, it appears that strigi uses java to create source files and
    … …  
    4538
    4639post-destroot   {
    4740                xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
    48                 xinstall -m 644 -W ${worksrcpath} COPYING README AUTHORS ChangeLog TODO ${destroot}${prefix}/share/doc/${name}
     41                xinstall -m 644 -W ${worksrcpath} COPYING AUTHORS ChangeLog ${destroot}${prefix}/share/doc/${name}
    4942}
    5043
    51 variant qt4 description {Use qt4-mac} {
    52     configure.args-delete       -DENABLE_QT4:BOOL=OFF
    53 }
    54 
    5544livecheck.url http://sourceforge.net/projects/strigi/files/
    5645livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"