mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-06 06:30:19 +00:00
Code Issues Releases Activity

Delay running gnome-post-install until the plist has been generated by

Browse Source 
post-install so that the icons are detected and gtk-update-icon-cache
gets run when the package is installed. [1]

Import upstream trunk commit r1728872 to add the
CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT up accept fix to the pipe code. [2]

PR:		208026 [1]
PR:		207301 [2]
This commit is contained in:
Don Lewis 2016-03-20 21:42:08 +00:00
parent 5aa4a113c0
commit 42956fde45
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=411522
2 changed files with 102 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editors/openoffice-4/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= apache-openoffice
PORTVERSION= ${AOOVERSION}
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= editors java
MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \
http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \
@ -165,6 +165,9 @@ SDK_CONFIGURE_ENABLE= odk
WIKI_PUBLISHER_CONFIGURE_ENABLE= wiki-publisher
WIKI_PUBLISHER_VARS= BUNDLED_EXTENSIONS+=swext/wiki-publisher.oxt
# Don't run gnome-post-install until after post-install generates the plist
TARGET_ORDER_OVERRIDE= 710:gnome-post-install
.include <bsd.port.pre.mk>
.include <${FILESDIR}/Makefile.localized>

98
editors/openoffice-4/files/patch-r1728872 Normal file
View File

@ -0,0 +1,98 @@
--- sal/osl/unx/pipe.c.orig 2014-02-25 08:31:45 UTC
+++ sal/osl/unx/pipe.c
@@ -115,7 +115,7 @@ oslPipe __osl_createPipeImpl()
pPipeImpl = (oslPipe)calloc(1, sizeof(struct oslPipeImpl));
pPipeImpl->m_nRefCount =1;
pPipeImpl->m_bClosed = sal_False;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipeImpl->m_bIsInShutdown = sal_False;
pPipeImpl->m_bIsAccepting = sal_False;
#endif
@@ -321,7 +321,7 @@ void SAL_CALL osl_releasePipe( oslPipe p
void SAL_CALL osl_closePipe( oslPipe pPipe )
{
int nRet;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
size_t len;
struct sockaddr_un addr;
int fd;
@@ -341,10 +341,10 @@ void SAL_CALL osl_closePipe( oslPipe pPi
ConnFD = pPipe->m_Socket;
/*
- Thread does not return from accept on linux, so
+ Thread does not return from accept on some operating systems, so
connect to the accepting pipe
*/
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
if ( pPipe->m_bIsAccepting )
{
pPipe->m_bIsInShutdown = sal_True;
@@ -356,7 +356,11 @@ void SAL_CALL osl_closePipe( oslPipe pPi
addr.sun_family = AF_UNIX;
strncpy(addr.sun_path, pPipe->m_Name, sizeof(addr.sun_path));
- len = sizeof(addr);
+#if defined(FREEBSD)
+ len = SUN_LEN(&addr);
+#else
+ len = sizeof(addr);
+#endif
nRet = connect( fd, (struct sockaddr *)&addr, len);
#if OSL_DEBUG_LEVEL > 1
@@ -367,7 +371,7 @@ void SAL_CALL osl_closePipe( oslPipe pPi
#endif /* OSL_DEBUG_LEVEL */
close(fd);
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
nRet = shutdown(ConnFD, 2);
@@ -408,13 +412,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe
OSL_ASSERT(strlen(pPipe->m_Name) > 0);
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipe->m_bIsAccepting = sal_True;
#endif
s = accept(pPipe->m_Socket, NULL, NULL);
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
pPipe->m_bIsAccepting = sal_False;
#endif
@@ -424,13 +428,13 @@ oslPipe SAL_CALL osl_acceptPipe(oslPipe
return NULL;
}
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
if ( pPipe->m_bIsInShutdown )
{
close(s);
return NULL;
}
-#endif /* LINUX */
+#endif /* CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT */
else
{
/* alloc memory */
--- sal/osl/unx/sockimpl.h.orig 2015-10-21 07:03:17 UTC
+++ sal/osl/unx/sockimpl.h
@@ -63,7 +63,7 @@ struct oslPipeImpl {
sal_Char m_Name[PATH_MAX + 1];
oslInterlockedCount m_nRefCount;
sal_Bool m_bClosed;
-#if defined(LINUX)
+#if CLOSESOCKET_DOESNT_WAKE_UP_ACCEPT
sal_Bool m_bIsAccepting;
sal_Bool m_bIsInShutdown;
#endif