diff options
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 2 | ||||
| -rw-r--r-- | packages/gnome/libsoup_2.2.93.bb | 2 | ||||
| -rw-r--r-- | packages/python/python-pyxml_0.8.4.bb | 2 | ||||
| -rw-r--r-- | packages/xfwm4/xfwm4.inc | 5 | ||||
| -rw-r--r-- | packages/xorg-app/rgb_X11R7.1-1.0.1.bb | 3 | ||||
| -rw-r--r-- | packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb | 8 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 1 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-kdrive_git.bb | 5 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb | 2 |
9 files changed, 26 insertions, 4 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index a6354319ca..ce52336a16 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -29,6 +29,7 @@ FEED_URIS += " \ #SRCDATE = "20060630" #SRCDATE_handhelds-pxa-2.6 = "20060622" +SRCDATE_gconf-dbus = "20060719" CVS_TARBALL_STASH = "\ http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \ @@ -46,6 +47,7 @@ require conf/distro/include/preferred-gpe-versions-2.8.inc PREFERRED_VERSION_fontconfig = "2.3.95" PREFERRED_VERSION_freetype = "2.2.1" +PREFERRED_VERSION_xserver-kdrive = "X11R7.1-1.1.0" #zap extra stuff taking place in $MACHINE.conf GPE_EXTRA_INSTALL = "" diff --git a/packages/gnome/libsoup_2.2.93.bb b/packages/gnome/libsoup_2.2.93.bb index 7ee1a1877e..9ee030d5c9 100644 --- a/packages/gnome/libsoup_2.2.93.bb +++ b/packages/gnome/libsoup_2.2.93.bb @@ -13,5 +13,5 @@ FILES_${PN}-doc = "${datadir}" do_stage() { autotools_stage_all - install -m 0644 ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc + ln -s ${STAGING_DATADIR}/pkgconfig/libsoup.pc ${STAGING_DATADIR}/pkgconfig/libsoup-2.2.pc } diff --git a/packages/python/python-pyxml_0.8.4.bb b/packages/python/python-pyxml_0.8.4.bb index b5d277916d..edf1d21542 100644 --- a/packages/python/python-pyxml_0.8.4.bb +++ b/packages/python/python-pyxml_0.8.4.bb @@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "PSF" RDEPENDS = "python-core python-xml python-netclient" SRCNAME = "pyxml" -PV = "0.8.3" +PR = "ml0" SRC_URI = "${SOURCEFORGE_MIRROR}/pyxml/PyXML-${PV}.tar.gz" S = "${WORKDIR}/PyXML-${PV}" diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc index 1b137c4261..fb85b4d9eb 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -9,10 +9,15 @@ inherit xfce FILES_${PN} += "${datadir}/xfwm4/defaults ${datadir}/xfwm4/themes/default.keys/*" DEPENDS = "startup-notification virtual/libx11 xpm libxfce4util libxfcegui4 libxfce4mcs xfce-mcs-manager" +RDEPENDS = "xfwm4-theme-default" EXTRA_OECONF += " --enable-startup-notification" +do_configure_append() { + sed -i s:/usr/include/xfce4::g mcs-plugin/Makefile +} + PACKAGES_DYNAMIC = "xfwm4-theme-*" python populate_packages_prepend () { diff --git a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb index 4077c44cfb..87194c44b8 100644 --- a/packages/xorg-app/rgb_X11R7.1-1.0.1.bb +++ b/packages/xorg-app/rgb_X11R7.1-1.0.1.bb @@ -1,7 +1,10 @@ include xorg-app-common.inc +PR = "r1" #DESCRIPTION = "" DEPENDS += " xproto util-macros" +FILES_${PN} += "${datadir}/X11" + diff --git a/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb new file mode 100644 index 0000000000..8501865871 --- /dev/null +++ b/packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb @@ -0,0 +1,8 @@ +include xorg-proto-common.inc + +SRC_URI = "${XORG_MIRROR}/individual/proto/${XORG_PN}-1.0.3.tar.bz2" +S = "${WORKDIR}/${XORG_PN}-1.0.3" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb index a7c92dcb83..cfb1294c09 100644 --- a/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb @@ -39,6 +39,7 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-dga --disable-dri --disable-xinerama \ --disable-xf86misc --disable-xf86vidmode \ --disable-xorg --disable-xorgcfg \ + --disable-dmx \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ --with-default-font-path=built-ins \ diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index e667e36f2c..491e486b3d 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,4 +1,4 @@ -PV = "0.0+git" +PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" @@ -26,7 +26,7 @@ SRC_URI = "git://anongit.freedesktop.org/xorg/xserver;protocol=git \ file://fbdev-not-fix.patch;patch=1 \ file://enable-builtin-fonts.patch;patch=1 \ file://optional-xkb.patch;patch=1 \ - file://disable-xf86-dga-xorgcfg.patch;patch=1 \ +# file://disable-xf86-dga-xorgcfg.patch;patch=1 \ file://enable-tslib.patch;patch=1" SRC_URI_append_mnci = " file://onlyfb.patch;patch=1" @@ -43,5 +43,6 @@ EXTRA_OECONF = "--enable-composite --enable-kdrive \ --disable-xorg --disable-xorgcfg \ --disable-xkb --disable-xnest --disable-xvfb \ --disable-xevie --disable-xprint --disable-xtrap \ + --disable-dmx \ --with-default-font-path=built-ins \ ac_cv_file__usr_share_X11_sgml_defs_ent=no" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb index 674f1e5e64..42b5bb918d 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb @@ -2,6 +2,8 @@ include xorg-xserver-common.inc SRC_URI += "file://drmfix.patch;patch=1" +EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " + #DESCRIPTION = "" #DEPENDS += " " |