[58801] trunk/dports/devel/strigi

[snc at macports.org]

Revision: 58801
          http://trac.macports.org/changeset/58801
Author:   snc at macports.org
Date:     2009-10-05 10:29:35 -0700 (Mon, 05 Oct 2009)
Log Message:
-----------
consistent patchfile naming

Modified Paths:
--------------
    trunk/dports/devel/strigi/Portfile

Added Paths:
-----------
    trunk/dports/devel/strigi/files/strigi-dbus-types.patch

Removed Paths:
-------------
    trunk/dports/devel/strigi/files/strigi-dbus-types.patch.diff

Modified: trunk/dports/devel/strigi/Portfile
===================================================================
--- trunk/dports/devel/strigi/Portfile	2009-10-05 17:22:48 UTC (rev 58800)
+++ trunk/dports/devel/strigi/Portfile	2009-10-05 17:29:35 UTC (rev 58801)
@@ -15,7 +15,7 @@
 homepage	http://strigi.sourceforge.net/
 master_sites	sourceforge
 use_bzip2	yes
-patchfiles      strigi-fix-check-gcc-visibility-macro-ccache.patch strigi-dbus-types.patch.diff
+patchfiles      strigi-fix-check-gcc-visibility-macro-ccache.patch strigi-dbus-types.patch
 patch.pre_args  -p1
 
 depends_lib     port:bzip2 \

Copied: trunk/dports/devel/strigi/files/strigi-dbus-types.patch (from rev 58800, trunk/dports/devel/strigi/files/strigi-dbus-types.patch.diff)
===================================================================
--- trunk/dports/devel/strigi/files/strigi-dbus-types.patch	                        (rev 0)
+++ trunk/dports/devel/strigi/files/strigi-dbus-types.patch	2009-10-05 17:29:35 UTC (rev 58801)
@@ -0,0 +1,37 @@
+--- strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.horig	2009-09-23 21:37:10 +0200
++++ strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.h	2009-09-23 21:38:03 +0200
+@@ -60,10 +60,10 @@ public:
+     DBusMessageReader& operator>>(std::vector<int32_t>& s);
+     DBusMessageReader& operator>>(std::vector<uint32_t>& s);
+     DBusMessageReader& operator>>(std::string& s);
+-    DBusMessageReader& operator>>(dbus_int32_t& s);
+-    DBusMessageReader& operator>>(dbus_uint32_t& s);
+-    DBusMessageReader& operator>>(dbus_uint64_t& s);
+-    DBusMessageReader& operator>>(dbus_int64_t& s);
++    DBusMessageReader& operator>>(int32_t& s);
++    DBusMessageReader& operator>>(uint32_t& s);
++    DBusMessageReader& operator>>(uint64_t& s);
++    DBusMessageReader& operator>>(int64_t& s);
+     DBusMessageReader& operator>>(std::multimap<int, std::string>&);
+     DBusMessageReader& operator>>(std::vector<std::pair<bool, std::string> >&);
+     bool isOk() const { return ok; }
+--- strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.cpporig	2009-09-23 21:37:07 +0200
++++ strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.cpp	2009-09-23 21:37:47 +0200
+@@ -29,7 +29,7 @@ DBusMessageReader::DBusMessageReader(DBu
+     }
+ }
+ DBusMessageReader&
+-DBusMessageReader::operator>>(dbus_uint32_t& s) {
++DBusMessageReader::operator>>(uint32_t& s) {
+     if (!isOk()) return *this;
+     if (DBUS_TYPE_UINT32 != dbus_message_iter_get_arg_type(&it)
+             && DBUS_TYPE_BOOLEAN != dbus_message_iter_get_arg_type(&it)) {
+@@ -52,7 +52,7 @@ DBusMessageReader::operator>>(int32_t& s
+     return *this;
+ }
+ DBusMessageReader&
+-DBusMessageReader::operator>>(dbus_uint64_t& s) {
++DBusMessageReader::operator>>(uint64_t& s) {
+     if (!isOk()) return *this;
+     if (DBUS_TYPE_UINT64 != dbus_message_iter_get_arg_type(&it)) {
+         close();

Deleted: trunk/dports/devel/strigi/files/strigi-dbus-types.patch.diff
===================================================================
--- trunk/dports/devel/strigi/files/strigi-dbus-types.patch.diff	2009-10-05 17:22:48 UTC (rev 58800)
+++ trunk/dports/devel/strigi/files/strigi-dbus-types.patch.diff	2009-10-05 17:29:35 UTC (rev 58801)
@@ -1,37 +0,0 @@
---- strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.horig	2009-09-23 21:37:10 +0200
-+++ strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.h	2009-09-23 21:38:03 +0200
-@@ -60,10 +60,10 @@ public:
-     DBusMessageReader& operator>>(std::vector<int32_t>& s);
-     DBusMessageReader& operator>>(std::vector<uint32_t>& s);
-     DBusMessageReader& operator>>(std::string& s);
--    DBusMessageReader& operator>>(dbus_int32_t& s);
--    DBusMessageReader& operator>>(dbus_uint32_t& s);
--    DBusMessageReader& operator>>(dbus_uint64_t& s);
--    DBusMessageReader& operator>>(dbus_int64_t& s);
-+    DBusMessageReader& operator>>(int32_t& s);
-+    DBusMessageReader& operator>>(uint32_t& s);
-+    DBusMessageReader& operator>>(uint64_t& s);
-+    DBusMessageReader& operator>>(int64_t& s);
-     DBusMessageReader& operator>>(std::multimap<int, std::string>&);
-     DBusMessageReader& operator>>(std::vector<std::pair<bool, std::string> >&);
-     bool isOk() const { return ok; }
---- strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.cpporig	2009-09-23 21:37:07 +0200
-+++ strigi-0.7.0/src/daemon/dbus/dbuscpp/dbusmessagereader.cpp	2009-09-23 21:37:47 +0200
-@@ -29,7 +29,7 @@ DBusMessageReader::DBusMessageReader(DBu
-     }
- }
- DBusMessageReader&
--DBusMessageReader::operator>>(dbus_uint32_t& s) {
-+DBusMessageReader::operator>>(uint32_t& s) {
-     if (!isOk()) return *this;
-     if (DBUS_TYPE_UINT32 != dbus_message_iter_get_arg_type(&it)
-             && DBUS_TYPE_BOOLEAN != dbus_message_iter_get_arg_type(&it)) {
-@@ -52,7 +52,7 @@ DBusMessageReader::operator>>(int32_t& s
-     return *this;
- }
- DBusMessageReader&
--DBusMessageReader::operator>>(dbus_uint64_t& s) {
-+DBusMessageReader::operator>>(uint64_t& s) {
-     if (!isOk()) return *this;
-     if (DBUS_TYPE_UINT64 != dbus_message_iter_get_arg_type(&it)) {
-         close();
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091005/62e9c258/attachment.html>