- more fixes in format patch to cover x32 time_t issue

- added gcc patch (disable non-standard __FUNCTION__ usage)

diff --git a/kinetic-c-format.patch b/kinetic-c-format.patch
index 62afe2142b86833cdd448a3795d7379d2f3730aa..4303ed4d44fbd127e9355dc4f62604f26aa314c1 100644 (file)
--- a/kinetic-c-format.patch
+++ b/kinetic-c-format.patch
@@ -17,3 +17,41 @@
              e_id, e_id);
          (void)e_id;
  
+--- kinetic-c-0.12.0/src/lib/bus/listener_task.c.orig  2015-03-13 21:12:09.000000000 +0100
++++ kinetic-c-0.12.0/src/lib/bus/listener_task.c       2016-04-11 21:29:25.941285397 +0200
+@@ -163,7 +163,7 @@ static void tick_handler(listener *l) {
+             } else {
+                 BUS_LOG_SNPRINTF(b, 3, LOG_LISTENER, b->udata, 64,
+                     "decrementing countdown on info %p [%u]: %ld",
+-                    (void*)info, info->id, info->timeout_sec - 1);
++                    (void*)info, info->id, (long)info->timeout_sec - 1);
+                 info->timeout_sec--;
+             }
+             break;
+@@ -205,7 +205,7 @@ static void tick_handler(listener *l) {
+             } else {
+                 BUS_LOG_SNPRINTF(b, 3, LOG_LISTENER, b->udata, 64,
+                     "decrementing countdown on info %p [%u]: %ld",
+-                    (void*)info, info->id, info->timeout_sec - 1);
++                    (void*)info, info->id, (long)info->timeout_sec - 1);
+                 info->timeout_sec--;
+             }
+             break;
+@@ -223,7 +223,7 @@ void ListenerTask_DumpRXInfoTable(listen
+         rx_info_t *info = &l->rx_info[i];
+         
+         printf(" -- state: %d, info[%d]: timeout %ld",
+-            info->state, info->id, info->timeout_sec);
++            info->state, info->id, (long)info->timeout_sec);
+         switch (l->rx_info[i].state) {
+         case RIS_HOLD:
+             printf(", fd %d, seq_id %lld, has_result? %d\n",
+@@ -289,7 +289,7 @@ static void clean_up_completed_info(list
+         struct boxed_msg *box = info->u.expect.box;
+         if (box->result.status != BUS_SEND_SUCCESS) {
+             printf("*** info %d: info->timeout %ld\n",
+-                info->id, info->timeout_sec);
++                info->id, (long)info->timeout_sec);
+             printf("    info->error %d\n", info->u.expect.error);
+             printf("    info->box == %p\n", (void*)box);
+             printf("    info->box->result.status == %d\n", box->result.status);

diff --git a/kinetic-c.spec b/kinetic-c.spec
index bbb96d0614ddb3e7845a2dd34e348508bd216db5..4cf0bd1ff88a54519ded81ab3ac64ac046b5e786 100644 (file)
--- a/kinetic-c.spec
+++ b/kinetic-c.spec
@@ -13,6 +13,7 @@ Source0:      https://github.com/Kinetic/kinetic-c/archive/%{version}/%{name}-%{versi
 # Source0-md5: 6e9816aeb2411ddf3c3159c0a6c1883a
 Patch0:                %{name}-make.patch
 Patch1:                %{name}-format.patch
+Patch2:                %{name}-gcc.patch
 URL:           https://github.com/Kinetic/kinetic-c/
 %{?with_apidocs:BuildRequires: doxygen}
 BuildRequires: json-c-devel
@@ -77,6 +78,7 @@ Dokumentacja API biblioteki C Kinetic.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 LDFLAGS="%{rpmldflags}" \