Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2013-02-04 21:13:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui (Old) and /work/SRC/openSUSE:Factory/.libyui.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui/libyui.changes 2012-11-22 14:02:06.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2013-02-04 21:13:40.000000000 +0100 @@ -2 +2,25 @@ -Fri Nov 2 08:49:47 UTC 2012 - [email protected] +Mon Feb 4 15:46:13 CET 2013 - [email protected] + +- Added setLocaleDir(), getLocaleDir() +- Version 2.42.6 + +------------------------------------------------------------------- +Sat Jan 19 23:55:33 CET 2013 - [email protected] + +- wrong path for Libyui_config.h + +------------------------------------------------------------------- +Fri Jan 18 14:51:40 CET 2013 - [email protected] + +- Fixed YSettings +- Added setThemeDir(), getThemeDir(), setIconsDir() and + getIconsDir() to YSettings + +------------------------------------------------------------------- +Mon Jan 7 12:59:46 CET 2013 - [email protected] + +- Removed needless loadPluginLib() from header file +- Version 2.42.4 + +------------------------------------------------------------------- +Fri Nov 2 15:03:47 CET 2012 - [email protected] Old: ---- libyui-2.42.3.tar.bz2 New: ---- libyui-2.42.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-doc.spec ++++++ --- /var/tmp/diff_new_pack.13xPtO/_old 2013-02-04 21:13:43.000000000 +0100 +++ /var/tmp/diff_new_pack.13xPtO/_new 2013-02-04 21:13:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libyui-doc +# spec file for package libyui (Version 2.42.6) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,26 +15,26 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: libyui-doc -Version: 2.42.3 +Version: 2.42.6 Release: 0 +License: LGPL-2.1 or LGPL-3.0 Source: libyui-%{version}.tar.bz2 +Group: Documentation/HTML BuildArch: noarch -BuildRequires: cmake >= 2.8 BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: gcc-c++ BuildRequires: graphviz-gnome -BuildRequires: libyui-devel BuildRequires: texlive-latex +BuildRequires: cmake >= 2.8 +BuildRequires: gcc-c++ +BuildRequires: libyui-devel -Url: http://github.com/libyui/ + +URL: http://github.com/libyui/ Summary: Libyui documentation -License: LGPL-2.1 or LGPL-3.0 -Group: Documentation/HTML %description This is the user interface engine that provides the abstraction from @@ -50,8 +50,10 @@ %prep + %setup -n libyui-%{version} + %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -65,15 +67,18 @@ make %{?jobs:-j%jobs} docs + %install cd build make install DESTDIR="$RPM_BUILD_ROOT" %fdupes -s $RPM_BUILD_ROOT/%_docdir/libyui4 + %clean rm -rf "$RPM_BUILD_ROOT" + %files %defattr(-,root,root) %doc %{_docdir}/libyui4 ++++++ libyui.spec ++++++ --- /var/tmp/diff_new_pack.13xPtO/_old 2013-02-04 21:13:43.000000000 +0100 +++ /var/tmp/diff_new_pack.13xPtO/_new 2013-02-04 21:13:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libyui +# spec file for package libyui (Version 2.42.6) # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,24 +15,24 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # # +# norootforbuild Name: libyui -Version: 2.42.3 +Version: 2.42.6 Release: 0 +License: LGPL-2.1 or LGPL-3.0 Source: libyui-%{version}.tar.bz2 +Group: System/Libraries BuildRequires: boost-devel BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ BuildRequires: pkg-config -Url: http://github.com/libyui/ +URL: http://github.com/libyui/ Summary: GUI-abstraction library -License: LGPL-2.1 or LGPL-3.0 -Group: System/Libraries %description This is the user interface engine that provides the abstraction from @@ -45,12 +45,13 @@ %package -n libyui4 +Group: System/Libraries + Provides: yast2-libyui = 2.42.0 Obsoletes: yast2-libyui < 2.42.0 -Url: http://github.com/libyui/ +URL: http://github.com/libyui/ Summary: Libyui - GUI-abstraction library -Group: System/Libraries %description -n libyui4 This is the user interface engine that provides the abstraction from @@ -64,14 +65,15 @@ %package devel -Requires: boost-devel +Group: Development/Languages/C and C++ + +Requires: libyui4 = %{version} Requires: glibc-devel Requires: libstdc++-devel -Requires: libyui4 = %{version} +Requires: boost-devel -Url: http://github.com/libyui/ +URL: http://github.com/libyui/ Summary: Libyui header files -Group: Development/Languages/C and C++ %description devel This is the user interface engine that provides the abstraction from @@ -89,6 +91,7 @@ %prep %setup -q -n libyui-%{version} + %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -113,6 +116,7 @@ make %{?jobs:-j%jobs} + %install cd build make install DESTDIR="$RPM_BUILD_ROOT" ++++++ libyui-2.42.3.tar.bz2 -> libyui-2.42.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.3/ChangeLog new/libyui-2.42.6/ChangeLog --- old/libyui-2.42.3/ChangeLog 2012-11-13 11:06:29.000000000 +0100 +++ new/libyui-2.42.6/ChangeLog 2013-02-04 16:15:57.000000000 +0100 @@ -1,4 +1,28 @@ ------------------------------------------------------------------- +Mon Feb 4 15:46:13 CET 2013 - [email protected] + +- Added setLocaleDir(), getLocaleDir() +- Version 2.42.6 + +------------------------------------------------------------------- +Sat Jan 19 23:55:33 CET 2013 - [email protected] + +- wrong path for Libyui_config.h + +------------------------------------------------------------------- +Fri Jan 18 14:51:40 CET 2013 - [email protected] + +- Fixed YSettings +- Added setThemeDir(), getThemeDir(), setIconsDir() and + getIconsDir() to YSettings + +------------------------------------------------------------------- +Mon Jan 7 12:59:46 CET 2013 - [email protected] + +- Removed needless loadPluginLib() from header file +- Version 2.42.4 + +------------------------------------------------------------------- Fri Nov 2 15:03:47 CET 2012 - [email protected] - Added new API to managed application title and icon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.3/VERSION.cmake new/libyui-2.42.6/VERSION.cmake --- old/libyui-2.42.3/VERSION.cmake 2012-11-13 11:06:29.000000000 +0100 +++ new/libyui-2.42.6/VERSION.cmake 2013-02-04 16:15:57.000000000 +0100 @@ -1,11 +1,11 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "42" ) -SET( VERSION_PATCH "3" ) +SET( VERSION_PATCH "6" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${GIT_SHA1_VERSION}" ) ##### This is need for the libyui core, ONLY. ##### These will be overridden from exports in LibyuiConfig.cmake SET( SONAME_MAJOR "4" ) -SET( SONAME_MINOR "0" ) +SET( SONAME_MINOR "1" ) SET( SONAME_PATCH "0" ) SET( SONAME "${SONAME_MAJOR}.${SONAME_MINOR}.${SONAME_PATCH}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.3/src/YPath.cc new/libyui-2.42.6/src/YPath.cc --- old/libyui-2.42.3/src/YPath.cc 2012-11-13 11:06:29.000000000 +0100 +++ new/libyui-2.42.6/src/YPath.cc 2013-02-04 16:15:57.000000000 +0100 @@ -49,7 +49,7 @@ yuiMilestone () << "Given filename: " << filename << std::endl; bool isThemeDir = ! directory.compare ( THEMEDIR ); - std::string progSubDir = YSettings::access () -> getProgSubDir (); + std::string progSubDir = YSettings::getProgSubDir (); std::string fullname = ""; std::string themeSubDir = "/current"; size_t splitPos = fullPath.rfind( "/" ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.3/src/YSettings.cc new/libyui-2.42.6/src/YSettings.cc --- old/libyui-2.42.3/src/YSettings.cc 2012-11-13 11:06:29.000000000 +0100 +++ new/libyui-2.42.6/src/YSettings.cc 2013-02-04 16:15:57.000000000 +0100 @@ -35,22 +35,17 @@ #define YUILogComponent "ui" #include "YUILog.h" +#include "Libyui_config.h" using std::endl; -YSettings * YSettings::_instance = 0; -std::string YSettings::progSubDir = ""; +std::string YSettings::progSubDir = ""; +std::string YSettings::progIconDir = ""; +std::string YSettings::progThemeDir = ""; +std::string YSettings::progLocaleDir = ""; -YSettings * YSettings::access () +YSettings::YSettings() { - if ( ! _instance ) - _instance = new YSettings (); - return _instance; -} - -YSettings::YSettings() -{ - progSubDir = ""; } YSettings::~YSettings () @@ -59,7 +54,7 @@ void YSettings::setProgSubDir( std::string directory ) { - if ( progSubDir.compare ( "" ) == 0 ) + if ( progSubDir.empty() ) { progSubDir = directory; yuiMilestone () << "Set progSubDir to \"" << directory << "\"" << endl; @@ -75,5 +70,104 @@ std::string YSettings::getProgSubDir () { + yuiMilestone () << "progSubDir: \"" << progSubDir << "\"" << endl; + return progSubDir; } + + +void YSettings::setIconsDir( std::string directory ) +{ + if ( progIconDir.empty() ) + { + progIconDir = directory; + yuiMilestone () << "Set progIconDir to \"" << directory << "\"" << endl; + yuiMilestone () << "progIconDir is now locked." << endl; + } + else + { + yuiMilestone () << "Can't set progIconDir to \"" << directory << "\"" << endl; + yuiMilestone () << "It is locked to: \"" << progIconDir << "\"" << endl; + YUI_THROW ( YUIException ( "progIconDir is locked to: \"" + progIconDir + "\"" ) ); + } +} + +std::string YSettings::getIconsDir () +{ + if (progIconDir.size()) + { + yuiMilestone () << "progIconDir: \"" << progIconDir << "\"" << endl; + return progIconDir; + } + else if (progSubDir.size()) + return progSubDir + "/icons/"; + + return THEMEDIR "/icons/"; +} + +void YSettings::setThemeDir( std::string directory ) +{ + if ( progThemeDir.empty() ) + { + progThemeDir = directory; + yuiMilestone () << "Set progThemeDir to \"" << directory << "\"" << endl; + yuiMilestone () << "progThemeDir is now locked." << endl; + } + else + { + yuiMilestone () << "Can't set progThemeDir to \"" << directory << "\"" << endl; + yuiMilestone () << "It is locked to: \"" << progThemeDir << "\"" << endl; + YUI_THROW ( YUIException ( "progThemeDir is locked to: \"" + progThemeDir + "\"" ) ); + } +} + +std::string YSettings::getThemeDir () +{ + if (progThemeDir.size()) + { + yuiMilestone () << "progThemeDir: \"" << progThemeDir << "\"" << endl; + return progThemeDir; + } + else if (progSubDir.size()) + { + //back compatibility if setProgSubDir is set to "/usr/share/YaST2" + return progSubDir + "/theme/current/wizard/"; + } + + return THEMEDIR "/current/wizard/"; +} + + +void YSettings::setLocaleDir( std::string directory ) +{ + if ( progLocaleDir.empty() ) + { + progLocaleDir = directory; + yuiMilestone () << "Set progLocaleDir to \"" << directory << "\"" << endl; + yuiMilestone () << "progLocaleDir is now locked." << endl; + } + else + { + yuiMilestone () << "Can't set progLocaleDir to \"" << directory << "\"" << endl; + yuiMilestone () << "It is locked to: \"" << progLocaleDir << "\"" << endl; + YUI_THROW ( YUIException ( "progLocaleDir is locked to: \"" + progLocaleDir + "\"" ) ); + } +} + +std::string YSettings::getLocaleDir () +{ + if (progLocaleDir.size()) + { + yuiMilestone () << "progLocaleDir: \"" << progLocaleDir << "\"" << endl; + return progLocaleDir; + } + else if (progSubDir.size()) + { + //back compatibility if setProgSubDir is set to "/usr/share/YaST2" + return progSubDir + "/locale/"; + } + + return "/usr/share/locale/"; +} + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.3/src/YSettings.h new/libyui-2.42.6/src/YSettings.h --- old/libyui-2.42.3/src/YSettings.h 2012-11-13 11:06:29.000000000 +0100 +++ new/libyui-2.42.6/src/YSettings.h 2013-02-04 16:15:57.000000000 +0100 @@ -44,12 +44,6 @@ { public: /** - * This returns a pointer to to the YSettings singleton object. - * - * If there is no object, when called, the object gets initialised. - **/ - static YSettings * access (); - /** * This can be used to set a subdir beneath PLUGINDIR or THEMEDIR, * where your program stores a custom plugin or theme. * @@ -61,10 +55,52 @@ * Returns the value of your program's subdir. **/ static std::string getProgSubDir (); + + /** + * This can be used to set a subdir ICONDIR, + * where your program stores a custom icons. + * + * Once this is set, it can't be altered. If you do so although an + * exception will be thrown. + **/ + static void setIconsDir ( std::string directory ); + /** + * Returns the value of your program's icons subdir. + **/ + static std::string getIconsDir (); + + /** + * This can be used to set a subdir THEMEDIR, + * where your program stores a custom icons. + * + * Once this is set, it can't be altered. If you do so although an + * exception will be thrown. + **/ + static void setThemeDir ( std::string directory ); + /** + * Returns the value of your program's theme subdir. + **/ + static std::string getThemeDir (); + + /** + * This can be used to set a subdir LOCALEDIR, + * where your program stores translations + * + * Once this is set, it can't be altered. If you do so although an + * exception will be thrown. + **/ + static void setLocaleDir ( std::string directory ); + /** + * Returns the value of your program's locale subdir. + **/ + static std::string getLocaleDir (); private: - static YSettings * _instance; static std::string progSubDir; + static std::string progIconDir; + static std::string progThemeDir; + static std::string progLocaleDir; + YSettings (); YSettings ( const YSettings& ); ~YSettings (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.3/src/YUIPlugin.h new/libyui-2.42.6/src/YUIPlugin.h --- old/libyui-2.42.3/src/YUIPlugin.h 2012-11-13 11:06:29.000000000 +0100 +++ new/libyui-2.42.6/src/YUIPlugin.h 2013-02-04 16:15:57.000000000 +0100 @@ -100,11 +100,6 @@ **/ std::string pluginLibFullPath() const; - /** - * Loads the plugin library. - **/ - void loadPluginLib(); - private: std::string _pluginLibBaseName; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
