diff options
author | rillig <rillig> | 2005-03-16 11:51:00 +0000 |
---|---|---|
committer | rillig <rillig> | 2005-03-16 11:51:00 +0000 |
commit | ffcf40bb520fd3dfa19d9d3d24b036fb04a71aa9 (patch) | |
tree | fb655207e8f332cbf7ca4af3932629a7bba41185 | |
parent | 47ee5341f4b17a277af5e35c0bc4bcb5e3effb6f (diff) | |
download | pkgsrc-ffcf40bb520fd3dfa19d9d3d24b036fb04a71aa9.tar.gz |
Added two patches that are needed for gcc-2.95.3. Approved by wiz.
-rw-r--r-- | audio/libopendaap/distinfo | 4 | ||||
-rw-r--r-- | audio/libopendaap/patches/patch-af | 34 | ||||
-rw-r--r-- | audio/libopendaap/patches/patch-ag | 18 |
3 files changed, 55 insertions, 1 deletions
diff --git a/audio/libopendaap/distinfo b/audio/libopendaap/distinfo index 87a1201ba4a..b8120532e5b 100644 --- a/audio/libopendaap/distinfo +++ b/audio/libopendaap/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2005/03/07 15:30:44 adam Exp $ +$NetBSD: distinfo,v 1.6 2005/03/16 11:51:00 rillig Exp $ SHA1 (libopendaap-0.3.0.tar.bz2) = 21817a7886ffc8c4d88c621231569562c61356db RMD160 (libopendaap-0.3.0.tar.bz2) = 2218783e40e7f48a7b89b2e27145e4964f7dd687 @@ -7,3 +7,5 @@ SHA1 (patch-ab) = 3bd01a3038505721149a8ea56f564442b035cee4 SHA1 (patch-ac) = d723c22d11df6d511290d45ccb54861fbecc178d SHA1 (patch-ad) = 88b72f80e4a6ed68f7ae74ace3f3dbf07709c0b1 SHA1 (patch-ae) = 606756fe07c6af4fc0361f5ae5f3f62b4a40d59e +SHA1 (patch-af) = 1d068403ee6396bc4d49850afe7cefd4d07fb645 +SHA1 (patch-ag) = a1c020561e83e467062710fb454f639700fc3e3a diff --git a/audio/libopendaap/patches/patch-af b/audio/libopendaap/patches/patch-af new file mode 100644 index 00000000000..5d706d4fd3f --- /dev/null +++ b/audio/libopendaap/patches/patch-af @@ -0,0 +1,34 @@ +$NetBSD: patch-af,v 1.1 2005/03/16 11:51:00 rillig Exp $ + +gcc-2.95.3 does not like code intermixed with declarations. + +--- client.c.orig Mon Jan 3 09:20:54 2005 ++++ client.c Tue Mar 15 23:34:55 2005 +@@ -1235,11 +1235,10 @@ int DAAP_ClientHost_GetAudioFile(DAAP_SC + int requestid = 0; + + HTTP_Connection *http_connection; ++ HTTP_GetResult *httpRes; + + if (strlen(songformat) > 4) return -1; + +- HTTP_GetResult *httpRes; +- + if (pCHThis->version_major != 3) + { + sprintf(buf, songUrl_42, databaseid, songid, songformat, +@@ -1489,13 +1488,13 @@ static void update_watch_cb(void *pv_pCH + static void AsyncWaitUpdate(void *pv_pCHThis, void *unused) + { + DAAP_SClientHost *pCHThis = (DAAP_SClientHost*)pv_pCHThis; +- TRACE("()\n"); + char hash[33] = {0}; + char updateUrl[] = "/update?session-id=%i&revision-number=%i&delta=%i"; + char buf[sizeof(updateUrl) + 11 + 11 + 11]; + + HTTP_GetResult *httpRes; + ++ TRACE("()\n"); + sprintf(buf, updateUrl, pCHThis->sessionid, pCHThis->revision_number, + pCHThis->revision_number); + diff --git a/audio/libopendaap/patches/patch-ag b/audio/libopendaap/patches/patch-ag new file mode 100644 index 00000000000..6385c7f3d55 --- /dev/null +++ b/audio/libopendaap/patches/patch-ag @@ -0,0 +1,18 @@ +$NetBSD: patch-ag,v 1.1 2005/03/16 11:51:00 rillig Exp $ + +gcc-2.95.3 does not like code intermixed with declarations. + +--- ioloop.c.orig Tue Dec 14 05:39:31 2004 ++++ ioloop.c Tue Mar 15 23:35:17 2005 +@@ -113,10 +113,10 @@ void fd_event_signal(fd_event *event) + + void fd_event_reset(fd_event *event) + { +- event->signalled = 0; + char buf[1] = {0}; + int flags; + ++ event->signalled = 0; + /* set non-blocking on read pipe */ + flags = fcntl(event->pipe[0], F_GETFL, 0); + if (flags == -1) flags = 0; |