From 8b8a6e7babf2dd728a981c403fa456f8287443f9 Mon Sep 17 00:00:00 2001 From: Stefan Fiedler Date: Sat, 3 Nov 2007 09:26:35 +0000 Subject: [PATCH] Stefan Fiedler: update hal, hal-info, dbus, dbus-glib, dbus-python, policykit add consolekit add CORE package dbus-qt3; this fixes HAL support in kdebase, resulting in much better handling of removable media like CD-ROMs and USB sticks (rebuilding kdebase is required) [2007101319522622540] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8795 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/dbus-glib/dbus-glib.desc | 4 +- package/base/dbus-glib/glib-linkage.patch | 23 --------- package/base/dbus-glib/makefiles.patch | 24 --------- package/base/dbus-qt3/dbus-qt3.desc | 43 ++++++++++++++++ package/base/dbus/dbus.desc | 4 +- package/base/dbus/dbus.init | 1 + package/base/hal-info/hal-info.desc | 4 +- package/base/hal/dont-install-fdis.patch | 17 ------- .../base/hal/fix-build-without-libpci.patch | 42 ---------------- package/base/hal/hal.desc | 4 +- package/base/policykit/policykit.conf | 3 +- package/base/policykit/policykit.desc | 4 +- package/public/consolekit/consolekit.desc | 49 +++++++++++++++++++ package/public/dbus-python/dbus-python.desc | 4 +- 14 files changed, 107 insertions(+), 119 deletions(-) delete mode 100644 package/base/dbus-glib/glib-linkage.patch delete mode 100644 package/base/dbus-glib/makefiles.patch create mode 100644 package/base/dbus-qt3/dbus-qt3.desc delete mode 100644 package/base/hal/dont-install-fdis.patch delete mode 100644 package/base/hal/fix-build-without-libpci.patch create mode 100644 package/public/consolekit/consolekit.desc diff --git a/package/base/dbus-glib/dbus-glib.desc b/package/base/dbus-glib/dbus-glib.desc index 9973203f7..0f6959386 100644 --- a/package/base/dbus-glib/dbus-glib.desc +++ b/package/base/dbus-glib/dbus-glib.desc @@ -43,8 +43,8 @@ [L] GPL [S] Beta -[V] 0.73 +[V] 0.74 [P] X -----5---9 171.500 -[D] 1186955002 dbus-glib-0.73.tar.gz http://dbus.freedesktop.org/releases/dbus-glib/ +[D] 3209514572 dbus-glib-0.74.tar.gz http://dbus.freedesktop.org/releases/dbus-glib/ diff --git a/package/base/dbus-glib/glib-linkage.patch b/package/base/dbus-glib/glib-linkage.patch deleted file mode 100644 index 6b9bdc03b..000000000 --- a/package/base/dbus-glib/glib-linkage.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -dur dbus-glib-0.72/test/core/Makefile.in dbus-glib-0.72-p/test/core/Makefile.in ---- dbus-glib-0.72/test/core/Makefile.in 2006-10-25 23:14:32.000000000 +0200 -+++ dbus-glib-0.72-p/test/core/Makefile.in 2006-12-30 00:49:47.000000000 +0100 -@@ -389,7 +389,7 @@ - $(LINK) $(test_dbus_glib_LDFLAGS) $(test_dbus_glib_OBJECTS) $(test_dbus_glib_LDADD) $(LIBS) - test-profile$(EXEEXT): $(test_profile_OBJECTS) $(test_profile_DEPENDENCIES) - @rm -f test-profile$(EXEEXT) -- $(LINK) $(test_profile_LDFLAGS) $(test_profile_OBJECTS) $(test_profile_LDADD) $(LIBS) -+ $(LINK) $(test_profile_LDFLAGS) $(test_profile_OBJECTS) $(test_profile_LDADD) $(LIBS) $(DBUS_GLIB_LIBS) - test-service-glib$(EXEEXT): $(test_service_glib_OBJECTS) $(test_service_glib_DEPENDENCIES) - @rm -f test-service-glib$(EXEEXT) - $(LINK) $(test_service_glib_LDFLAGS) $(test_service_glib_OBJECTS) $(test_service_glib_LDADD) $(LIBS) ---- dbus-glib-0.72/dbus/examples/Makefile.in 2006-10-25 23:14:31.000000000 +0200 -+++ dbus-glib-0.72-p/dbus/examples/Makefile.in 2006-12-30 00:47:24.000000000 +0100 -@@ -343,7 +343,7 @@ - done - example-client$(EXEEXT): $(example_client_OBJECTS) $(example_client_DEPENDENCIES) - @rm -f example-client$(EXEEXT) -- $(LINK) $(example_client_LDFLAGS) $(example_client_OBJECTS) $(example_client_LDADD) $(LIBS) -+ $(LINK) $(example_client_LDFLAGS) $(example_client_OBJECTS) $(example_client_LDADD) $(LIBS) $(DBUS_GLIB_LIBS) - example-service$(EXEEXT): $(example_service_OBJECTS) $(example_service_DEPENDENCIES) - @rm -f example-service$(EXEEXT) - $(LINK) $(example_service_LDFLAGS) $(example_service_OBJECTS) $(example_service_LDADD) $(LIBS) diff --git a/package/base/dbus-glib/makefiles.patch b/package/base/dbus-glib/makefiles.patch deleted file mode 100644 index 37987bdcc..000000000 --- a/package/base/dbus-glib/makefiles.patch +++ /dev/null @@ -1,24 +0,0 @@ -Benjamin Schieder: - fix drainbramaged Makefile.in files ---- ./dbus/examples/Makefile.in 2007-03-21 10:36:29.000000000 +0100 -+++ ./dbus/examples/Makefile.in.inew 2007-03-21 10:49:06.000000000 +0100 -@@ -187,7 +187,7 @@ INTLLIBS = @INTLLIBS@ - INTROSPECT_XML_PATH = @INTROSPECT_XML_PATH@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ @DBUS_GLIB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ ---- ./dbus/examples/statemachine/Makefile.in 2007-02-13 15:16:44.000000000 +0100 -+++ ./dbus/examples/statemachine/Makefile.in.new 2007-03-21 10:50:20.000000000 +0100 -@@ -163,7 +163,7 @@ INTLLIBS = @INTLLIBS@ - INTROSPECT_XML_PATH = @INTROSPECT_XML_PATH@ - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = @LIBS@ @DBUS_GLIB_LIBS@ - LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ diff --git a/package/base/dbus-qt3/dbus-qt3.desc b/package/base/dbus-qt3/dbus-qt3.desc new file mode 100644 index 000000000..9122ff6e6 --- /dev/null +++ b/package/base/dbus-qt3/dbus-qt3.desc @@ -0,0 +1,43 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/public/dbus-qt3/dbus-qt3.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2007 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] Qt3 bindings for dbus + +[T] Qt3 bindings for dbus. + +[U] http://freedesktop.org/wiki/Software/DBusBindings +[U] http://wiki.linuxfromscratch.org/blfs/wiki/dbus-qt3 + +[A] Stephan Kulow { maintainer } +[M] The ROCK Linux Project + +[C] extra/configuration +[F] CORE + +[L] GPL +[S] Stable +[V] 0.62 +[P] X -----5---9 171.600 + +[D] 1471883642 dbus-qt3-0.62.tar.bz2 http://anduin.linuxfromscratch.org/files/BLFS/sources/ + diff --git a/package/base/dbus/dbus.desc b/package/base/dbus/dbus.desc index 8a426d501..b0eb7ab81 100644 --- a/package/base/dbus/dbus.desc +++ b/package/base/dbus/dbus.desc @@ -43,8 +43,8 @@ [L] GPL [S] Stable -[V] 1.0.2 +[V] 1.1.2 [P] X -----5---9 171.300 -[D] 2540049283 dbus-1.0.2.tar.gz http://dbus.freedesktop.org/releases/dbus/ +[D] 3556224779 dbus-1.1.2.tar.gz http://dbus.freedesktop.org/releases/dbus/ diff --git a/package/base/dbus/dbus.init b/package/base/dbus/dbus.init index 86c2173cb..4d30ed708 100644 --- a/package/base/dbus/dbus.init +++ b/package/base/dbus/dbus.init @@ -5,6 +5,7 @@ main_begin block_begin(start, `Setting up D-Bus.') check(`mkdir -p /var/run/dbus') + check(`D_prefix/bin/dbus-uuidgen --ensure') check(`D_prefix/bin/dbus-daemon --system') block_end diff --git a/package/base/hal-info/hal-info.desc b/package/base/hal-info/hal-info.desc index 1b6bc9e7b..6a796d32c 100644 --- a/package/base/hal-info/hal-info.desc +++ b/package/base/hal-info/hal-info.desc @@ -38,8 +38,8 @@ [L] GPL [S] Beta -[V] 20070131 +[V] 20070618 [P] X -----5---9 172.600 # git clone git://anongit.freedesktop.org/git/hal-info -[D] 2114202491 hal-info-20070131.tar.bz2 http://www.rocklinux.net/people/clifford/mirror/ +[D] 4004508587 hal-info-20070618.tar.gz http://people.freedesktop.org/~david/dist/ diff --git a/package/base/hal/dont-install-fdis.patch b/package/base/hal/dont-install-fdis.patch deleted file mode 100644 index ecdbf6fcc..000000000 --- a/package/base/hal/dont-install-fdis.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- hal-0.5.8.1/fdi/information/10freedesktop/Makefile.in~ 2006-09-19 22:24:36.000000000 +0200 -+++ hal-0.5.8.1/fdi/information/10freedesktop/Makefile.in 2006-12-30 20:03:41.000000000 +0100 -@@ -282,13 +282,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - fdidir = $(datadir)/hal/fdi/information/10freedesktop --dist_fdi_DATA = 10-usb-card-readers.fdi \ -- 10-usb-music-players.fdi \ -- 10-usb-zip-drives.fdi \ -- 10-wireless-mice.fdi \ -- 10-camera-ptp.fdi \ -- 10-usb-pda.fdi \ -- 10-cd-dvd-burner.fdi -+dist_fdi_DATA = 10-wireless-mice.fdi - - all: all-am - diff --git a/package/base/hal/fix-build-without-libpci.patch b/package/base/hal/fix-build-without-libpci.patch deleted file mode 100644 index 38cdfc311..000000000 --- a/package/base/hal/fix-build-without-libpci.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -dur hal-0.5.8.1/configure hal-0.5.8.1-p/configure ---- hal-0.5.8.1/configure 2006-09-19 22:24:41.000000000 +0200 -+++ hal-0.5.8.1-p/configure 2006-12-30 13:49:17.000000000 +0100 -@@ -22383,10 +22383,10 @@ - - fi; - BUILD_MACBOOKPRO=no --if test "x$use_macbookpro" = "xyes" ; then -+if test "x$with_macbookpro" = "xyes" ; then - BUILD_MACBOOKPRO=yes --elif test "x$use_macbookpro" = "x" ; then -- if test "$HAVE_LIBPCI" != "false" ; then -+elif test "x$with_macbookpro" = "x" ; then -+ if test "x$HAVE_LIBPCI_TRUE" != "x#" ; then - case "${host}" in - i[3456]86-*-linux*) - BUILD_MACBOOKPRO=yes -@@ -22397,7 +22397,6 @@ - fi - fi - -- - if test x$BUILD_MACBOOKPRO = xyes; then - BUILD_MACBOOKPRO_TRUE= - BUILD_MACBOOKPRO_FALSE='#' -diff -dur hal-0.5.8.1/configure.in hal-0.5.8.1-p/configure.in ---- hal-0.5.8.1/configure.in 2006-09-19 22:24:05.000000000 +0200 -+++ hal-0.5.8.1-p/configure.in 2006-12-30 13:49:06.000000000 +0100 -@@ -250,10 +250,10 @@ - dnl see if we should build macbookpro utils - AC_ARG_WITH(macbookpro, [ --with-macbookpro Whether to build Macbook Pro utils (auto)]) - BUILD_MACBOOKPRO=no --if test "x$use_macbookpro" = "xyes" ; then -+if test "x$with_macbookpro" = "xyes" ; then - BUILD_MACBOOKPRO=yes --elif test "x$use_macbookpro" = "x" ; then -- if test "$HAVE_LIBPCI" != "false" ; then -+elif test "x$with_macbookpro" = "x" ; then -+ if test "x$HAVE_LIBPCI_TRUE" != "x#" ; then - case "${host}" in - i[[3456]]86-*-linux*) - BUILD_MACBOOKPRO=yes diff --git a/package/base/hal/hal.desc b/package/base/hal/hal.desc index 47a12c027..974b89c89 100644 --- a/package/base/hal/hal.desc +++ b/package/base/hal/hal.desc @@ -35,8 +35,8 @@ [L] GPL [S] Beta -[V] 0.5.8.1 +[V] 0.5.9.1 [P] X -----5---9 171.800 -[D] 1641124710 hal-0.5.8.1.tar.gz http://freedesktop.org/~david/dist/ +[D] 4213366806 hal-0.5.9.1.tar.gz http://freedesktop.org/~david/dist/ diff --git a/package/base/policykit/policykit.conf b/package/base/policykit/policykit.conf index aa873e5ea..6f9e01f48 100644 --- a/package/base/policykit/policykit.conf +++ b/package/base/policykit/policykit.conf @@ -1,4 +1,5 @@ autogen=1 pkginstalled xmlto || var_append extraconfopt " " "--disable-docbook-docs" -hook_add postmake 3 "install_init policykit $confdir/policykit.init" +# polkitd seems to have been removed. +# hook_add postmake 3 "install_init policykit $confdir/policykit.init" diff --git a/package/base/policykit/policykit.desc b/package/base/policykit/policykit.desc index d83af72f6..73b765103 100644 --- a/package/base/policykit/policykit.desc +++ b/package/base/policykit/policykit.desc @@ -34,9 +34,9 @@ [L] GPL [S] Beta -[V] 20070131 +[V] 0.3 [P] X -----5---9 171.600 # git clone git://anongit.freedesktop.org/git/PolicyKit -[D] 3190504228 PolicyKit-20070131.tar.bz2 http://www.rocklinux.net/people/clifford/mirror/ +[D] 2019877367 PolicyKit-0.3.tar.gz http://people.freedesktop.org/~david/dist/ diff --git a/package/public/consolekit/consolekit.desc b/package/public/consolekit/consolekit.desc new file mode 100644 index 000000000..88148f368 --- /dev/null +++ b/package/public/consolekit/consolekit.desc @@ -0,0 +1,49 @@ + +[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- +[COPY] +[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. +[COPY] Please add additional copyright information _after_ the line containing +[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by +[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! +[COPY] +[COPY] ROCK Linux: rock-src/package/public/consolekit/consolekit.desc +[COPY] ROCK Linux is Copyright (C) 1998 - 2007 Clifford Wolf +[COPY] +[COPY] This program is free software; you can redistribute it and/or modify +[COPY] it under the terms of the GNU General Public License as published by +[COPY] the Free Software Foundation; either version 2 of the License, or +[COPY] (at your option) any later version. A copy of the GNU General Public +[COPY] License can be found at Documentation/COPYING. +[COPY] +[COPY] Many people helped and are helping developing ROCK Linux. Please +[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM +[COPY] file for details. +[COPY] +[COPY] --- ROCK-COPYRIGHT-NOTE-END --- + +[I] a framework for defining and tracking users, login sessions and seats + +[T] ConsoleKit is a framework for defining and tracking users, login sessions, +[T] and seats. +[T] A seat is a collection of sessions and a set of hardware (usually at +[T] least a keyboard and mouse). Only one session may be active on a +[T] seat at a time. +[T] A session is a collection of all processes that originate from a single +[T] common ancestor and retain knowledge of a secret. As an implementation +[T] detail, this secret may be stored in the process environment by the +[T] login manager under the name XDG_SESSION_COOKIE. + +[U] http://freedesktop.org/wiki/Software/ConsoleKit + +[A] William Jon McCann +[M] The ROCK Linux Project + +[C] extra/configuration + +[L] GPL +[S] Beta +[V] 0.2.3 +[P] X -----5---9 171.500 + +[D] 2400043252 ConsoleKit-0.2.3.tar.gz http://people.freedesktop.org/~mccann/dist/ + diff --git a/package/public/dbus-python/dbus-python.desc b/package/public/dbus-python/dbus-python.desc index 2eec31ea5..50700a1ba 100644 --- a/package/public/dbus-python/dbus-python.desc +++ b/package/public/dbus-python/dbus-python.desc @@ -42,7 +42,7 @@ [L] GPL [S] Beta -[V] 0.71 +[V] 0.82.3 [P] X -----5---9 171.700 -[D] 1667270371 dbus-python-0.71.tar.gz http://dbus.freedesktop.org/releases/ +[D] 2416670593 dbus-python-0.82.3.tar.gz http://dbus.freedesktop.org/releases/dbus-python/