Maintainance update to dbus-1.2.24.
This commit is contained in:
parent
bce8f39f7e
commit
33f40fbd10
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.32 2010/02/06 11:58:59 landry Exp $
|
||||
# $OpenBSD: Makefile,v 1.33 2010/04/20 14:54:21 ajacoutot Exp $
|
||||
|
||||
# XXX patches/patch-configure_in disables PIE on arm/hppa. This is just a
|
||||
# temporary workaround until PIE works.
|
||||
|
||||
COMMENT= message bus system
|
||||
|
||||
DISTNAME= dbus-1.2.16
|
||||
PKGNAME= ${DISTNAME}p0
|
||||
DISTNAME= dbus-1.2.24
|
||||
SHARED_LIBS += dbus-1 7.1 # .7.0
|
||||
CATEGORIES= x11
|
||||
|
||||
@ -33,6 +32,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||
CONFIGURE_ARGS= --localstatedir=/var \
|
||||
--with-dbus-user=_dbus \
|
||||
--with-xml=expat \
|
||||
--enable-kqueue \
|
||||
--disable-silent-rules \
|
||||
--disable-xml-docs \
|
||||
--disable-doxygen-docs \
|
||||
--disable-abstract-sockets
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (dbus-1.2.16.tar.gz) = x6R7hR6+AvZya2W3jRtzCw==
|
||||
RMD160 (dbus-1.2.16.tar.gz) = cUHEg91PQMn3u/5MxkbVVRk6Owg=
|
||||
SHA1 (dbus-1.2.16.tar.gz) = KKpciDnmDYLrnOk04+JEq92pE/c=
|
||||
SHA256 (dbus-1.2.16.tar.gz) = looxwWpsS7vbYDy6o9YNbRm8iuMMDtVdf4wuJUQT5Mg=
|
||||
SIZE (dbus-1.2.16.tar.gz) = 1576209
|
||||
MD5 (dbus-1.2.24.tar.gz) = VlNGzs2c/s8UY1QMYIbMLA==
|
||||
RMD160 (dbus-1.2.24.tar.gz) = L1He94QFa8FvvsLdw74iwCKpT7U=
|
||||
SHA1 (dbus-1.2.24.tar.gz) = lZNxc0jqNroii0bxZbtnwSfBK+g=
|
||||
SHA256 (dbus-1.2.24.tar.gz) = 8Sx0j0pwNlXj1MPblM31p1KgzQs2lYxxWAQ3O9NZXEg=
|
||||
SIZE (dbus-1.2.24.tar.gz) = 1673774
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-bus_Makefile_in,v 1.5 2009/10/10 14:30:47 ajacoutot Exp $
|
||||
--- bus/Makefile.in.orig Tue Jul 14 21:43:06 2009
|
||||
+++ bus/Makefile.in Sat Oct 10 14:49:00 2009
|
||||
@@ -1380,20 +1380,12 @@ install-data-hook:
|
||||
$OpenBSD: patch-bus_Makefile_in,v 1.6 2010/04/20 14:54:21 ajacoutot Exp $
|
||||
--- bus/Makefile.in.orig Tue Mar 23 20:11:23 2010
|
||||
+++ bus/Makefile.in Tue Apr 20 16:38:21 2010
|
||||
@@ -1438,20 +1438,12 @@ install-data-hook:
|
||||
chmod 755 $(DESTDIR)$(DBUS_DAEMONDIR); \
|
||||
fi
|
||||
$(INSTALL_PROGRAM) dbus-daemon $(DESTDIR)$(DBUS_DAEMONDIR)
|
||||
|
12
x11/dbus/patches/patch-bus_dir-watch-kqueue_c
Normal file
12
x11/dbus/patches/patch-bus_dir-watch-kqueue_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-bus_dir-watch-kqueue_c,v 1.1 2010/04/20 14:54:21 ajacoutot Exp $
|
||||
--- bus/dir-watch-kqueue.c.orig Tue Apr 20 16:39:43 2010
|
||||
+++ bus/dir-watch-kqueue.c Tue Apr 20 16:40:09 2010
|
||||
@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *context, DBusList **
|
||||
*/
|
||||
for (i = 0; new_dirs[i]; i++)
|
||||
{
|
||||
- for (j = 0; i < num_fds; j++)
|
||||
+ for (j = 0; j < num_fds; j++)
|
||||
{
|
||||
if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
|
||||
{
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-configure,v 1.4 2010/02/06 11:58:59 landry Exp $
|
||||
--- configure.orig Tue Jul 14 21:43:08 2009
|
||||
+++ configure Sat Feb 6 12:35:50 2010
|
||||
@@ -22148,13 +22148,13 @@ fi
|
||||
$OpenBSD: patch-configure,v 1.5 2010/04/20 14:54:21 ajacoutot Exp $
|
||||
--- configure.orig Tue Mar 23 20:11:22 2010
|
||||
+++ configure Tue Apr 20 16:38:22 2010
|
||||
@@ -22230,13 +22230,13 @@ fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pthread_cond_timedwait" >&5
|
||||
$as_echo "$ac_cv_func_pthread_cond_timedwait" >&6; }
|
||||
if test "x$ac_cv_func_pthread_cond_timedwait" = x""yes; then
|
||||
@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.4 2010/02/06 11:58:59 landry Exp $
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -22214,7 +22214,7 @@ fi
|
||||
@@ -22296,7 +22296,7 @@ fi
|
||||
{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_cond_timedwait" >&5
|
||||
$as_echo "$ac_cv_lib_pthread_pthread_cond_timedwait" >&6; }
|
||||
if test "x$ac_cv_lib_pthread_pthread_cond_timedwait" = x""yes; then
|
||||
@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.4 2010/02/06 11:58:59 landry Exp $
|
||||
fi
|
||||
|
||||
fi
|
||||
@@ -25213,7 +25213,10 @@ if test "x$GCC" = "xyes"; then
|
||||
@@ -25294,7 +25294,10 @@ if test "x$GCC" = "xyes"; then
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -39,7 +39,7 @@ $OpenBSD: patch-configure,v 1.4 2010/02/06 11:58:59 landry Exp $
|
||||
*[\ \ ]-fPIE[\ \ ]*) ;;
|
||||
*) if cc_supports_flag -fPIE; then
|
||||
PIE_CFLAGS="-fPIE"
|
||||
@@ -25225,6 +25228,7 @@ if test "x$GCC" = "xyes"; then
|
||||
@@ -25306,6 +25309,7 @@ if test "x$GCC" = "xyes"; then
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
@ -47,7 +47,7 @@ $OpenBSD: patch-configure,v 1.4 2010/02/06 11:58:59 landry Exp $
|
||||
|
||||
### Disabled warnings, and compiler flag overrides
|
||||
|
||||
@@ -25241,13 +25245,6 @@ if test "x$GCC" = "xyes"; then
|
||||
@@ -25322,13 +25326,6 @@ if test "x$GCC" = "xyes"; then
|
||||
case " $CFLAGS " in
|
||||
*[\ \ ]-Wno-sign-compare[\ \ ]*) ;;
|
||||
*) CFLAGS="$CFLAGS -Wno-sign-compare" ;;
|
||||
@ -60,4 +60,4 @@ $OpenBSD: patch-configure,v 1.4 2010/02/06 11:58:59 landry Exp $
|
||||
- ;;
|
||||
esac
|
||||
|
||||
# http://bugs.freedesktop.org/show_bug.cgi?id=19195
|
||||
# This one is special - it's not a warning override.
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-dbus_Makefile_in,v 1.5 2009/10/10 14:30:47 ajacoutot Exp $
|
||||
--- dbus/Makefile.in.orig Tue Jul 14 21:43:06 2009
|
||||
+++ dbus/Makefile.in Sat Oct 10 12:53:59 2009
|
||||
@@ -332,7 +332,7 @@ top_builddir = @top_builddir@
|
||||
$OpenBSD: patch-dbus_Makefile_in,v 1.6 2010/04/20 14:54:21 ajacoutot Exp $
|
||||
--- dbus/Makefile.in.orig Tue Mar 23 20:11:23 2010
|
||||
+++ dbus/Makefile.in Tue Apr 20 16:38:22 2010
|
||||
@@ -350,7 +350,7 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
configdir = $(sysconfdir)/dbus-1
|
||||
INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) @PIC_CFLAGS@ -DDBUS_COMPILATION \
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-doc_Makefile_in,v 1.5 2009/10/10 14:30:47 ajacoutot Exp $
|
||||
--- doc/Makefile.in.orig Tue Jul 14 21:43:06 2009
|
||||
+++ doc/Makefile.in Sat Oct 10 12:53:59 2009
|
||||
@@ -437,16 +437,16 @@ uninstall-am:
|
||||
$OpenBSD: patch-doc_Makefile_in,v 1.6 2010/04/20 14:54:21 ajacoutot Exp $
|
||||
--- doc/Makefile.in.orig Tue Mar 23 20:11:23 2010
|
||||
+++ doc/Makefile.in Tue Apr 20 16:38:22 2010
|
||||
@@ -444,16 +444,16 @@ uninstall-am:
|
||||
@DBUS_XML_DOCS_ENABLED_TRUE@all-local: $(HTML_FILES)
|
||||
|
||||
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-specification.html: dbus-specification.xml
|
||||
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-tools_Makefile_in,v 1.5 2009/10/10 14:30:47 ajacoutot Exp $
|
||||
--- tools/Makefile.in.orig Tue Jul 14 21:43:07 2009
|
||||
+++ tools/Makefile.in Sat Oct 10 12:53:59 2009
|
||||
@@ -322,7 +322,7 @@ top_build_prefix = @top_build_prefix@
|
||||
$OpenBSD: patch-tools_Makefile_in,v 1.6 2010/04/20 14:54:21 ajacoutot Exp $
|
||||
--- tools/Makefile.in.orig Tue Mar 23 20:11:23 2010
|
||||
+++ tools/Makefile.in Tue Apr 20 16:38:22 2010
|
||||
@@ -339,7 +339,7 @@ top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
configdir = $(sysconfdir)/dbus-1
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-tools_Makefile_in,v 1.5 2009/10/10 14:30:47 ajacoutot Exp $
|
||||
dbus_send_SOURCES = \
|
||||
dbus-print-message.c \
|
||||
dbus-print-message.h \
|
||||
@@ -358,8 +358,8 @@ CLEANFILES = \
|
||||
@@ -375,8 +375,8 @@ CLEANFILES = \
|
||||
run-with-tmp-session-bus.conf
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user