From: Paul Sokolovsky Date: Fri, 29 Sep 2006 01:12:32 +0000 (+0000) Subject: xserver-kdrive X11R7.1-1.1.0: Follow git renaming of xcalibrateext to xcalibrateproto. X-Git-Tag: Release-2010-05/1~9453^2~666^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab65d156b24915068d09e4add646329b5ef4d674;p=openembedded.git xserver-kdrive X11R7.1-1.1.0: Follow git renaming of xcalibrateext to xcalibrateproto. * XCalibrate was migrated to X.org git, where most other packages live. * After that, to follow new convention, its protocol definition part (vs implementation library) was renamed to have "proto" suffix. * That's state of git repo now, and if we patch older xserver release with XCalibrate support, let's make sure that this is done in a manner compatible with the git (as obviously, that will be base for new release). * This means, xserver-kdrive cannot be any longer built with older XCalibrate from previous CVS repo, and thus, it better be removed to alleviate confusion. --- diff --git a/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch index 3f8cd4ea5c..b07d55c5ff 100644 --- a/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch +++ b/packages/xorg-xserver/xserver-kdrive/xcalibrate.patch @@ -37,7 +37,7 @@ +AM_CONDITIONAL(XCALIBRATE, [test "x$XCALIBRATE" = xyes]) +if test "x$XCALIBRATE" = xyes; then + AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) -+ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateext" ++ REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" +fi + AM_CONDITIONAL(XEVIE, [test "x$XEVIE" = xyes])