Hello community,
here is the log from the commit of package libyui-ncurses for openSUSE:Factory
checked in at 2012-11-14 09:13:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-ncurses (Old)
and /work/SRC/openSUSE:Factory/.libyui-ncurses.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-ncurses/libyui-ncurses.changes
2012-10-06 18:39:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libyui-ncurses.new/libyui-ncurses.changes
2012-11-14 09:13:56.000000000 +0100
@@ -1,0 +2,15 @@
+Fri Nov 2 18:11:49 CET 2012 - anase...@linux.it
+
+- NCApplication: Reimplemented setApplicationTitle from YApplication
+- Added the availiability to build a git sha1 versioned package using
+ cmake -DGIT_VERSION=on
+- V 2.43.2
+
+-------------------------------------------------------------------
+Thu Oct 18 11:07:50 CEST 2012 - g...@suse.de
+
+- NCCheckBoxFrame: respect option `noAutoEnable, bug-fix for
+ nested frames (bnc #7853079),
+- V 2.43.1
+
+-------------------------------------------------------------------
Old:
----
libyui-ncurses-2.43.0.tar.bz2
New:
----
libyui-ncurses-2.43.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-ncurses-doc.spec ++++++
--- /var/tmp/diff_new_pack.Dsgqxo/_old 2012-11-14 09:13:59.000000000 +0100
+++ /var/tmp/diff_new_pack.Dsgqxo/_new 2012-11-14 09:13:59.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-ncurses (Version 2.43.0)
+# spec file for package libyui-ncurses (Version 2.43.2)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,7 +16,7 @@
#
Name: libyui-ncurses-doc
-Version: 2.43.0
+Version: 2.43.2
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-ncurses-%{version}.tar.bz2
++++++ libyui-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.Dsgqxo/_old 2012-11-14 09:13:59.000000000 +0100
+++ /var/tmp/diff_new_pack.Dsgqxo/_new 2012-11-14 09:13:59.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-ncurses (Version 2.43.0)
+# spec file for package libyui-ncurses (Version 2.43.2)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,7 +17,7 @@
# norootforbuild
Name: libyui-ncurses
-Version: 2.43.0
+Version: 2.43.2
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-ncurses-%{version}.tar.bz2
@@ -28,7 +28,7 @@
BuildRequires: gcc-c++
BuildRequires: pkg-config
-%define libyui_devel_version libyui-devel >= 2.42.0
+%define libyui_devel_version libyui-devel >= 2.42.3
BuildRequires: %{libyui_devel_version}
BuildRequires: ncurses-devel
++++++ libyui-ncurses-2.43.0.tar.bz2 -> libyui-ncurses-2.43.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-2.43.0/CMakeLists.txt
new/libyui-ncurses-2.43.2/CMakeLists.txt
--- old/libyui-ncurses-2.43.0/CMakeLists.txt 2012-10-04 12:00:06.000000000
+0200
+++ new/libyui-ncurses-2.43.2/CMakeLists.txt 2012-11-13 11:58:05.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 --tags"
+ 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-ncurses-2.43.0/ChangeLog
new/libyui-ncurses-2.43.2/ChangeLog
--- old/libyui-ncurses-2.43.0/ChangeLog 2012-10-04 12:00:06.000000000 +0200
+++ new/libyui-ncurses-2.43.2/ChangeLog 2012-11-13 11:58:05.000000000 +0100
@@ -1,4 +1,19 @@
-------------------------------------------------------------------
+Fri Nov 2 18:11:49 CET 2012 - anase...@linux.it
+
+- NCApplication: Reimplemented setApplicationTitle from YApplication
+- Added the availiability to build a git sha1 versioned package using
+ cmake -DGIT_VERSION=on
+- V 2.43.2
+
+-------------------------------------------------------------------
+Thu Oct 18 11:07:50 CEST 2012 - g...@suse.de
+
+- NCCheckBoxFrame: respect option `noAutoEnable, bug-fix for
+ nested frames (bnc #7853079),
+- V 2.43.1
+
+-------------------------------------------------------------------
Thu Oct 4 11:20:57 CEST 2012 - g...@suse.de
- NCTablePad: bug-fix for sorting of tables
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-2.43.0/VERSION.cmake
new/libyui-ncurses-2.43.2/VERSION.cmake
--- old/libyui-ncurses-2.43.0/VERSION.cmake 2012-10-04 12:00:06.000000000
+0200
+++ new/libyui-ncurses-2.43.2/VERSION.cmake 2012-11-13 11:58:05.000000000
+0100
@@ -1,7 +1,7 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "43" )
-SET( VERSION_PATCH "0" )
-SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
+SET( VERSION_PATCH "2" )
+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-ncurses-2.43.0/libyui-ncurses.spec.in
new/libyui-ncurses-2.43.2/libyui-ncurses.spec.in
--- old/libyui-ncurses-2.43.0/libyui-ncurses.spec.in 2012-10-04
12:00:06.000000000 +0200
+++ new/libyui-ncurses-2.43.2/libyui-ncurses.spec.in 2012-11-13
11:58:05.000000000 +0100
@@ -28,7 +28,7 @@
BuildRequires: gcc-c++
BuildRequires: pkg-config
-%define libyui_devel_version libyui-devel >= 2.42.0
+%define libyui_devel_version libyui-devel >= 2.42.3
BuildRequires: %{libyui_devel_version}
BuildRequires: ncurses-devel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-2.43.0/src/NCApplication.cc
new/libyui-ncurses-2.43.2/src/NCApplication.cc
--- old/libyui-ncurses-2.43.0/src/NCApplication.cc 2012-10-04
12:00:06.000000000 +0200
+++ new/libyui-ncurses-2.43.2/src/NCApplication.cc 2012-11-13
11:58:05.000000000 +0100
@@ -251,3 +251,10 @@
{
return ( NCstring::terminalEncoding() == "UTF-8" );
}
+
+void NCApplication::setApplicationTitle ( const std::string& title )
+{
+ YApplication::setApplicationTitle ( title );
+ NCurses::SetTitle(title);
+}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-2.43.0/src/NCApplication.h
new/libyui-ncurses-2.43.2/src/NCApplication.h
--- old/libyui-ncurses-2.43.0/src/NCApplication.h 2012-10-04
12:00:06.000000000 +0200
+++ new/libyui-ncurses-2.43.2/src/NCApplication.h 2012-11-13
11:58:05.000000000 +0100
@@ -192,6 +192,13 @@
virtual bool richTextSupportsTable() { return false; }
virtual bool leftHandedMouse() { return false; }
+
+ /**
+ * Set the application title
+ *
+ * Reimplemented from YApplication.
+ **/
+ virtual void setApplicationTitle(const std::string& title);
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-2.43.0/src/NCCheckBoxFrame.cc
new/libyui-ncurses-2.43.2/src/NCCheckBoxFrame.cc
--- old/libyui-ncurses-2.43.0/src/NCCheckBoxFrame.cc 2012-10-04
12:00:06.000000000 +0200
+++ new/libyui-ncurses-2.43.2/src/NCCheckBoxFrame.cc 2012-11-13
11:58:05.000000000 +0100
@@ -99,20 +99,44 @@
Redraw();
}
+bool NCCheckBoxFrame::getParentValue( NCWidget * widget, bool initial )
+{
+ bool enabled = initial;
+
+ for ( tnode<NCWidget*> * c = widget->Parent();
+ c && widget->IsDescendantOf( c );
+ c = c->Parent() )
+ {
+ NCCheckBoxFrame * frame = dynamic_cast<NCCheckBoxFrame *>( c->Value()
);
+ if ( frame )
+ {
+ enabled = frame->getValue();
+
+ if ( frame->GetState() == NC::WSdisabeled )
+ enabled = false;
+
+ break;
+ }
+ }
+ return enabled;
+}
void NCCheckBoxFrame::setEnabled( bool do_bv )
{
YWidget::setEnabled( do_bv );
-
+ bool do_it = do_bv;
+
for ( tnode<NCWidget*> * c = this->Next();
c && c->IsDescendantOf( this );
c = c->Next() )
{
if ( c->Value()->GetState() != NC::WSdumb )
{
- c->Value()->setEnabled( do_bv );
- // explicitely set the state (needed for first run - bug #268352)
- c->Value()->SetState( do_bv ? NC::WSnormal : NC::WSdisabeled, true
);
+ do_it = getParentValue( c->Value(), do_it );
+
+ c->Value()->setEnabled( do_it );
+ // explicitely set the state (needed for first run - bug #268352)
+ c->Value()->SetState( do_it ? NC::WSnormal : NC::WSdisabeled, true
);
}
}
}
@@ -171,7 +195,8 @@
win->printw( 0, 2, "%c", 'x' );
}
- setEnabled( getValue() );
+ if ( autoEnable() )
+ setEnabled( getValue() );
}
@@ -192,13 +217,11 @@
setValue( true );
}
- //No need to call Redraw() here, it is already done
- //in setValue
+ // No need to call Redraw() here, it is already done in setValue() and
+ // no need to call setEnabled(), it is called in Redraw(), resp.
wRedraw().
if ( notify() )
ret = NCursesEvent::ValueChanged;
- else
- setEnabled( getValue() );
}
return ret;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-2.43.0/src/NCCheckBoxFrame.h
new/libyui-ncurses-2.43.2/src/NCCheckBoxFrame.h
--- old/libyui-ncurses-2.43.0/src/NCCheckBoxFrame.h 2012-10-04
12:00:06.000000000 +0200
+++ new/libyui-ncurses-2.43.2/src/NCCheckBoxFrame.h 2012-11-13
11:58:05.000000000 +0100
@@ -81,6 +81,8 @@
virtual bool value();
virtual NCursesEvent wHandleInput( wint_t key );
+
+ bool getParentValue( NCWidget * widget, bool initial );
};
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
