diff options
| -rw-r--r-- | conf/distro/angstrom-2007.1.conf | 5 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 2 | ||||
| -rw-r--r-- | packages/gdado/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/gdado/gdado_2.2.bb | 15 | ||||
| -rw-r--r-- | packages/gnome/gconf-dbus_svn.bb | 27 |
5 files changed, 29 insertions, 20 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index 86e87f31d6..5ad67f328f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -96,9 +96,6 @@ PREFERRED_VERSION_linux-handhelds-2.6_magician ?= "2.6.20-hh6" PREFERRED_VERSION_file = "4.18" PREFERRED_VERSION_file_native = "4.18" -SRCDATE_gconf-dbus = "20060719" -SRCDATE_gnome-vfs-dbus = "20060803" - CVS_TARBALL_STASH = "\ http://www.angstrom-distribution.org/unstable/sources/ \ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ @@ -130,7 +127,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm ?= "gtk+" PREFERRED_VERSION_fontconfig = "2.4.1" -PREFERRED_VERSION_freetype = "2.3.1" +PREFERRED_VERSION_freetype = "2.3.3" PREFERRED_VERSION_freetype-native = "2.2.1" PREFERRED_VERSION_cairo = "1.4.2" PREFERRED_VERSION_glib-2.0 = "2.12.11" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index fdac29e398..9fd71d05d8 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,7 +46,7 @@ SRCDATE_rosetta ?= "20060804" SRCDATE_gpesyncd ?= "20061128" # GNOME -SRCDATE_gconf-dbus ?= "20060719" +SRCDATE_gconf-dbus ?= "20070412" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" diff --git a/packages/gdado/.mtn2git_empty b/packages/gdado/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/gdado/.mtn2git_empty diff --git a/packages/gdado/gdado_2.2.bb b/packages/gdado/gdado_2.2.bb new file mode 100644 index 0000000000..feaa6ed991 --- /dev/null +++ b/packages/gdado/gdado_2.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "gtk+ based dice roller for RPG games" +HOMEPAGE = "http://gdado.sf.net" +SECTION = "x11/games" +LICENSE = "GPLv2" +DEPENDS = "libgnomeui gtk+" +PR = "r1" +SRC_URI = "${SOURCEFORGE_MIRROR}/gdado/gdado-${PV}.tar.gz" + +inherit autotools + +do_install_prepend() { + sed -i -e "s|Icon=gdado.png|Icon=${datadir}/pixmaps/gdado/gdado.png|" \ + gdado.desktop +} + diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb index 87daa1d227..0bb9765749 100644 --- a/packages/gnome/gconf-dbus_svn.bb +++ b/packages/gnome/gconf-dbus_svn.bb @@ -6,13 +6,10 @@ PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "2.10.0+svn${SRCDATE}" +PV = "2.16.0+svn${SRCDATE}" PR = "r0" SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ - file://gconf-dbus-update.patch;patch=1;pnum=0 \ - file://xml-backend-locks-compile-fix.patch;patch=1 \ - file://xml-backend-oldxml-Makefile.patch \ file://69gconfd-dbus" inherit pkgconfig autotools @@ -20,23 +17,22 @@ S = "${WORKDIR}/trunk" PARALLEL_MAKE = "" -FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" -FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug" +FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \ + ${libdir}/GConf-dbus/2/*.so \ + ${libdir}/dbus-1.0 \ + ${sysconfdir} \ + ${datadir}/dbus*" +FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \ + ${libdir}/GConf-dbus/2/.debug "" EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" -HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" - -do_compile_prepend() { - cd ${S} - patch -p1 < ../xml-backend-oldxml-Makefile.patch +do_configure_prepend() { + touch ${S}/gtk-doc.make } do_stage() { - oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} - install -d ${STAGING_INCDIR}/gconf/2/gconf/ - ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) - install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 + autotools_stage_all } do_install_append () { @@ -45,3 +41,4 @@ do_install_append () { install -d ${D}/${datadir}/dbus-1.0/services/ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ } + |