Ticket #21138: fix-dbus-types.patch

File fix-dbus-types.patch, 2.8 KB (added by jeremy.laine@…, 15 years ago)

Update Portfile to fix build on x86_64

  • dports/devel/strigi/Portfile 

    diff --git a/dports/devel/strigi/Portfile b/dports/devel/strigi/Portfile
index e566db4..7ad1506 100644
    a b PortGroup cmake 1.0 
    55
    66name            strigi
    77version         0.6.3
    8 revision    1
     8revision    2
    99categories      devel
    1010maintainers     gmail.com:clubjuggler openmaintainer
    1111description     Fastest and smallest desktop searching program
    … … platforms darwin 
    1414homepage        http://strigi.sourceforge.net/
    1515master_sites    sourceforge
    1616use_bzip2       yes
    17 patchfiles      strigi-fix-check-gcc-visibility-macro-ccache.patch
     17patchfiles      strigi-fix-check-gcc-visibility-macro-ccache.patch strigi-dbus-types.patch
    1818patch.pre_args  -p1
    1919
    2020depends_lib     port:bzip2 \

  • new file dports/devel/strigi/files/strigi-dbus-types.patch 

    diff --git a/dports/devel/strigi/files/strigi-dbus-types.patch b/dports/devel/strigi/files/strigi-dbus-types.patch
new file mode 100644
index 0000000..f506b10
    - +  
     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();