From 3798ea72cf90aff1caea5db9f4af1f0e1fe93c55 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 10:36:34 +0000 Subject: kbproto: update to 1.0.3, needed for kdrive-git --- packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 packages/xorg-proto/kbproto_X11R7.1-1.0.3.bb 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 += " " -- cgit v1.2.3 From fcc8b4aabe5c8e0d0624d283e5bab5a8af0854ad Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 10:44:39 +0000 Subject: xserver-kdrive git: fix PV --- packages/xorg-xserver/xserver-kdrive_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index e667e36f2c..0bcb06a6b1 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" 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" -- cgit v1.2.3 From b29c3b65131054a4a7f2c3351f94044a65958a9d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 10:48:24 +0000 Subject: xserver-xorg R7.1: fix configure brokenness by telling the ents.def file isn't there --- packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb | 2 ++ 1 file changed, 2 insertions(+) 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 += " " -- cgit v1.2.3 From 56be22422d39b604e898f8d19907a849cf63239d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 10:57:20 +0000 Subject: xserver-kdrive git: include SRCDATE in PV, even if it doesn't make sense for git trees --- packages/xorg-xserver/xserver-kdrive_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/xorg-xserver/xserver-kdrive_git.bb b/packages/xorg-xserver/xserver-kdrive_git.bb index 0bcb06a6b1..491e486b3d 100644 --- a/packages/xorg-xserver/xserver-kdrive_git.bb +++ b/packages/xorg-xserver/xserver-kdrive_git.bb @@ -1,4 +1,4 @@ -PV = "1.1.0+git" +PV = "1.1.0+git${SRCDATE}" DEFAULT_PREFERENCE = "-2" LICENSE = "MIT" @@ -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" -- cgit v1.2.3 From 2fe6cda0ec331dc71c2b428638b0b0d51f91985a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 11:05:33 +0000 Subject: xserver-kdrive X11R7.1-1.1.0: disable non-compiling dmx --- packages/xorg-xserver/xserver-kdrive_X11R7.1-1.1.0.bb | 1 + 1 file changed, 1 insertion(+) 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 \ -- cgit v1.2.3 From c17c2a421c7e2872dd7465e9e18372da064ffe52 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 11:12:56 +0000 Subject: angstrom-2006.9: prefer a kdrive that actually work :) --- conf/distro/angstrom-2006.9.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index a6354319ca..ef1113659d 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -46,6 +46,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 = "" -- cgit v1.2.3 From c17c4f5380bd0a53048c33724b4516a07e3de365 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 11:36:33 +0000 Subject: libsoup: fix #1275 --- packages/gnome/libsoup_2.2.93.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 } -- cgit v1.2.3 From c41e3f4c26b1af6f75f3d6e7ffd5002b03209ac4 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 12:27:51 +0000 Subject: angstrom-2006.9: use a newer srcdate for gconf-dbus --- conf/distro/angstrom-2006.9.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index ef1113659d..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/ \ -- cgit v1.2.3 From dee9e6650e7b7a6dcdcf048b8d4181439cf89b20 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 12:50:35 +0000 Subject: rgb _X11R7.1-1.0.1: ship rgb.txt --- packages/xorg-app/rgb_X11R7.1-1.0.1.bb | 3 +++ 1 file changed, 3 insertions(+) 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" + -- cgit v1.2.3 From 0f59b162e942bbaf773885abb835d5ce7b693ad9 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 14:12:14 +0000 Subject: xfwm4.inc: RDEPEND on the default theme --- packages/xfwm4/xfwm4.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc index 1b137c4261..79c5b59820 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -9,6 +9,7 @@ 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" -- cgit v1.2.3 From 1e999b4e74fd481ebd8bf6e9d5425c61ce6f451e Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 3 Aug 2006 14:18:36 +0000 Subject: xfwm4.inc: sed out pointers to host includes --- packages/xfwm4/xfwm4.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/xfwm4/xfwm4.inc b/packages/xfwm4/xfwm4.inc index 79c5b59820..fb85b4d9eb 100644 --- a/packages/xfwm4/xfwm4.inc +++ b/packages/xfwm4/xfwm4.inc @@ -14,6 +14,10 @@ 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 () { -- cgit v1.2.3