Author: rpmcruz Date: Fri Dec 14 10:13:31 2007 New Revision: 43072 URL: http://svn.opensuse.org/viewcvs/yast?rev=43072&view=rev Log: * configure.in.in: error when using on older versions of libyui than of the recent API change. Also, got rid of old test code for zypp2 and libyui plugin. Modified: trunk/gtk/unstable-libyui/ChangeLog trunk/gtk/unstable-libyui/configure.in.in trunk/gtk/unstable-libyui/src/Y2CCGtk.cc Modified: trunk/gtk/unstable-libyui/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/ChangeLog?rev... ============================================================================== --- trunk/gtk/unstable-libyui/ChangeLog (original) +++ trunk/gtk/unstable-libyui/ChangeLog Fri Dec 14 10:13:31 2007 @@ -7,6 +7,10 @@ works together and the interface presents itself gracefully. Also fixed a few issues and added support for patches. + * configure.in.in: error when using on older versions of libyui than of + the recent API change. Also, got rid of old test code for zypp2 and + libyui plugin. + 2007-12-09 Ricardo Cruz <rpmcruz@alunos.dcc.fc.up.pt> * src/YGUI.h.cc: fixed package selector issue. We weren't implementing Modified: trunk/gtk/unstable-libyui/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/configure.in.... ============================================================================== --- trunk/gtk/unstable-libyui/configure.in.in (original) +++ trunk/gtk/unstable-libyui/configure.in.in Fri Dec 14 10:13:31 2007 @@ -27,19 +27,9 @@ fi AC_SUBST(PKG_CONFIG) - AC_FUNC_ALLOCA AC_HEADER_STDC -dnl Try to find the Zypp includes -AC_MSG_CHECKING([for zypp 3]) -if test -f /usr/include/zypp/SourceManager.h; then - AC_DEFINE(PRE_ZYPP_3, 1, [defined if using an older SL10.1 era zypp]) - AC_MSG_RESULT([pre 3]) -else - AC_MSG_RESULT([found]) -fi - PKG_CHECK_MODULES( ZYPP, libzypp ) AC_SUBST(ZYPP_LIBS) @@ -62,19 +52,22 @@ yast_vers=`echo "$verstxt" | awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` AC_DEFINE_UNQUOTED(YAST2_VERSION, $yast_vers, [yast version for compile conditionals]) -dnl new UI library -AC_MSG_CHECKING([for old libyui]) PYUI_LIBS='-lpy2UI' -if test $yast_vers -le 2015006; then - PYUI_LIBS='-lyui' - AC_MSG_RESULT([found]) -else - AC_MSG_RESULT([use new lib]) -fi AC_SUBST(PYUI_LIBS) +dnl Checking for new libyui API... +if test $yast_vers -lt 2015012; then + AC_MSG_ERROR([ +*** Version of libyui >= 2.15.12 needed (your version: $verstxt) +*** You can find it on: svn checkout http://svn.opensuse.org/svn/yast/trunk/core/ +*** Do "make -f Makefile.cvs" on root +*** Then you just need to compile stuff under libyui, +*** "cd libyui && make && sudo make install" +*** libyui broke compatibility in order to get away from YCP structures, +*** to make it easier for binding.]) +fi + AC_OUTPUT([Makefile src/Makefile]) -echo " -Hello hacker: please read the README carefully while this builds. -" +echo "Hello hacker: checkout README while this builds." + Modified: trunk/gtk/unstable-libyui/src/Y2CCGtk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/src/Y2CCGtk.c... ============================================================================== --- trunk/gtk/unstable-libyui/src/Y2CCGtk.cc (original) +++ trunk/gtk/unstable-libyui/src/Y2CCGtk.cc Fri Dec 14 10:13:31 2007 @@ -6,16 +6,7 @@ #include <YGUI.h> #include <YUIComponent.h> #include <ycp/y2log.h> - -#if YAST2_VERSION >= 2015006 -// New UI plugin work -# include <Y2CCUI.h> -# define NEW_UI_PLUGIN -# define Y2CCUI_INIT -#else -# define Y2CCUI Y2ComponentCreator -# define Y2CCUI_INIT Y2ComponentBroker::BUILTIN -#endif +#include <Y2CCUI.h> class YGUIComponent : public YUIComponent { @@ -38,7 +29,7 @@ class Y2CCGtk : public Y2CCUI { public: - Y2CCGtk () : Y2CCUI (Y2CCUI_INIT) { }; + Y2CCGtk() : Y2CCUI() { }; bool isServerCreator () const { return true; }; @@ -46,17 +37,12 @@ { y2milestone( "Creating %s component", name ); if (!strcmp (name, "gtk") ) { -#ifdef NEW_UI_PLUGIN Y2Component* ret = YUIComponent::uiComponent (); if (!ret || ret->name () != name) { y2debug ("UI component is %s, creating %s", ret? ret->name().c_str() : "NULL", name); ret = new YGUIComponent(); } return ret; -#else - y2debug ("Component already created"); - return new YGUIComponent(); -#endif } return 0; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org