Hello community, here is the log from the commit of package libyui for openSUSE:Factory checked in at 2012-11-22 14:02:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-09-11 09:11:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libyui.new/libyui.changes 2012-11-22 14:02:06.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 2 08:49:47 UTC 2012 - [email protected] + +- Added new API to managed application title and icon +- Added the availiability to build a git sha1 versioned package using cmake -DGIT_VERSION=on + +------------------------------------------------------------------- Old: ---- libyui-2.42.2.tar.bz2 New: ---- libyui-2.42.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-doc.spec ++++++ --- /var/tmp/diff_new_pack.CEnsFn/_old 2012-11-22 14:02:07.000000000 +0100 +++ /var/tmp/diff_new_pack.CEnsFn/_new 2012-11-22 14:02:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libyui (Version 2.42.2) +# spec file for package libyui-doc # # 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.2 +Version: 2.42.3 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: graphviz-gnome -BuildRequires: texlive-latex -BuildRequires: cmake >= 2.8 BuildRequires: gcc-c++ +BuildRequires: graphviz-gnome BuildRequires: libyui-devel +BuildRequires: texlive-latex - -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,10 +50,8 @@ %prep - %setup -n libyui-%{version} - %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -67,18 +65,15 @@ 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.CEnsFn/_old 2012-11-22 14:02:07.000000000 +0100 +++ /var/tmp/diff_new_pack.CEnsFn/_new 2012-11-22 14:02:07.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libyui (Version 2.42.2) +# spec file for package libyui # # 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.2 +Version: 2.42.3 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,13 +45,12 @@ %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 @@ -65,15 +64,14 @@ %package devel -Group: Development/Languages/C and C++ - -Requires: libyui4 = %{version} +Requires: boost-devel Requires: glibc-devel Requires: libstdc++-devel -Requires: boost-devel +Requires: libyui4 = %{version} -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 @@ -91,7 +89,6 @@ %prep %setup -q -n libyui-%{version} - %build export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" @@ -116,7 +113,6 @@ make %{?jobs:-j%jobs} - %install cd build make install DESTDIR="$RPM_BUILD_ROOT" ++++++ libyui-2.42.2.tar.bz2 -> libyui-2.42.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.2/CMakeLists.txt new/libyui-2.42.3/CMakeLists.txt --- old/libyui-2.42.2/CMakeLists.txt 2012-09-07 14:12:23.000000000 +0200 +++ new/libyui-2.42.3/CMakeLists.txt 2012-11-13 11:06:29.000000000 +0100 @@ -17,6 +17,28 @@ SET( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/Modules" "${BUILDTOOLS_DIR}" "${CMAKE_MODULE_PATH}" ) INCLUDE( LibyuiCommon ) + +#if you need to get a git versioned package you can use cmake -DGIT_VERSION=on +if (GIT_VERSION) + FIND_PACKAGE(Git) + if(GIT_FOUND) + exec_program( + "${GIT_EXECUTABLE}" + ${CMAKE_CURRENT_SOURCE_DIR} + ARGS "describe" + OUTPUT_VARIABLE GIT_VERSION ) + + string( REGEX MATCH "-g[0-9|a-f]+$" VERSION_SHA1 ${GIT_VERSION} ) + string( REGEX REPLACE "[g]" "" VERSION_SHA1 ${VERSION_SHA1} ) + set (GIT_SHA1_VERSION "${VERSION_SHA1}") + else() + message (STATUS "GIT_VERSION option needs git installed") + set (GIT_SHA1_VERSION "") + endif() +else() + set (GIT_SHA1_VERSION "") +endif() + INCLUDE( "${CMAKE_CURRENT_SOURCE_DIR}/VERSION.cmake" ) INITIALIZE() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.2/ChangeLog new/libyui-2.42.3/ChangeLog --- old/libyui-2.42.2/ChangeLog 2012-09-07 14:12:23.000000000 +0200 +++ new/libyui-2.42.3/ChangeLog 2012-11-13 11:06:29.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Nov 2 15:03:47 CET 2012 - [email protected] + +- Added new API to managed application title and icon +- Added the availiability to build a git sha1 versioned package using cmake -DGIT_VERSION=on + +------------------------------------------------------------------- Fri Sep 7 13:48:44 CEST 2012 - [email protected] - Version 2.42.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.2/VERSION.cmake new/libyui-2.42.3/VERSION.cmake --- old/libyui-2.42.2/VERSION.cmake 2012-09-07 14:12:23.000000000 +0200 +++ new/libyui-2.42.3/VERSION.cmake 2012-11-13 11:06:29.000000000 +0100 @@ -1,7 +1,7 @@ SET( VERSION_MAJOR "2" ) SET( VERSION_MINOR "42" ) -SET( VERSION_PATCH "2" ) -SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) +SET( VERSION_PATCH "3" ) +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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.2/buildtools/config.h.in new/libyui-2.42.3/buildtools/config.h.in --- old/libyui-2.42.2/buildtools/config.h.in 2012-09-07 14:12:23.000000000 +0200 +++ new/libyui-2.42.3/buildtools/config.h.in 2012-11-13 11:06:29.000000000 +0100 @@ -42,5 +42,7 @@ #define THEMEDIR "@PREFIX@/@THEME_DIR@" #define PLUGIN_PREFIX "lib@BASELIB@-" #define PLUGIN_SUFFIX ".so.@SONAME_MAJOR@" +#define LIBYUI_VERSION_NUM (((@VERSION_MAJOR@) << 16) | ((@VERSION_MINOR@) << 8) | (@VERSION_PATCH@)) +#define LIBYUI_VERSION_AT_LEAST(M,N,O) LIBYUI_VERSION_NUM >= (((M) << 16) | ((N) << 8) | (O)) #endif // @PROJECTNAME_UC@_CONFIG_H Files old/libyui-2.42.2/package/zypp-plugin-0.3.tar.bz2 and new/libyui-2.42.3/package/zypp-plugin-0.3.tar.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.2/src/YApplication.cc new/libyui-2.42.3/src/YApplication.cc --- old/libyui-2.42.2/src/YApplication.cc 2012-09-07 14:12:23.000000000 +0200 +++ new/libyui-2.42.3/src/YApplication.cc 2012-11-13 11:06:29.000000000 +0100 @@ -34,6 +34,7 @@ #include "YShortcut.h" #include "YUI.h" #include "YItem.h" +#include "YCommandLine.h" using std::endl; @@ -49,6 +50,8 @@ std::string productName; bool reverseLayout; + std::string applicationTitle; + std::string applicationIcon; YFunctionKeyMap defaultFunctionKey; YIconLoader* iconLoader; }; @@ -59,6 +62,9 @@ { YUI_CHECK_NEW( priv ); priv->iconLoader = new YIconLoader(); + YCommandLine cmdLine; // Retrieve command line args from /proc/<pid>/cmdline + if ( cmdLine.argc() > 0 ) + priv->applicationTitle = cmdLine.arg(0); } @@ -246,3 +252,23 @@ return -1; } + +void YApplication::setApplicationTitle(const std::string &title) +{ + priv->applicationTitle = title; +} + +const std::string &YApplication::applicationTitle() const +{ + return priv->applicationTitle; +} + +void YApplication::setApplicationIcon(const std::string &icon) +{ + priv->applicationIcon = icon; +} +const std::string &YApplication::applicationIcon() const +{ + return priv->applicationIcon; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-2.42.2/src/YApplication.h new/libyui-2.42.3/src/YApplication.h --- old/libyui-2.42.2/src/YApplication.h 2012-09-07 14:12:23.000000000 +0200 +++ new/libyui-2.42.3/src/YApplication.h 2012-11-13 11:06:29.000000000 +0100 @@ -380,6 +380,30 @@ virtual bool hasWizardDialogSupport() { return false; } + /** + * Set the application title + **/ + virtual void setApplicationTitle ( const std::string& title ); + + /** + * Get the application title + * + * Default title is the running command (argv[0]) + **/ + virtual const std::string& applicationTitle() const; + + /** + * Set the application Icon + **/ + virtual void setApplicationIcon ( const std::string& icon ); + + /** + * Get the application Icon + * + * Default icon is an empty string + **/ + virtual const std::string& applicationIcon() const; + private: ImplPtr<YApplicationPrivate> priv; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
