diff --git a/general.ent b/general.ent index 13394f600f..57f6cc1226 100644 --- a/general.ent +++ b/general.ent @@ -3,13 +3,13 @@ $LastChangedBy$ $Date$ --> - + - + @@ -198,7 +198,8 @@ $Date$ - + + @@ -294,7 +295,7 @@ $Date$ - + diff --git a/general/genlib/gobject-introspection.xml b/general/genlib/gobject-introspection.xml index 7b5ce6229a..9bf651a59d 100644 --- a/general/genlib/gobject-introspection.xml +++ b/general/genlib/gobject-introspection.xml @@ -4,12 +4,14 @@ %general-entities; - - - - - - + + + + + + + + ]> @@ -33,7 +35,7 @@ to describe the APIs and collect them in a uniform, machine readable format. - &lfs65_checked; + &lfs70_checked; Package Information @@ -58,14 +60,18 @@ Required - , - or (build Java so that - libffi is built), and - + + , + or (build Java so that + libffi is built), and + + Optional - (Required for the tests) and - + + (Required for the tests) and + + User Notes: @@ -75,18 +81,10 @@ Installation of gobject-introspection - - If you have Python-2.7 installed, issue the following command to - prevent a build failure: -sed -i 's/Importer:/Importer(None, None):/' \ - giscanner/{sourcescanner,xmlwriter}.py - - Install gobject-introspection by running the following commands: -./configure --prefix=/usr \ - --disable-tests && +./configure --prefix=/usr --disable-tests && make To test the results, issue: make check. @@ -118,11 +116,16 @@ make Installed Directories - g-ir-compiler and g-ir-generate + + g-ir-annotation-tool, g-ir-compiler, g-ir-doc-tool, g-ir-generate, + and g-ir-scanner + _giscanner.{so,a} and libgirepository-1.0.{so,a} - /usr/{include/gobject-introspection-1.0,lib/{girepository-1.0, - gobject-introspection/giscanner},share/{gir-1.0, - gobject-introspection-1.0}} + + /usr/include/gobject-introspection-1.0, + /usr/lib/{girepository-1.0,gobject-introspection}, + /usr/lib/share/{gir-1.0,gobject-introspection-1.0} + diff --git a/general/sysutils/dbus.xml b/general/sysutils/dbus.xml index 9021b81cf7..b5dd788aa5 100644 --- a/general/sysutils/dbus.xml +++ b/general/sysutils/dbus.xml @@ -7,10 +7,10 @@ - - - - + + + + ]> @@ -40,7 +40,7 @@ applications to communicate directly (without going through the message bus daemon). - &lfs70_built; + &lfs70_checked; Package Information @@ -67,12 +67,17 @@ D-BUS Dependencies Required - (preferred) or + + (preferred) or + + Optional - and - (to generate the API documentation) + + , + (to run tests), and + (to generate the API documentation) + Note that the configure script will look for but it does nothing as the XML/HTML documentation is @@ -104,61 +109,51 @@ As the root user, create a system user and group to handle the system message bus activity: -groupadd -fg 18 messagebus && +groupadd -g 18 messagebus && useradd -c "D-BUS Message Daemon User" -d /dev/null \ - -u 18 -g messagebus -s /bin/false messagebus || [ $? == 9 ] - - This package's test suite cannot be run without passing additional - parameters to configure and exposing additional - functionality in the binaries. These interfaces are not intended to be - used in a production build of D-BUS, so it - will have to be built twice in this situation. If you would like to run - the unit tests, issue the following commands: - -./configure --enable-tests --enable-asserts && -make && -make check && -make distclean - - Note there has been a report that the tests may fail if running - inside a Midnight Commander shell. + -u 18 -g messagebus -s /bin/false messagebus Install D-BUS by running the following commands (you may wish to review the output from ./configure --help first and add any desired parameters to the configure command shown below): -./configure --prefix=/usr \ - --sysconfdir=/etc \ +./configure --prefix=/usr \ + --sysconfdir=/etc \ --libexecdir=/usr/lib/dbus-1.0 \ --localstatedir=/var && make - - - The parameter does not work + + See below for test instructions. Now, as the root user: make install && -install -v -m755 -d /usr/share/doc/dbus-&dbus-version; && -install -v -m644 doc/{TODO,*.{dtd,html,xml,xsl,txt,c}} \ - /usr/share/doc/dbus-&dbus-version; +mv -v /usr/share/doc/dbus /usr/share/doc/dbus-&dbus-version; - If you built the API documentation, install it by issuing the - following commands as the root - user: + The dbus tests cannot be run until after + has been installed. The tests require passing additional parameters to + configure and exposing additional functionality in the + binaries. These interfaces are not intended to be used in a production + build of D-BUS. If you would like to run the + unit tests, issue the following commands: -install -v -m755 -d /usr/share/doc/dbus-&dbus-version;/api \ - /usr/share/man/man3dbus && -install -v -m644 doc/api/html/* \ - /usr/share/doc/dbus-&dbus-version;/api && -install -v -m644 doc/api/man/man3dbus/* \ - /usr/share/man/man3dbus + +make distclean && +./configure --enable-tests --enable-asserts && +make && +make check && +make distclean + + Note there has been a report that the tests may fail if running + inside a Midnight Commander shell. diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml index f914ade915..234bf3d306 100644 --- a/introduction/welcome/changelog.xml +++ b/introduction/welcome/changelog.xml @@ -41,6 +41,18 @@ --> + + December 16th, 2011 + + + + [bdubbs] - Updated to gobject-introspection-1.29.17 + + + + December 13th, 2011 diff --git a/x/lib/qt.xml b/x/lib/qt.xml index 89141dd77b..3988476b80 100644 --- a/x/lib/qt.xml +++ b/x/lib/qt.xml @@ -32,9 +32,10 @@ The Qt package contains a C++ GUI library. This is useful for creating graphical applications or executing graphical applications that are - dynamically linked to the Qt library. One of - the major users of Qt is - KDE. + dynamically linked to the Qt library. Two of + the major users of Qt are + KDE and its foolow on project, + Trinity. Package Information @@ -58,6 +59,10 @@ + + + + Qt Dependencies Required