Update to dbus-1.4.8.

This commit is contained in:
ajacoutot 2011-04-21 08:27:23 +00:00
parent 6d01c2069a
commit 84e11a7fde
4 changed files with 29 additions and 39 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.58 2011/03/07 19:20:28 ajacoutot Exp $ # $OpenBSD: Makefile,v 1.59 2011/04/21 08:27:23 ajacoutot Exp $
# XXX patches/patch-configure_in disables PIE on arm/hppa. This is just a # XXX patches/patch-configure_in disables PIE on arm/hppa. This is just a
# temporary workaround until PIE works. # temporary workaround until PIE works.
COMMENT= message bus system COMMENT= message bus system
DISTNAME= dbus-1.4.6 DISTNAME= dbus-1.4.8
EPOCH= 0 EPOCH= 0
SHARED_LIBS += dbus-1 9.1 # .8.4 SHARED_LIBS += dbus-1 9.1 # .8.4
@ -28,7 +28,6 @@ MASTER_SITES= ${HOMEPAGE}/releases/dbus/
SEPARATE_BUILD= simple SEPARATE_BUILD= simple
USE_LIBTOOL= Yes USE_LIBTOOL= Yes
USE_GROFF = Yes
CONFIGURE_STYLE= gnu CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \

View File

@ -1,5 +1,5 @@
MD5 (dbus-1.4.6.tar.gz) = mbFl9yfdilxLfiwgqL9dtg== MD5 (dbus-1.4.8.tar.gz) = 4wJT4V8PTmxe6ebw66UEbA==
RMD160 (dbus-1.4.6.tar.gz) = x1FjBlQiW3KVEtepluWtcNv8Wfw= RMD160 (dbus-1.4.8.tar.gz) = Pw9/9+lSuTwz/ieGLStBkTlOADI=
SHA1 (dbus-1.4.6.tar.gz) = 6HUgUY36C/xLh5EQVnPkj5k4dNc= SHA1 (dbus-1.4.8.tar.gz) = aAdnFcxgCWSWdxX/+Sf6zgExO24=
SHA256 (dbus-1.4.6.tar.gz) = dT4eZN8t5Rjsk73umoE6hbPBR6NjYVQSgYw8CVy4pWc= SHA256 (dbus-1.4.8.tar.gz) = SL9zo1vg8OLZpQcdjy2cfEC0JU2bQF3uV/D7B8nDz1g=
SIZE (dbus-1.4.6.tar.gz) = 1835214 SIZE (dbus-1.4.8.tar.gz) = 1841864

View File

@ -1,10 +1,10 @@
$OpenBSD: patch-configure,v 1.11 2011/03/10 15:18:43 ajacoutot Exp $ $OpenBSD: patch-configure,v 1.12 2011/04/21 08:27:23 ajacoutot Exp $
Unbreak on gcc3: remove non supported -Wno-address. Unbreak on gcc3: remove non supported -Wno-address.
--- configure.orig Thu Feb 17 21:06:57 2011 --- configure.orig Fri Apr 8 15:30:41 2011
+++ configure Thu Mar 10 07:45:39 2011 +++ configure Thu Apr 21 09:14:24 2011
@@ -17999,13 +17999,13 @@ fi @@ -17886,13 +17886,13 @@ fi
# Thread lib detection # Thread lib detection
ac_fn_c_check_func "$LINENO" "pthread_cond_timedwait" "ac_cv_func_pthread_cond_timedwait" ac_fn_c_check_func "$LINENO" "pthread_cond_timedwait" "ac_cv_func_pthread_cond_timedwait"
if test "x$ac_cv_func_pthread_cond_timedwait" = x""yes; then : if test "x$ac_cv_func_pthread_cond_timedwait" = x""yes; then :
@ -21,7 +21,7 @@ Unbreak on gcc3: remove non supported -Wno-address.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@@ -18036,7 +18036,7 @@ fi @@ -17923,7 +17923,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cond_timedwait" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_cond_timedwait" >&5
$as_echo "$ac_cv_lib_pthread_pthread_cond_timedwait" >&6; } $as_echo "$ac_cv_lib_pthread_pthread_cond_timedwait" >&6; }
if test "x$ac_cv_lib_pthread_pthread_cond_timedwait" = x""yes; then : if test "x$ac_cv_lib_pthread_pthread_cond_timedwait" = x""yes; then :
@ -30,7 +30,7 @@ Unbreak on gcc3: remove non supported -Wno-address.
fi fi
fi fi
@@ -18251,13 +18251,13 @@ if test x$have_selinux = xyes ; then @@ -18138,13 +18138,13 @@ if test x$have_selinux = xyes ; then
if test "x$ac_cv_func_pthread_create" = x""yes; then : if test "x$ac_cv_func_pthread_create" = x""yes; then :
else else
@ -47,7 +47,7 @@ Unbreak on gcc3: remove non supported -Wno-address.
cat confdefs.h - <<_ACEOF >conftest.$ac_ext cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
@@ -18288,7 +18288,7 @@ fi @@ -18175,7 +18175,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
@ -56,7 +56,7 @@ Unbreak on gcc3: remove non supported -Wno-address.
fi fi
fi fi
@@ -19569,11 +19569,6 @@ if test "x$GCC" = "xyes"; then @@ -19474,11 +19474,6 @@ if test "x$GCC" = "xyes"; then
esac esac
case " $CFLAGS " in case " $CFLAGS " in
@ -68,7 +68,7 @@ Unbreak on gcc3: remove non supported -Wno-address.
*[\ \ ]-Wfloat-equal[\ \ ]*) ;; *[\ \ ]-Wfloat-equal[\ \ ]*) ;;
*) if cc_supports_flag -Wfloat-equal; then *) if cc_supports_flag -Wfloat-equal; then
CFLAGS="$CFLAGS -Wfloat-equal" CFLAGS="$CFLAGS -Wfloat-equal"
@@ -19608,7 +19603,10 @@ if test "x$GCC" = "xyes"; then @@ -19513,7 +19508,10 @@ if test "x$GCC" = "xyes"; then
;; ;;
esac esac
@ -80,7 +80,7 @@ Unbreak on gcc3: remove non supported -Wno-address.
*[\ \ ]-fPIE[\ \ ]*) ;; *[\ \ ]-fPIE[\ \ ]*) ;;
*) if test x$dbus_win = xno && cc_supports_flag -fPIE; then *) if test x$dbus_win = xno && cc_supports_flag -fPIE; then
PIE_CFLAGS="-fPIE" PIE_CFLAGS="-fPIE"
@@ -19620,6 +19618,7 @@ if test "x$GCC" = "xyes"; then @@ -19525,6 +19523,7 @@ if test "x$GCC" = "xyes"; then
fi fi
;; ;;
esac esac
@ -88,7 +88,7 @@ Unbreak on gcc3: remove non supported -Wno-address.
### Disabled warnings, and compiler flag overrides ### Disabled warnings, and compiler flag overrides
@@ -19636,13 +19635,6 @@ if test "x$GCC" = "xyes"; then @@ -19541,13 +19540,6 @@ if test "x$GCC" = "xyes"; then
case " $CFLAGS " in case " $CFLAGS " in
*[\ \ ]-Wno-sign-compare[\ \ ]*) ;; *[\ \ ]-Wno-sign-compare[\ \ ]*) ;;
*) CFLAGS="$CFLAGS -Wno-sign-compare" ;; *) CFLAGS="$CFLAGS -Wno-sign-compare" ;;

View File

@ -1,24 +1,15 @@
$OpenBSD: patch-doc_Makefile_in,v 1.11 2011/03/07 19:20:28 ajacoutot Exp $ $OpenBSD: patch-doc_Makefile_in,v 1.12 2011/04/21 08:27:23 ajacoutot Exp $
--- doc/Makefile.in.orig Thu Feb 17 21:06:59 2011
+++ doc/Makefile.in Fri Mar 4 21:59:31 2011 Don't install apidir since we disable doxygen docs.
@@ -595,16 +595,16 @@ uninstall-man: uninstall-man1
@DBUS_XML_DOCS_ENABLED_TRUE@all-local:: $(HTML_FILES) --- doc/Makefile.in.orig Fri Apr 8 15:30:42 2011
+++ doc/Makefile.in Thu Apr 21 10:03:12 2011
@@ -550,7 +550,7 @@ info: info-am
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-specification.html: dbus-specification.xml info-am:
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-specification.xml
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-test-plan.html: dbus-test-plan.xml -install-data-am: install-apiDATA install-data-local install-man
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $< +install-data-am: install-data-local install-man
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-test-plan.xml
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-tutorial.html: dbus-tutorial.xml install-dvi: install-dvi-am
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-tutorial.xml
@DBUS_XML_DOCS_ENABLED_TRUE@dbus-faq.html: dbus-faq.xml
-@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $<
+@DBUS_XML_DOCS_ENABLED_TRUE@ $(XMLTO) html-nochunks $(srcdir)/dbus-faq.xml
@DBUS_DOXYGEN_DOCS_ENABLED_TRUE@all-local:: $(DOXYGEN_HTML_INDEX)