[libisds] Rebuild with GCC 4.6

Petr Pisar ppisar at fedoraproject.org
Fri Feb 11 12:46:11 UTC 2011


commit 4db56bb39df0e01c4eb989cdbba464e931e6fcf3
Author: Petr Písař <ppisar at redhat.com>
Date:   Fri Feb 11 13:35:22 2011 +0100

    Rebuild with GCC 4.6

 libisds-0.4-GCC-4.6-tunes.patch |   47 +++++++++++++++++++++++++++++++++++++++
 libisds.spec                    |    8 +++++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/libisds-0.4-GCC-4.6-tunes.patch b/libisds-0.4-GCC-4.6-tunes.patch
new file mode 100644
index 0000000..a090fea
--- /dev/null
+++ b/libisds-0.4-GCC-4.6-tunes.patch
@@ -0,0 +1,47 @@
+From 544b5d41dc096209a39e29ad3c0364c6a33c342a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <petr.pisar at atlas.cz>
+Date: Fri, 11 Feb 2011 13:31:03 +0100
+Subject: [PATCH] GCC 4.6 tunes
+
+Remove unread variable and initialize `possibly' uninitialized variable.
+
+Petr Pisar: Adjustd for 0.4 version
+
+---
+ src/isds.c |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/isds.c b/src/isds.c
+index c4ed02a..a0fa336 100644
+--- a/src/isds.c
++++ b/src/isds.c
+@@ -3432,7 +3432,7 @@ static isds_error extract_documents(struct isds_ctx *context,
+     isds_error err = IE_SUCCESS;
+     xmlXPathObjectPtr result = NULL;
+     xmlNodePtr files_node = xpath_ctx->node;
+-    struct isds_list *document, *prev_document;
++    struct isds_list *document, *prev_document = NULL;
+ 
+     if (!context) return IE_INVALID_CONTEXT;
+     if (!documents) return IE_INVAL;
+@@ -6876,7 +6876,7 @@ isds_error isds_send_message(struct isds_ctx *context,
+     xmlChar *code = NULL, *message = NULL;
+     xmlXPathContextPtr xpath_ctx = NULL;
+     xmlXPathObjectPtr result = NULL;
+-    _Bool message_is_complete = 0;
++    /*_Bool message_is_complete = 0;*/
+ 
+     if (!context) return IE_INVALID_CONTEXT;
+     zfree(context->long_message);
+@@ -6910,7 +6910,7 @@ isds_error isds_send_message(struct isds_ctx *context,
+ 
+ 
+     /* Signal we can serialize message since now */
+-    message_is_complete = 1;
++    /*message_is_complete = 1;*/
+     
+ 
+     isds_log(ILF_ISDS, ILL_DEBUG, _("Sending CreateMessage request to ISDS\n"));
+-- 
+1.7.4
+
diff --git a/libisds.spec b/libisds.spec
index a2cadd4..c410924 100644
--- a/libisds.spec
+++ b/libisds.spec
@@ -1,12 +1,14 @@
 Name:           libisds
 Version:        0.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library for accessing the Czech Data Boxes
 
 Group:          System Environment/Libraries
 License:        LGPLv3
 URL:            http://xpisar.wz.cz/%{name}/
 Source0:        http://xpisar.wz.cz/%{name}/dist/%{name}-%{version}.tar.xz
+# In upstream
+Patch0:         %{name}-0.4-GCC-4.6-tunes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml2-devel, libcurl-devel, libgcrypt-devel, gpgme-devel
@@ -29,6 +31,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .gcc46
 
 %build
 %configure --disable-static \
@@ -69,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc client specification
 
 %changelog
+* Fri Feb 11 2011 Petr Pisar <ppisar at redhat.com> - 0.4-2
+- Rebuild with GCC 4.6
+
 * Mon Dec 20 2010 Petr Pisar <ppisar at redhat.com> - 0.4-1
 - 0.4 bump, it breaks ABI
 - Use smaller xz archive instead of bzip2


More information about the scm-commits mailing list