Remove uneeded patch and set proper autoconf version.
from Brad
This commit is contained in:
parent
e2894e788c
commit
927118332a
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.26 2012/07/13 15:10:47 kili Exp $
|
||||
# $OpenBSD: Makefile,v 1.27 2012/08/26 07:19:26 ajacoutot Exp $
|
||||
|
||||
COMMENT= SVG vector drawing application
|
||||
|
||||
DISTNAME= inkscape-0.48.2
|
||||
REVISION= 2
|
||||
REVISION= 3
|
||||
CATEGORIES= graphics
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=inkscape/}
|
||||
|
||||
@ -55,7 +55,7 @@ USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
USE_GROFF= Yes
|
||||
CONFIGURE_STYLE= autoconf
|
||||
AUTOCONF_VERSION= 2.67
|
||||
AUTOCONF_VERSION= 2.68
|
||||
CONFIGURE_ARGS= --without-gnome-vfs
|
||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include/ImageMagick \
|
||||
-I${LOCALBASE}/include -I${X11BASE}/include" \
|
||||
|
@ -1,37 +0,0 @@
|
||||
$OpenBSD: patch-src_dom_util_thread_cpp,v 1.1.1.1 2008/04/04 14:37:26 landry Exp $
|
||||
--- src/dom/util/thread.cpp.orig Fri Mar 28 16:19:08 2008
|
||||
+++ src/dom/util/thread.cpp Fri Mar 28 16:20:56 2008
|
||||
@@ -33,6 +33,10 @@
|
||||
*
|
||||
*/
|
||||
|
||||
+#if defined(__OpenBSD__)
|
||||
+#include <pthread.h>
|
||||
+#endif
|
||||
+
|
||||
#include "thread.h"
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
@@ -77,7 +81,9 @@ void Thread::sleep(unsigned long millis)
|
||||
|
||||
|
||||
#else /* UNIX */
|
||||
+#if !defined(__OpenBSD__)
|
||||
#include <pthread.h>
|
||||
+#endif
|
||||
|
||||
void *PthreadThreadFunction(void *context)
|
||||
{
|
||||
@@ -104,7 +110,12 @@ void Thread::start()
|
||||
|
||||
void Thread::sleep(unsigned long millis)
|
||||
{
|
||||
+#if defined(__OpenBSD__)
|
||||
+ struct timespec requested;
|
||||
+#else
|
||||
timespec requested;
|
||||
+#endif
|
||||
+
|
||||
requested.tv_sec = millis / 1000;
|
||||
requested.tv_nsec = (millis % 1000 ) * 1000000L;
|
||||
nanosleep(&requested, NULL);
|
Loading…
x
Reference in New Issue
Block a user