November 2009 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-iscsi-server for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package yast2-iscsi-server for openSUSE:Factory checked in at Wed Nov 4 11:16:48 CET 2009. -------- --- yast2-iscsi-server/yast2-iscsi-server.changes 2009-03-09 15:53:47.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-iscsi-server/yast2-iscsi-server.changes 2009-11-03 12:51:20.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 3 12:48:42 CET 2009 - mzugec(a)suse.cz + +- export credentials for target (fate#301932) +- 2.18.4 + +------------------------------------------------------------------- +Thu May 21 09:19:51 CEST 2009 - mzugec(a)suse.cz + +- handle correctly when tgt is already installed (bnc#501375) +- 2.18.3 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-iscsi-server-2.18.2.tar.bz2 New: ---- yast2-iscsi-server-2.18.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-server.spec ++++++ --- /var/tmp/diff_new_pack.VP9zLu/_old 2009-11-04 11:15:09.000000000 +0100 +++ /var/tmp/diff_new_pack.VP9zLu/_new 2009-11-04 11:15:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-server (Version 2.18.2) +# spec file for package yast2-iscsi-server (Version 2.18.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: yast2-iscsi-server -Version: 2.18.2 +Version: 2.18.4 Release: 1 -License: GPL v2 or later -Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-server-2.18.2.tar.bz2 +Source0: yast2-iscsi-server-2.18.4.tar.bz2 Prefix: /usr +Group: System/YaST +License: GPL v2 or later BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite # network needs Wizard::OpenCancelOKDialog() # function from yast2-2.18.2 @@ -36,10 +36,8 @@ %description Configuration of iSCSI target - - %prep -%setup -n yast2-iscsi-server-2.18.2 +%setup -n yast2-iscsi-server-2.18.4 %build %{prefix}/bin/y2tool y2autoconf @@ -49,7 +47,9 @@ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" ++++++ yast2-iscsi-server-2.18.2.tar.bz2 -> yast2-iscsi-server-2.18.4.tar.bz2 ++++++ ++++ 3585 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/Makefile.am new/yast2-iscsi-server-2.18.4/Makefile.am --- old/yast2-iscsi-server-2.18.2/Makefile.am 2009-03-09 15:34:30.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/Makefile.am 2009-11-03 12:50:23.000000000 +0100 @@ -32,10 +32,10 @@ # less strict; prefer bzip2 AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip -# where devtools instal m4 snippets +# where devtools install m4 snippets # argh, executed literally #ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal -ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal +ACLOCAL_AMFLAGS = -I . -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common cmp -s $< $@ || cp -f $< $@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/VERSION new/yast2-iscsi-server-2.18.4/VERSION --- old/yast2-iscsi-server-2.18.2/VERSION 2009-03-09 15:42:12.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/VERSION 2009-11-03 12:48:39.000000000 +0100 @@ -1 +1 @@ -2.18.2 +2.18.4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/autodocs-ycp.ami new/yast2-iscsi-server-2.18.4/autodocs-ycp.ami --- old/yast2-iscsi-server-2.18.2/autodocs-ycp.ami 2009-03-09 15:34:30.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/autodocs-ycp.ami 2009-11-03 12:50:23.000000000 +0100 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/configure.in new/yast2-iscsi-server-2.18.4/configure.in --- old/yast2-iscsi-server-2.18.2/configure.in 2009-03-09 15:34:30.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/configure.in 2009-11-03 12:50:23.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2-iscsi-server dnl -dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-iscsi-server, 2.18.1, http://bugs.opensuse.org/, yast2-iscsi-server) +AC_INIT(yast2-iscsi-server, 2.18.4, http://bugs.opensuse.org/, yast2-iscsi-server) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.1" +VERSION="2.18.4" RPMNAME="yast2-iscsi-server" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/missing new/yast2-iscsi-server-2.18.4/missing --- old/yast2-iscsi-server-2.18.2/missing 2009-03-09 15:34:39.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/missing 2009-11-03 12:50:27.000000000 +0100 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/src/IscsiServer.ycp new/yast2-iscsi-server-2.18.4/src/IscsiServer.ycp --- old/yast2-iscsi-server-2.18.2/src/IscsiServer.ycp 2008-03-05 08:29:09.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/src/IscsiServer.ycp 2009-05-21 09:30:00.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: IscsiServer settings, input and output functions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: IscsiServer.ycp 45026 2008-02-26 14:53:51Z mzugec $ + * $Id: IscsiServer.ycp 57274 2009-05-21 07:29:59Z mzugec $ * * Representation of the configuration of iscsi-server. * Input and output routines. @@ -27,6 +27,8 @@ import "IscsiServerFunctions"; import "Mode"; import "NetworkService"; +import "PackageSystem"; +import "Label"; boolean serviceStatus = false; boolean statusOnStart = false; @@ -125,15 +127,21 @@ // test if required package ("iscsitarget") is installed boolean installed_packages(){ - boolean ret = false; - y2milestone("Check if iscsitarget is installed"); - if( !Package::InstallMsg( "iscsitarget", - _("To configure the iSCSI target, the %1 package must be installed.") + - _("Install it now?")) ) - { - Popup::Error( Message::CannotContinueWithoutPackagesInstalled() ); - } else ret = true; - return ret; + if (!PackageSystem::PackageInstalled("iscsitarget")){ + y2milestone("Not installed, will install"); + boolean confirm = Popup::AnyQuestionRichText( + "", _("Can't continue without installing iscsitarget package"), 40, 10, + Label::InstallButton(), Label::CancelButton (), `focus_yes + ); + + if (confirm){ + if (PackageSystem::PackageInstalled("tgt")) PackageSystem::DoRemove(["tgt"]); + PackageSystem::DoInstall(["iscsitarget"]); + if (PackageSystem::PackageInstalled("iscsitarget")) return true; + else return false; + } + return false; + } else return true; } // check status of iscsitarget service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/src/IscsiServerFunctions.pm new/yast2-iscsi-server-2.18.4/src/IscsiServerFunctions.pm --- old/yast2-iscsi-server-2.18.2/src/IscsiServerFunctions.pm 2009-03-03 13:13:14.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/src/IscsiServerFunctions.pm 2009-11-03 11:19:03.000000000 +0100 @@ -5,8 +5,13 @@ package IscsiServerFunctions; use strict; +use YaST::YCP qw(:LOGGING); use Data::Dumper; use YaPI; +use Switch; + +YaST::YCP::Import ("SCR"); + our %TYPEINFO; @@ -392,5 +397,63 @@ return \$ret; } +BEGIN { $TYPEINFO{SaveIntoFile} = ["function", "boolean", "string" ]; } +sub SaveIntoFile { + my $self = shift; + my $filename = shift; + my $file=""; + my $delimiter = "---------------------\n"; + + my $auth = $self->getConfig()->{"auth"}; + if (defined $auth && scalar(@{$auth})>0){ + $file = "Discovery authentication:\n" . $delimiter; + foreach my $row (@{$auth}){ + $file = $file . $row->{'KEY'} . ": " . $row->{'VALUE'} . "\n"; + } + $file = $file . "\n"; + } + +# my $isns = $self->getConfig()->{"iSNS"}; +# if (defined $isns && $isns>0){ +# foreach my $row (@{$isns}){ +# y2internal("isns ", Dumper($row)); +# } +# } + + my %targets = %{$self->getTargets()}; + if (scalar(keys %targets)>0){ + $file = $file . "Targets\n" . $delimiter . "\n"; + } + foreach my $target (keys %targets){ + my $target_name = ""; + my @auths = (); + my @luns = (); + foreach my $row (@{$targets{$target}}){ + switch ($row->{'KEY'}) { + case ('Target') { + $target_name = $row->{'VALUE'}; + } + case ('Lun') { + push(@luns, $row->{'VALUE'}); + } + case ('IncomingUser' || 'OutgoingUser') { + push(@auths, $row->{'KEY'} . ": " . $row->{'VALUE'}) + } + } + } + $file = $file . $target_name . "\n"; + $file = $file . "Luns: " . join(', ', @luns) . "\n" if (scalar(@luns) > 0); + $file = $file . join("\n", @auths) if (scalar(@auths) > 0); + $file = $file . "\n"; + } + + y2milestone("Save report : \n", $file); + + my $result = SCR -> Write (".target.string", $filename, $file); + y2milestone("Save result: ", $result); + return $result; +} + + 1; # EOF diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/src/dialogs.ycp new/yast2-iscsi-server-2.18.4/src/dialogs.ycp --- old/yast2-iscsi-server-2.18.2/src/dialogs.ycp 2009-03-09 15:43:10.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/src/dialogs.ycp 2009-11-03 12:49:43.000000000 +0100 @@ -11,7 +11,7 @@ * Summary: Dialogs definitions * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: dialogs.ycp 56021 2009-03-09 14:43:09Z mzugec $ + * $Id: dialogs.ycp 59270 2009-11-03 11:49:42Z mzugec $ */ { @@ -49,6 +49,8 @@ "isns", `VSpacing (2), "firewall", + `VSpacing (2), + "save", `VSpacing (2) ), `HSpacing (1), @@ -56,7 +58,7 @@ ), `VStretch() ), - "widget_names" : [ "auto_start_up", "isns", "firewall" ] + "widget_names" : [ "auto_start_up", "isns", "firewall", "save" ] ], // second tab - global authentication "global":$[ @@ -102,8 +104,8 @@ "contents" : `VBox( `HBox( - `TextEntry(`id(`target), _("Target"), "iqn.2001-04.com.example"), - `TextEntry(`id(`identifier), _("Identifier"), "test") + `InputField(`id(`target), `opt(`hstretch), _("Target"), "iqn.2001-04.com.example"), + `InputField(`id(`identifier), `opt(`hstretch), _("Identifier"), "test") ), `VBox( `Table(`id(`lun_table), @@ -144,7 +146,7 @@ `VSpacing(2), `Left( `CheckBox(`id(`auth_out),`opt(`notify), _("Outgoing Authentication"), false) ), `HBox( - `TextEntry(`id(`user_out), _("Username")), `Password(`id(`pass_out), _("Password")) + `InputField(`id(`user_out), `opt(`hstretch), _("Username")), `Password(`id(`pass_out), _("Password")) ) ) ] @@ -174,13 +176,20 @@ "services" : [ "service:iscsitarget" ], "display_details" : true, ]), + "save" : $[ + "widget" : `push_button, + "label" : Label::SaveButton(), + "handle" : saveConfiguration, + "opt": [], + "help": HELPS["save_configuration"]:"" + ], "isns" : $[ "widget" : `custom, "custom_widget" : `HBox( `CheckBoxFrame(`id(`isns_ac), _("iSNS Access Control"), true, `VBox( - `TextEntry(`id(`isns_ip), _("iSNS Server")) + `InputField(`id(`isns_ip), `opt(`hstretch), _("iSNS Server")) )) ), "init" : initiSNS, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/src/helps.ycp new/yast2-iscsi-server-2.18.4/src/helps.ycp --- old/yast2-iscsi-server-2.18.2/src/helps.ycp 2008-09-08 13:05:41.000000000 +0200 +++ new/yast2-iscsi-server-2.18.4/src/helps.ycp 2009-11-03 12:49:43.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Help texts of all the dialogs * Authors: Michal Zugec <mzugec(a)suse.cz> * - * $Id: helps.ycp 50790 2008-09-08 11:05:40Z mzugec $ + * $Id: helps.ycp 59270 2009-11-03 11:49:42Z mzugec $ */ { @@ -38,6 +38,10 @@ "), + "save_configuration" : _("Save button will export some informations about +targets into selected file."), + + /* Summary dialog help 1/3 */ "summary" : _("<big>iSCSI Target Configuration</big> Configure an iSCSI target here. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-iscsi-server-2.18.2/src/widgets.ycp new/yast2-iscsi-server-2.18.4/src/widgets.ycp --- old/yast2-iscsi-server-2.18.2/src/widgets.ycp 2008-12-05 10:49:48.000000000 +0100 +++ new/yast2-iscsi-server-2.18.4/src/widgets.ycp 2009-11-03 11:23:27.000000000 +0100 @@ -47,22 +47,22 @@ map <string, any> ret_map = $[]; term lun_dialog = `VBox( - `Left( `HWeight(3, `TextEntry( `id( `lun ), "LUN", previous["lun"]:"0" )) ), + `Left( `HWeight(3, `InputField( `id( `lun ), `opt(`hstretch), "LUN", previous["lun"]:"0" )) ), `VSpacing(2), `RadioButtonGroup(`id(`rb), `VBox( `Left( `RadioButton(`id(`fileio), `opt(`notify), "Type=fileio", previous["fileio"]:true) ), `HBox( - `TextEntry( `id( `file_path ), _("Path:"), previous["path"]:""), + `InputField( `id( `file_path ), `opt(`hstretch), _("Path:"), previous["path"]:""), `VBox( `Label(""), `PushButton(`id(`browse), _("Browse")) ) ), - `TextEntry( `id( `scsi_id ), "ScsiId:", previous["scsi_id"]:"" ), + `InputField( `id( `scsi_id ), `opt(`hstretch), "ScsiId:", previous["scsi_id"]:"" ), `VSpacing(2), `Left( `RadioButton(`id(`nullio), `opt(`notify), "Type=nullio", previous["nullio"]:false) ), - `TextEntry( `id( `sectors ), _("Sectors:"), previous["sectors"]:"" ) + `InputField( `id( `sectors ), `opt(`hstretch), _("Sectors:"), previous["sectors"]:"" ) ) ), `Left( `HBox( `PushButton(`id(`ok), Label::OKButton() ), `PushButton(`id(`cancel), Label::CancelButton() ))) @@ -149,7 +149,7 @@ // dialog to add/modify user and password list <string> getDialogValues(string user, string pass){ UI::OpenDialog( `VBox( - `TextEntry(`id(`p_user),_("Username"), user), + `InputField(`id(`p_user), `opt(`hstretch), _("Username"), user), `Password(`id(`p_pass), _("Password"), pass), `HBox( `PushButton(`id(`ok), _("OK")), @@ -175,6 +175,31 @@ else return []; } + +symbol saveConfiguration(string key, map event){ + if (is(event["ID"]:nil, string) && event["ID"]:"" == "save"){ + any filename = UI::AskForSaveFileName("/", "*", _("Save as...")); + if ( filename != nil && (string)filename!="") + { + if ( IscsiServerFunctions::SaveIntoFile( (string)filename )) + { + Popup::Message(sformat(_("File %1 was saved successfully."), filename)); + list pathComponents = splitstring( (string)filename, "/"); + integer s = size(pathComponents) - 1; + string base = pathComponents[s]:"default"; + } + else + { + Popup::Warning(_("An error occured while saving the file.")); + } + } + } + return nil; +} + + + + // **************** Server Dialog ********************* // dialog with targets ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdegraphics4 for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdegraphics4 for openSUSE:Factory checked in at Wed Nov 4 11:14:43 CET 2009. -------- --- KDE/kdegraphics4/kdegraphics4.changes 2009-10-13 23:13:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdegraphics4/kdegraphics4.changes 2009-11-02 22:02:10.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 22:02:06 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdegraphics-4.3.1.tar.bz2 New: ---- kdegraphics-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdegraphics4.spec ++++++ --- /var/tmp/diff_new_pack.4XinXG/_old 2009-11-04 11:13:32.000000000 +0100 +++ /var/tmp/diff_new_pack.4XinXG/_new 2009-11-04 11:13:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdegraphics4 (Version 4.3.1) +# spec file for package kdegraphics4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ Group: Productivity/Graphics/Other Summary: kdegraphics base package Url: http://www.kde.org -Version: 4.3.1 -Release: 3 +Version: 4.3.3 +Release: 1 Source0: kdegraphics-%version.tar.bz2 Patch0: 4_3_BRANCH.diff Patch1: solid_action_kamera-bnc-505997.diff ++++++ 4_3_BRANCH.diff ++++++ ++++ 3968 lines (skipped) ++++ between KDE/kdegraphics4/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdegraphics4/4_3_BRANCH.diff ++++++ kdegraphics-4.3.1.tar.bz2 -> kdegraphics-4.3.3.tar.bz2 ++++++ ++++ 4715 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit zypper for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Wed Nov 4 11:12:59 CET 2009. -------- --- zypper/zypper.changes 2009-10-30 12:50:09.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2009-11-02 18:45:15.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 18:36:50 CET 2009 - ma(a)suse.de + +- Prevent clipping lines when output is redirected. (bnc #551744) +- 1.2.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- zypper-1.2.8.tar.bz2 New: ---- zypper-1.2.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.yQbjSa/_old 2009-11-04 11:12:32.000000000 +0100 +++ /var/tmp/diff_new_pack.yQbjSa/_new 2009-11-04 11:12:32.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 1.2.8) +# spec file for package zypper (Version 1.2.9) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,7 +31,7 @@ AutoReqProv: on PreReq: permissions Summary: Command line software manager using libzypp -Version: 1.2.8 +Version: 1.2.9 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc ++++++ zypper-1.2.8.tar.bz2 -> zypper-1.2.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.8/VERSION.cmake new/zypper-1.2.9/VERSION.cmake --- old/zypper-1.2.8/VERSION.cmake 2009-10-30 12:10:41.000000000 +0100 +++ new/zypper-1.2.9/VERSION.cmake 2009-11-02 20:26:34.000000000 +0100 @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "2") -SET(VERSION_PATCH "8") +SET(VERSION_PATCH "9") -# LAST RELEASED: 1.2.8 +# LAST RELEASED: 1.2.9 #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.8/package/zypper.changes new/zypper-1.2.9/package/zypper.changes --- old/zypper-1.2.8/package/zypper.changes 2009-10-30 12:10:41.000000000 +0100 +++ new/zypper-1.2.9/package/zypper.changes 2009-11-02 20:26:34.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Nov 2 18:36:50 CET 2009 - ma(a)suse.de + +- Prevent clipping lines when output is redirected. (bnc #551744) +- 1.2.9 + +------------------------------------------------------------------- Fri Oct 30 11:36:57 CET 2009 - ma(a)suse.de - Fix 'zypper in --from' selecting the wrong packages. (bnc #548392) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.8/src/utils/misc.cc new/zypper-1.2.9/src/utils/misc.cc --- old/zypper-1.2.8/src/utils/misc.cc 2009-10-30 12:10:41.000000000 +0100 +++ new/zypper-1.2.9/src/utils/misc.cc 2009-11-02 20:26:34.000000000 +0100 @@ -65,7 +65,7 @@ unsigned get_screen_width() { if (!::isatty(STDOUT_FILENO)) - return 80; + return -1; // no clipping int width = 80; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.8/src/utils/misc.h new/zypper-1.2.9/src/utils/misc.h --- old/zypper-1.2.8/src/utils/misc.h 2009-10-30 12:10:41.000000000 +0100 +++ new/zypper-1.2.9/src/utils/misc.h 2009-11-02 20:26:34.000000000 +0100 @@ -37,6 +37,8 @@ /** * Reads COLUMNS environment variable or gets the screen width from readline, * in that order. Falls back to 80 if all that fails. + * \NOTE In case stdout is not connected to a terminal max. unsigned + * is returned. This should prevent clipping when output is redirected. */ unsigned get_screen_width(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebindings4 for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdebindings4 for openSUSE:Factory checked in at Wed Nov 4 11:12:08 CET 2009. -------- --- KDE/kdebindings4/kdebindings4.changes 2009-09-24 19:27:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes 2009-11-03 11:35:25.000000000 +0100 @@ -1,0 +2,12 @@ +Mon Nov 2 22:00:10 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- +Mon Nov 2 13:29:17 UTC 2009 - dmacvicar(a)suse.de + +- split ruby Qt4 bindings to ruby-qt4 and ruby-qt4-devel + (bnc #551653) + +------------------------------------------------------------------- mono-kde4.changes: same change python-kde4.changes: same change ruby-kde4.changes: same change calling whatdependson for head-i586 Old: ---- kdebindings-4.3.1.tar.bz2 New: ---- kdebindings-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebindings4.spec ++++++ --- /var/tmp/diff_new_pack.vpesTC/_old 2009-11-04 11:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.vpesTC/_new 2009-11-04 11:10:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings4 (Version 4.3.1) +# spec file for package kdebindings4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Bindings for KDE 4.x libraries -Version: 4.3.1 -Release: 2 +Version: 4.3.3 +Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_3_BRANCH.diff Patch1: plasma_no_examples.diff @@ -48,6 +48,11 @@ %requires_eq libkde4 %py_requires %endif +%if %is_ruby +%requires_eq ruby-qt4 +%kde4_runtime_requires +%kde4_akonadi_requires +%endif %if %is_mono Requires: mono-qt = %version %endif @@ -72,6 +77,24 @@ %description -n libsmoke-devel %endif +%if %is_ruby + +%package -n ruby-qt4 +License: LGPL v2.1 or later +Group: Development/Libraries/KDE +Summary: Bindings for Qt4 libraries + +%description -n ruby-qt4 + +%package -n ruby-qt4-devel +License: LGPL v2.1 or later +Group: Development/Libraries/KDE +Summary: Development files for Qt4 libraries Ruby bindings +Requires: ruby-qt4 = %version + +%description -n ruby-qt4-devel + +%endif %if %is_mono %package -n libqyotoshared1 @@ -153,6 +176,10 @@ %post -n ruby-kde4 -p /sbin/ldconfig %postun -n ruby-kde4 -p /sbin/ldconfig + +%post -n ruby-qt4 -p /sbin/ldconfig + +%postun -n ruby-qt4 -p /sbin/ldconfig %endif %if %is_base @@ -240,8 +267,6 @@ %defattr(-,root,root) %_kde4_modulesdir/krossruby.so %_kde4_modulesdir/krubypluginfactory.so -%_kde4_libdir/libqtruby4shared.so -%_kde4_libdir/libqtruby4shared.so.* %_kde4_libdir/ruby/site_ruby/*/akonadi %_kde4_libdir/ruby/site_ruby/*/*-linux/akonadi.so %_kde4_libdir/ruby/site_ruby/*/KDE @@ -250,41 +275,49 @@ %_kde4_libdir/ruby/site_ruby/*/*-linux/khtml.so %_kde4_libdir/ruby/site_ruby/*/*-linux/korundum4.so %_kde4_libdir/ruby/site_ruby/*/*-linux/ktexteditor.so +%_kde4_libdir/ruby/site_ruby/*/*-linux/solid.so +%_kde4_libdir/ruby/site_ruby/*/*-linux/nepomuk.so +%_kde4_libdir/ruby/site_ruby/*/solid/solid.rb +%_kde4_libdir/ruby/site_ruby/*/*-linux/soprano.so +%_kde4_libdir/ruby/site_ruby/*/soprano/soprano.rb +%_kde4_libdir/ruby/site_ruby/*/khtml +%_kde4_libdir/ruby/site_ruby/*/nepomuk +%_kde4_libdir/ruby/site_ruby/*/ktexteditor +%_kde4_libdir/ruby/site_ruby/*/solid +%_kde4_libdir/ruby/site_ruby/*/soprano +%_kde4_libdir/ruby/site_ruby/*/*-linux/plasma_applet.so +%_kde4_appsdir/dbpedia_references +%_kde4_bindir/krubyapplication +%_kde4_bindir/rbkconfig_compiler4 +%_kde4_appsdir/dbpedia_references/dbpedia_references.rb + +%files -n ruby-qt4 +%defattr(-,root,root) +%_kde4_libdir/libqtruby4shared.so.* %_kde4_libdir/ruby/site_ruby/*/*-linux/qtruby4.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qtuitools.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qtwebkit.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/solid.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/nepomuk.so %_kde4_libdir/ruby/site_ruby/*/Qt %_kde4_libdir/ruby/site_ruby/*/Qt3.rb %_kde4_libdir/ruby/site_ruby/*/Qt4.rb %_kde4_libdir/ruby/site_ruby/*/Qt.rb %_kde4_libdir/ruby/site_ruby/*/qtuitools/qtuitools.rb %_kde4_libdir/ruby/site_ruby/*/qtwebkit/qtwebkit.rb -%_kde4_libdir/ruby/site_ruby/*/solid/solid.rb %_kde4_libdir/ruby/site_ruby/*/*-linux/qtscript.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/soprano.so %_kde4_libdir/ruby/site_ruby/*/qtscript/qtscript.rb -%_kde4_libdir/ruby/site_ruby/*/soprano/soprano.rb -%_kde4_libdir/ruby/site_ruby/*/khtml -%_kde4_libdir/ruby/site_ruby/*/nepomuk -%_kde4_libdir/ruby/site_ruby/*/ktexteditor %_kde4_libdir/ruby/site_ruby/*/qtscript %_kde4_libdir/ruby/site_ruby/*/qtuitools %_kde4_libdir/ruby/site_ruby/*/qtwebkit -%_kde4_libdir/ruby/site_ruby/*/solid -%_kde4_libdir/ruby/site_ruby/*/soprano -%_kde4_libdir/ruby/site_ruby/*/*-linux/plasma_applet.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qttest.so %_kde4_libdir/ruby/site_ruby/*/qttest -%_kde4_appsdir/dbpedia_references -%_kde4_bindir/krubyapplication -%_kde4_bindir/rbkconfig_compiler4 %_kde4_bindir/rbqtapi %_kde4_bindir/rbrcc %_kde4_bindir/rbuic4 + +%files -n ruby-qt4-devel +%defattr(-,root,root) +%_kde4_libdir/libqtruby4shared.so /usr/include/qtruby -%_kde4_appsdir/dbpedia_references/dbpedia_references.rb %endif %if %is_mono mono-kde4.spec: same change python-kde4.spec: same change ++++++ ruby-kde4.spec ++++++ --- /var/tmp/diff_new_pack.vpesTC/_old 2009-11-04 11:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.vpesTC/_new 2009-11-04 11:10:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package ruby-kde4 (Version 4.3.1) +# spec file for package ruby-kde4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Bindings for KDE 4.x libraries -Version: 4.3.1 -Release: 2 +Version: 4.3.3 +Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_3_BRANCH.diff Patch1: plasma_no_examples.diff @@ -48,6 +48,11 @@ %requires_eq libkde4 %py_requires %endif +%if %is_ruby +%requires_eq ruby-qt4 +%kde4_runtime_requires +%kde4_akonadi_requires +%endif %if %is_mono Requires: mono-qt = %version %endif @@ -72,6 +77,24 @@ %description -n libsmoke-devel %endif +%if %is_ruby + +%package -n ruby-qt4 +License: LGPL v2.1 or later +Group: Development/Libraries/KDE +Summary: Bindings for Qt4 libraries + +%description -n ruby-qt4 + +%package -n ruby-qt4-devel +License: LGPL v2.1 or later +Group: Development/Libraries/KDE +Summary: Development files for Qt4 libraries Ruby bindings +Requires: ruby-qt4 = %version + +%description -n ruby-qt4-devel + +%endif %if %is_mono %package -n libqyotoshared1 @@ -153,6 +176,10 @@ %post -n ruby-kde4 -p /sbin/ldconfig %postun -n ruby-kde4 -p /sbin/ldconfig + +%post -n ruby-qt4 -p /sbin/ldconfig + +%postun -n ruby-qt4 -p /sbin/ldconfig %endif %if %is_base @@ -240,8 +267,6 @@ %defattr(-,root,root) %_kde4_modulesdir/krossruby.so %_kde4_modulesdir/krubypluginfactory.so -%_kde4_libdir/libqtruby4shared.so -%_kde4_libdir/libqtruby4shared.so.* %_kde4_libdir/ruby/site_ruby/*/akonadi %_kde4_libdir/ruby/site_ruby/*/*-linux/akonadi.so %_kde4_libdir/ruby/site_ruby/*/KDE @@ -250,41 +275,49 @@ %_kde4_libdir/ruby/site_ruby/*/*-linux/khtml.so %_kde4_libdir/ruby/site_ruby/*/*-linux/korundum4.so %_kde4_libdir/ruby/site_ruby/*/*-linux/ktexteditor.so +%_kde4_libdir/ruby/site_ruby/*/*-linux/solid.so +%_kde4_libdir/ruby/site_ruby/*/*-linux/nepomuk.so +%_kde4_libdir/ruby/site_ruby/*/solid/solid.rb +%_kde4_libdir/ruby/site_ruby/*/*-linux/soprano.so +%_kde4_libdir/ruby/site_ruby/*/soprano/soprano.rb +%_kde4_libdir/ruby/site_ruby/*/khtml +%_kde4_libdir/ruby/site_ruby/*/nepomuk +%_kde4_libdir/ruby/site_ruby/*/ktexteditor +%_kde4_libdir/ruby/site_ruby/*/solid +%_kde4_libdir/ruby/site_ruby/*/soprano +%_kde4_libdir/ruby/site_ruby/*/*-linux/plasma_applet.so +%_kde4_appsdir/dbpedia_references +%_kde4_bindir/krubyapplication +%_kde4_bindir/rbkconfig_compiler4 +%_kde4_appsdir/dbpedia_references/dbpedia_references.rb + +%files -n ruby-qt4 +%defattr(-,root,root) +%_kde4_libdir/libqtruby4shared.so.* %_kde4_libdir/ruby/site_ruby/*/*-linux/qtruby4.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qtuitools.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qtwebkit.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/solid.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/nepomuk.so %_kde4_libdir/ruby/site_ruby/*/Qt %_kde4_libdir/ruby/site_ruby/*/Qt3.rb %_kde4_libdir/ruby/site_ruby/*/Qt4.rb %_kde4_libdir/ruby/site_ruby/*/Qt.rb %_kde4_libdir/ruby/site_ruby/*/qtuitools/qtuitools.rb %_kde4_libdir/ruby/site_ruby/*/qtwebkit/qtwebkit.rb -%_kde4_libdir/ruby/site_ruby/*/solid/solid.rb %_kde4_libdir/ruby/site_ruby/*/*-linux/qtscript.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/soprano.so %_kde4_libdir/ruby/site_ruby/*/qtscript/qtscript.rb -%_kde4_libdir/ruby/site_ruby/*/soprano/soprano.rb -%_kde4_libdir/ruby/site_ruby/*/khtml -%_kde4_libdir/ruby/site_ruby/*/nepomuk -%_kde4_libdir/ruby/site_ruby/*/ktexteditor %_kde4_libdir/ruby/site_ruby/*/qtscript %_kde4_libdir/ruby/site_ruby/*/qtuitools %_kde4_libdir/ruby/site_ruby/*/qtwebkit -%_kde4_libdir/ruby/site_ruby/*/solid -%_kde4_libdir/ruby/site_ruby/*/soprano -%_kde4_libdir/ruby/site_ruby/*/*-linux/plasma_applet.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qttest.so %_kde4_libdir/ruby/site_ruby/*/qttest -%_kde4_appsdir/dbpedia_references -%_kde4_bindir/krubyapplication -%_kde4_bindir/rbkconfig_compiler4 %_kde4_bindir/rbqtapi %_kde4_bindir/rbrcc %_kde4_bindir/rbuic4 + +%files -n ruby-qt4-devel +%defattr(-,root,root) +%_kde4_libdir/libqtruby4shared.so /usr/include/qtruby -%_kde4_appsdir/dbpedia_references/dbpedia_references.rb %endif %if %is_mono ++++++ 4_3_BRANCH.diff ++++++ --- /var/tmp/diff_new_pack.vpesTC/_old 2009-11-04 11:10:17.000000000 +0100 +++ /var/tmp/diff_new_pack.vpesTC/_new 2009-11-04 11:10:17.000000000 +0100 @@ -5,481 +5,3 @@ @@ -0,0 +1,2 @@ +current HEAD: 1027747 +svn di between //tags/KDE/4.3.1/kdebindings and //branches/KDE/4.3/kdebindings ---- ruby/korundum/ChangeLog -+++ ruby/korundum/ChangeLog -@@ -1,3 +1,7 @@ -+2009-09-22 Richard Dale <richard.j.dale(a)gmail.com> -+ * Fix broken KDE::ConfigGroup.readEntry method. Thanks to Paulo Capriotti -+ for reporting the bug -+ - 2009-08-04 Richard Dale <richard.j.dale(a)gmail.com> - * Enable KDE::ConfigGroup.read_entry() and write_entry() methods to - automatically convert args to Qt::Variants as well as the camel case ---- ruby/korundum/src/lib/KDE/korundum4.rb -+++ ruby/korundum/src/lib/KDE/korundum4.rb -@@ -318,16 +318,18 @@ - method_missing(:name, *args) - end - -- def readEntry(key, default = nil) -- if default.kind_of?(String) || default.kind_of?(Qt::Variant) -- return super(key, default) -- else -- return super(key, Qt::Variant.new(default)).value -- end -- end -+ def readEntry(*args) -+ if args.length < 2 -+ return super(*args) -+ elsif args[1].kind_of?(String) || args[1].kind_of?(Qt::Variant) -+ return super(*args) -+ else -+ return super(args[0], Qt::Variant.new(args[1])).value -+ end -+ end - -- def read_entry(key, default = nil) -- readEntry(key, default) -+ def read_entry(*args) -+ readEntry(*args) - end - - def writeEntry(key, value, pFlags = KDE::ConfigBase::Normal) ---- python/pykde4/sip/kio/global.sip -+++ python/pykde4/sip/kio/global.sip -@@ -210,8 +210,8 @@ - QString bcpp = it.value (); - PyObject *ainst = 0; - PyObject *binst = 0; -- if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipClass_QString)) == NULL) -- || ((binst = sipBuildResult (NULL, "N", new QString (bcpp), sipClass_QString)) == NULL) -+ if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipType_QString)) == NULL) -+ || ((binst = sipBuildResult (NULL, "N", new QString (bcpp), sipType_QString)) == NULL) - || (PyDict_SetItem (dict, ainst, binst) < 0)) - { - Py_XDECREF (ainst); -@@ -243,8 +243,8 @@ - { - int iserr = 0; - -- acpp = (QString *)sipForceConvertToInstance(aelem, sipClass_QString, NULL, 0, NULL, &iserr); -- bcpp = (QString *)sipForceConvertToInstance(belem, sipClass_QString, NULL, 0, NULL, &iserr); -+ acpp = (QString *)sipForceConvertToType(aelem, sipType_QString, NULL, 0, NULL, &iserr); -+ bcpp = (QString *)sipForceConvertToType(belem, sipType_QString, NULL, 0, NULL, &iserr); - - if (iserr) - { ---- python/pykde4/sip/kio/kacl.sip -+++ python/pykde4/sip/kio/kacl.sip -@@ -116,7 +116,7 @@ - { - QString s = (*it).first; - ushort u = (*it).second; -- PyObject *pys = sipBuildResult (NULL, "N", new QString (s), sipClass_QString); -+ PyObject *pys = sipBuildResult (NULL, "N", new QString (s), sipType_QString); - if ((pys == NULL) || ((inst = Py_BuildValue ("Ni", pys, u)) == NULL) - || PyList_Append (pylist, inst) < 0) - { -@@ -144,7 +144,7 @@ - { - PyObject *elem = PyList_GET_ITEM (sipPy, i); - PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0); -- p1 = *(QString *)sipForceConvertToInstance(pyp1, sipClass_QString, NULL, 0, NULL, &iserr); -+ p1 = *(QString *)sipForceConvertToType(pyp1, sipType_QString, NULL, 0, NULL, &iserr); - if (iserr) - { - *sipIsErr = 1; ---- python/pykde4/sip/kdecore/typedefs.sip -+++ python/pykde4/sip/kdecore/typedefs.sip -@@ -134,8 +134,8 @@ - TYPE1 *t1 = new TYPE1(i.key()); - TYPE2 *t2 = new TYPE2(i.value()); - -- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj); -- PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj); -+ PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj); -+ PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj); - - if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0) - { -@@ -175,10 +175,10 @@ - - while (PyDict_Next(sipPy, &i, &t1obj, *t2obj)) - { -- if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE)) - return 0; - -- if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE)) - return 0; - } - -@@ -191,13 +191,13 @@ - { - int state1, state2; - -- TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -- TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); -+ TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -+ TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t1, sipClass_TYPE1, state1); -- sipReleaseInstance(t2, sipClass_TYPE2, state2); -+ sipReleaseType(t1, sipType_TYPE1, state1); -+ sipReleaseType(t2, sipType_TYPE2, state2); - - delete qm; - return 0; -@@ -205,8 +205,8 @@ - - qm->insert(*t1, t2); - -- sipReleaseInstance(t1, sipClass_TYPE1, state1); -- sipReleaseInstance(t2, sipClass_TYPE2, state2); -+ sipReleaseType(t1, sipType_TYPE1, state1); -+ sipReleaseType(t2, sipType_TYPE2, state2); - } - - *sipCppPtr = qm; -@@ -232,7 +232,7 @@ - - KSharedPtr<TYPE> *cPtr = new KSharedPtr<TYPE> (*(KSharedPtr<TYPE> *)sipCpp); - TYPE *cpp = cPtr->data (); -- PyObject *obj = sipConvertFromInstance (cpp, sipClass_TYPE, sipTransferObj); -+ PyObject *obj = sipConvertFromType(cpp, sipType_TYPE, sipTransferObj); - - return obj; - %End -@@ -244,7 +244,7 @@ - return PyInstance_Check(sipPy); - - int iserr = 0; -- TYPE *cpp = (TYPE *)sipForceConvertToInstance(sipPy, sipClass_TYPE, NULL, 0, NULL, &iserr); -+ TYPE *cpp = (TYPE *)sipForceConvertToType(sipPy, sipType_TYPE, NULL, 0, NULL, &iserr); - - if (iserr) - { -@@ -385,8 +385,8 @@ - TYPE1 *t1 = new TYPE1(i.key()); - TYPE2 *t2 = i.value(); - -- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj); -- PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj); -+ PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj); -+ PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj); - - if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0) - { -@@ -426,10 +426,10 @@ - - while (PyDict_Next(sipPy, &i, &t1obj, &t2obj)) - { -- if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE)) - return 0; - -- if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE)) - return 0; - } - -@@ -442,13 +442,13 @@ - { - int state1, state2; - -- TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -- TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); -+ TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -+ TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t1, sipClass_TYPE1, state1); -- sipReleaseInstance(t2, sipClass_TYPE2, state2); -+ sipReleaseType(t1, sipType_TYPE1, state1); -+ sipReleaseType(t2, sipType_TYPE2, state2); - - delete qm; - return 0; -@@ -456,8 +456,8 @@ - - qm->insert(*t1, t2); - -- sipReleaseInstance(t1, sipClass_TYPE1, state1); -- sipReleaseInstance(t2, sipClass_TYPE2, state2); -+ sipReleaseType(t1, sipType_TYPE1, state1); -+ sipReleaseType(t2, sipType_TYPE2, state2); - } - - *sipCppPtr = qm; -@@ -486,7 +486,7 @@ - int i = 0; - foreach ((TYPE *)value, set) - { -- PyObject *obj = sipConvertFromNewInstance(value, sipClass_TYPE, sipTransferObj); -+ PyObject *obj = sipConvertFromNewType(value, sipType_TYPE, sipTransferObj); - if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) - { - Py_DECREF(l); -@@ -519,7 +519,7 @@ - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE)) - return 0; - } - -@@ -529,11 +529,11 @@ - { - int state; - -- TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM (l, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (l, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t, sipClass_TYPE, state); -+ sipReleaseType(t, sipType_TYPE, state); - - delete qs; - return 0; -@@ -541,7 +541,7 @@ - - *qs << t; - -- sipReleaseInstance(t, sipClass_TYPE, state); -+ sipReleaseType(t, sipType_TYPE, state); - } - - *sipCppPtr = qs; -@@ -570,7 +570,7 @@ - int i = 0; - foreach (TYPE value, set) - { -- PyObject *obj = sipConvertFromNewInstance(&value, sipClass_TYPE, sipTransferObj); -+ PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj); - if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) - { - Py_DECREF(l); -@@ -603,7 +603,7 @@ - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE)) - return 0; - } - -@@ -613,11 +613,11 @@ - { - int state; - -- TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t, sipClass_TYPE, state); -+ sipReleaseType(t, sipType_TYPE, state); - - delete qs; - return 0; -@@ -625,7 +625,7 @@ - - *qs << *t; - -- sipReleaseInstance(t, sipClass_TYPE, state); -+ sipReleaseType(t, sipType_TYPE, state); - } - - *sipCppPtr = qs; -@@ -647,8 +647,8 @@ - TYPE1 *t1 = new TYPE1(sipCpp->first); - TYPE2 *t2 = new TYPE2(sipCpp->second); - -- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj); -- PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj); -+ PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj); -+ PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj); - - if (t1obj == NULL || t2obj == NULL) - { -@@ -679,13 +679,13 @@ - PyObject *t1obj = PyTuple_GET_ITEM(sipPy, 0); - PyObject *t2obj = PyTuple_GET_ITEM(sipPy, 1); - -- TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -- TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); -+ TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -+ TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t1, sipClass_TYPE1, state1); -- sipReleaseInstance(t2, sipClass_TYPE2, state2); -+ sipReleaseType(t1, sipType_TYPE1, state1); -+ sipReleaseType(t2, sipType_TYPE2, state2); - - return 0; - } ---- python/pykde4/sip/kdecore/klocalizedstring.sip -+++ python/pykde4/sip/kdecore/klocalizedstring.sip -@@ -89,14 +89,14 @@ - - } else { - int state = 0; -- arg = (QString *)sipForceConvertToInstance(pyarg, sipClass_QString, NULL, SIP_NOT_NONE, &state, &iserr); -+ arg = (QString *)sipForceConvertToType(pyarg, sipType_QString, NULL, SIP_NOT_NONE, &state, &iserr); - if (iserr) { - *sipIsErr = 1; - return QString(); - } - - result = result.subs(*arg); -- sipReleaseInstance(arg,sipClass_QString,state); -+ sipReleaseType(arg,sipType_QString,state); - arg = 0; - } - } ---- python/pykde4/sip/kdecore/kservice.sip -+++ python/pykde4/sip/kdecore/kservice.sip -@@ -115,7 +115,7 @@ - KService::Ptr *t = new KService::Ptr (sipCpp->at(i)); - PyObject *tobj; - -- if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KService, sipTransferObj)) == NULL) -+ if ((tobj = sipConvertFromNewType(t->data(), sipType_KService, sipTransferObj)) == NULL) - { - Py_DECREF(l); - delete t; -@@ -137,7 +137,7 @@ - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KService, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KService, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -148,11 +148,11 @@ - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - int state; -- KService *t = reinterpret_cast<KService *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ KService *t = reinterpret_cast<KService *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t, sipClass_KService, state); -+ sipReleaseType(t, sipType_KService, state); - - delete ql; - return 0; -@@ -162,7 +162,7 @@ - - ql->append(*tptr); - -- sipReleaseInstance(t, sipClass_KService, state); -+ sipReleaseType(t, sipType_KService, state); - } - - *sipCppPtr = ql; ---- python/pykde4/sip/kdecore/kservicetype.sip -+++ python/pykde4/sip/kdecore/kservicetype.sip -@@ -74,7 +74,7 @@ - KServiceType::Ptr *t = new KServiceType::Ptr (sipCpp->at(i)); - PyObject *tobj; - -- if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KServiceType, sipTransferObj)) == NULL) -+ if ((tobj = sipConvertFromNewType(t->data(), sipType_KServiceType, sipTransferObj)) == NULL) - { - Py_DECREF(l); - delete t; -@@ -96,7 +96,7 @@ - return 0; - - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceType, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceType, SIP_NOT_NONE)) - return 0; - - return 1; -@@ -107,11 +107,11 @@ - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - { - int state; -- KServiceType *t = reinterpret_cast<KServiceType *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -+ KServiceType *t = reinterpret_cast<KServiceType *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); - - if (*sipIsErr) - { -- sipReleaseInstance(t, sipClass_KServiceType, state); -+ sipReleaseType(t, sipType_KServiceType, state); - - delete ql; - return 0; -@@ -121,7 +121,7 @@ - - ql->append(*tptr); - -- sipReleaseInstance(t, sipClass_KServiceType, state); -+ sipReleaseType(t, sipType_KServiceType, state); - } - - *sipCppPtr = ql; -@@ -152,7 +152,7 @@ - QString *t1 = new QString (i.key()); - QVariant::Type t2 = (QVariant::Type) (i.value()); - -- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_QString, sipTransferObj); -+ PyObject *t1obj = sipConvertFromNewType(t1, sipType_QString, sipTransferObj); - PyObject *t2obj = PyInt_FromLong ((long) t2); - - if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0) -@@ -191,7 +191,7 @@ - - while (PyDict_Next(sipPy, &i, &t1obj, &t2obj)) - { -- if (!sipCanConvertToInstance(t1obj, sipClass_QString, SIP_NOT_NONE)) -+ if (!sipCanConvertToType(t1obj, sipType_QString, SIP_NOT_NONE)) - return 0; - - if (!PyInt_Check (t2obj)) -@@ -207,12 +207,12 @@ - { - int state1; - -- QString *t1 = reinterpret_cast<QString *>(sipConvertToInstance(t1obj, sipClass_QString, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); -+ QString *t1 = reinterpret_cast<QString *>(sipConvertToType(t1obj, sipType_QString, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); - QVariant::Type t2 = (QVariant::Type)PyInt_AS_LONG (t2obj); - - if (*sipIsErr) - { -- sipReleaseInstance(t1, sipClass_QString, state1); -+ sipReleaseType(t1, sipType_QString, state1); - - delete qm; - return 0; -@@ -220,7 +220,7 @@ - - qm->insert(*t1, t2); - -- sipReleaseInstance(t1, sipClass_QString, state1); -+ sipReleaseType(t1, sipType_QString, state1); - } - - *sipCppPtr = qm; ---- python/krosspython/cxx/Objects.hxx -+++ python/krosspython/cxx/Objects.hxx -@@ -49,6 +49,7 @@ - #include <iterator> - #include <utility> - #include <typeinfo> -+#include <algorithm> - - namespace Py - { ++++++ kdebindings-4.3.1.tar.bz2 -> kdebindings-4.3.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/krosspython/cxx/Objects.hxx new/kdebindings-4.3.3/python/krosspython/cxx/Objects.hxx --- old/kdebindings-4.3.1/python/krosspython/cxx/Objects.hxx 2008-05-15 20:37:08.000000000 +0200 +++ new/kdebindings-4.3.3/python/krosspython/cxx/Objects.hxx 2009-10-02 10:21:29.000000000 +0200 @@ -49,6 +49,7 @@ #include <iterator> #include <utility> #include <typeinfo> +#include <algorithm> namespace Py { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/krosspython/pythoninterpreter.cpp new/kdebindings-4.3.3/python/krosspython/pythoninterpreter.cpp --- old/kdebindings-4.3.1/python/krosspython/pythoninterpreter.cpp 2009-07-21 17:22:22.000000000 +0200 +++ new/kdebindings-4.3.3/python/krosspython/pythoninterpreter.cpp 2009-10-02 10:21:29.000000000 +0200 @@ -183,7 +183,8 @@ " if mod == None:\n" " if name == 'qt':\n" " raise ImportError('Import of the PyQt3 module is not allowed. Please use PyQt4 instead.')\n" - //" print \"2===========> _Importer name=%s fromlist=%s\" % (name,fromlist)\n" + " if name == 'dcop':\n" + " raise ImportError('Import of the KDE3 DCOP module is not allowed. Please use PyQt4 DBUS instead.')\n" #if PY_MAJOR_VERSION >= 3 || (PY_MAJOR_VERSION >= 2 && PY_MINOR_VERSION >= 5) " mod = self.realImporter(name, globals, locals, fromlist, level)\n" #else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/krosspython/pythonvariant.h new/kdebindings-4.3.3/python/krosspython/pythonvariant.h --- old/kdebindings-4.3.1/python/krosspython/pythonvariant.h 2008-05-15 20:37:08.000000000 +0200 +++ new/kdebindings-4.3.3/python/krosspython/pythonvariant.h 2009-10-30 13:31:44.000000000 +0100 @@ -227,7 +227,7 @@ } #endif if( obj.isString() ) - return Py::String(obj).as_string().c_str(); + return QString::fromUtf8(Py::String(obj).as_string().c_str()); if( strcmp(Py::Object(PyObject_Type(obj.ptr()),true).repr().as_string().c_str(),"<class 'PyQt4.QtCore.QString'>") == 0 ) return PythonType<QString>::toVariant( Py::Callable(obj.getAttr("__str__")).apply() ); return QString(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/pykde4/sip/kdecore/klocalizedstring.sip new/kdebindings-4.3.3/python/pykde4/sip/kdecore/klocalizedstring.sip --- old/kdebindings-4.3.1/python/pykde4/sip/kdecore/klocalizedstring.sip 2008-10-30 15:10:22.000000000 +0100 +++ new/kdebindings-4.3.3/python/pykde4/sip/kdecore/klocalizedstring.sip 2009-10-02 10:21:29.000000000 +0200 @@ -89,14 +89,14 @@ } else { int state = 0; - arg = (QString *)sipForceConvertToInstance(pyarg, sipClass_QString, NULL, SIP_NOT_NONE, &state, &iserr); + arg = (QString *)sipForceConvertToType(pyarg, sipType_QString, NULL, SIP_NOT_NONE, &state, &iserr); if (iserr) { *sipIsErr = 1; return QString(); } result = result.subs(*arg); - sipReleaseInstance(arg,sipClass_QString,state); + sipReleaseType(arg,sipType_QString,state); arg = 0; } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/pykde4/sip/kdecore/kservice.sip new/kdebindings-4.3.3/python/pykde4/sip/kdecore/kservice.sip --- old/kdebindings-4.3.1/python/pykde4/sip/kdecore/kservice.sip 2008-12-21 21:18:52.000000000 +0100 +++ new/kdebindings-4.3.3/python/pykde4/sip/kdecore/kservice.sip 2009-10-02 10:21:29.000000000 +0200 @@ -115,7 +115,7 @@ KService::Ptr *t = new KService::Ptr (sipCpp->at(i)); PyObject *tobj; - if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KService, sipTransferObj)) == NULL) + if ((tobj = sipConvertFromNewType(t->data(), sipType_KService, sipTransferObj)) == NULL) { Py_DECREF(l); delete t; @@ -137,7 +137,7 @@ return 0; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KService, SIP_NOT_NONE)) + if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KService, SIP_NOT_NONE)) return 0; return 1; @@ -148,11 +148,11 @@ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { int state; - KService *t = reinterpret_cast<KService *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); + KService *t = reinterpret_cast<KService *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); if (*sipIsErr) { - sipReleaseInstance(t, sipClass_KService, state); + sipReleaseType(t, sipType_KService, state); delete ql; return 0; @@ -162,7 +162,7 @@ ql->append(*tptr); - sipReleaseInstance(t, sipClass_KService, state); + sipReleaseType(t, sipType_KService, state); } *sipCppPtr = ql; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/pykde4/sip/kdecore/kservicetype.sip new/kdebindings-4.3.3/python/pykde4/sip/kdecore/kservicetype.sip --- old/kdebindings-4.3.1/python/pykde4/sip/kdecore/kservicetype.sip 2008-07-08 11:27:48.000000000 +0200 +++ new/kdebindings-4.3.3/python/pykde4/sip/kdecore/kservicetype.sip 2009-10-02 10:21:29.000000000 +0200 @@ -74,7 +74,7 @@ KServiceType::Ptr *t = new KServiceType::Ptr (sipCpp->at(i)); PyObject *tobj; - if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KServiceType, sipTransferObj)) == NULL) + if ((tobj = sipConvertFromNewType(t->data(), sipType_KServiceType, sipTransferObj)) == NULL) { Py_DECREF(l); delete t; @@ -96,7 +96,7 @@ return 0; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceType, SIP_NOT_NONE)) + if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceType, SIP_NOT_NONE)) return 0; return 1; @@ -107,11 +107,11 @@ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { int state; - KServiceType *t = reinterpret_cast<KServiceType *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); + KServiceType *t = reinterpret_cast<KServiceType *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); if (*sipIsErr) { - sipReleaseInstance(t, sipClass_KServiceType, state); + sipReleaseType(t, sipType_KServiceType, state); delete ql; return 0; @@ -121,7 +121,7 @@ ql->append(*tptr); - sipReleaseInstance(t, sipClass_KServiceType, state); + sipReleaseType(t, sipType_KServiceType, state); } *sipCppPtr = ql; @@ -152,7 +152,7 @@ QString *t1 = new QString (i.key()); QVariant::Type t2 = (QVariant::Type) (i.value()); - PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_QString, sipTransferObj); + PyObject *t1obj = sipConvertFromNewType(t1, sipType_QString, sipTransferObj); PyObject *t2obj = PyInt_FromLong ((long) t2); if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0) @@ -191,7 +191,7 @@ while (PyDict_Next(sipPy, &i, &t1obj, &t2obj)) { - if (!sipCanConvertToInstance(t1obj, sipClass_QString, SIP_NOT_NONE)) + if (!sipCanConvertToType(t1obj, sipType_QString, SIP_NOT_NONE)) return 0; if (!PyInt_Check (t2obj)) @@ -207,12 +207,12 @@ { int state1; - QString *t1 = reinterpret_cast<QString *>(sipConvertToInstance(t1obj, sipClass_QString, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); + QString *t1 = reinterpret_cast<QString *>(sipConvertToType(t1obj, sipType_QString, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); QVariant::Type t2 = (QVariant::Type)PyInt_AS_LONG (t2obj); if (*sipIsErr) { - sipReleaseInstance(t1, sipClass_QString, state1); + sipReleaseType(t1, sipType_QString, state1); delete qm; return 0; @@ -220,7 +220,7 @@ qm->insert(*t1, t2); - sipReleaseInstance(t1, sipClass_QString, state1); + sipReleaseType(t1, sipType_QString, state1); } *sipCppPtr = qm; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/pykde4/sip/kdecore/typedefs.sip new/kdebindings-4.3.3/python/pykde4/sip/kdecore/typedefs.sip --- old/kdebindings-4.3.1/python/pykde4/sip/kdecore/typedefs.sip 2009-04-28 15:45:47.000000000 +0200 +++ new/kdebindings-4.3.3/python/pykde4/sip/kdecore/typedefs.sip 2009-10-02 10:21:29.000000000 +0200 @@ -134,8 +134,8 @@ TYPE1 *t1 = new TYPE1(i.key()); TYPE2 *t2 = new TYPE2(i.value()); - PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj); - PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj); + PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj); + PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj); if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0) { @@ -175,10 +175,10 @@ while (PyDict_Next(sipPy, &i, &t1obj, *t2obj)) { - if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE)) + if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE)) return 0; - if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE)) + if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE)) return 0; } @@ -191,13 +191,13 @@ { int state1, state2; - TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); - TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); + TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); + TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); if (*sipIsErr) { - sipReleaseInstance(t1, sipClass_TYPE1, state1); - sipReleaseInstance(t2, sipClass_TYPE2, state2); + sipReleaseType(t1, sipType_TYPE1, state1); + sipReleaseType(t2, sipType_TYPE2, state2); delete qm; return 0; @@ -205,8 +205,8 @@ qm->insert(*t1, t2); - sipReleaseInstance(t1, sipClass_TYPE1, state1); - sipReleaseInstance(t2, sipClass_TYPE2, state2); + sipReleaseType(t1, sipType_TYPE1, state1); + sipReleaseType(t2, sipType_TYPE2, state2); } *sipCppPtr = qm; @@ -232,7 +232,7 @@ KSharedPtr<TYPE> *cPtr = new KSharedPtr<TYPE> (*(KSharedPtr<TYPE> *)sipCpp); TYPE *cpp = cPtr->data (); - PyObject *obj = sipConvertFromInstance (cpp, sipClass_TYPE, sipTransferObj); + PyObject *obj = sipConvertFromType(cpp, sipType_TYPE, sipTransferObj); return obj; %End @@ -244,7 +244,7 @@ return PyInstance_Check(sipPy); int iserr = 0; - TYPE *cpp = (TYPE *)sipForceConvertToInstance(sipPy, sipClass_TYPE, NULL, 0, NULL, &iserr); + TYPE *cpp = (TYPE *)sipForceConvertToType(sipPy, sipType_TYPE, NULL, 0, NULL, &iserr); if (iserr) { @@ -385,8 +385,8 @@ TYPE1 *t1 = new TYPE1(i.key()); TYPE2 *t2 = i.value(); - PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj); - PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj); + PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj); + PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj); if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0) { @@ -426,10 +426,10 @@ while (PyDict_Next(sipPy, &i, &t1obj, &t2obj)) { - if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE)) + if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE)) return 0; - if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE)) + if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE)) return 0; } @@ -442,13 +442,13 @@ { int state1, state2; - TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); - TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); + TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); + TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); if (*sipIsErr) { - sipReleaseInstance(t1, sipClass_TYPE1, state1); - sipReleaseInstance(t2, sipClass_TYPE2, state2); + sipReleaseType(t1, sipType_TYPE1, state1); + sipReleaseType(t2, sipType_TYPE2, state2); delete qm; return 0; @@ -456,8 +456,8 @@ qm->insert(*t1, t2); - sipReleaseInstance(t1, sipClass_TYPE1, state1); - sipReleaseInstance(t2, sipClass_TYPE2, state2); + sipReleaseType(t1, sipType_TYPE1, state1); + sipReleaseType(t2, sipType_TYPE2, state2); } *sipCppPtr = qm; @@ -486,7 +486,7 @@ int i = 0; foreach ((TYPE *)value, set) { - PyObject *obj = sipConvertFromNewInstance(value, sipClass_TYPE, sipTransferObj); + PyObject *obj = sipConvertFromNewType(value, sipType_TYPE, sipTransferObj); if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) { Py_DECREF(l); @@ -519,7 +519,7 @@ return 0; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - if (!sipCanConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, SIP_NOT_NONE)) + if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE)) return 0; } @@ -529,11 +529,11 @@ { int state; - TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM (l, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); + TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (l, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); if (*sipIsErr) { - sipReleaseInstance(t, sipClass_TYPE, state); + sipReleaseType(t, sipType_TYPE, state); delete qs; return 0; @@ -541,7 +541,7 @@ *qs << t; - sipReleaseInstance(t, sipClass_TYPE, state); + sipReleaseType(t, sipType_TYPE, state); } *sipCppPtr = qs; @@ -570,7 +570,7 @@ int i = 0; foreach (TYPE value, set) { - PyObject *obj = sipConvertFromNewInstance(&value, sipClass_TYPE, sipTransferObj); + PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj); if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) { Py_DECREF(l); @@ -603,7 +603,7 @@ return 0; for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) - if (!sipCanConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, SIP_NOT_NONE)) + if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE)) return 0; } @@ -613,11 +613,11 @@ { int state; - TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); + TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); if (*sipIsErr) { - sipReleaseInstance(t, sipClass_TYPE, state); + sipReleaseType(t, sipType_TYPE, state); delete qs; return 0; @@ -625,7 +625,7 @@ *qs << *t; - sipReleaseInstance(t, sipClass_TYPE, state); + sipReleaseType(t, sipType_TYPE, state); } *sipCppPtr = qs; @@ -647,8 +647,8 @@ TYPE1 *t1 = new TYPE1(sipCpp->first); TYPE2 *t2 = new TYPE2(sipCpp->second); - PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj); - PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj); + PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj); + PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj); if (t1obj == NULL || t2obj == NULL) { @@ -679,13 +679,13 @@ PyObject *t1obj = PyTuple_GET_ITEM(sipPy, 0); PyObject *t2obj = PyTuple_GET_ITEM(sipPy, 1); - TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); - TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); + TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr)); + TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr)); if (*sipIsErr) { - sipReleaseInstance(t1, sipClass_TYPE1, state1); - sipReleaseInstance(t2, sipClass_TYPE2, state2); + sipReleaseType(t1, sipType_TYPE1, state1); + sipReleaseType(t2, sipType_TYPE2, state2); return 0; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/pykde4/sip/kio/global.sip new/kdebindings-4.3.3/python/pykde4/sip/kio/global.sip --- old/kdebindings-4.3.1/python/pykde4/sip/kio/global.sip 2009-04-28 15:45:46.000000000 +0200 +++ new/kdebindings-4.3.3/python/pykde4/sip/kio/global.sip 2009-10-02 10:21:28.000000000 +0200 @@ -210,8 +210,8 @@ QString bcpp = it.value (); PyObject *ainst = 0; PyObject *binst = 0; - if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipClass_QString)) == NULL) - || ((binst = sipBuildResult (NULL, "N", new QString (bcpp), sipClass_QString)) == NULL) + if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipType_QString)) == NULL) + || ((binst = sipBuildResult (NULL, "N", new QString (bcpp), sipType_QString)) == NULL) || (PyDict_SetItem (dict, ainst, binst) < 0)) { Py_XDECREF (ainst); @@ -243,8 +243,8 @@ { int iserr = 0; - acpp = (QString *)sipForceConvertToInstance(aelem, sipClass_QString, NULL, 0, NULL, &iserr); - bcpp = (QString *)sipForceConvertToInstance(belem, sipClass_QString, NULL, 0, NULL, &iserr); + acpp = (QString *)sipForceConvertToType(aelem, sipType_QString, NULL, 0, NULL, &iserr); + bcpp = (QString *)sipForceConvertToType(belem, sipType_QString, NULL, 0, NULL, &iserr); if (iserr) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/python/pykde4/sip/kio/kacl.sip new/kdebindings-4.3.3/python/pykde4/sip/kio/kacl.sip --- old/kdebindings-4.3.1/python/pykde4/sip/kio/kacl.sip 2009-04-28 15:45:46.000000000 +0200 +++ new/kdebindings-4.3.3/python/pykde4/sip/kio/kacl.sip 2009-10-02 10:21:28.000000000 +0200 @@ -116,7 +116,7 @@ { QString s = (*it).first; ushort u = (*it).second; - PyObject *pys = sipBuildResult (NULL, "N", new QString (s), sipClass_QString); + PyObject *pys = sipBuildResult (NULL, "N", new QString (s), sipType_QString); if ((pys == NULL) || ((inst = Py_BuildValue ("Ni", pys, u)) == NULL) || PyList_Append (pylist, inst) < 0) { @@ -144,7 +144,7 @@ { PyObject *elem = PyList_GET_ITEM (sipPy, i); PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0); - p1 = *(QString *)sipForceConvertToInstance(pyp1, sipClass_QString, NULL, 0, NULL, &iserr); + p1 = *(QString *)sipForceConvertToType(pyp1, sipType_QString, NULL, 0, NULL, &iserr); if (iserr) { *sipIsErr = 1; Files old/kdebindings-4.3.1/python/pykde4/tools/cmake_project/sample_project/doc/en/index.cache.bz2 and new/kdebindings-4.3.3/python/pykde4/tools/cmake_project/sample_project/doc/en/index.cache.bz2 differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/ruby/korundum/ChangeLog new/kdebindings-4.3.3/ruby/korundum/ChangeLog --- old/kdebindings-4.3.1/ruby/korundum/ChangeLog 2009-08-27 10:17:04.000000000 +0200 +++ new/kdebindings-4.3.3/ruby/korundum/ChangeLog 2009-10-02 10:21:29.000000000 +0200 @@ -1,3 +1,7 @@ +2009-09-22 Richard Dale <richard.j.dale(a)gmail.com> + * Fix broken KDE::ConfigGroup.readEntry method. Thanks to Paulo Capriotti + for reporting the bug + 2009-08-04 Richard Dale <richard.j.dale(a)gmail.com> * Enable KDE::ConfigGroup.read_entry() and write_entry() methods to automatically convert args to Qt::Variants as well as the camel case diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebindings-4.3.1/ruby/korundum/src/lib/KDE/korundum4.rb new/kdebindings-4.3.3/ruby/korundum/src/lib/KDE/korundum4.rb --- old/kdebindings-4.3.1/ruby/korundum/src/lib/KDE/korundum4.rb 2009-08-27 10:17:04.000000000 +0200 +++ new/kdebindings-4.3.3/ruby/korundum/src/lib/KDE/korundum4.rb 2009-10-02 10:21:29.000000000 +0200 @@ -318,16 +318,18 @@ method_missing(:name, *args) end - def readEntry(key, default = nil) - if default.kind_of?(String) || default.kind_of?(Qt::Variant) - return super(key, default) - else - return super(key, Qt::Variant.new(default)).value - end - end + def readEntry(*args) + if args.length < 2 + return super(*args) + elsif args[1].kind_of?(String) || args[1].kind_of?(Qt::Variant) + return super(*args) + else + return super(args[0], Qt::Variant.new(args[1])).value + end + end - def read_entry(key, default = nil) - readEntry(key, default) + def read_entry(*args) + readEntry(*args) end def writeEntry(key, value, pFlags = KDE::ConfigBase::Normal) ++++++ kdebindings4.spec.in ++++++ --- /var/tmp/diff_new_pack.vpesTC/_old 2009-11-04 11:10:20.000000000 +0100 +++ /var/tmp/diff_new_pack.vpesTC/_new 2009-11-04 11:10:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebindings4 (Version 4.3.0) +# spec file for package kdebindings4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,7 +28,7 @@ License: LGPL v2.1 or later Group: Development/Libraries/KDE Summary: Bindings for KDE 4.x libraries -Version: 4.3.1 +Version: 4.3.3 Release: 1 Source0: kdebindings-%version.tar.bz2 Patch0: 4_3_BRANCH.diff @@ -47,12 +47,16 @@ %requires_eq libkde4 %py_requires %endif +%if %is_ruby +%requires_eq ruby-qt4 +%kde4_runtime_requires +%kde4_akonadi_requires +%endif + %if %is_mono Requires: mono-qt = %version %endif - - %description %if %is_base @@ -72,6 +76,22 @@ %description -n libsmoke-devel %endif +%if %is_ruby +%package -n ruby-qt4 +License: LGPL v2.1 or later +Group: Development/Libraries/KDE +Summary: Bindings for Qt4 libraries +%description -n ruby-qt4 + +%package -n ruby-qt4-devel +License: LGPL v2.1 or later +Group: Development/Libraries/KDE +Summary: Development files for Qt4 libraries Ruby bindings +Requires: ruby-qt4 = %version +%description -n ruby-qt4-devel + +%endif + %if %is_mono %package -n libqyotoshared1 License: LGPL v2.1 or later @@ -154,6 +174,11 @@ %post -n ruby-kde4 -p /sbin/ldconfig %postun -n ruby-kde4 -p /sbin/ldconfig + +%post -n ruby-qt4 -p /sbin/ldconfig + +%postun -n ruby-qt4 -p /sbin/ldconfig + %endif %if %is_base @@ -242,8 +267,6 @@ %defattr(-,root,root) %_kde4_modulesdir/krossruby.so %_kde4_modulesdir/krubypluginfactory.so -%_kde4_libdir/libqtruby4shared.so -%_kde4_libdir/libqtruby4shared.so.* %_kde4_libdir/ruby/site_ruby/*/akonadi %_kde4_libdir/ruby/site_ruby/*/*-linux/akonadi.so %_kde4_libdir/ruby/site_ruby/*/KDE @@ -252,41 +275,50 @@ %_kde4_libdir/ruby/site_ruby/*/*-linux/khtml.so %_kde4_libdir/ruby/site_ruby/*/*-linux/korundum4.so %_kde4_libdir/ruby/site_ruby/*/*-linux/ktexteditor.so +%_kde4_libdir/ruby/site_ruby/*/*-linux/solid.so +%_kde4_libdir/ruby/site_ruby/*/*-linux/nepomuk.so +%_kde4_libdir/ruby/site_ruby/*/solid/solid.rb +%_kde4_libdir/ruby/site_ruby/*/*-linux/soprano.so +%_kde4_libdir/ruby/site_ruby/*/soprano/soprano.rb +%_kde4_libdir/ruby/site_ruby/*/khtml +%_kde4_libdir/ruby/site_ruby/*/nepomuk +%_kde4_libdir/ruby/site_ruby/*/ktexteditor +%_kde4_libdir/ruby/site_ruby/*/solid +%_kde4_libdir/ruby/site_ruby/*/soprano +%_kde4_libdir/ruby/site_ruby/*/*-linux/plasma_applet.so +%_kde4_appsdir/dbpedia_references +%_kde4_bindir/krubyapplication +%_kde4_bindir/rbkconfig_compiler4 +%_kde4_appsdir/dbpedia_references/dbpedia_references.rb + +%files -n ruby-qt4 +%defattr(-,root,root) +%_kde4_libdir/libqtruby4shared.so.* %_kde4_libdir/ruby/site_ruby/*/*-linux/qtruby4.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qtuitools.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qtwebkit.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/solid.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/nepomuk.so %_kde4_libdir/ruby/site_ruby/*/Qt %_kde4_libdir/ruby/site_ruby/*/Qt3.rb %_kde4_libdir/ruby/site_ruby/*/Qt4.rb %_kde4_libdir/ruby/site_ruby/*/Qt.rb %_kde4_libdir/ruby/site_ruby/*/qtuitools/qtuitools.rb %_kde4_libdir/ruby/site_ruby/*/qtwebkit/qtwebkit.rb -%_kde4_libdir/ruby/site_ruby/*/solid/solid.rb %_kde4_libdir/ruby/site_ruby/*/*-linux/qtscript.so -%_kde4_libdir/ruby/site_ruby/*/*-linux/soprano.so %_kde4_libdir/ruby/site_ruby/*/qtscript/qtscript.rb -%_kde4_libdir/ruby/site_ruby/*/soprano/soprano.rb -%_kde4_libdir/ruby/site_ruby/*/khtml -%_kde4_libdir/ruby/site_ruby/*/nepomuk -%_kde4_libdir/ruby/site_ruby/*/ktexteditor %_kde4_libdir/ruby/site_ruby/*/qtscript %_kde4_libdir/ruby/site_ruby/*/qtuitools %_kde4_libdir/ruby/site_ruby/*/qtwebkit -%_kde4_libdir/ruby/site_ruby/*/solid -%_kde4_libdir/ruby/site_ruby/*/soprano -%_kde4_libdir/ruby/site_ruby/*/*-linux/plasma_applet.so %_kde4_libdir/ruby/site_ruby/*/*-linux/qttest.so %_kde4_libdir/ruby/site_ruby/*/qttest -%_kde4_appsdir/dbpedia_references -%_kde4_bindir/krubyapplication -%_kde4_bindir/rbkconfig_compiler4 %_kde4_bindir/rbqtapi %_kde4_bindir/rbrcc %_kde4_bindir/rbuic4 + +%files -n ruby-qt4-devel +%defattr(-,root,root) +%_kde4_libdir/libqtruby4shared.so /usr/include/qtruby -%_kde4_appsdir/dbpedia_references/dbpedia_references.rb + %endif %if %is_mono ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at Wed Nov 4 11:06:50 CET 2009. -------- --- alsa/alsa.changes 2009-11-02 10:19:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2009-11-03 09:15:23.000000000 +0100 @@ -1,0 +2,10 @@ +Tue Nov 3 09:13:13 CET 2009 - tiwai(a)suse.de + +- backport major fix patches from alsa-lib GIT tree + * pcm_hw: Always use delay ioctl in snd_pcm_delay() + * dmix - Fix snd_pcm_info() + * hcontrol: fix compare_default function to handle also + id.device and id.subdevice + * Fix corruption after snd_device_name_hint() + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- alsa-lib-dmix-snd_pcm_info-fix.diff alsa-lib-fix-namehint-corruption.diff alsa-lib-fix-pcm-hw-delay.diff alsa-lib-hcontrol-fix-compare-default.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.PMHfGo/_old 2009-11-04 11:04:49.000000000 +0100 +++ /var/tmp/diff_new_pack.PMHfGo/_new 2009-11-04 11:04:49.000000000 +0100 @@ -34,7 +34,7 @@ # Summary: Advanced Linux Sound Architecture Version: 1.0.21 -Release: 3 +Release: 4 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source8: 40-alsa.rules Source11: alsasound @@ -51,6 +51,10 @@ Source33: alsa-info.sh Source34: alsa-init.sh Patch: alsa-lib-git-fixes.diff +Patch1: alsa-lib-fix-pcm-hw-delay.diff +Patch2: alsa-lib-dmix-snd_pcm_info-fix.diff +Patch3: alsa-lib-hcontrol-fix-compare-default.diff +Patch4: alsa-lib-fix-namehint-corruption.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -126,6 +130,10 @@ %prep %setup -q -n alsa-lib-%{package_version} %patch -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 # hack to fix build on older distros %if %suse_version < 1100 %ifarch %ix86 ++++++ alsa-lib-dmix-snd_pcm_info-fix.diff ++++++ >From da237814e7409b38baedab64d6b4b18928b32404 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Mon, 28 Sep 2009 11:59:50 +0200 Subject: [PATCH] dmix - Fix snd_pcm_info() Call the slave snd_pcm_info() as long as possible in the direct plugins (i.e. when the PCM device could be opened with O_APPEND mode). This allows dmix/dsnoop as a salve for PCM hook controls. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/pcm/pcm_direct.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 82cc126..d9e596e 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -591,7 +591,10 @@ int snd_pcm_direct_poll_revents(snd_pcm_t *pcm, struct pollfd *pfds, unsigned in int snd_pcm_direct_info(snd_pcm_t *pcm, snd_pcm_info_t * info) { - // snd_pcm_direct_t *dmix = pcm->private_data; + snd_pcm_direct_t *dmix = pcm->private_data; + + if (dmix->spcm && !dmix->shmptr->use_server) + return snd_pcm_info(dmix->spcm, info); memset(info, 0, sizeof(*info)); info->stream = pcm->stream; -- 1.6.4.2 ++++++ alsa-lib-fix-namehint-corruption.diff ++++++ >From e1c7dd261347f6a0b9ad56e52bb86dfe057cfb9a Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Tue, 3 Nov 2009 08:57:10 +0100 Subject: [PATCH] Fix corruption after snd_device_name_hint() snd_device_name_hint() corrupts the config name space after its call. This results in the error from the suceeding calls of snd_pcm_open() after snd_device_name_hint(). The bug is in try_config() in namehint.c; it calls snd_config_delete(res) but res can be two different objects in the function. One is the object obtained via snd_config_search_definition(), and another is the one from snd_config_search_alias_hooks(). The former is the expanded objects, thus it should be freed. But, the latter is a reference, and must not be freed. This patch adds the check to free or not. Reported-by: John Lindgren <john.lindgren(a)tds.net> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/control/namehint.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/control/namehint.c b/src/control/namehint.c index e878f83..a134ed7 100644 --- a/src/control/namehint.c +++ b/src/control/namehint.c @@ -219,6 +219,7 @@ static int try_config(struct hint_list *list, const char *str; int err = 0, level; long dev = list->device; + int cleanup_res = 0; list->device_input = -1; list->device_output = -1; @@ -244,6 +245,7 @@ static int try_config(struct hint_list *list, snd_lib_error_set_handler(eh); if (err < 0) goto __skip_add; + cleanup_res = 1; err = -EINVAL; if (snd_config_get_type(res) != SND_CONFIG_TYPE_COMPOUND) goto __cleanup; @@ -330,6 +332,7 @@ static int try_config(struct hint_list *list, goto __hint; snd_config_delete(res); res = NULL; + cleanup_res = 0; if (strchr(buf, ':') != NULL) goto __ok; /* find, if all parameters have a default, */ @@ -379,7 +382,7 @@ static int try_config(struct hint_list *list, err = hint_list_add(list, buf, buf1); } __skip_add: - if (res) + if (res && cleanup_res) snd_config_delete(res); if (buf1) free(buf1); -- 1.6.4.2 ++++++ alsa-lib-fix-pcm-hw-delay.diff ++++++ >From ecf4b5af8632a17af3c84cfceeaaf0a1609e2928 Mon Sep 17 00:00:00 2001 From: Kai Vehmanen <kvehmanen(a)eca.cx> Date: Fri, 11 Sep 2009 01:07:21 +0300 Subject: [PATCH] pcm_hw: Always use delay ioctl in snd_pcm_delay() As the result of snd_pcm_delay() is affected not only by hw_ptr and appl_ptr, but also by 'runtime->delay' property, either SNDRV_PCM_IOCTL_DELAY or SNDRV_PCM_IOCTL_STATUS ioctl must be used to get the correct result. Previously 'runtime->delay' was ignored in case 'hw->sync_ptr' was used. Signed-off-by: Kai Vehmanen <kvehmanen(a)eca.cx> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/pcm/pcm_hw.c | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/src/pcm/pcm_hw.c b/src/pcm/pcm_hw.c index c46d14f..8abb204 100644 --- a/src/pcm/pcm_hw.c +++ b/src/pcm/pcm_hw.c @@ -507,28 +507,6 @@ static int snd_pcm_hw_delay(snd_pcm_t *pcm, snd_pcm_sframes_t *delayp) { snd_pcm_hw_t *hw = pcm->private_data; int fd = hw->fd, err; - if (hw->sync_ptr) { - err = sync_ptr1(hw, SNDRV_PCM_SYNC_PTR_HWSYNC); - if (err < 0) - return err; - switch (FAST_PCM_STATE(hw)) { - case SNDRV_PCM_STATE_RUNNING: - case SNDRV_PCM_STATE_DRAINING: - case SNDRV_PCM_STATE_PAUSED: - case SNDRV_PCM_STATE_PREPARED: - case SNDRV_PCM_STATE_SUSPENDED: - break; - case SNDRV_PCM_STATE_XRUN: - return -EPIPE; - default: - return -EBADFD; - } - if (pcm->stream == SND_PCM_STREAM_PLAYBACK) - *delayp = snd_pcm_mmap_playback_hw_avail(pcm); - else - *delayp = snd_pcm_mmap_capture_avail(pcm); - return 0; - } if (ioctl(fd, SNDRV_PCM_IOCTL_DELAY, delayp) < 0) { err = -errno; SYSMSG("SNDRV_PCM_IOCTL_DELAY failed"); -- 1.6.4.2 ++++++ alsa-lib-hcontrol-fix-compare-default.diff ++++++ >From 0110d62043589f0e3344d7af7ed33ac52da6b596 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela <perex(a)perex.cz> Date: Tue, 6 Oct 2009 10:46:54 +0200 Subject: [PATCH] hcontrol: fix compare_default function to handle also id.device and id.subdevice In case when kcontrol differs only by device or subdevice numbers, the find function can give wrong results. Signed-off-by: Jaroslav Kysela <perex(a)perex.cz> --- src/control/hcontrol.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c index 181e767..1bfc015 100644 --- a/src/control/hcontrol.c +++ b/src/control/hcontrol.c @@ -471,8 +471,9 @@ int snd_hctl_compare_fast(const snd_hctl_elem_t *c1, static int snd_hctl_compare_default(const snd_hctl_elem_t *c1, const snd_hctl_elem_t *c2) { - int res; - int d = c1->id.iface - c2->id.iface; + int res, d; + + d = c1->id.iface - c2->id.iface; if (d != 0) return d; if (c1->id.iface == SNDRV_CTL_ELEM_IFACE_MIXER) { @@ -480,11 +481,16 @@ static int snd_hctl_compare_default(const snd_hctl_elem_t *c1, if (d != 0) return d; } + d = c1->id.device - c2->id.device; + if (d != 0) + return d; + d = c1->id.subdevice - c2->id.subdevice; + if (d != 0) + return d; res = strcmp((const char *)c1->id.name, (const char *)c2->id.name); if (res != 0) return res; - d = c1->id.index - c2->id.index; - return d; + return c1->id.index - c2->id.index; } /** -- 1.6.4.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ladspa for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package ladspa for openSUSE:Factory checked in at Wed Nov 4 11:00:52 CET 2009. -------- --- ladspa/ladspa.changes 2009-06-19 11:02:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/ladspa/ladspa.changes 2009-11-02 16:01:06.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 15:53:13 CET 2009 - tiwai(a)suse.de + +- fix invalid so files due to static linking in swh plugins + (bnc#549865) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- swh-nostatic-lib.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ladspa-devel.spec ++++++ --- /var/tmp/diff_new_pack.CGJn3u/_old 2009-11-04 10:59:47.000000000 +0100 +++ /var/tmp/diff_new_pack.CGJn3u/_new 2009-11-04 10:59:47.000000000 +0100 @@ -21,7 +21,7 @@ Name: ladspa-devel Summary: Include Files mandatory for Development. Version: 1.12.code10.3 -Release: 102 +Release: 103 License: GPL v2 or later Group: Development/Libraries/C and C++ Source: ladspa_sdk_1.12.tar.bz2 ++++++ ladspa.spec ++++++ --- /var/tmp/diff_new_pack.CGJn3u/_old 2009-11-04 10:59:47.000000000 +0100 +++ /var/tmp/diff_new_pack.CGJn3u/_new 2009-11-04 10:59:47.000000000 +0100 @@ -38,7 +38,7 @@ %define blepvco_version 0.1.0 Summary: The Linux Audio Developer's Simple Plug-In API Version: 1.12.code10.3.1 -Release: 116 +Release: 117 License: GPL v2 or later Group: Development/Libraries/C and C++ AutoReq: on @@ -91,6 +91,7 @@ Patch22: alienwah-compile-fix.diff Patch23: alienwah-float_complex.diff Patch25: pvoc-0.1.10-depend-copts-fix.diff +Patch26: swh-nostatic-lib.diff Url: http://www.ladspa.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -133,6 +134,7 @@ %patch1 %patch15 %patch17 +%patch26 -p1 ) (cd cmt %patch2 ++++++ swh-nostatic-lib.diff ++++++ --- Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- a/Makefile.am +++ b/Makefile.am @@ -66,12 +66,12 @@ fm_osc_1415_la_LIBADD = util/libblo.a analogue_osc_1416_la_DEPENDENCIES = util/libblo.a analogue_osc_1416_la_LIBADD = util/libblo.a -sc1_1425_la_LIBADD = util/libdb.a util/librms.a -sc2_1426_la_LIBADD = util/libdb.a util/librms.a -sc3_1427_la_LIBADD = util/libdb.a util/librms.a -sc4_1882_la_LIBADD = util/libdb.a util/librms.a -sc4m_1916_la_LIBADD = util/libdb.a util/librms.a -se4_1883_la_LIBADD = util/libdb.a util/librms.a +sc1_1425_la_SOURCES = sc1_1425.c util/db.c util/rms.c +sc2_1426_la_SOURCES = sc2_1426.c util/db.c util/rms.c +sc3_1427_la_SOURCES = sc3_1427.c util/db.c util/rms.c +sc4_1882_la_SOURCES = sc4_1882.c util/db.c util/rms.c +sc4m_1916_la_SOURCES = sc4m_1916.c util/db.c util/rms.c +se4_1883_la_SOURCES = se4_1883.c util/db.c util/rms.c gsm_1215_la_LIBADD = gsm/libgsm.a gverb_1216_la_LIBADD = gverb/libgverb.a lcr_delay_1436_la_DEPENDENCIES = util/biquad.h ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit taglib for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package taglib for openSUSE:Factory checked in at Wed Nov 4 10:59:28 CET 2009. -------- --- KDE/taglib/taglib.changes 2009-03-10 15:07:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/taglib/taglib.changes 2009-11-04 00:24:55.000000000 +0100 @@ -1,0 +2,54 @@ +Tue Nov 3 23:21:25 UTC 2009 - beineri(a)opensuse.org + +- Update to version 1.6.1 + * Better detection of the audio codec of .oga files in FileRef. + * Fixed saving of Vorbis comments to Ogg FLAC files. TagLib tried to + include the Vorbis framing bit, which is only correct for Ogg Vorbis. + * Public symbols now have explicitly set visibility to "default" on GCC. + * Added missing exports for static ID3v1 functions. + * Fixed a typo in taglib_c.pc + * Fixed a failing test on ppc64. + * Support for binary 'covr' atom in MP4 files. TagLib 1.6 treated them + as text atoms, which corrupted them in some cases. + * Fixed ID3v1-style genre to string conversion in MP4 files. + +------------------------------------------------------------------- +Tue Sep 22 19:14:46 UTC 2009 - tittiatcoke(a)gmail.com + +- Update to version 1.6 + * New CMake option to build a static version - ENABLE_STATIC. + * Added support for disabling dllimport/dllexport on Windows + using the TAGLIB_STATIC macro. + * Support for parsing the obsolete 'gnre' MP4 atom. + * New cpp macros TAGLIB_WITH_MP4 and TAGLIB_WITH_ASF to determine + if TagLib was built with MP4/ASF support. + * Split Ogg packets larger than 64k into multiple pages. + * TagLib can now use FLAC padding block. + * ID3v2.2 frames are now not incorrectly saved. + * Support for ID3v2.2 PIC frames. + * Fixed a bug in ByteVectorList::split(). + * XiphComment::year() now falls back to YEAR if DATE doesn't exist + and XiphComment::year() falls back to TRACKNUM if TRACKNUMBER + doesn't exist. + * Improved ID3v2.3 genre parsing. + * Better checking of corrupted ID3v2 APIC data. + * Bitrate calculating using the Xing header now uses floating + point numbers. + * New TagLib::String method rfind(). + * Added support for MP4 file format with iTunes-style metadata + * Added support for ASF (WMA) file format. + * Fixed crash when saving a Locator APEv2 tag. + * Fixed a possible crash in the non-const version of String::operator[] + and in String::operator+=. + * Added support for PRIV ID3v2 frames. + * Empty ID3v2 genres are no longer treated as numeric ID3v1 genres. + * Added support for the POPM (rating/playcount) ID3v2 frame. + * Generic RIFF file format support: + * Support for AIFF files with ID3v2 tags. + * Support for WAV files with ID3v2 tags. + * Fixed crash on handling unsupported ID3v2 frames, e.g. on encrypted + frames. + * Fixed overflow while calculating bitrate of FLAC files with a very + high bitrate + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- taglib-1.5.tar.bz2 New: ---- taglib-1.6.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ taglib.spec ++++++ --- /var/tmp/diff_new_pack.V87Wg4/_old 2009-11-04 10:58:50.000000000 +0100 +++ /var/tmp/diff_new_pack.V87Wg4/_new 2009-11-04 10:58:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package taglib (Version 1.5) +# spec file for package taglib (Version 1.6.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -License: LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) +License: LGPL v2.1 or later ; MPL .. Group: Development/Libraries/C and C++ Summary: C++ Library to Parse Metadata in Media Files Url: http://ktown.kde.org/~wheeler/taglib/ @@ -32,8 +32,8 @@ Obsoletes: taglib-64bit %endif # -Version: 1.5 -Release: 81 +Version: 1.6.1 +Release: 1 Source0: %name-%version.tar.bz2 Source1: %name.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -77,7 +77,7 @@ export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" _libsuffix=$(echo %_lib | cut -b4-) -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTS:BOOL=ON -DLIB_SUFFIX=$_libsuffix . +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_TESTS:BOOL=ON -DLIB_SUFFIX=$_libsuffix -DWITH_ASF:BOOL=ON -DWITH_MP4:BOOL=ON . %{__make} %{?jobs:-j %jobs} VERBOSE=1 cd doc doxygen taglib.doxygen ++++++ taglib-1.5.tar.bz2 -> taglib-1.6.1.tar.bz2 ++++++ ++++ 83103 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-workspace for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Wed Nov 4 10:57:28 CET 2009. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-10-12 11:40:49.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2009-11-04 10:55:56.476254000 +0100 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Mon Nov 2 21:59:35 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- kdebase-workspace-4.3.1.tar.bz2 khotkeys-bnc504714.diff New: ---- kdebase-workspace-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.kHGGX3/_old 2009-11-04 10:56:06.000000000 +0100 +++ /var/tmp/diff_new_pack.kHGGX3/_new 2009-11-04 10:56:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.3.1) +# spec file for package kdebase4-wallpapers (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,8 +29,8 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.3.1 -Release: 6 +Version: 4.3.3 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.kHGGX3/_old 2009-11-04 10:56:06.000000000 +0100 +++ /var/tmp/diff_new_pack.kHGGX3/_new 2009-11-04 10:56:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.3.1) +# spec file for package kdebase4-workspace (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,8 +37,8 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.3.1 -Release: 6 +Version: 4.3.3 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd Source2: titlebar_decor.png @@ -92,7 +92,6 @@ # https://svn.kde.org/home/kde/branches/work/~seli/randr43 # | sed 's#^--- #--- kcontrol/randr/#' | sed 's#^+++ #+++ kcontrol/randr/#' Patch113: randr12.diff -Patch114: khotkeys-bnc504714.diff Patch115: plasma-dont-hide-jobs.diff Requires: kde4-kgreeter-plugins = %version %kde4_runtime_requires @@ -174,7 +173,6 @@ %patch110 %patch112 %patch113 -%patch114 %patch115 cp %{SOURCE3} kwin/effects/data/cubecap.png ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.kHGGX3/_old 2009-11-04 10:56:06.000000000 +0100 +++ /var/tmp/diff_new_pack.kHGGX3/_new 2009-11-04 10:56:06.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package python-kdebase4 (Version 4.3.1) +# spec file for package python-kdebase4 (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -32,8 +32,8 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.3.1 -Release: 6 +Version: 4.3.3 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: python-kde4 = %{version} ++++++ 4_3_BRANCH.diff ++++++ ++++ 30913 lines (skipped) ++++ between KDE/kdebase4-workspace/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_3_BRANCH.diff ++++++ kdebase-workspace-4.3.1.tar.bz2 -> kdebase-workspace-4.3.3.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.3.1.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.3.3.tar.bz2 differ: char 11, line 1 ++++++ randr12.diff ++++++ --- /var/tmp/diff_new_pack.kHGGX3/_old 2009-11-04 10:56:06.000000000 +0100 +++ /var/tmp/diff_new_pack.kHGGX3/_new 2009-11-04 10:56:06.000000000 +0100 @@ -527,7 +527,7 @@ // create the container for the settings widget QHBoxLayout *layout = new QHBoxLayout(outputList); -@@ -78,35 +81,24 @@ +@@ -78,36 +81,24 @@ kDebug() << "Invalid display! Aborting config load."; return; } @@ -559,6 +559,7 @@ foreach(RandROutput *output, outputs) { - o = new OutputGraphicsItem(output); +- o->setParent(m_scene); - m_scene->addItem(o); + OutputConfig *config = new OutputConfig(this, output, preceding); + m_configs.append( config ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdebase4-runtime for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at Wed Nov 4 10:51:00 CET 2009. -------- --- KDE/kdebase4-runtime/kdebase4-runtime.changes 2009-10-13 18:54:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2009-11-03 20:19:07.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 3 19:09:23 UTC 2009 - coolo(a)novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- +Mon Nov 2 21:59:14 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- kdebase-runtime-4.3.1.tar.bz2 New: ---- kdebase-runtime-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.Iwylvq/_old 2009-11-04 10:48:00.000000000 +0100 +++ /var/tmp/diff_new_pack.Iwylvq/_new 2009-11-04 10:48:00.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-runtime (Version 4.3.1) +# spec file for package kdebase4-runtime (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,8 +37,8 @@ Group: System/GUI/KDE Summary: The KDE Runtime Components Url: http://www.kde.org/ -Version: 4.3.1 -Release: 5 +Version: 4.3.3 +Release: 1 Source0: kdebase-runtime-%version.tar.bz2 Source1: kde4-essential.menu Source2: kde-settings.menu @@ -164,9 +164,6 @@ %files branding-upstream %defattr(-,root,root) %doc COPYING -%if %suse_version > 1100 -%_kde4_appsdir/desktoptheme/default/widgets/background.svgz -%endif %_kde4_appsdir/desktoptheme/default/widgets/branding.svgz %files @@ -276,9 +273,6 @@ %_kde_config_dir/emoticons.knsrc %_kde_config_dir/icons.knsrc %_kde4_appsdir/cmake -%if %suse_version > 1100 -%exclude %_kde4_appsdir/desktoptheme/default/widgets/background.svgz -%endif %exclude %_kde4_appsdir/desktoptheme/default/widgets/branding.svgz %_kde4_appsdir/desktoptheme %_kde4_appsdir/drkonqi ++++++ 4_3_BRANCH.diff ++++++ ++++ 35528 lines (skipped) ++++ between KDE/kdebase4-runtime/4_3_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-runtime/4_3_BRANCH.diff ++++++ kdebase-runtime-4.3.1.tar.bz2 -> kdebase-runtime-4.3.3.tar.bz2 ++++++ KDE/kdebase4-runtime/kdebase-runtime-4.3.1.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase-runtime-4.3.3.tar.bz2 differ: char 11, line 1 ++++++ knetattach-show.diff ++++++ --- /var/tmp/diff_new_pack.Iwylvq/_old 2009-11-04 10:48:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Iwylvq/_new 2009-11-04 10:48:01.000000000 +0100 @@ -1,7 +1,9 @@ ---- knetattach/knetattach.desktop 2008/12/02 13:18:20 1.1 -+++ knetattach/knetattach.desktop 2008/12/02 13:18:45 -@@ -92,3 +92,4 @@ +Index: knetattach/knetattach.desktop +=================================================================== +--- knetattach/knetattach.desktop.orig ++++ knetattach/knetattach.desktop +@@ -171,3 +171,4 @@ Terminal=false X-KDE-StartupNotify=true - Categories=Qt;KDE;Network; + Categories=Qt;KDE;Network;RemoteAccess; X-DocPath=knetattach/index.html +OnlyShowIn=KDE; ++++++ simple-ccsm-kde.diff ++++++ --- /var/tmp/diff_new_pack.Iwylvq/_old 2009-11-04 10:48:01.000000000 +0100 +++ /var/tmp/diff_new_pack.Iwylvq/_new 2009-11-04 10:48:01.000000000 +0100 @@ -3,10 +3,12 @@ Patch-upstream: no (maybe later) Relates: kdebase4-runtime/wm-switch-systemsettings.diff ---- kcontrol/componentchooser/windowmanagers/compiz.desktop.sav 2008-09-03 16:58:44.000000000 +0200 -+++ kcontrol/componentchooser/windowmanagers/compiz.desktop 2008-09-12 10:52:13.000000000 +0200 -@@ -9,5 +9,6 @@ Name[sr]=Компиз - Name[x-test]=xxCompizxx +Index: kcontrol/componentchooser/windowmanagers/compiz.desktop +=================================================================== +--- kcontrol/componentchooser/windowmanagers/compiz.desktop.orig ++++ kcontrol/componentchooser/windowmanagers/compiz.desktop +@@ -74,5 +74,6 @@ Name[zh_CN]=Compiz + Name[zh_TW]=Compiz Exec=compiz ccp TryExec=compiz -X-KDE-WindowManagerConfigure=simple-ccsm ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit oxygen-icon-theme for openSUSE:Factory
by root＠Hilbert.suse.de 04 Nov '09

04 Nov '09

Hello community, here is the log from the commit of package oxygen-icon-theme for openSUSE:Factory checked in at Wed Nov 4 10:43:51 CET 2009. -------- --- KDE/oxygen-icon-theme/oxygen-icon-theme.changes 2009-08-28 14:03:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/oxygen-icon-theme/oxygen-icon-theme.changes 2009-11-02 22:06:40.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 2 22:06:37 CET 2009 - dmueller(a)suse.de + +- update to 4.3.3 + * see http://kde.org/announcements/changelogs/changelog4_3_2to4_3_3.php for details + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- oxygen-icons-4.3.1.tar.bz2 New: ---- oxygen-icons-4.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ oxygen-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.0Ww4hL/_old 2009-11-04 10:43:28.000000000 +0100 +++ /var/tmp/diff_new_pack.0Ww4hL/_new 2009-11-04 10:43:28.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package oxygen-icon-theme (Version 4.3.1) +# spec file for package oxygen-icon-theme (Version 4.3.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ Group: System/GUI/KDE Summary: Oxygen Icon Theme Url: http://www.kde.org -Version: 4.3.1 +Version: 4.3.3 Release: 1 Requires: hicolor-icon-theme Recommends: oxygen-icon-theme-scalable ++++++ oxygen-icons-4.3.1.tar.bz2 -> oxygen-icons-4.3.3.tar.bz2 ++++++ KDE/oxygen-icon-theme/oxygen-icons-4.3.1.tar.bz2 /mounts/work_src_done/STABLE/oxygen-icon-theme/oxygen-icons-4.3.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0