diff options
| author | markus <markus@FreeBSD.org> | 2004-03-19 00:56:46 +0800 |
|---|---|---|
| committer | markus <markus@FreeBSD.org> | 2004-03-19 00:56:46 +0800 |
| commit | 9a91500cf8a1b8dc31a71372af67fc8a2a4b048d (patch) | |
| tree | f8309074bc9fbd3ca0807378cc816da8a1832a61 /audio/amarok-kde4 | |
| parent | b92ff4e79b24fc0afa0604844ee69d18bcba1c2c (diff) | |
| download | freebsd-ports-gnome-9a91500cf8a1b8dc31a71372af67fc8a2a4b048d.tar.gz freebsd-ports-gnome-9a91500cf8a1b8dc31a71372af67fc8a2a4b048d.tar.zst freebsd-ports-gnome-9a91500cf8a1b8dc31a71372af67fc8a2a4b048d.zip | |
- add patch to fix bug that prevented IPC to work properly
- add patch to close sockets properly [1]
- bump PORTREVISION
PR: ports/64338
Noticed by: Csaba Molnar <molnarcs@message.hu> [1]
Approved by: arved (mentor)
Diffstat (limited to 'audio/amarok-kde4')
| -rw-r--r-- | audio/amarok-kde4/Makefile | 1 | ||||
| -rw-r--r-- | audio/amarok-kde4/files/patch-loader.cpp | 15 | ||||
| -rw-r--r-- | audio/amarok-kde4/files/patch-playerapp.cpp | 22 |
3 files changed, 38 insertions, 0 deletions
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile index 227d3d876037..68fd0373446b 100644 --- a/audio/amarok-kde4/Makefile +++ b/audio/amarok-kde4/Makefile @@ -6,6 +6,7 @@ PORTNAME= amarok PORTVERSION= 0.9 +PORTREVISION= 1 CATEGORIES= audio kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/audio/amarok-kde4/files/patch-loader.cpp b/audio/amarok-kde4/files/patch-loader.cpp new file mode 100644 index 000000000000..de86b33651aa --- /dev/null +++ b/audio/amarok-kde4/files/patch-loader.cpp @@ -0,0 +1,15 @@ +--- amarok/amarok/loader/loader.cpp.orig Fri Mar 5 22:15:11 2004 ++++ amarok/amarok/loader/loader.cpp Tue Mar 16 21:48:30 2004 +@@ -156,10 +156,11 @@ + path += "/.kde/share/apps/amarok/.loader_socket"; + ::strcpy( &local.sun_path[0], path ); + +- int len = ::strlen( local.sun_path ) + sizeof( local.sun_family ); ++ int len = sizeof( local ); + + if ( ::connect( fd, (struct sockaddr*) &local, len ) == -1 ) { + // qDebug( "[Loader::tryConnect()] connect() failed" ); ++ ::close ( fd ); + return -1; + } + diff --git a/audio/amarok-kde4/files/patch-playerapp.cpp b/audio/amarok-kde4/files/patch-playerapp.cpp new file mode 100644 index 000000000000..09bbb3135cc7 --- /dev/null +++ b/audio/amarok-kde4/files/patch-playerapp.cpp @@ -0,0 +1,22 @@ +--- amarok/amarok/playerapp.cpp.orig Fri Mar 5 22:15:10 2004 ++++ amarok/amarok/playerapp.cpp Tue Mar 16 21:51:00 2004 +@@ -298,14 +298,18 @@ + ::strcpy( &local.sun_path[0], path ); + ::unlink( path ); + +- int len = ::strlen( local.sun_path ) + sizeof( local.sun_family ); ++ int len = sizeof( local ); + + if ( ::bind( m_sockfd, (struct sockaddr*) &local, len ) == -1 ) { + kdWarning() << k_funcinfo << " bind() error\n"; ++ ::close ( m_sockfd ); ++ m_sockfd = -1; + return; + } + if ( ::listen( m_sockfd, 1 ) == -1 ) { + kdWarning() << k_funcinfo << " listen() error\n"; ++ ::close ( m_sockfd ); ++ m_sockfd = -1; + return; + } + |