[SM-Commit] GIT changes to master grimoire by Treeve Jelbert (3b18153c260a5f6f2ba38ac3ebc29cce9e5c28eb)

Treeve Jelbert scm at mail.sourcemage.org
Fri Sep 29 08:14:11 EDT 2006


GIT changes to master grimoire by Treeve Jelbert <treeve at scarlet.be>:

 utils/dbus-glib/DEPENDS |    1 +
 utils/dbus-glib/DETAILS |    2 +-
 utils/dbus-glib/HISTORY |    4 ++++
 utils/dbus/DEPENDS      |    1 +
 utils/dbus/DETAILS      |    1 +
 utils/dbus/HISTORY      |    5 +++++
 utils/hal/BUILD         |    3 ++-
 utils/hal/DEPENDS       |   25 ++++++++++++++++++-------
 utils/hal/DETAILS       |    5 ++---
 utils/hal/HISTORY       |   12 ++++++++++++
 10 files changed, 47 insertions(+), 12 deletions(-)

New commits:
commit 3b18153c260a5f6f2ba38ac3ebc29cce9e5c28eb
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    dbus-glib - extra depends pkgconfig

commit 399de869ed68a1ae9d73bf44cccf7dc59d883655
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    dbus - extra depends pkgconfig

commit f5224bc1f3ad3d737a6f539755d50b7516d93498
Author: Treeve Jelbert <treeve at scarlet.be>
Commit: Treeve Jelbert <treeve at scarlet.be>

    hal-0.5.8.1

diff --git a/utils/dbus-glib/DEPENDS b/utils/dbus-glib/DEPENDS
index aae3cc5..575c62e 100755
--- a/utils/dbus-glib/DEPENDS
+++ b/utils/dbus-glib/DEPENDS
@@ -1,3 +1,4 @@
+depends pkgconfig  &&
 depends glib2  &&
 depends dbus   &&
 if  [  "$DBUS_XMLTYPE"  ==  'y'  ];  then
diff --git a/utils/dbus-glib/DETAILS b/utils/dbus-glib/DETAILS
index 0b177cc..46c8182 100755
--- a/utils/dbus-glib/DETAILS
+++ b/utils/dbus-glib/DETAILS
@@ -7,7 +7,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
 #      SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
         WEB_SITE=http://freedesktop.org/wiki/Software_2fdbus
          ENTERED=20060724
-      PATCHLEVEL=1
+      PATCHLEVEL=2
       LICENSE[0]=GPL
         KEYWORDS="dbus bindings"
            SHORT="glib2 bindings for dbus"
diff --git a/utils/dbus-glib/HISTORY b/utils/dbus-glib/HISTORY
index e2a5065..213f7a2 100644
--- a/utils/dbus-glib/HISTORY
+++ b/utils/dbus-glib/HISTORY
@@ -1,3 +1,7 @@
+2006-09-29 Treeve Jelbert <treeve at pi.be>
+	* DEPENDS: add pkgconfig
+	* DETAILS: PATCHLEVEL++
+
 2006-07-27 Flavien Bridault <vlaaad at sourcemage.org>
 	* PRE_BUILD: removed, this is not a connection test, this is a process
 	  which creates functions
diff --git a/utils/dbus/DEPENDS b/utils/dbus/DEPENDS
index 04b5d8f..c30039d 100755
--- a/utils/dbus/DEPENDS
+++ b/utils/dbus/DEPENDS
@@ -1,3 +1,4 @@
+depends  pkgconfig                               &&
 if  [  "$DBUS_XMLTYPE"  ==  'y'  ];  then
    depends  libxml2  '--with-xml=libxml'
 else
diff --git a/utils/dbus/DETAILS b/utils/dbus/DETAILS
index 05211e6..98c4165 100755
--- a/utils/dbus/DETAILS
+++ b/utils/dbus/DETAILS
@@ -8,6 +8,7 @@ #      SOURCE_GPG="gurus.gpg:${SOURCE}.s
         WEB_SITE=http://freedesktop.org/wiki/Software_2fdbus
          ENTERED=20040527
       LICENSE[0]=GPL
+      PATCHLEVEL=1
         KEYWORDS="utils"
            SHORT="a simple IPC library based on messages"
 cat << EOF
diff --git a/utils/dbus/HISTORY b/utils/dbus/HISTORY
index 503da1f..9ccb69a 100644
--- a/utils/dbus/HISTORY
+++ b/utils/dbus/HISTORY
@@ -1,3 +1,8 @@
+2006-09-29 Treeve Jelbert <treeve01 at pi.be>
+	* DEPENDS: add pkgconfig
+	  hal won't configure unless dbus is buid with latest pkgconfig
+	* DETAILS: PATCHLEVEL++
+
 2006-09-17 Robin Cook <rcook at wyrms.net>
 	* DETAILS: updated VERSION to 0.93
 
diff --git a/utils/hal/BUILD b/utils/hal/BUILD
index a935920..39015b8 100755
--- a/utils/hal/BUILD
+++ b/utils/hal/BUILD
@@ -1,7 +1,8 @@
+LDFLAGS="-lz $LDFLAGS"            &&
 if [ "$SELINUX" == "y" ]; then
    OPTS="$OPTS --enable-selinux"
 fi                                              &&
 
 OPTS="$OPTS --with-pid-file=/var/run/hald.pid \
-	    --enable-sysfs-carrier --enable-hotplug-map"  &&
+	    --enable-sysfs-carrier --enable-hotplug-map --disable-policy-kit"  &&
 default_build
diff --git a/utils/hal/DEPENDS b/utils/hal/DEPENDS
index 876dede..26cba2e 100755
--- a/utils/hal/DEPENDS
+++ b/utils/hal/DEPENDS
@@ -7,19 +7,30 @@ depends  libtool            &&
 depends  python             &&
 depends  udev               &&
 depends  xml-parser-expat   &&
-
+depends  dmidecode          &&
+depends  pkgconfig          &&
 #
 # expat should have --with-expat or --without-expat but there is an bug in configure.
 #
 optional_depends  expat               \
-                  ""                  \
-                  ""                  \
+                  "--with-expat"                  \
+                  "--without-expat"                  \
                   "Enable expat use"  &&
 
-optional_depends  doxygen                   \
-                  "--enable-doxygen-docs"   \
-                  "--disable-doxygen-docs"  \
-                  "Generate Doxygen docs"   &&
+#optional_depends  polkit                    \
+#                  "--enable-policy-kit"     \
+#                  "--disable-policy-kit"    \
+#                  "Build with PolicyKit (strongly recommended)"  &&
+
+optional_depends  gtk-doc                   \
+                  "--enable-gtk-doc"        \
+                  "--disable-gtk-doc"       \
+                  "build documentation"     &&
+
+optional_depends  parted                    \
+                  "--enable-parted"         \
+                  "--disable-parted"        \
+                 "to check partition table" &&
 
 optional_depends  docbook-utils             \
                   "--enable-docbook-docs"   \
diff --git a/utils/hal/DETAILS b/utils/hal/DETAILS
index c2627d6..f831d86 100755
--- a/utils/hal/DETAILS
+++ b/utils/hal/DETAILS
@@ -1,13 +1,12 @@
            SPELL=hal
-         VERSION=0.5.7.1
-     SOURCE_HASH=sha512:8bcb9579b2614b356ff7a61af9ea925fb1c2143954b7ace6b90cb42fca22da3fff70bfd4fc372fb7011c53e875e4d18968de1a4caee7ad4637d22924139ea25e
+         VERSION=0.5.8.1
+     SOURCE_HASH=sha512:044677b047517cd641f6b2e9f36cef7dd05ee035b636cd8c1d4900e300aa3b0ab5d979bd87e1bb7c4ba1689dd6546c91cca74400107a14b9a2d5f63278fd01c6
           SOURCE=$SPELL-$VERSION.tar.gz
 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=http://freedesktop.org/~david/dist/$SOURCE
 #     SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
         WEB_SITE=http://freedesktop.org/Software/hal
          ENTERED=20040904
-      PATCHLEVEL=1
       LICENSE[0]=GPL
         KEYWORDS="utils"
            SHORT="A hardware abstraction layer library"
diff --git a/utils/hal/HISTORY b/utils/hal/HISTORY
index 74d1d17..5a37a42 100644
--- a/utils/hal/HISTORY
+++ b/utils/hal/HISTORY
@@ -1,3 +1,15 @@
+2006-09-28 Treeve Jelbert <treeve at pi.be>
+	* DETAILS: version 0.5.8.1
+	* PRE_BUILD, dbus.patch: remove
+	* DEPENDS: add parted
+	  remove doxygen, add gtk-doc
+	  add back options for expat
+	  add dmidecode
+	  add pkgconfig
+	  add disabled check for polkit (no such spell yet)
+	* BUILD: disable polkit (not a good idea)
+	  add missing -lz flag to LDFLAGS
+
 2006-07-27 Treeve Jelbert <treeve at pi.be>
 	* DETAILS: version 0.5.7.1
 



More information about the SM-Commit mailing list