Hello community,
here is the log from the commit of package yast2-gtk for openSUSE:Factory
checked in at Thu Oct 7 23:31:19 CEST 2010.
--------
--- yast2-gtk/yast2-gtk.changes 2010-08-30 10:50:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-gtk/yast2-gtk.changes 2010-10-07 14:27:11.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Oct 07 13:22:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt
+
+- 2.21.76
+- sw_single: run solver at end, fixes bnc#620513.
+- rpm spec fix (now compatible with both 11.3 and factory).
+- got rid of included FindGTK2.cmake module.
+- overall string review.
+- text domain changed from "yast2-gtk" to "gtk".
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-gtk-2.21.70.tar.bz2
yast2-gtk-fix-FindGTK2-gdk-pixbuf.patch
New:
----
yast2-gtk-2.21.76.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-gtk.spec ++++++
--- /var/tmp/diff_new_pack.OSYcUe/_old 2010-10-07 23:17:13.000000000 +0200
+++ /var/tmp/diff_new_pack.OSYcUe/_new 2010-10-07 23:17:13.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-gtk (Version 2.21.70)
+# spec file for package yast2-gtk (Version 2.21.76)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,13 +18,11 @@
Name: yast2-gtk
-Version: 2.21.70
-Release: 2
+Version: 2.21.76
+Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-gtk-2.21.70.tar.bz2
-# PATCH-FIX-UPSTREAM yast2-gtk-fix-FindGTK2-gdk-pixbuf.patch vuntz@opensuse.org -- FindGTK2 module needs to look for gdk-pixbuf too
-Patch0: yast2-gtk-fix-FindGTK2-gdk-pixbuf.patch
+Source0: yast2-gtk-2.21.76.tar.bz2
Url: http://en.opensuse.org/YaST2-GTK
Summary: YaST2 - GTK+ Graphical User Interface
Group: System/YaST
@@ -32,9 +30,13 @@
BuildRequires: cmake
BuildRequires: blocxx-devel gcc-c++ libxcrypt-devel
BuildRequires: gtk2-devel
+%if 0%{?suse_version} > 1130
+BuildRequires: gdk-pixbuf-devel
+%endif
BuildRequires: yast2-devtools >= 2.16.3
BuildRequires: yast2-libyui-devel >= 2.18.8
BuildRequires: libzypp-devel >= 6.3.0
+Requires: gtk2
Requires: yast2-libyui >= 2.18.8
Requires: yast2_theme >= 2.16.1
Requires: libzypp >= 6.3.0
@@ -48,7 +50,6 @@
%prep
%setup
-%patch0 -p1
%build
mkdir build
++++++ yast2-gtk-2.21.70.tar.bz2 -> yast2-gtk-2.21.76.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/CMakeLists.txt new/yast2-gtk-2.21.76/CMakeLists.txt
--- old/yast2-gtk-2.21.70/CMakeLists.txt 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/CMakeLists.txt 2010-10-07 14:25:32.000000000 +0200
@@ -5,9 +5,6 @@
## configure
-# we bundle our own FindGTK2.cmake while it isn't shipped with cmake
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/modules")
-
find_package (GTK2 REQUIRED gtk)
find_package (Libyui REQUIRED)
find_package (Zypp REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/ChangeLog new/yast2-gtk-2.21.76/ChangeLog
--- old/yast2-gtk-2.21.70/ChangeLog 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/ChangeLog 2010-10-07 14:25:32.000000000 +0200
@@ -1,25 +1,56 @@
-2010-08-23 Ricardo Cruz
+2010-10-04 Ricardo Cruz
- * src/YGUI.cc & src/YGDialog.cc: bug fix 633498: set
- default window size as a proportion of both a constant
- number of characters and pixels.
-
- * src/YGUtils.cc, src/ygtkwizard.c, src/pkg/YGPackageSelector.cc:
- paned position now set in percent terms. Related to
- previous item.
-
- * src/YGPackageSelector.cc: bug fix 632377: when
- show-devel or show-debug disabled, then number count
- in the filters box was not always correct.
+ * src/*.cc & src/pkg/*.cc: general string review,
+ and text domain change from "yast2-gtk" to "gtk".
- * src/YGUI.cc: bug fix 633173: ensure file picking
- dialog doesn't crash when esoteric filename selected.
+ * src/pkg/ygtkpkgdetailview.cc: on the dependencies
+ expander, show '"' for available version information
+ when that text is the same of the installed version.
+
+2010-09-14 Ricardo Cruz
+
+ * src/pkg/YGPackageSelector.cc: fix bug 637761: run
+ solver one final time at apply.
+
+ * src/pkg/yzyppwrapper.h/cc: added supporting methods.
+
+ * CMakeLists.txt: remove included FindGTK2.cmake module.
+
+2010-08-29 Ricardo Cruz
+
+ * yast2-gtk.spec.in: add gdk-pixbuf-devel to
+ BuildRequires. gtk and gdk-pixbuf divorced.
+ bug fix 635352.
2010-07-26 Ricardo Cruz
* src/pkg/ygtkpkgmenubar.cc: bug fix 624310: file >
import and export failing.
+2010-07-14 Ricardo Cruz
+
+ * Undone reversion.
+
+2010-07-14 Ricardo Cruz
+
+ * Reversed some of previous changes for build service
+ process.
+
+2010-07-13 Ricardo Cruz
+
+ * src/YGDialog.cc & src/pkg/YGPackageSelector.cc: as
+ requested by Michael Meeks, enlarge window size for
+ bigger fonts.
+
+2010-07-12 Ricardo Cruz
+
+ * src/pkg/ygtkpkgdetailview.cc: as suggested by Atri,
+ to address bug 620513's usability complaint, replaced
+ the usage og bold fonts within the details box by
+ italic ones.
+
+ * src/pkg/ygtkpkgdetailview.cc: more italic work.
+
2010-07-10 Ricardo Cruz
* src/pkg/ygtkpkgdetailview.cc & src/ygtkrichtext.c:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/README new/yast2-gtk-2.21.76/README
--- old/yast2-gtk-2.21.70/README 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/README 2010-10-07 14:25:32.000000000 +0200
@@ -17,8 +17,8 @@
To make this compile you'll need the following packages installed
(at a minimum):
- gcc-c++, gtk2-devel, yast2-devtools, yast2-core-devel, yast2-libyui-devel,
- and libzypp-devel
+ gcc-c++, cmake, gtk2-devel, yast2-devtools, yast2-core-devel,
+ yast2-libyui-devel, and libzypp-devel
They all are distributed with Suse's CDs.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/VERSION new/yast2-gtk-2.21.76/VERSION
--- old/yast2-gtk-2.21.70/VERSION 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/VERSION 2010-10-07 14:25:32.000000000 +0200
@@ -1 +1 @@
-2.21.70
+2.21.76
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/VERSION.cmake new/yast2-gtk-2.21.76/VERSION.cmake
--- old/yast2-gtk-2.21.70/VERSION.cmake 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/VERSION.cmake 2010-10-07 14:25:32.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "2")
SET(VERSION_MINOR "21")
-SET(VERSION_PATCH "70")
+SET(VERSION_PATCH "76")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/modules/FindGTK2.cmake new/yast2-gtk-2.21.76/modules/FindGTK2.cmake
--- old/yast2-gtk-2.21.70/modules/FindGTK2.cmake 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/modules/FindGTK2.cmake 1970-01-01 01:00:00.000000000 +0100
@@ -1,554 +0,0 @@
-# - FindGTK2.cmake
-# This module can find the GTK2 widget libraries and several of its other
-# optional components like gtkmm, glade, and glademm.
-#
-# NOTE: If you intend to use version checking, CMake 2.6.2 or later is
-# required.
-#
-# Specify one or more of the following components
-# as you call this find module. See example below.
-#
-# gtk
-# gtkmm
-# glade
-# glademm
-#
-# The following variables will be defined for your use
-#
-# GTK2_FOUND - Were all of your specified components found?
-# GTK2_INCLUDE_DIRS - All include directories
-# GTK2_LIBRARIES - All libraries
-#
-# GTK2_VERSION - The version of GTK2 found (x.y.z)
-# GTK2_MAJOR_VERSION - The major version of GTK2
-# GTK2_MINOR_VERSION - The minor version of GTK2
-# GTK2_PATCH_VERSION - The patch version of GTK2
-#
-# Optional variables you can define prior to calling this module:
-#
-# GTK2_DEBUG - Enables verbose debugging of the module
-# GTK2_SKIP_MARK_AS_ADVANCED - Disable marking cache variables as advanced
-#
-#=================
-# Example Usage:
-#
-# Call find_package() once, here are some examples to pick from:
-#
-# Require GTK 2.6 or later
-# find_package(GTK2 2.6 REQUIRED gtk)
-#
-# Require GTK 2.10 or later and Glade
-# find_package(GTK2 2.10 REQUIRED gtk glade)
-#
-# Search for GTK/GTKMM 2.8 or later
-# find_package(GTK2 2.8 COMPONENTS gtk gtkmm)
-#
-# if(GTK2_FOUND)
-# include_directories(${GTK2_INCLUDE_DIRS})
-# add_executable(mygui mygui.cc)
-# target_link_libraries(mygui ${GTK2_LIBRARIES})
-# endif()
-#
-
-#=============================================================================
-# Copyright 2009 Kitware, Inc.
-# Copyright 2008-2009 Philip Lowman
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distributed this file outside of CMake, substitute the full
-# License text for the above reference.)
-
-# Version 0.8 (1/4/2010)
-# * Get module working under MacOSX fink by adding /sw/include, /sw/lib
-# to PATHS and the gobject library
-# Version 0.7 (3/22/09)
-# * Checked into CMake CVS
-# * Added versioning support
-# * Module now defaults to searching for GTK if COMPONENTS not specified.
-# * Added HKCU prior to HKLM registry key and GTKMM specific environment
-# variable as per mailing list discussion.
-# * Added lib64 to include search path and a few other search paths where GTK
-# may be installed on Unix systems.
-# * Switched to lowercase CMake commands
-# * Prefaced internal variables with _GTK2 to prevent collision
-# * Changed internal macros to functions
-# * Enhanced documentation
-# Version 0.6 (1/8/08)
-# Added GTK2_SKIP_MARK_AS_ADVANCED option
-# Version 0.5 (12/19/08)
-# Second release to cmake mailing list
-
-#=============================================================
-# _GTK2_GET_VERSION
-# Internal function to parse the version number in gtkversion.h
-# _OUT_major = Major version number
-# _OUT_minor = Minor version number
-# _OUT_micro = Micro version number
-# _gtkversion_hdr = Header file to parse
-#=============================================================
-function(_GTK2_GET_VERSION _OUT_major _OUT_minor _OUT_micro _gtkversion_hdr)
- file(READ ${_gtkversion_hdr} _contents)
- if(_contents)
- string(REGEX REPLACE ".*#define GTK_MAJOR_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_major} "${_contents}")
- string(REGEX REPLACE ".*#define GTK_MINOR_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_minor} "${_contents}")
- string(REGEX REPLACE ".*#define GTK_MICRO_VERSION[ \t]+\\(([0-9]+)\\).*" "\\1" ${_OUT_micro} "${_contents}")
-
- if(NOT ${_OUT_major} MATCHES "[0-9]+")
- message(FATAL_ERROR "Version parsing failed for GTK2_MAJOR_VERSION!")
- endif()
- if(NOT ${_OUT_minor} MATCHES "[0-9]+")
- message(FATAL_ERROR "Version parsing failed for GTK2_MINOR_VERSION!")
- endif()
- if(NOT ${_OUT_micro} MATCHES "[0-9]+")
- message(FATAL_ERROR "Version parsing failed for GTK2_MICRO_VERSION!")
- endif()
-
- set(${_OUT_major} ${${_OUT_major}} PARENT_SCOPE)
- set(${_OUT_minor} ${${_OUT_minor}} PARENT_SCOPE)
- set(${_OUT_micro} ${${_OUT_micro}} PARENT_SCOPE)
- else()
- message(FATAL_ERROR "Include file ${_gtkversion_hdr} does not exist")
- endif()
-endfunction()
-
-#=============================================================
-# _GTK2_FIND_INCLUDE_DIR
-# Internal function to find the GTK include directories
-# _var = variable to set
-# _hdr = header file to look for
-#=============================================================
-function(_GTK2_FIND_INCLUDE_DIR _var _hdr)
-
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "_GTK2_FIND_INCLUDE_DIR( ${_var} ${_hdr} )")
- endif()
-
- set(_relatives
- # FIXME
- glibmm-2.4
- glib-2.0
- atk-1.0
- atkmm-1.6
- cairo
- cairomm-1.0
- gdkmm-2.4
- giomm-2.4
- gtk-2.0
- gtkmm-2.4
- libglade-2.0
- libglademm-2.4
- pango-1.0
- pangomm-1.4
- sigc++-2.0
- )
-
- set(_suffixes)
- foreach(_d ${_relatives})
- list(APPEND _suffixes ${_d})
- list(APPEND _suffixes ${_d}/include) # for /usr/lib/gtk-2.0/include
- endforeach()
-
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "include suffixes = ${_suffixes}")
- endif()
-
- find_path(${_var} ${_hdr}
- PATHS
- /usr/local/lib64
- /usr/local/lib
- /usr/lib64
- /usr/lib
- /opt/gnome/include
- /opt/gnome/lib
- /opt/openwin/include
- /usr/openwin/lib
- /sw/include
- /sw/lib
- $ENV{GTKMM_BASEPATH}/include
- $ENV{GTKMM_BASEPATH}/lib
- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/include
- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/include
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
- PATH_SUFFIXES
- ${_suffixes}
- )
-
- if(${_var})
- set(GTK2_INCLUDE_DIRS ${GTK2_INCLUDE_DIRS} ${${_var}} PARENT_SCOPE)
- if(NOT GTK2_SKIP_MARK_AS_ADVANCED)
- mark_as_advanced(${_var})
- endif()
- endif()
-
-endfunction(_GTK2_FIND_INCLUDE_DIR)
-
-#=============================================================
-# _GTK2_FIND_LIBRARY
-# Internal function to find libraries packaged with GTK2
-# _var = library variable to create
-#=============================================================
-function(_GTK2_FIND_LIBRARY _var _lib _expand_vc _append_version)
-
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "_GTK2_FIND_LIBRARY( ${_var} ${_lib} ${_expand_vc} ${_append_version} )")
- endif()
-
- # Not GTK versions per se but the versions encoded into Windows
- # import libraries (GtkMM 2.14.1 has a gtkmm-vc80-2_4.lib for example)
- # Also the MSVC libraries use _ for . (this is handled below)
- set(_versions 2.20 2.18 2.16 2.14 2.12
- 2.10 2.8 2.6 2.4 2.2 2.0
- 1.20 1.18 1.16 1.14 1.12
- 1.10 1.8 1.6 1.4 1.2 1.0)
-
- set(_library)
- set(_library_d)
-
- set(_library ${_lib})
-
- if(_expand_vc)
- # Add vc80/vc90 midfixes
- if(MSVC80)
- set(_library ${_library}-vc80)
- set(_library_d ${_library}-d)
- elseif(MSVC90)
- set(_library ${_library}-vc90)
- set(_library_d ${_library}-d)
- endif()
- endif()
-
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "After midfix addition = ${_library} and ${_library_d}")
- endif()
-
- set(_lib_list)
- set(_libd_list)
- if(_append_version)
- foreach(_ver ${_versions})
- list(APPEND _lib_list "${_library}-${_ver}")
- list(APPEND _libd_list "${_library_d}-${_ver}")
- endforeach()
- else()
- set(_lib_list ${_library})
- set(_libd_list ${_library_d})
- endif()
-
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "library list = ${_lib_list} and library debug list = ${_libd_list}")
- endif()
-
- # For some silly reason the MSVC libraries use _ instead of .
- # in the version fields
- if(_expand_vc AND MSVC)
- set(_no_dots_lib_list)
- set(_no_dots_libd_list)
- foreach(_l ${_lib_list})
- string(REPLACE "." "_" _no_dots_library ${_l})
- list(APPEND _no_dots_lib_list ${_no_dots_library})
- endforeach()
- # And for debug
- set(_no_dots_libsd_list)
- foreach(_l ${_libd_list})
- string(REPLACE "." "_" _no_dots_libraryd ${_l})
- list(APPEND _no_dots_libd_list ${_no_dots_libraryd})
- endforeach()
-
- # Copy list back to original names
- set(_lib_list ${_no_dots_lib_list})
- set(_libd_list ${_no_dots_libd_list})
- endif()
-
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "While searching for ${_var}, our proposed library list is ${_lib_list}")
- endif()
-
- find_library(${_var}
- NAMES ${_lib_list}
- PATHS
- /opt/gnome/lib
- /opt/gnome/lib64
- /usr/openwin/lib
- /usr/openwin/lib64
- /sw/lib
- $ENV{GTKMM_BASEPATH}/lib
- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
- )
-
- if(_expand_vc AND MSVC)
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "While searching for ${_var}_DEBUG our proposed library list is ${_libd_list}")
- endif()
-
- find_library(${_var}_DEBUG
- NAMES ${_libd_list}
- PATHS
- $ENV{GTKMM_BASEPATH}/lib
- [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]/lib
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]/lib
- )
-
- if(${_var} AND ${_var}_DEBUG)
- if(NOT GTK2_SKIP_MARK_AS_ADVANCED)
- mark_as_advanced(${_var}_DEBUG)
- endif()
- set(GTK2_LIBRARIES ${GTK2_LIBRARIES} optimized ${${_var}} debug ${${_var}_DEBUG})
- set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE)
- endif()
- else()
- if(NOT GTK2_SKIP_MARK_AS_ADVANCED)
- mark_as_advanced(${_var})
- endif()
- set(GTK2_LIBRARIES ${GTK2_LIBRARIES} ${${_var}})
- set(GTK2_LIBRARIES ${GTK2_LIBRARIES} PARENT_SCOPE)
- # Set debug to release
- set(${_var}_DEBUG ${${_var}})
- set(${_var}_DEBUG ${${_var}} PARENT_SCOPE)
- endif()
-endfunction(_GTK2_FIND_LIBRARY)
-
-#=============================================================
-
-#
-# main()
-#
-
-set(GTK2_FOUND)
-set(GTK2_INCLUDE_DIRS)
-set(GTK2_LIBRARIES)
-
-if(NOT GTK2_FIND_COMPONENTS)
- # Assume they only want GTK
- set(GTK2_FIND_COMPONENTS gtk)
-endif()
-
-#
-# If specified, enforce version number
-#
-if(GTK2_FIND_VERSION)
- cmake_minimum_required(VERSION 2.6.2)
- set(GTK2_FAILED_VERSION_CHECK true)
- if(GTK2_DEBUG)
- message(STATUS "[FindGTK2.cmake:${CMAKE_CURRENT_LIST_LINE}] "
- "Searching for version ${GTK2_FIND_VERSION}")
- endif()
- _GTK2_FIND_INCLUDE_DIR(GTK2_GTK_INCLUDE_DIR gtk/gtk.h)
- if(GTK2_GTK_INCLUDE_DIR)
- _GTK2_GET_VERSION(GTK2_MAJOR_VERSION
- GTK2_MINOR_VERSION
- GTK2_PATCH_VERSION
- ${GTK2_GTK_INCLUDE_DIR}/gtk/gtkversion.h)
- set(GTK2_VERSION
- ${GTK2_MAJOR_VERSION}.${GTK2_MINOR_VERSION}.${GTK2_PATCH_VERSION})
- if(GTK2_FIND_VERSION_EXACT)
- if(GTK2_VERSION VERSION_EQUAL GTK2_FIND_VERSION)
- set(GTK2_FAILED_VERSION_CHECK false)
- endif()
- else()
- if(GTK2_VERSION VERSION_EQUAL GTK2_FIND_VERSION OR
- GTK2_VERSION VERSION_GREATER GTK2_FIND_VERSION)
- set(GTK2_FAILED_VERSION_CHECK false)
- endif()
- endif()
- else()
- # If we can't find the GTK include dir, we can't do version checking
- if(GTK2_FIND_REQUIRED AND NOT GTK2_FIND_QUIETLY)
- message(FATAL_ERROR "Could not find GTK2 include directory")
- endif()
- return()
- endif()
-
- if(GTK2_FAILED_VERSION_CHECK)
- if(GTK2_FIND_REQUIRED AND NOT GTK2_FIND_QUIETLY)
- if(GTK2_FIND_VERSION_EXACT)
- message(FATAL_ERROR "GTK2 version check failed. Version ${GTK2_VERSION} was found, version ${GTK2_FIND_VERSION} is needed exactly.")
- else()
- message(FATAL_ERROR "GTK2 version check failed. Version ${GTK2_VERSION} was found, at least version ${GTK2_FIND_VERSION} is required")
- endif()
- endif()
-
- # If the version check fails, exit out of the module here
- return()
- endif()
-endif()
-
-#
-# Find all components
-#
-
-foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
- if(_GTK2_component STREQUAL "gtk")
- _GTK2_FIND_INCLUDE_DIR(GTK2_GLIB_INCLUDE_DIR glib.h)
- _GTK2_FIND_INCLUDE_DIR(GTK2_GLIBCONFIG_INCLUDE_DIR glibconfig.h)
- _GTK2_FIND_LIBRARY (GTK2_GLIB_LIBRARY glib false true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GOBJECT_INCLUDE_DIR gobject/gobject.h)
- _GTK2_FIND_LIBRARY (GTK2_GOBJECT_LIBRARY gobject false true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GDK_INCLUDE_DIR gdk/gdk.h)
- _GTK2_FIND_INCLUDE_DIR(GTK2_GDKCONFIG_INCLUDE_DIR gdkconfig.h)
- _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-x11 false true)
- _GTK2_FIND_LIBRARY (GTK2_GDK_LIBRARY gdk-win32 false true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GTK_INCLUDE_DIR gtk/gtk.h)
- _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-x11 false true)
- _GTK2_FIND_LIBRARY (GTK2_GTK_LIBRARY gtk-win32 false true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_CAIRO_INCLUDE_DIR cairo.h)
- _GTK2_FIND_LIBRARY (GTK2_CAIRO_LIBRARY cairo false false)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_PANGO_INCLUDE_DIR pango/pango.h)
- _GTK2_FIND_LIBRARY (GTK2_PANGO_LIBRARY pango false true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_ATK_INCLUDE_DIR atk/atk.h)
- _GTK2_FIND_LIBRARY (GTK2_ATK_LIBRARY atk false true)
-
- #elseif(_GTK2_component STREQUAL "gdk_pixbuf")
- #_GTK2_FIND_INCLUDE_DIR(GTK2_GDKPIXBUF_INCLUDE_DIR gdk-pixbuf/gdk-pixbuf.h)
- #_GTK2_FIND_LIBRARY (GTK2_GDKPIXBUF_LIBRARY gdk_pixbuf false true)
-
- elseif(_GTK2_component STREQUAL "gtkmm")
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GLIBMM_INCLUDE_DIR glibmm.h)
- _GTK2_FIND_INCLUDE_DIR(GTK2_GLIBMMCONFIG_INCLUDE_DIR glibmmconfig.h)
- _GTK2_FIND_LIBRARY (GTK2_GLIBMM_LIBRARY glibmm true true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GDKMM_INCLUDE_DIR gdkmm.h)
- _GTK2_FIND_INCLUDE_DIR(GTK2_GDKMMCONFIG_INCLUDE_DIR gdkmmconfig.h)
- _GTK2_FIND_LIBRARY (GTK2_GDKMM_LIBRARY gdkmm true true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GTKMM_INCLUDE_DIR gtkmm.h)
- _GTK2_FIND_INCLUDE_DIR(GTK2_GTKMMCONFIG_INCLUDE_DIR gtkmmconfig.h)
- _GTK2_FIND_LIBRARY (GTK2_GTKMM_LIBRARY gtkmm true true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_CAIROMM_INCLUDE_DIR cairomm/cairomm.h)
- _GTK2_FIND_LIBRARY (GTK2_CAIROMM_LIBRARY cairomm true true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_PANGOMM_INCLUDE_DIR pangomm.h)
- _GTK2_FIND_LIBRARY (GTK2_PANGOMM_LIBRARY pangomm true true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_SIGC++_INCLUDE_DIR sigc++/sigc++.h)
- _GTK2_FIND_INCLUDE_DIR(GTK2_SIGC++CONFIG_INCLUDE_DIR sigc++config.h)
- _GTK2_FIND_LIBRARY (GTK2_SIGC++_LIBRARY sigc true true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GIOMM_INCLUDE_DIR giomm.h)
- _GTK2_FIND_INCLUDE_DIR(GTK2_GIOMMCONFIG_INCLUDE_DIR giommconfig.h)
- _GTK2_FIND_LIBRARY (GTK2_GIOMM_LIBRARY giomm true true)
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_ATKMM_INCLUDE_DIR atkmm.h)
- _GTK2_FIND_LIBRARY (GTK2_ATKMM_LIBRARY atkmm true true)
-
- elseif(_GTK2_component STREQUAL "glade")
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GLADE_INCLUDE_DIR glade/glade.h)
- _GTK2_FIND_LIBRARY (GTK2_GLADE_LIBRARY glade false true)
-
- elseif(_GTK2_component STREQUAL "glademm")
-
- _GTK2_FIND_INCLUDE_DIR(GTK2_GLADEMM_INCLUDE_DIR libglademm.h)
- _GTK2_FIND_INCLUDE_DIR(GTK2_GLADEMMCONFIG_INCLUDE_DIR libglademmconfig.h)
- _GTK2_FIND_LIBRARY (GTK2_GLADEMM_LIBRARY glademm true true)
-
- else()
- message(FATAL_ERROR "Unknown GTK2 component ${_component}")
- endif()
-endforeach()
-
-#
-# Solve for the GTK2 version if we haven't already
-#
-if(NOT GTK2_FIND_VERSION AND GTK2_GTK_INCLUDE_DIR)
- _GTK2_GET_VERSION(GTK2_MAJOR_VERSION
- GTK2_MINOR_VERSION
- GTK2_PATCH_VERSION
- ${GTK2_GTK_INCLUDE_DIR}/gtk/gtkversion.h)
- set(GTK2_VERSION ${GTK2_MAJOR_VERSION}.${GTK2_MINOR_VERSION}.${GTK2_PATCH_VERSION})
-endif()
-
-#
-# Try to enforce components
-#
-
-set(_GTK2_did_we_find_everything true) # This gets set to GTK2_FOUND
-
-include(FindPackageHandleStandardArgs)
-
-foreach(_GTK2_component ${GTK2_FIND_COMPONENTS})
- string(TOUPPER ${_GTK2_component} _COMPONENT_UPPER)
-
- if(_GTK2_component STREQUAL "gtk")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtk libraries were not found."
- GTK2_GTK_LIBRARY
- GTK2_GTK_INCLUDE_DIR
-
- GTK2_GLIB_INCLUDE_DIR
- GTK2_GLIBCONFIG_INCLUDE_DIR
- GTK2_GLIB_LIBRARY
-
- GTK2_GDK_INCLUDE_DIR
- GTK2_GDKCONFIG_INCLUDE_DIR
- GTK2_GDK_LIBRARY
- )
- elseif(_GTK2_component STREQUAL "gtkmm")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "Some or all of the gtkmm libraries were not found."
- GTK2_GTKMM_LIBRARY
- GTK2_GTKMM_INCLUDE_DIR
- GTK2_GTKMMCONFIG_INCLUDE_DIR
-
- GTK2_GLIBMM_INCLUDE_DIR
- GTK2_GLIBMMCONFIG_INCLUDE_DIR
- GTK2_GLIBMM_LIBRARY
-
- GTK2_GDKMM_INCLUDE_DIR
- GTK2_GDKMMCONFIG_INCLUDE_DIR
- GTK2_GDKMM_LIBRARY
- )
- elseif(_GTK2_component STREQUAL "glade")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "The glade library was not found."
- GTK2_GLADE_LIBRARY
- GTK2_GLADE_INCLUDE_DIR
- )
- elseif(_GTK2_component STREQUAL "glademm")
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(GTK2_${_COMPONENT_UPPER} "The glademm library was not found."
- GTK2_GLADEMM_LIBRARY
- GTK2_GLADEMM_INCLUDE_DIR
- GTK2_GLADEMMCONFIG_INCLUDE_DIR
- )
- endif()
-
- if(NOT GTK2_${_COMPONENT_UPPER}_FOUND)
- set(_GTK2_did_we_find_everything false)
- endif()
-endforeach()
-
-if(_GTK2_did_we_find_everything AND NOT GTK2_VERSION_CHECK_FAILED)
- set(GTK2_FOUND true)
-else()
- # Unset our variables.
- set(GTK2_FOUND false)
- set(GTK2_VERSION)
- set(GTK2_VERSION_MAJOR)
- set(GTK2_VERSION_MINOR)
- set(GTK2_VERSION_PATCH)
- set(GTK2_INCLUDE_DIRS)
- set(GTK2_LIBRARIES)
-endif()
-
-if(GTK2_INCLUDE_DIRS)
- list(REMOVE_DUPLICATES GTK2_INCLUDE_DIRS)
-endif()
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/package/yast2-gtk.changes new/yast2-gtk-2.21.76/package/yast2-gtk.changes
--- old/yast2-gtk-2.21.70/package/yast2-gtk.changes 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/package/yast2-gtk.changes 2010-10-07 14:25:32.000000000 +0200
@@ -1,4 +1,21 @@
-------------------------------------------------------------------
+Thu Oct 07 13:22:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt
+
+- 2.21.76
+- sw_single: run solver at end, fixes bnc#620513.
+- rpm spec fix (now compatible with both 11.3 and factory).
+- got rid of included FindGTK2.cmake module.
+- overall string review.
+- text domain changed from "yast2-gtk" to "gtk".
+
+-------------------------------------------------------------------
+Mon Aug 30 10:48:27 CEST 2010 - vuntz@opensuse.org
+
+- Add yast2-gtk-fix-FindGTK2-gdk-pixbuf.patch to fix build with
+ gtk2 2.21.x: gdk-pixbuf was split and the include paths are
+ different now.
+
+-------------------------------------------------------------------
Mon Aug 23 00:40:00 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt
- 2.21.70
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/package/yast2-gtk.spec new/yast2-gtk-2.21.76/package/yast2-gtk.spec
--- old/yast2-gtk-2.21.70/package/yast2-gtk.spec 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-gtk-2.21.76/package/yast2-gtk.spec 2010-10-07 14:25:32.000000000 +0200
@@ -0,0 +1,69 @@
+#
+# spec file for package yast2-gtk (Version 2.21.75)
+#
+# norootforbuild;,
+
+
+Name: yast2-gtk
+Version: 2.21.75
+Release: 0
+
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source0: yast2-gtk-2.21.75.tar.bz2
+Url: http://en.opensuse.org/YaST2-GTK
+Summary: YaST2 - GTK+ Graphical User Interface
+Group: System/YaST
+License: GPL v2.1 or later
+BuildRequires: cmake
+BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel
+BuildRequires: gtk2-devel
+%if 0%{?suse_version} > 1130
+BuildRequires: gdk-pixbuf-devel
+%endif
+BuildRequires: yast2-devtools >= 2.16.3
+BuildRequires: yast2-libyui-devel >= 2.18.8
+BuildRequires: libzypp-devel >= 6.3.0
+Requires: gtk2
+Requires: yast2-libyui >= 2.18.8
+Requires: yast2_theme >= 2.16.1
+Requires: libzypp >= 6.3.0
+Provides: yast2_ui yast2-ui-gtk
+Provides: yast2_ui_pkg
+Source1: yast2-gtk-rpmlintrc
+
+%description
+One of several user interfaces available for YaST2, based on GTK and
+the X Window System.
+
+%prep
+%setup
+
+%build
+mkdir build
+cd build
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$CFLAGS"
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+ -DLIB=%{_lib} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=1 \
+ ..
+make %{?_smp_mflags} VERBOSE=1
+
+%install
+cd build
+make install DESTDIR=$RPM_BUILD_ROOT
+cd ..
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+%files
+%defattr (-, root, root)
+%dir %_libdir/YaST2
+%_libdir/YaST2/plugin/
+# %_prefix/share/YaST2/gtk/
+
+%changelog
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/YGProgressBar.cc new/yast2-gtk-2.21.76/src/YGProgressBar.cc
--- old/yast2-gtk-2.21.70/src/YGProgressBar.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/YGProgressBar.cc 2010-10-07 14:25:32.000000000 +0200
@@ -3,7 +3,7 @@
********************************************************************/
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#define YUILogComponent "gtk"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/YGTable.cc new/yast2-gtk-2.21.76/src/YGTable.cc
--- old/yast2-gtk-2.21.70/src/YGTable.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/YGTable.cc 2010-10-07 14:25:32.000000000 +0200
@@ -2,7 +2,7 @@
* YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
********************************************************************/
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/YGUI.cc new/yast2-gtk-2.21.76/src/YGUI.cc
--- old/yast2-gtk-2.21.70/src/YGUI.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/YGUI.cc 2010-10-07 14:25:32.000000000 +0200
@@ -3,7 +3,7 @@
********************************************************************/
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/YGUtils.cc new/yast2-gtk-2.21.76/src/YGUtils.cc
--- old/yast2-gtk-2.21.70/src/YGUtils.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/YGUtils.cc 2010-10-07 14:25:32.000000000 +0200
@@ -2,7 +2,7 @@
* YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
********************************************************************/
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#define YUILogComponent "gtk"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/YGi18n.h new/yast2-gtk-2.21.76/src/YGi18n.h
--- old/yast2-gtk-2.21.70/src/YGi18n.h 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/YGi18n.h 2010-10-07 14:25:32.000000000 +0200
@@ -6,7 +6,7 @@
#define YGi18n_h
#include
-#define TEXTDOMAIN "yast2-gtk"
+#define TEXTDOMAIN "gtk"
static inline const char *_(const char *msgid)
{ return dgettext (TEXTDOMAIN, msgid); }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/YGPackageSelector.cc new/yast2-gtk-2.21.76/src/pkg/YGPackageSelector.cc
--- old/yast2-gtk-2.21.70/src/pkg/YGPackageSelector.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/YGPackageSelector.cc 2010-10-07 14:25:32.000000000 +0200
@@ -2,7 +2,7 @@
* YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
********************************************************************/
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
@@ -266,13 +266,13 @@
return confirmed;
}
- virtual bool acceptLicense (Ypp::Selectable &sel, const std::string &license)
+ virtual bool showLicense (Ypp::Selectable &sel, const std::string &license)
{
return acceptText (sel, _("License Agreement"),
_("Do you accept the terms of this license?"), license);
}
- virtual bool displayMessage (Ypp::Selectable &sel, const std::string &message)
+ virtual bool showMessage (Ypp::Selectable &sel, const std::string &message)
{ return acceptText (sel, _("Warning Message"), _("Install anyway"), message); }
virtual bool resolveProblems (const std::list &problems)
@@ -699,6 +699,7 @@
dialog->setTitle (title);
Ypp::setInterface (impl);
+ Ypp::runSolver(); // check dependencies at start
impl->refreshQuery();
if (summaryMode()) popupChanges();
@@ -720,6 +721,11 @@
void YGPackageSelector::apply()
{
+ if (!Ypp::runSolver()) return; // final dependencies check
+ if (onlineUpdateMode())
+ if (!Ypp::showPendingLicenses (Ypp::Selectable::PATCH)) return;
+ if (!Ypp::showPendingLicenses (Ypp::Selectable::PACKAGE)) return;
+
if (Ypp::isModified()) { // confirm
if (!onlineUpdateMode() && confirmUnsupported()) {
if (!impl->confirmUnsupported())
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/pkg-selector-help.cc new/yast2-gtk-2.21.76/src/pkg/pkg-selector-help.cc
--- old/yast2-gtk-2.21.70/src/pkg/pkg-selector-help.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/pkg-selector-help.cc 2010-10-07 14:25:32.000000000 +0200
@@ -2,7 +2,7 @@
* YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
********************************************************************/
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgdetailview.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgdetailview.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgdetailview.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgdetailview.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
@@ -339,16 +339,16 @@
ZyppPackage zpkg = castZyppPackage (zobj);
std::string str;
- std::string b ("<i>"), _b ("</i> "), br ("<br/>");
+ std::string b ("<i>"), _b ("</i> "), i (""), _i(""), br ("<br/>");
str.reserve (2048);
- str += b + _("Size:") + _b + zobj->installSize().asString();
- str += br + b + _("License:") + _b + zpkg->license();
+ str += b + _("Size:") + _b + i + zobj->installSize().asString() + _i;
+ str += br + b + _("License:") + _b + i + zpkg->license() + _i;
if (zsel->hasInstalledObj())
- str += br + b + ("Installed at:") + _b +
- zsel->installedObj()->installtime().form ("%x");
+ str += br + b + ("Installed at:") + _b + i +
+ zsel->installedObj()->installtime().form ("%x") + _i;
if (zsel->hasCandidateObj())
- str += br + b + ("Latest build:") + _b +
- zsel->candidateObj()->buildtime().form ("%x");
+ str += br + b + ("Latest build:") + _b + i +
+ zsel->candidateObj()->buildtime().form ("%x") + _i;
ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str());
}
@@ -720,6 +720,8 @@
ygtk_rich_text_set_text (YGTK_RICH_TEXT (col),
("<i>" + col1 + "</i>").c_str());
gtk_box_pack_start (GTK_BOX (hbox), col, FALSE, TRUE, 0);
+ // by settings both the two following "col" text widgets with the same
+ // fixed width, and expanded=True, we ensure all rows have the same size
col = ygtk_rich_text_new();
gtk_widget_set_size_request (col, 80, -1);
ygtk_rich_text_set_text (YGTK_RICH_TEXT (col), col2.c_str());
@@ -758,23 +760,27 @@
Ypp::Selectable sel = list.get (0);
clear();
- std::string installed_str (_("<b>Installed Version</b>"));
- std::string candidate_str (_("<b>Candidate Version</b>"));
- installed_str = "<i>" + installed_str + "</i>";
- candidate_str = "<i>" + candidate_str + "</i>";
- if (sel.hasInstalledVersion())
+ std::string i ("<i>"), _i ("</i>"), b ("<b>"), _b ("</b>");
+ std::string installed_str (i + b + _("Installed Version:") + _b + _i);
+ std::string candidate_str (i + b + _("Available Version:") + _b + _i);
+ bool hasInstalled = sel.hasInstalledVersion(),
+ hasCandidate = sel.hasCandidateVersion();
+ if (hasInstalled)
installed_str += "<br>" + sel.installed().number();
- if (sel.hasCandidateVersion())
+ if (hasCandidate)
candidate_str += "<br>" + sel.candidate().number();
addLine ("", installed_str, candidate_str, -1);
for (int dep = 0; dep < VersionDependencies::total(); dep++) {
std::string inst, cand;
- if (sel.hasInstalledVersion())
+ if (hasInstalled)
inst = VersionDependencies (sel.installed()).getText (dep);
- if (sel.hasCandidateVersion())
+ if (hasCandidate)
cand = VersionDependencies (sel.candidate()).getText (dep);
- if (!inst.empty() || !cand.empty())
+ if (!inst.empty() || !cand.empty()) {
+ if (inst == cand)
+ cand = i + _("idem") + _i;
addLine (VersionDependencies::getLabel (dep), inst, cand, dep);
+ }
}
gtk_widget_show_all (vbox);
}
@@ -1052,7 +1058,7 @@
Ypp::Selectable sel = list.get (0);
std::string str (authors (sel));
if (str.empty())
- ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("<i>Unspecified attribute.</i>"));
+ ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), _("<i>Not specified.</i>"));
else
ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str());
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgfilterview.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgfilterview.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgfilterview.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgfilterview.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
@@ -199,12 +199,12 @@
}
else {
// Translators: "Any status" may be translated as "All statuses" (whichever's smaller)
- addRow (NULL, _("Any status"), true, 0);
+ addRow (NULL, _("All packages"), true, 0);
// Translators: this refers to the package status
addRow (NULL, _("Not installed"), true, 0);
addRow (NULL, _("Installed"), true, 0);
// Translators: refers to package status: may be translated as "Upgrade"
- addRow (NULL, _("Upgradable"), true, 0, false);
+ addRow (NULL, _("Upgrades"), true, 0, false);
// Translators: this refers to the package status
addRow (NULL, _("Locked"), true, 0, false);
addRow (NULL, _("Modified"), true, 0, false);
@@ -270,7 +270,7 @@
GtkWidget *hbox = gtk_hbox_new (FALSE, 6), *button, *icon;
// Translators: if you prefer, translate this as "Apply Patches"
- button = gtk_button_new_with_label (_("Upgrade Patches"));
+ button = gtk_button_new_with_label (_("Apply Patches"));
gtk_widget_set_sensitive (button, hasPatches);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (upgrade_patches_clicked_cb), this);
@@ -564,7 +564,7 @@
YGtkPkgPriorityModel::YGtkPkgPriorityModel()
{
// Translators: "Any priority" may be translated as "All priorities" (whichever's smaller)
- addRow (NULL, _("Any priority"), true, 0);
+ addRow (NULL, _("All patches"), true, 0);
for (int i = 0; i < Ypp::Patch::priorityTotal(); i++)
addRow (NULL, Ypp::Patch::prioritySummary (i), true, 0, false);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkghistorydialog.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkghistorydialog.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkghistorydialog.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkghistorydialog.cc 2010-10-07 14:25:32.000000000 +0200
@@ -1,11 +1,11 @@
/********************************************************************
* YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
********************************************************************/
-/* YGtkPkgMenuBar, menu bar */
+/* YGtkPkgHistoryDialog, dialog */
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
@@ -47,8 +47,11 @@
{
if (reqby.empty())
return _("automatic");
- if (reqby.compare (0, 4, "root", 4) == 0)
- return _("user: root");
+ if (reqby.compare (0, 4, "root", 4) == 0) {
+ std::string str (_("user:"));
+ str += " root";
+ return str;
+ }
return reqby;
}
@@ -409,7 +412,7 @@
static void save_to_file (GtkWindow *parent)
{
- GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save logs to"), parent,
+ GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save to"), parent,
GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (dialog), TRUE);
@@ -508,7 +511,7 @@
GtkCellRenderer *renderer, *pix_renderer;
GtkTreeViewColumn *column;
- GtkWidget *log_view = ygtk_tree_view_new (_("No log entries."));
+ GtkWidget *log_view = ygtk_tree_view_new (_("No entries."));
gtk_tree_view_set_search_column (GTK_TREE_VIEW (log_view), LogListHandler::SHORTCUT_COLUMN);
gtk_tree_view_set_fixed_height_mode (GTK_TREE_VIEW (log_view), TRUE);
gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (log_view), TRUE);
@@ -615,7 +618,7 @@
GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_OTHER, GTK_BUTTONS_NONE,
- _("History of Changes (%s)"), FILENAME);
+ _("History (%s)"), FILENAME);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_JUMP_TO, 1);
gtk_dialog_add_button (GTK_DIALOG (dialog), _("Save to File"), 2);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkglistview.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkglistview.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkglistview.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkglistview.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#define YUILogComponent "gtk"
@@ -940,8 +940,10 @@
text = _("To remove");
else if (sel.isInstalled()) {
text = _("Installed");
- if (sel.hasUpgrade())
- text += _(" (upgrade available)");
+ if (sel.hasUpgrade()) {
+ text += " ";
+ text += _("(upgrade available)");
+ }
}
else
text = _("Not installed");
@@ -982,7 +984,7 @@
std::string getRepositoryLabel (Ypp::Repository &repo)
{
std::string name (repo.name()), url, str;
- url = repo.isSystem() ? _("Local database") : repo.url();
+ url = repo.isSystem() ? _("System") : repo.url();
str.reserve (name.size() + url.size() + 64);
str = name + "\n";
str += "";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgmenubar.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgmenubar.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgmenubar.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgmenubar.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
@@ -214,7 +214,7 @@
static void import_file_cb (GtkMenuItem *item)
{
- GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Load Package List"),
+ GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import"),
YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
@@ -290,10 +290,10 @@
YGPackageSelector::get()->popupChanges();
}
- catch ( const zypp::Exception & exception )
+ catch (const zypp::Exception & exception)
{
yuiWarning() << "Error reading package list from " << filename << endl;
- char *text = g_strdup_printf (_("Error loading package list from '%s'"), filename);
+ char *text = g_strdup_printf (_("Could not load package list: '%s'"), filename);
errorMsg (text);
g_free (text);
}
@@ -307,7 +307,7 @@
static void export_file_cb (GtkMenuItem *item)
{
- GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save Package List"),
+ GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export"),
YGDialog::currentWindow(), GTK_FILE_CHOOSER_ACTION_SAVE,
GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL);
@@ -364,7 +364,7 @@
g_remove (filename);
// Post error popup
- char *text = g_strdup_printf (_("Error exporting package list to '%s'"), filename);
+ char *text = g_strdup_printf (_("Could not export package list: '%s'"), filename);
errorMsg (text);
g_free (text);
}
@@ -379,13 +379,13 @@
{
const char *dirname = "/var/log/YaST2/solverTestcase";
std::string msg = _("Use this to generate extensive logs to help tracking down "
- "bugs in the dependency resolver.\nThe logs will be stored in "
+ "bugs in the dependency solver.\nThe logs will be stored in "
"directory: ");
msg += dirname;
GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK_CANCEL,
- "%s", _("Create Dependency Resolver Test Case"));
+ "%s", _("Create Dependency Solver Test Case"));
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", msg.c_str());
int ret = gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
@@ -400,11 +400,11 @@
GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(),
GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION,
GTK_BUTTONS_YES_NO, "%s", _("Success"));
- msg = _("Dependency resolver test case written to");
+ msg = _("Dependency solver test case written to");
msg += " <tt>";
msg += dirname;
msg += "</tt>\n";
- msg += _("Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?");
+ msg += _("Also create a <tt>y2logs.tgz</tt> tar archive to attach to bugzilla?");
gtk_message_dialog_format_secondary_markup (GTK_MESSAGE_DIALOG (dialog),
"%s", msg.c_str());
ret = gtk_dialog_run (GTK_DIALOG (dialog));
@@ -413,7 +413,7 @@
YGUI::ui()->askSaveLogs();
}
else {
- msg = _("Failed to create dependency resolver test case.\n"
+ msg = _("Failed to create dependency solver test case.\n"
"Please check disk space and permissions for");
msg += " <tt>";
msg += dirname;
@@ -731,10 +731,10 @@
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), (submenu = gtk_menu_new()));
append_menu_item (submenu, _("Show Products"), NULL,
G_CALLBACK (show_products_cb), this);
- append_menu_item (submenu, _("Show Package Changes"), NULL,
+ append_menu_item (submenu, _("Show Changes"), NULL,
G_CALLBACK (show_pkg_changes_cb), this);
if (!selector->onlineUpdateMode())
- append_menu_item (submenu, _("Show History of Changes"), NULL,
+ append_menu_item (submenu, _("Show History"), NULL,
G_CALLBACK (show_log_changes_cb), this);
append_menu_item (submenu, NULL, NULL, NULL, NULL);
append_menu_item (submenu, _("Install All Matching -devel Packages"), NULL,
@@ -744,7 +744,7 @@
append_menu_item (submenu, _("Install All Matching -debug-source Packages"), NULL,
G_CALLBACK (install_all_debug_source_pkgs_cb), this);
append_menu_item (submenu, NULL, NULL, NULL, NULL);
- append_menu_item (submenu, _("Generate Dependency Resolver Test Case"), NULL,
+ append_menu_item (submenu, _("Generate Dependency Solver Test Case"), NULL,
G_CALLBACK (create_solver_testcase_cb), this);
append_menu_item (submenu, _("Reset Ignored Dependency Conflicts"), NULL,
G_CALLBACK (reset_ignored_dependency_conflicts_cb), this);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgpatternview.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgpatternview.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgpatternview.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgpatternview.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgproductdialog.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgproductdialog.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgproductdialog.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgproductdialog.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgquerycombo.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgquerycombo.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgquerycombo.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgquerycombo.cc 2010-10-07 14:25:32.000000000 +0200
@@ -1,10 +1,13 @@
/********************************************************************
* YaST2-GTK - http://en.opensuse.org/YaST2-GTK *
********************************************************************/
-/* Textdomain "yast2-gtk" */
/* YGtkPkgQueryCombo, an umbrella for any group of QueryWidget widgets */
// check the header file for information about this widget
+/*
+ Textdomain "yast2-gtk"
+ */
+
#define YUILogComponent "gtk-pkg"
#include "YGi18n.h"
#include "config.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgrpmgroupsview.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgrpmgroupsview.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgrpmgroupsview.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgrpmgroupsview.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgsearchentry.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgsearchentry.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgsearchentry.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgsearchentry.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
@@ -237,7 +237,7 @@
break;
case 2: {
GtkWidget *label = gtk_label_new (
- _("Search by file name is only reliable for installed packages."));
+ _("Search by file name only reliable for installed packages."));
gtk_misc_set_alignment (GTK_MISC (label), 0, .5);
GtkWidget *icon = gtk_image_new_from_stock (
GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgstatusbar.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgstatusbar.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgstatusbar.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgstatusbar.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/ygtkpkgundolist.cc new/yast2-gtk-2.21.76/src/pkg/ygtkpkgundolist.cc
--- old/yast2-gtk-2.21.70/src/pkg/ygtkpkgundolist.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/ygtkpkgundolist.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this utility
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/yzypptags.cc new/yast2-gtk-2.21.76/src/pkg/yzypptags.cc
--- old/yast2-gtk-2.21.70/src/pkg/yzypptags.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/yzypptags.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this translator
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "YGi18n.h"
@@ -28,11 +28,16 @@
case YPKG_GROUP_PROGRAMMING: return _( "Programming" );
case YPKG_GROUP_MULTIMEDIA: return _( "Multimedia" );
case YPKG_GROUP_SYSTEM: return _( "System" );
+ // Translators: keep translation short
case YPKG_GROUP_DESKTOP_GNOME: return _( "Desktop (GNOME)" );
+ // Translators: keep translation short
case YPKG_GROUP_DESKTOP_KDE: return _( "Desktop (KDE)" );
+ // Translators: keep translation short
case YPKG_GROUP_DESKTOP_XFCE: return _( "Desktop (XFCE)" );
+ // Translators: keep translation short
case YPKG_GROUP_DESKTOP_OTHER: return _( "Desktop (Others)" );
case YPKG_GROUP_PUBLISHING: return _( "Publishing" );
+ // Translators: keep translation short
case YPKG_GROUP_ADMIN_TOOLS: return _( "Admin Tools" );
case YPKG_GROUP_LOCALIZATION: return _( "Localization" );
case YPKG_GROUP_SECURITY: return _( "Security" );
@@ -41,10 +46,10 @@
case YPKG_GROUP_DOCUMENTATION: return _( "Documentation" );
case YPKG_GROUP_UTILITIES: return _( "Utilities" );
- case YPKG_GROUP_UNKNOWN: return _( "Unknown Group" );
+ case YPKG_GROUP_UNKNOWN: return _( "Unknown" );
case YPKG_GROUP_SUGGESTED: return _( "Suggested" );
case YPKG_GROUP_RECOMMENDED: return _( "Recommended" );
- case YPKG_GROUP_ORPHANED: return _( "Orphaned" );
+ case YPKG_GROUP_ORPHANED: return _( "Unmaintained" );
case YPKG_GROUP_RECENT: return _( "Recent" );
case YPKG_GROUP_MULTIVERSION: return _( "Multiversion" );
case YPKG_GROUP_TOTAL: break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/yzyppwrapper.cc new/yast2-gtk-2.21.76/src/pkg/yzyppwrapper.cc
--- old/yast2-gtk-2.21.70/src/pkg/yzyppwrapper.cc 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/yzyppwrapper.cc 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this wrapper
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include "config.h"
@@ -17,6 +17,7 @@
#include <algorithm>
static Ypp::Interface *g_interface = 0;
+static bool g_autoSolver = true;
// Repository
@@ -144,7 +145,7 @@
int installed, total;
col.stats (&installed, &total);
std::ostringstream stream;
- stream << _("Installed: ") << installed << _(" of ") << total;
+ stream << _("Installed:") << " " << installed << " " << _("of") << " " << total;
return stream.str();
}
default: break;
@@ -322,14 +323,14 @@
default: {
if (!m_sel->hasLicenceConfirmed()) {
ZyppResObject obj = m_sel->candidateObj();
- if (obj) {
+ if (obj && g_interface && g_autoSolver) {
const std::string &license = obj->licenseToConfirm();
- if (!license.empty() && g_interface)
- if (!g_interface->acceptLicense (*this, license))
+ if (!license.empty())
+ if (!g_interface->showLicense (*this, license))
return;
const std::string &msg = obj->insnotify();
- if (!msg.empty() && g_interface)
- if (!g_interface->displayMessage (*this, msg))
+ if (!msg.empty())
+ if (!g_interface->showMessage (*this, msg))
return;
}
m_sel->setLicenceConfirmed();
@@ -379,11 +380,11 @@
_zyppPool().eraseRequestedLocale (m_locale);
break;
default: {
- if (m_sel->hasCandidateObj()) {
+ if (m_sel->hasCandidateObj() && g_interface && g_autoSolver) {
ZyppResObject obj = m_sel->candidateObj();
const std::string &msg = obj->delnotify();
- if (!msg.empty() && g_interface)
- if (!g_interface->displayMessage (*this, msg))
+ if (!msg.empty())
+ if (!g_interface->showMessage (*this, msg))
return;
}
@@ -730,11 +731,15 @@
const char *Ypp::Patch::prioritySummary (int priority)
{
switch (priority) {
+ // Translators: this refers to patch priority
case 0: return _("Security");
+ // Translators: this refers to patch priority
case 1: return _("Recommended");
case 2: return "YaST";
case 3: return _("Documentation");
+ // Translators: this refers to patch priority
case 4: return _("Optional");
+ // Translators: this refers to patch priority
case 5: return _("Other");
}
return 0;
@@ -832,7 +837,7 @@
// Interface
std::list g_sel_listeners;
-static bool g_transacting = false, g_autoSolver = true;
+static bool g_transacting = false;
void Ypp::addSelListener (Ypp::SelListener *listener)
{ g_sel_listeners.push_back (listener); }
@@ -850,7 +855,6 @@
void Ypp::setInterface (Ypp::Interface *interface)
{
g_interface = interface;
- runSolver(); // check problems at start
}
Ypp::Interface *Ypp::getInterface() { return g_interface; }
@@ -938,6 +942,30 @@
bool Ypp::isSolverEnabled()
{ return g_autoSolver; }
+bool Ypp::showPendingLicenses (Ypp::Selectable::Type type)
+{
+ const zypp::ResKind &kind = Selectable::asKind (type);
+ for (ZyppPool::const_iterator it = zyppPool().byKindBegin(kind);
+ it != zyppPool().byKindEnd(kind); it++) {
+ ZyppSelectable zsel = (*it);
+ switch (zsel->status()) {
+ case zypp::ui::S_Install: case zypp::ui::S_AutoInstall:
+ case zypp::ui::S_Update: case zypp::ui::S_AutoUpdate:
+ if (zsel->candidateObj()) {
+ std::string license = zsel->candidateObj()->licenseToConfirm();
+ if (!license.empty())
+ if (!zsel->hasLicenceConfirmed()) {
+ Selectable sel (zsel);
+ if (!g_interface->showLicense (sel, license))
+ return false;
+ }
+ }
+ default: break;
+ }
+ }
+ return true;
+}
+
void Ypp::startTransactions()
{ g_transacting = true; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/pkg/yzyppwrapper.h new/yast2-gtk-2.21.76/src/pkg/yzyppwrapper.h
--- old/yast2-gtk-2.21.70/src/pkg/yzyppwrapper.h 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/pkg/yzyppwrapper.h 2010-10-07 14:25:32.000000000 +0200
@@ -266,6 +266,7 @@
bool runSolver (bool force = false); // returns whether succesful
void setEnableSolver (bool enabled); // true by default
bool isSolverEnabled();
+ bool showPendingLicenses (Ypp::Selectable::Type type);
// temporarily suspends run-solver while installing/removing a few packages at a time
// -- used by Ypp::List
@@ -273,8 +274,8 @@
bool finishTransactions(); // returns return of runSolver()
struct Interface {
- virtual bool acceptLicense (Selectable &sel, const std::string &license) = 0;
- virtual bool displayMessage (Selectable &sel, const std::string &message) = 0;
+ virtual bool showLicense (Selectable &sel, const std::string &license) = 0;
+ virtual bool showMessage (Selectable &sel, const std::string &message) = 0;
// resolveProblems = false to cancel the action that had that effect
virtual bool resolveProblems (const std::list &problems) = 0;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/ygtksteps.c new/yast2-gtk-2.21.76/src/ygtksteps.c
--- old/yast2-gtk-2.21.70/src/ygtksteps.c 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/ygtksteps.c 2010-10-07 14:25:32.000000000 +0200
@@ -6,7 +6,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/ygtktreeview.c new/yast2-gtk-2.21.76/src/ygtktreeview.c
--- old/yast2-gtk-2.21.70/src/ygtktreeview.c 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/ygtktreeview.c 2010-10-07 14:25:32.000000000 +0200
@@ -5,7 +5,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/src/ygtkwizard.c new/yast2-gtk-2.21.76/src/ygtkwizard.c
--- old/yast2-gtk-2.21.70/src/ygtkwizard.c 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/src/ygtkwizard.c 2010-10-07 14:25:32.000000000 +0200
@@ -6,7 +6,7 @@
// check the header file for information about this widget
/*
- Textdomain "yast2-gtk"
+ Textdomain "gtk"
*/
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/tests/FileDialog.ycp new/yast2-gtk-2.21.76/tests/FileDialog.ycp
--- old/yast2-gtk-2.21.70/tests/FileDialog.ycp 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/tests/FileDialog.ycp 2010-10-07 14:25:32.000000000 +0200
@@ -50,13 +50,14 @@
UI::CloseDialog();
if (action == `open_file)
- ret_path = UI::AskForSaveFileName (start_path, filter_str, "Choose a File");
+ ret_path = UI::AskForExistingFile (start_path, filter_str, "Choose a File");
else if (action == `save_file)
ret_path = UI::AskForSaveFileName (start_path, filter_str, "Choose a File");
else if (action == `select_folder)
- ret_path = UI::AskForSaveFileName (start_path, filter_str, "Choose a Folder");
+ ret_path = UI::AskForExistingDirectory (start_path, "Choose a Folder");
- if (ret_path != nil)
- show_selected (ret_path);
+ if (ret_path == nil)
+ ret_path = "(none)";
+ show_selected (ret_path);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-gtk-2.21.70/yast2-gtk.spec.in new/yast2-gtk-2.21.76/yast2-gtk.spec.in
--- old/yast2-gtk-2.21.70/yast2-gtk.spec.in 2010-08-23 01:42:39.000000000 +0200
+++ new/yast2-gtk-2.21.76/yast2-gtk.spec.in 2010-10-07 14:25:32.000000000 +0200
@@ -9,9 +9,13 @@
BuildRequires: cmake
BuildRequires: gcc-c++ blocxx-devel libxcrypt-devel
BuildRequires: gtk2-devel
+%if 0%{?suse_version} > 1130
+BuildRequires: gdk-pixbuf-devel
+%endif
BuildRequires: yast2-devtools >= 2.16.3
BuildRequires: yast2-libyui-devel >= 2.18.8
BuildRequires: libzypp-devel >= 6.3.0
+Requires: gtk2
Requires: yast2-libyui >= 2.18.8
Requires: yast2_theme >= 2.16.1
Requires: libzypp >= 6.3.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org