January 2011 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Fri Jan 7 10:31:00 CET 2011. -------- --- yast2-network/yast2-network.changes 2010-11-26 14:15:42.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2011-01-03 17:20:38.000000000 +0100 @@ -1,0 +2,30 @@ +Thu Dec 23 00:32:23 CET 2010 - mzugec(a)suse.cz + +- ifcfg-ethX.Y style config files for VLAN(fate#309240) +- 2.20.10 + +------------------------------------------------------------------- +Mon Dec 20 11:37:02 CET 2010 - mzugec(a)suse.cz + +- fate#306855: FCoE boot support +- 2.20.9 + +------------------------------------------------------------------- +Fri Dec 17 10:57:38 CET 2010 - mzugec(a)suse.cz + +- L3: don't propose bridge for vbox (bnc#648044) +- 2.20.8 + +------------------------------------------------------------------- +Mon Dec 6 16:13:04 CET 2010 - mzugec(a)suse.cz + +- L3: AY Layer2 support - fixed portname option (bnc#573607) +- 2.20.7 + +------------------------------------------------------------------- +Thu Dec 2 10:07:43 CET 2010 - mzugec(a)suse.cz + +- removed obsolete 50-ipv6.conf (bnc#632530) +- 2.20.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-network-2.20.5.tar.bz2 New: ---- yast2-network-2.20.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.yGsRa3/_old 2011-01-07 10:30:21.000000000 +0100 +++ /var/tmp/diff_new_pack.yGsRa3/_new 2011-01-07 10:30:21.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-network (Version 2.20.5) +# spec file for package yast2-network (Version 2.20.10) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: yast2-network -Version: 2.20.5 +Version: 2.20.10 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.20.5.tar.bz2 +Source0: yast2-network-2.20.10.tar.bz2 Prefix: /usr @@ -73,7 +73,7 @@ This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.20.5 +%setup -n yast2-network-2.20.10 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-network-2.20.5.tar.bz2 -> yast2-network-2.20.10.tar.bz2 ++++++ ++++ 11085 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-network-2.20.5/configure.in new/yast2-network-2.20.10/configure.in --- old/yast2-network-2.20.5/configure.in 2010-02-09 15:48:20.000000000 +0100 +++ new/yast2-network-2.20.10/configure.in 2011-01-03 17:08:29.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-network, 2.19.10, http://bugs.opensuse.org/, yast2-network) +AC_INIT(yast2-network, 2.20.10, http://bugs.opensuse.org/, yast2-network) 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.19.10" +VERSION="2.20.10" RPMNAME="yast2-network" 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-network-2.20.5/src/clients/lan_proposal.ycp new/yast2-network-2.20.10/src/clients/lan_proposal.ycp --- old/yast2-network-2.20.5/src/clients/lan_proposal.ycp 2010-05-27 14:00:38.000000000 +0200 +++ new/yast2-network-2.20.10/src/clients/lan_proposal.ycp 2010-12-20 15:31:58.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Lan configuration proposal * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: lan_proposal.ycp 62071 2010-05-27 12:00:38Z mzugec $ + * $Id: lan_proposal.ycp 63004 2010-12-17 09:59:53Z mzugec $ */ { @@ -52,7 +52,7 @@ Lan::Read (force_reset? `nocache: `cache); if (Lan::virt_net_proposal==nil){ if((PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")|| - PackageSystem::Installed("qemu") || PackageSystem::Installed("virtualbox-ose")) + PackageSystem::Installed("qemu")) Lan::virt_net_proposal = true; else Lan::virt_net_proposal = false; } 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-network-2.20.5/src/clients/save_network.ycp new/yast2-network-2.20.10/src/clients/save_network.ycp --- old/yast2-network-2.20.5/src/clients/save_network.ycp 2010-11-08 15:17:07.000000000 +0100 +++ new/yast2-network-2.20.10/src/clients/save_network.ycp 2010-12-20 15:31:58.000000000 +0100 @@ -266,6 +266,20 @@ network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); } break; + case 3: // FCoE case - create VLAN configuration + map<string,any> cmd = (map<string,any>) SCR::Execute(.target.bash_output, + "ls -la /sys/block/*|grep target|grep eth|cut -d'>' -f2|cut -d'/' -f5|uniq"); + y2internal("cmd %1", cmd); + if (cmd["exit"]:-1==0){ + string ifcfg = splitstring(cmd["stdout"]:"", "\n")[0]:""; + y2internal("ifcfg: %1", ifcfg); + string config=sformat("BOOTPROTO=\"static\"\nSTARTMODE=\"nfsroot\" +ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\n", splitstring(ifcfg, ".")[0]:""); + y2internal("config: %1", config); + string config_file=sformat("/etc/sysconfig/network/ifcfg-%1", ifcfg); + y2internal("filename: %1", config_file); + SCR::Write(.target.string, config_file, config); + } else y2error("Command failed."); case 2: network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); break; 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-network-2.20.5/src/lan/address.ycp new/yast2-network-2.20.10/src/lan/address.ycp --- old/yast2-network-2.20.5/src/lan/address.ycp 2010-11-16 16:14:09.000000000 +0100 +++ new/yast2-network-2.20.10/src/lan/address.ycp 2011-01-03 16:00:07.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card adresss configuration dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: address.ycp 62859 2010-11-16 10:14:11Z mzugec $ + * $Id: address.ycp 63021 2010-12-22 23:32:50Z mzugec $ */ { @@ -126,6 +126,7 @@ void InitVLANSlave(string key) { settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; + settings["VLAN_ID"] = tointeger(NetworkInterfaces::Current["VLAN_ID"]:"0"); list items = []; // unconfigured devices @@ -143,10 +144,21 @@ items = add (items, `item(`id(devname), sformat("%1 - %2", devname, configurations[devtype, devname, "NAME"]:""), settings["ETHERDEVICE"]:""==devname) ); }); }); - UI::ChangeWidget(`id(key), `Items, items); + UI::ChangeWidget(`id(`vlan_eth), `Items, items); + UI::ChangeWidget(`id(`vlan_id), `Value, settings["VLAN_ID"]:0); } +symbol HandleVLANSlave(string key, map event){ + if (event["EventReason"]:""=="ValueChanged"){ + string configname = sformat("%1.%2", UI::QueryWidget(`id(`vlan_eth), `Value), UI::QueryWidget(`id(`vlan_id), `Value)); + NetworkInterfaces::Name = configname; + LanItems::Items[LanItems::current, "ifcfg"]= configname; + UI::ChangeWidget(`id("IFCFGID"), `Value, configname); + } + return nil; +} + /** * Default function to store the value of ETHERDEVICE devices box. @@ -155,7 +167,8 @@ */ void StoreVLANSlave(string key, map event) { - settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(key), `Value); + settings["ETHERDEVICE"] = (string)UI::QueryWidget (`id(`vlan_eth), `Value); + settings["VLAN_ID"] = UI::QueryWidget (`id(`vlan_id), `Value); } @@ -733,11 +746,15 @@ "help": help["bridge_ports"]:"", ], "ETHERDEVICE": $[ - "widget": `combobox, - "label": _("Real Interface for &VLAN"), - "items" : [ ], + "widget": `custom, + "custom_widget": + `HBox( + `ComboBox(`id(`vlan_eth), `opt(`notify), _("Real Interface for &VLAN"), []), + `IntField(`id(`vlan_id), `opt(`notify), _("VLAN id"), 0, 9999, 0) + ), "opt": [`hstretch], "init": InitVLANSlave, + "handle": HandleVLANSlave, "store": StoreVLANSlave, "help": help["etherdevice"]:"", ], @@ -1005,7 +1022,7 @@ // interface types. It will work in some cases, like // overriding eth to wlan but not in others where we would // need to change the contents of the dialog. #30890. - "IFCFGTYPE", + LanItems::type!="vlan" ? "IFCFGTYPE" : `Empty(), `HSpacing(1.5), `MinWidth(30, "IFCFGID"), `HSpacing(0.5), @@ -1260,6 +1277,9 @@ if (LanItems::type == "vlan"){ LanItems::vlan_etherdevice = settings["ETHERDEVICE"]:""; +y2internal("%1, %2", LanItems::vlan_id, (integer)settings["VLAN_ID"]:0); + LanItems::vlan_id = tostring((integer)settings["VLAN_ID"]:0); +y2internal("%1", LanItems::vlan_id); } else if (LanItems::type == "br"){ LanItems::bridge_ports = settings["BRIDGE_PORTS"]:""; } else if (contains(["tun", "tap"], LanItems::type)){ 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-network-2.20.5/src/lan/hardware.ycp new/yast2-network-2.20.10/src/lan/hardware.ycp --- old/yast2-network-2.20.5/src/lan/hardware.ycp 2010-03-01 16:54:49.000000000 +0100 +++ new/yast2-network-2.20.10/src/lan/hardware.ycp 2011-01-03 16:00:07.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Hardware dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: hardware.ycp 60925 2010-02-22 09:18:46Z mzugec $ + * $Id: hardware.ycp 63021 2010-12-22 23:32:50Z mzugec $ */ { @@ -530,6 +530,10 @@ y2milestone("interface without hwinfo, proposing STARTMODE=auto"); LanItems::startmode="auto"; } + if (LanItems::type=="vlan"){ + string vlanid=(string) UI::QueryWidget(`id(`num), `Value); + NetworkInterfaces::Current["VLAN_ID"] = vlanid; + } } string driver = (string) UI::QueryWidget(`modul, `Value); 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-network-2.20.5/src/modules/LanItems.ycp new/yast2-network-2.20.10/src/modules/LanItems.ycp --- old/yast2-network-2.20.5/src/modules/LanItems.ycp 2010-11-26 14:11:34.000000000 +0100 +++ new/yast2-network-2.20.10/src/modules/LanItems.ycp 2011-01-03 16:00:06.000000000 +0100 @@ -85,6 +85,7 @@ // VLAN option global string vlan_etherdevice=""; +global string vlan_id=""; // interfaces attached to bridge (list delimited by ' ') global string bridge_ports=""; @@ -832,6 +833,7 @@ usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes"; description = GetDeviceVar (devmap, defaults, "NAME"); bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS"); + vlan_id = GetDeviceVar(devmap, defaults, "VLAN_ID"); bond_slaves=[]; foreach(any key, any value, devmap, @@ -1063,7 +1065,9 @@ newdev["NAME"] = description; // L3: bnc#585458 // if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; - if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type) newdev["INTERFACETYPE"]=type; + // exception for VLAN + // because of ethX.Y +// if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type && type!="vlan") newdev["INTERFACETYPE"]=type; if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; @@ -1092,6 +1096,7 @@ if (type=="vlan"){ newdev["ETHERDEVICE"]=vlan_etherdevice; + newdev["VLAN_ID"]=vlan_id; } if (type=="br"){ newdev["BRIDGE_PORTS"]=bridge_ports; @@ -1158,6 +1163,7 @@ } NetworkInterfaces::Name = Items[current, "ifcfg"]:""; NetworkInterfaces::Current = newdev; +y2internal("%1", newdev); if (!NetworkInterfaces::Commit()) Items[current, "ifcfg"]=""; } else { 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-network-2.20.5/src/modules/LanUdevAuto.ycp new/yast2-network-2.20.10/src/modules/LanUdevAuto.ycp --- old/yast2-network-2.20.5/src/modules/LanUdevAuto.ycp 2010-11-16 16:14:09.000000000 +0100 +++ new/yast2-network-2.20.10/src/modules/LanUdevAuto.ycp 2010-12-20 15:31:58.000000000 +0100 @@ -138,6 +138,11 @@ LanItems::chan_mode=rule["router"]:""; break; } + y2milestone("rule:%1", rule); + y2milestone("type:%1", LanItems::type); + y2milestone("chanids:%1", LanItems::qeth_chanids); + y2milestone("layer2:%1", LanItems::qeth_layer2); + y2milestone("portname:%1", LanItems::chan_mode); LanItems::createS390Device(); y2milestone("rule %1", rule); }); @@ -188,7 +193,7 @@ AY["s390-devices", device]=$["type":device_type]; if (size(chanids)>0) AY["s390-devices", device, "chanids"]=chanids; -// if (size(portname)>0) AY[device, "portname"]=portname; + if (size(portname)>0) AY["s390-devices", device, "portname"]=portname; if (size(protocol)>0) AY["s390-devices", device, "protocol"]=protocol; if (layer2) AY["s390-devices", device, "layer2"]=true; 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-network-2.20.5/src/modules/Lan.ycp new/yast2-network-2.20.10/src/modules/Lan.ycp --- old/yast2-network-2.20.5/src/modules/Lan.ycp 2010-09-17 11:27:59.000000000 +0200 +++ new/yast2-network-2.20.10/src/modules/Lan.ycp 2010-12-20 15:31:58.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 62494 2010-09-17 09:27:58Z mzugec $ + * $Id: Lan.ycp 63004 2010-12-17 09:59:53Z mzugec $ * * Representation of the configuration of network cards. * Input and output routines. @@ -149,12 +149,14 @@ "filelist" : ["sysctl.conf"], "filepath" : "/etc/", "regexp" : "^[[:space:]]*(net.ipv6.conf.all.disable_ipv6)[[:space:]]*=[[:space:]]*1" - ], + ] +/* "module" : $[ "filelist" : ["ipv6", "50-ipv6.conf"], "filepath" : "/etc/modprobe.d/", "regexp" : "^[[:space:]]*(install ipv6 /bin/true)" ] +*/ ]; foreach(string which,map<string,any> method, methods, { @@ -347,7 +349,7 @@ void writeIPv6(){ // SCR::Write(.target.string, "/etc/modprobe.d/ipv6", sformat("%1install ipv6 /bin/true", ipv6?"#":"")); // uncomment to write to old place (and comment code bellow) - SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true\n", ipv6?"#":"")); +// SCR::Write(.target.string, "/etc/modprobe.d/50-ipv6.conf", sformat("%1install ipv6 /bin/true\n", ipv6?"#":"")); string filename = "/etc/sysctl.conf"; string sysctl = (string)SCR::Read(.target.string, filename); string sysctl_row = sformat("%1net.ipv6.conf.all.disable_ipv6 = 1", ipv6?"# ":""); @@ -710,8 +712,9 @@ // enable ipv6 support link_v6 = Hyperlink (href_v6, _("Enable IPv6")); } + // no exception needed for virtualbox* (bnc#648044) http://www.virtualbox.org/manual/ch06.html if ( (PackageSystem::Installed("xen") && !Arch::is_xenU()) || PackageSystem::Installed("kvm")|| - PackageSystem::Installed("qemu")||PackageSystem::Installed("virtualbox-ose") + PackageSystem::Installed("qemu") ){ if (virt_net_proposal){ href_virt_net = "virtual-revert"; @@ -836,7 +839,7 @@ // test if we have any virtualization installed if (virt_net_proposal) { - y2milestone("Virtualization [xen|kvm|qemu|virtualbox-ose] detected - will propose virtualization network"); + y2milestone("Virtualization [xen|kvm|qemu] detected - will propose virtualization network"); // in case of virtualization use special proposal // collect all interfaces that will be skipped from bridged proposal list<string> skipped = []; 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-network-2.20.5/VERSION new/yast2-network-2.20.10/VERSION --- old/yast2-network-2.20.5/VERSION 2010-11-26 14:09:19.000000000 +0100 +++ new/yast2-network-2.20.10/VERSION 2011-01-03 16:00:07.000000000 +0100 @@ -1 +1 @@ -2.20.5 +2.20.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-libs-gui for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-libs-gui for openSUSE:Factory checked in at Fri Jan 7 10:29:58 CET 2011. -------- --- libreoffice-libs-gui/libreoffice-libs-gui.changes 2010-12-01 20:46:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-libs-gui/libreoffice-libs-gui.changes 2010-12-21 19:58:30.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-l10n-3.3.0.1.tar.bz2 libreoffice-libs-gui-3.3.0.1.tar.bz2 New: ---- libreoffice-l10n-3.3.0.2.tar.bz2 libreoffice-libs-gui-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-libs-gui.spec ++++++ --- /var/tmp/diff_new_pack.VXLz39/_old 2011-01-07 10:22:00.000000000 +0100 +++ /var/tmp/diff_new_pack.VXLz39/_new 2011-01-07 10:22:00.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-libs-gui (Version 3.3.0.1) +# spec file for package libreoffice-libs-gui (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,11 @@ %define distro SUSE Name: libreoffice-libs-gui -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece libs-gui -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-l10n-3.3.0.1.tar.bz2 -> libreoffice-l10n-3.3.0.2.tar.bz2 ++++++ libreoffice-libs-gui/libreoffice-l10n-3.3.0.1.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-libs-gui/libreoffice-l10n-3.3.0.2.tar.bz2 differ: byte 11, line 1 ++++++ libreoffice-libs-gui-3.3.0.1.tar.bz2 -> libreoffice-libs-gui-3.3.0.2.tar.bz2 ++++++ libreoffice-libs-gui/libreoffice-libs-gui-3.3.0.1.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-libs-gui/libreoffice-libs-gui-3.3.0.2.tar.bz2 differ: byte 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

commit libreoffice-testing for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-testing for openSUSE:Factory checked in at Fri Jan 7 10:21:39 CET 2011. -------- --- libreoffice-testing/libreoffice-testing.changes 2010-12-01 20:47:22.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-testing/libreoffice-testing.changes 2010-12-21 19:59:12.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-testing-3.3.0.1.tar.bz2 New: ---- libreoffice-testing-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-testing.spec ++++++ --- /var/tmp/diff_new_pack.Upg2ok/_old 2011-01-07 10:21:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Upg2ok/_new 2011-01-07 10:21:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-testing (Version 3.3.0.1) +# spec file for package libreoffice-testing (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-testing -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece testing -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-testing-3.3.0.1.tar.bz2 -> libreoffice-testing-3.3.0.2.tar.bz2 ++++++ libreoffice-testing/libreoffice-testing-3.3.0.1.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-testing/libreoffice-testing-3.3.0.2.tar.bz2 differ: byte 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

commit libreoffice-libs-extern for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-libs-extern for openSUSE:Factory checked in at Fri Jan 7 10:21:05 CET 2011. -------- --- libreoffice-libs-extern/libreoffice-libs-extern.changes 2010-12-01 20:46:11.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-libs-extern/libreoffice-libs-extern.changes 2010-12-21 19:57:43.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-libs-extern-3.3.0.1.tar.bz2 libreoffice-libs-extern-sys-3.3.0.1.tar.bz2 New: ---- libreoffice-libs-extern-3.3.0.2.tar.bz2 libreoffice-libs-extern-sys-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-libs-extern.spec ++++++ --- /var/tmp/diff_new_pack.iXw9pE/_old 2011-01-07 10:20:32.000000000 +0100 +++ /var/tmp/diff_new_pack.iXw9pE/_new 2011-01-07 10:20:32.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-libs-extern (Version 3.3.0.1) +# spec file for package libreoffice-libs-extern (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,11 +21,11 @@ Name: libreoffice-libs-extern # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) %define use_xulrunner191 no -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece libs-extern -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-libs-extern-3.3.0.1.tar.bz2 -> libreoffice-libs-extern-3.3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-libs-extern-3.3.0.1/ChangeLog new/libreoffice-libs-extern-3.3.0.2/ChangeLog --- old/libreoffice-libs-extern-3.3.0.1/ChangeLog 2010-12-01 16:33:34.000000000 +0100 +++ new/libreoffice-libs-extern-3.3.0.2/ChangeLog 2010-12-18 20:53:31.000000000 +0100 @@ -1,3 +1,8 @@ +2010-12-18 Petr Mladek <pmladek(a)suse.cz> [388ea9c2e8de41d232a52d2fbd882ccb5aa171c1] + +Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) + + 2010-12-01 Petr Mladek <pmladek(a)suse.cz> [85ae3396442d59369068a84dd33704dae1ca9ee6] Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1) ++++++ libreoffice-libs-extern-sys-3.3.0.1.tar.bz2 -> libreoffice-libs-extern-sys-3.3.0.2.tar.bz2 ++++++ libreoffice-libs-extern/libreoffice-libs-extern-sys-3.3.0.1.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-libs-extern/libreoffice-libs-extern-sys-3.3.0.2.tar.bz2 differ: byte 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

commit libreoffice-artwork for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-artwork for openSUSE:Factory checked in at Fri Jan 7 10:20:11 CET 2011. -------- --- libreoffice-artwork/libreoffice-artwork.changes 2010-12-01 20:44:05.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-artwork/libreoffice-artwork.changes 2010-12-21 19:55:12.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-artwork-3.3.0.1.tar.bz2 New: ---- libreoffice-artwork-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-artwork.spec ++++++ --- /var/tmp/diff_new_pack.2Q3Lyg/_old 2011-01-07 10:19:37.000000000 +0100 +++ /var/tmp/diff_new_pack.2Q3Lyg/_new 2011-01-07 10:19:37.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-artwork (Version 3.3.0.1) +# spec file for package libreoffice-artwork (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-artwork -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece artwork -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_piece_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-artwork-3.3.0.1.tar.bz2 -> libreoffice-artwork-3.3.0.2.tar.bz2 ++++++ libreoffice-artwork/libreoffice-artwork-3.3.0.1.tar.bz2 /mounts/work_src_done/STABLE/libreoffice-artwork/libreoffice-artwork-3.3.0.2.tar.bz2 differ: byte 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

commit libreoffice-ure for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-ure for openSUSE:Factory checked in at Fri Jan 7 10:19:06 CET 2011. -------- --- libreoffice-ure/libreoffice-ure.changes 2010-12-01 20:47:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-ure/libreoffice-ure.changes 2010-12-21 19:59:23.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-sdk-3.3.0.1.tar.bz2 libreoffice-ure-3.3.0.1.tar.bz2 New: ---- libreoffice-sdk-3.3.0.2.tar.bz2 libreoffice-ure-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-ure.spec ++++++ --- /var/tmp/diff_new_pack.ahpfLm/_old 2011-01-07 10:12:55.000000000 +0100 +++ /var/tmp/diff_new_pack.ahpfLm/_new 2011-01-07 10:12:55.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-ure (Version 3.3.0.1) +# spec file for package libreoffice-ure (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: libreoffice-ure -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 %define piece ure -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_sourcedirname libreoffice-build-%ooo_build_version %define ooo_prefix %_libdir %define ooo_home libreoffice ++++++ libreoffice-sdk-3.3.0.1.tar.bz2 -> libreoffice-sdk-3.3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-sdk-3.3.0.1/ChangeLog new/libreoffice-sdk-3.3.0.2/ChangeLog --- old/libreoffice-sdk-3.3.0.1/ChangeLog 2010-12-01 16:32:15.000000000 +0100 +++ new/libreoffice-sdk-3.3.0.2/ChangeLog 2010-12-18 20:52:18.000000000 +0100 @@ -1,3 +1,8 @@ +2010-12-18 Petr Mladek <pmladek(a)suse.cz> [c11761a82ef9426746460f905f38fe23fac500d0] + +Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) + + 2010-12-01 Petr Mladek <pmladek(a)suse.cz> [0be0562aa6496f0386bdea23b23a9c3a589ef92c] Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1) ++++++ libreoffice-ure-3.3.0.1.tar.bz2 -> libreoffice-ure-3.3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.3.0.1/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx new/libreoffice-ure-3.3.0.2/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx --- old/libreoffice-ure-3.3.0.1/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 2010-11-11 20:09:04.000000000 +0100 +++ new/libreoffice-ure-3.3.0.2/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx 2010-12-14 17:02:47.000000000 +0100 @@ -68,7 +68,7 @@ if (pReturnTypeDescr) { - if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) + if (x86::isSimpleReturnType( pReturnTypeDescr )) { pUnoReturn = pReturnValue; // direct way for simple types } @@ -359,15 +359,39 @@ int const codeSnippetSize = 16; +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +namespace +{ + PrivateSnippetExecutor returnsInRegister(typelib_TypeDescriptionReference * pReturnTypeRef) + { + //These archs apparently are returning small structs in registers, while Linux + //doesn't + PrivateSnippetExecutor exec=NULL; + + typelib_TypeDescription * pReturnTypeDescr = 0; + TYPELIB_DANGER_GET( &pReturnTypeDescr, pReturnTypeRef ); + const bool bSimpleReturnStruct = x86::isSimpleReturnType(pReturnTypeDescr); + const sal_Int32 nRetSize = pReturnTypeDescr->nSize; + TYPELIB_DANGER_RELEASE( pReturnTypeDescr ); + if (bSimpleReturnStruct) + { + exec = privateSnippetExecutorGeneral; // fills eax + if (nRetSize > 4) + exec = privateSnippetExecutorHyper; // fills eax/edx + } + return exec; + } +} +#endif + unsigned char * codeSnippet( unsigned char * code, sal_PtrDiff writetoexecdiff, sal_Int32 functionIndex, sal_Int32 vtableOffset, - typelib_TypeClass returnTypeClass) + typelib_TypeDescriptionReference * pReturnTypeRef) { - if (!bridges::cpp_uno::shared::isSimpleType(returnTypeClass)) { - functionIndex |= 0x80000000; - } PrivateSnippetExecutor exec; - switch (returnTypeClass) { + typelib_TypeClass eReturnClass = pReturnTypeRef ? pReturnTypeRef->eTypeClass : typelib_TypeClass_VOID; + switch (eReturnClass) + { case typelib_TypeClass_VOID: exec = privateSnippetExecutorVoid; break; @@ -381,13 +405,24 @@ case typelib_TypeClass_DOUBLE: exec = privateSnippetExecutorDouble; break; + case typelib_TypeClass_STRUCT: + case typelib_TypeClass_EXCEPTION: +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) + exec = returnsInRegister(pReturnTypeRef); + if (!exec) + { + exec = privateSnippetExecutorClass; + functionIndex |= 0x80000000; + } + break; +#endif case typelib_TypeClass_STRING: case typelib_TypeClass_TYPE: case typelib_TypeClass_ANY: case typelib_TypeClass_SEQUENCE: - case typelib_TypeClass_STRUCT: case typelib_TypeClass_INTERFACE: exec = privateSnippetExecutorClass; + functionIndex |= 0x80000000; break; default: exec = privateSnippetExecutorGeneral; @@ -455,7 +490,7 @@ code = codeSnippet( code, writetoexecdiff, functionOffset++, vtableOffset, reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( - member)->pAttributeTypeRef->eTypeClass); + member)->pAttributeTypeRef); // Setter: if (!reinterpret_cast< typelib_InterfaceAttributeTypeDescription * >( @@ -464,7 +499,7 @@ (s++)->fn = code + writetoexecdiff; code = codeSnippet( code, writetoexecdiff, functionOffset++, vtableOffset, - typelib_TypeClass_VOID); + NULL); } break; @@ -473,7 +508,7 @@ code = codeSnippet( code, writetoexecdiff, functionOffset++, vtableOffset, reinterpret_cast< typelib_InterfaceMethodTypeDescription * >( - member)->pReturnTypeRef->eTypeClass); + member)->pReturnTypeRef); break; default: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.3.0.1/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx new/libreoffice-ure-3.3.0.2/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx --- old/libreoffice-ure-3.3.0.1/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx 2010-11-11 16:43:29.000000000 +0100 +++ new/libreoffice-ure-3.3.0.2/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx 2010-12-14 17:02:47.000000000 +0100 @@ -88,6 +88,12 @@ //================================================================================================== void fillUnoException( __cxa_exception * header, uno_Any *, uno_Mapping * pCpp2Uno ); + +} + +namespace x86 +{ + bool isSimpleReturnType(typelib_TypeDescription * pTD, bool recursive = false); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.3.0.1/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx new/libreoffice-ure-3.3.0.2/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx --- old/libreoffice-ure-3.3.0.1/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx 2010-11-11 16:43:29.000000000 +0100 +++ new/libreoffice-ure-3.3.0.2/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx 2010-12-14 17:02:47.000000000 +0100 @@ -29,7 +29,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) +#include <stdlib.h> +#else #include <malloc.h> +#endif #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" @@ -59,7 +63,7 @@ void * pAdjustedThisPtr, sal_Int32 nVtableIndex, void * pRegisterReturn, - typelib_TypeClass eReturnType, + typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn, sal_Int32 * pStackLongs, sal_Int32 nStackLongs ) __attribute__((noinline)); @@ -67,7 +71,7 @@ void * pAdjustedThisPtr, sal_Int32 nVtableIndex, void * pRegisterReturn, - typelib_TypeClass eReturnType, + typelib_TypeDescription * pReturnTypeDescr, bool bSimpleReturn, sal_Int32 * pStackLongs, sal_Int32 nStackLongs ) { @@ -120,8 +124,10 @@ : "m"(nStackLongs), "m"(pStackLongs), "m"(pAdjustedThisPtr), "m"(nVtableIndex), "m"(eax), "m"(edx), "m"(stackptr) : "eax", "edx" ); - switch( eReturnType ) + switch( pReturnTypeDescr->eTypeClass ) { + case typelib_TypeClass_VOID: + break; case typelib_TypeClass_HYPER: case typelib_TypeClass_UNSIGNED_HYPER: ((long*)pRegisterReturn)[1] = edx; @@ -146,7 +152,20 @@ asm ( "fstpl %0\n\t" : : "m"(*(char *)pRegisterReturn) ); break; default: + { +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) + sal_Int32 const nRetSize = pReturnTypeDescr->nSize; + if (bSimpleReturn && nRetSize <= 8 && nRetSize > 0) + { + if (nRetSize > 4) + static_cast<long *>(pRegisterReturn)[1] = edx; + static_cast<long *>(pRegisterReturn)[0] = eax; + } +#else + (void)bSimpleReturn; +#endif break; + } } } @@ -169,10 +188,12 @@ OSL_ENSURE( pReturnTypeDescr, "### expected return type description!" ); void * pCppReturn = 0; // if != 0 && != pUnoReturn, needs reconversion + bool bSimpleReturn = true; if (pReturnTypeDescr) { - if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr )) + bSimpleReturn = x86::isSimpleReturnType(pReturnTypeDescr); + if (bSimpleReturn) { pCppReturn = pUnoReturn; // direct way for simple types } @@ -269,7 +290,7 @@ OSL_ENSURE( !( (pCppStack - pCppStackStart ) & 3), "UNALIGNED STACK !!! (Please DO panic)" ); callVirtualMethod( pAdjustedThisPtr, aVtableSlot.index, - pCppReturn, pReturnTypeDescr->eTypeClass, + pCppReturn, pReturnTypeDescr, bSimpleReturn, (sal_Int32 *)pCppStackStart, (pCppStack - pCppStackStart) / sizeof(sal_Int32) ); // NO exception occured... *ppUnoExc = 0; @@ -328,6 +349,38 @@ } +namespace x86 +{ + bool isSimpleReturnType(typelib_TypeDescription * pTD, bool recursive) + { + if (bridges::cpp_uno::shared::isSimpleType( pTD )) + return true; +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) + // Only structs of exactly 1, 2, 4, or 8 bytes are returned through + // registers, see <http://developer.apple.com/documentation/DeveloperTools/ + // Conceptual/LowLevelABI/Articles/IA32.html>: + if (pTD->eTypeClass == typelib_TypeClass_STRUCT && + (recursive || pTD->nSize <= 2 || pTD->nSize == 4 || pTD->nSize == 8)) + { + typelib_CompoundTypeDescription *const pCompTD = + (typelib_CompoundTypeDescription *) pTD; + for ( sal_Int32 pos = pCompTD->nMembers; pos--; ) { + typelib_TypeDescription * pMemberTD = 0; + TYPELIB_DANGER_GET( &pMemberTD, pCompTD->ppTypeRefs[pos] ); + bool const b = isSimpleReturnType(pMemberTD, true); + TYPELIB_DANGER_RELEASE( pMemberTD ); + if (! b) + return false; + } + return true; + } +#else + (void)recursive; +#endif + return false; + } +} + namespace bridges { namespace cpp_uno { namespace shared { void unoInterfaceProxyDispatch( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.3.0.1/ChangeLog new/libreoffice-ure-3.3.0.2/ChangeLog --- old/libreoffice-ure-3.3.0.1/ChangeLog 2010-12-01 16:33:25.000000000 +0100 +++ new/libreoffice-ure-3.3.0.2/ChangeLog 2010-12-18 20:53:22.000000000 +0100 @@ -1,3 +1,24 @@ +2010-12-18 Petr Mladek <pmladek(a)suse.cz> [b51291955378ddd44382460b4077e426c4f8278e] + +Version 3.3.0.2, tag libreoffice-3.3.0.2 (3.3-rc2) + + +2010-12-13 Robert Nagy <robert(a)openbsd.org> [886f9a4f76aa6897b8be7486bc3a97a193424ef8] + +malloc.h is obsolete on BSDs, so use stdlib.h there + + +2010-12-13 Caolán McNamara <caolanm(a)redhat.com> [ad15cb46fb7b58cafb051e068a49ed4f39eb3728] + +fix bsd bridges + +(cherry picked from commit a5ac1c19ca78b6549d2dc7381ddd31ae839288ec) + +2010-12-04 Kalman Szalai - KAMI <kami911(a)gmail.com> [2e76a820c8d5027d8c4da4c6d9d3d4cf5d13f7e3] + +Fix for build.lst in cli_ure + + 2010-12-01 Petr Mladek <pmladek(a)suse.cz> [1d474a668f0f07064e7cd02d6f2f975b270b466a] Version 3.3.0.1, tag LIBREOFFICE_3_3_0_1 (3.3-rc1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libreoffice-ure-3.3.0.1/cli_ure/prj/build.lst new/libreoffice-ure-3.3.0.2/cli_ure/prj/build.lst --- old/libreoffice-ure-3.3.0.1/cli_ure/prj/build.lst 2010-11-11 16:43:29.000000000 +0100 +++ new/libreoffice-ure-3.3.0.2/cli_ure/prj/build.lst 2010-12-06 16:19:56.000000000 +0100 @@ -6,8 +6,7 @@ ure cli_ure\source\basetypes nmake - w,vc7 ure_source_basetypes ure_source_version ure_source_source.w ure_inc NULL ure cli_ure\source\climaker nmake - w,vc7 ure_source_climaker ure_source_basetypes.w ure_inc NULL ure cli_ure\unotypes nmake - w,vc7 ure_unotypes ure_source_version ure_source_source.w ure_source_climaker.w ure_inc NULL -ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_unotypes.w ure_inc NULL +ure cli_ure\source\ure nmake - w,vc7 ure_source_ure ure_source_version ure_source_source.w ure_source_basetypes.w ure_unotypes.w ure_inc NULL ure cli_ure\source\uno_bridge nmake - w,vc7 ure_source_uno_bridge ure_source_basetypes.w ure_unotypes.w ure_source_ure.w ure_inc NULL ure cli_ure\source\native nmake - w,vc7 ure_source_native ure_source_version ure_source_source.w ure_source_ure.w ure_unotypes.w ure_source_uno_bridge.w ure_inc NULL - #ure cli_ure\util nmake - w,vc7 ure_util ure_source_ure.w ure_source_native.w NULL ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 libreoffice-bootstrap for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package libreoffice-bootstrap for openSUSE:Factory checked in at Fri Jan 7 10:12:29 CET 2011. -------- --- libreoffice-bootstrap/libreoffice-bootstrap.changes 2010-12-01 20:44:16.000000000 +0100 +++ /mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-bootstrap.changes 2010-12-21 19:55:23.000000000 +0100 @@ -1,0 +2,52 @@ +Tue Dec 21 19:44:02 CET 2010 - pmladek(a)suse.cz + +- updated to libreoffice-3.3.0.2 (3.3-rc2): + * common: + * copy & paste a text formatted cell (i#115825) + * replaced http://www.openoffice.org (fdo#32169) + * bootstrap: + * check if KDE is >= 4.2 + * cleanup unfortunate license duplication + * calc: + * ignore preceding spaces when parsing numbers + * make the string 'New Record' localizable (fdo#32209) + * remove trailing spaces too when parsing CSV simple numbers + * display correct record information in Data Form dialog (fdo#32196) + * components: + * make the ODMA check box clickable again (fdo#32132) + * fixed the sizes of Tips and Extended tips check boxes + * make 'Reset help agent' button clickable again (fdo#32132) + * extensions: + * fix filled polygons on PDF import + * filters: + * performance for import of XLSX files with drawing objects (i#115940) + * impress: + * missing embedded object in ODP export (i#115898) + * grey as default color for native tables in Impress + * graphics on master page cannot be deleted (i#115993) + * libs-core: + * save with the proper DOC variant (fdo#32219) + * removed dupe para ids introduced by copy&paste + * colon needed for LD_LIBRARY_PATH set but empty + * wikihelp: use the right Help ID URL (fdo#32338) + * MySQL Cast(col1 as CHAR) yields error (i#115436) + * import compatibility for enhanced fields names (fdo#32172) + * libs-extern-sys: + * XPATH handling fix + * libs-gui: + * PPTX import crasher (bnc#654065) + * copy&paste problem of metafiles (i#115825) + * force Qt paint system to native (fdo#30991) + * display problem with Vegur font (fdo#31243) + * URIs must be exported as 7bit ASCII (i#115788) + * regression in WMF text rendering (fdo#32236, i#115825) + * postprocess: + * only register EvolutionLocal when EVO support is enabled (fdo#32007) + * writer: + * after "data to fields" mail merge does not work (fdo#31190) + * missing outline feature in new RTF export filter (fdo#32039) + * encoding of Greek letters names with accent in French (i#115956) + * build bits: + * better build identification in the about dialog + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- libreoffice-bootstrap-3.3.0.1.tar.bz2 libreoffice-build-3.3.0.1.tar.gz setup_native_packinfo-3.2.99.3.tar.bz2 New: ---- libreoffice-bootstrap-3.3.0.2.tar.bz2 libreoffice-build-3.3.0.1e-piece-sfx2.diff libreoffice-build-3.3.0.2-build-fixes.diff libreoffice-build-3.3.0.2.tar.gz setup_native_packinfo-3.3.0.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libreoffice-bootstrap.spec ++++++ --- /var/tmp/diff_new_pack.5TK7Vy/_old 2011-01-07 09:45:43.000000000 +0100 +++ /var/tmp/diff_new_pack.5TK7Vy/_new 2011-01-07 09:45:43.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package libreoffice-bootstrap (Version 3.3.0.1) +# spec file for package libreoffice-bootstrap (Version 3.3.0.2) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -182,8 +182,8 @@ # we would like to support also a non-conflicting OOo2 package %define ooo_bin_suffix no # -%define ooo_build_version 3.3.0.1 -%define ooo_piece_version 3.3.0.1 +%define ooo_build_version 3.3.0.2 +%define ooo_piece_version 3.3.0.2 %define ooo_build_dir build %define ooo_sourcedirname libreoffice-%ooo_piece_version %define ooo_prefix %_libdir @@ -191,7 +191,7 @@ %define ooo_basis_dir basis3.3 License: Artistic ; BSD3c ; GPLv2+ ; LPPL .. ; LGPLv2.1+ ; LGPLv3 ; MPL .. ; MIT Group: Productivity/Office/Suite -Version: 3.3.0.1 +Version: 3.3.0.2 Release: 1 AutoReqProv: on # we use the tool "free" to detect the available memory and reduce the parallelism is needed @@ -204,7 +204,7 @@ Source0: libreoffice-build-%ooo_build_version.tar.gz Source1: libreoffice-bootstrap-%ooo_piece_version.tar.bz2 # hacked soures from setup_native -Source30: setup_native_packinfo-3.2.99.3.tar.bz2 +Source30: setup_native_packinfo-3.3.0.2.tar.bz2 # Hmm, rpmlint complains about devel files in non-devel package # We would like to keep the -bootstrap package name # So we need to disable these rpmlint checks @@ -215,6 +215,8 @@ # patches against libreoffice-build # Patch0: libreoffice-build-3.3.0.1-enable-foo.diff # example Patch0: libreoffice-build-3.2.99.2-extensions-hack.diff +Patch1: libreoffice-build-3.3.0.1e-piece-sfx2.diff +Patch2: libreoffice-build-3.3.0.2-build-fixes.diff # allow to use xulrunner191 on SLED11-SP1 (bnc#540726) Patch500: ooo-build-3.1.99.2-xulrunner-1.9.1.diff # FIXME: fix the python UNO components registration on SLED10 @@ -248,6 +250,8 @@ # apply patches against libreoffice-build # %patch0 # example %patch0 +%patch1 +%patch2 install -m 644 %{S:1} %{S:30} src/ %if 0%{?suse_version} == 01010 install -m 644 %{S:150} src/ ++++++ libreoffice-bootstrap-3.3.0.1.tar.bz2 -> libreoffice-bootstrap-3.3.0.2.tar.bz2 ++++++ ++++ 15548 lines of diff (skipped) ++++++ libreoffice-build-3.2.99.2-extensions-hack.diff ++++++ --- /var/tmp/diff_new_pack.5TK7Vy/_old 2011-01-07 09:45:44.000000000 +0100 +++ /var/tmp/diff_new_pack.5TK7Vy/_new 2011-01-07 09:45:44.000000000 +0100 @@ -9,7 +9,7 @@ #Localize Localize : LocalizeFixes UnstableWP : UnstableLibwpd -@@ -2719,6 +2719,10 @@ +@@ -2315,6 +2315,10 @@ oox-drawingml-fix-apply-shape-reference-crash.diff, n#593611, rodo oox-smartart-import.diff, thorsten @@ -19,7 +19,7 @@ + [ NovellOnlyWin32 ] sled10-splash.diff, i#123456, pmladek - + openlockedquerybox-alwaysontop.diff, n#656566, tml --- patches/dev300/piece-config-office-extensions.diff +++ patches/dev300/piece-config-office-extensions.diff @@ -0,0 +1,79 @@ ++++++ libreoffice-build-3.3.0.1e-piece-sfx2.diff ++++++ --- patches/dev300/piece-sfx2.diff +++ patches/dev300/piece-sfx2.diff @@ -4,7 +4,7 @@ .SOURCE.xcu : $(MISC)/$(EXTNAME)/merge $(MISC)/$(EXTNAME)/registry/data $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/merge $(MISC)/$(COMPONENT_SHARED_CONFIG)_in/registry/data $(COMPONENT_CONFIGDIR) . .SOURCE.xcs : $(MISC)/$(EXTNAME)/registry $(MISC)/$(EXTNAME)/registry/schema . -+SOLARLICENSEDIR*=$(SOLARBINDIR)/osl ++LICENSEDIR*=$(OO_INSTDIR) + fixme=$(MISC)/$(EXTNAME)/merge/$(MISC) fixme2=$(fixme:n) @@ -14,10 +14,10 @@ .IF "$(CUSTOM_LICENSE)"=="" .IF "$(GUI)" == "WNT" -PACKLICDEPS=$(SOLARBINDIR)/osl/license.txt -+PACKLICDEPS=$(SOLARLICENSEDIR)/license.txt ++PACKLICDEPS=$(LICENSEDIR)/license.txt .ELSE # "$(GUI)" == "WNT" -PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE -+PACKLICDEPS=$(SOLARLICENSEDIR)/LICENSE ++PACKLICDEPS=$(LICENSEDIR)/LICENSE .ENDIF # "$(GUI)" == "WNT" .ELSE # "$(CUSTOM_LICENSE)" == "" PACKLICDEPS=$(CUSTOM_LICENSE) @@ -27,7 +27,7 @@ LIBTARGET=NO EXTENSIONNAME:=custom-tool-panel -+SOLARLICENSEDIR=$(SOLARPIECE)$/$(INPATH)$/bin$/osl ++LICENSEDIR=$(SOLARPIECE)$/$(INPATH)$/bin$/osl + # --- Settings ----------------------------------------------------- ++++++ libreoffice-build-3.3.0.2-build-fixes.diff ++++++ --- bin/piece/save-noarch +++ bin/piece/save-noarch @@ -44,7 +44,7 @@ mkdir -p $DEST # lang packs are noarch -for list in $DESTDIR/gid_Module_Langpack* ; do +for list in $DESTDIR/gid_Module_Langpack* $DESTDIR/gid_Module_Helppack* ; do test -f $list || continue; # we want to keep the en_US localization in the package echo $list | grep "en_US" && continue; @@ -61,7 +61,7 @@ rmdir --ignore-fail-on-non-empty "$DESTDIR$source_dir" done # we need to save the list of files with the piece-specific name - listname_piece=`echo $list | sed "s|gid_Module_Langpack|gid_Module_Langpack_$piece|"` + listname_piece=`echo $list | sed -e "s|$gid_Module_Langpack$|\1_$piece|" -e "s|$gid_Module_Helppack$|\1_$piece|"` listname_piece=`basename $listname_piece` if test "$OOO_BUILD_NOARCH" = 'YES' ; then sed "s|$OO_INSTDIR|$OO_INSTDIR_SHARE|" $list >$DEST/$listname_piece --- bin/piece/sort-l10n +++ bin/piece/sort-l10n @@ -14,7 +14,7 @@ files_found= filelist=files-$piece-$lang.txt rm -f $filelist - for list in $gid_dir/gid_Module_Langpack*$lang ; do + for list in $gid_dir/gid_Module_Langpack*$lang $gid_dir/gid_Module_Helppack*$lang ; do test -f $list || continue; files_found=1 # add to the lang specific file-list --- bin/unpack +++ bin/unpack @@ -289,7 +289,7 @@ fi # ugly hack around odd positioning of this info echo "Unpacking setup_native .txt pieces" - ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.2.99.3.tar.bz2 | $GNUTAR xf - ) || exit + ($OOO_DECOMPRESS_CMD $SRCDIR/setup_native_packinfo-3.3.0.2.tar.bz2 | $GNUTAR xf - ) || exit # hack to patch new files in the root dir if test "z$PIECE" = "zbootstrap" ; then touch $OOBUILDDIR/boost.m4 --- download.in +++ download.in @@ -540,7 +540,7 @@ } if ('@PIECE@' eq 'bootstrap') { - source_file( 'setup_native_packinfo-3.2.99.3.tar.bz2' ); + source_file( 'setup_native_packinfo-3.3.0.2.tar.bz2' ); } if ('@OOOP_FONTS_PACK@' ne '') { ++++++ libreoffice-build-3.3.0.1.tar.gz -> libreoffice-build-3.3.0.2.tar.gz ++++++ libreoffice-bootstrap/libreoffice-build-3.3.0.1.tar.gz /mounts/work_src_done/STABLE/libreoffice-bootstrap/libreoffice-build-3.3.0.2.tar.gz differ: byte 5, line 1 ++++++ setup_native_packinfo-3.2.99.3.tar.bz2 -> setup_native_packinfo-3.3.0.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/linuxcopyrightfile new/setup_native/source/packinfo/linuxcopyrightfile --- old/setup_native/source/packinfo/linuxcopyrightfile 1970-01-01 01:00:00.000000000 +0100 +++ new/setup_native/source/packinfo/linuxcopyrightfile 2010-11-11 16:12:41.000000000 +0100 @@ -0,0 +1,2 @@ +Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved. +Use is subject to license terms. Files old/setup_native/source/packinfo/openofficelanguagepack.pcp and new/setup_native/source/packinfo/openofficelanguagepack.pcp differ Files old/setup_native/source/packinfo/openoffice.pcp and new/setup_native/source/packinfo/openoffice.pcp differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_accessories.txt new/setup_native/source/packinfo/packinfo_accessories.txt --- old/setup_native/source/packinfo/packinfo_accessories.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_accessories.txt 2010-11-30 21:17:39.000000000 +0100 @@ -0,0 +1,73 @@ +# Format: + +# Start +# scpModule +# shellscript file (optional) +# solarispackagename +# solarisrequires (optional) +# solarisprovides (optional) +# packagename +# linuxreplaces (optional) +# requires (optional) +# provides (optional) +# copyright +# vendor +# description +# destpath +# End + +# Package definitions for OxygenOffice Professional +# 1/3 Gallery + +Start +module = "gid_Module_Optional_Accessories_Gallery" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-gallery" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-gallery" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" +freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" +copyright = "1999-2008 by %PRODUCTNAME" +solariscopyright = "solariscopyrightfile" +vendor = "%PRODUCTNAME" +description = "Extra gallery for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%OOOPACKAGEVERSION" +End + +# 2/3 Fonts + +Start +module = "gid_Module_Optional_Accessories_Fonts" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-fonts" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-fonts" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" +freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" +copyright = "1999-2008 by %PRODUCTNAME" +solariscopyright = "solariscopyrightfile" +vendor = "%PRODUCTNAME" +description = "Extra fonts for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%OOOPACKAGEVERSION" +End + +# 3/3 Templates - Common + +Start +module = "gid_Module_Optional_Accessories_Tem_Common" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-extra-templates-common" +solarisrequires = %BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core02,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core03,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core04,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core05,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core06,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core07" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-extra-templates-common" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" +freebsdrequires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-core01" +copyright = "1999-2008 by %PRODUCTNAME" +solariscopyright = "solariscopyrightfile" +vendor = "%PRODUCTNAME" +description = "Extra Common Templates for %PRODUCTNAME %PRODUCTVERSION" +destpath = "/opt" +packageversion = "%OOOPACKAGEVERSION" +End + + +# END OF Package definitions for OxygenOffice Professional + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_brand.txt new/setup_native/source/packinfo/packinfo_brand.txt --- old/setup_native/source/packinfo/packinfo_brand.txt 2010-11-02 12:43:32.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_brand.txt 2010-12-17 22:21:26.000000000 +0100 @@ -128,8 +128,8 @@ module = "gid_Module_Langpack_Brand" solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING" packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION-%LANGUAGESTRING" -requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-draw,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-impress,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer" -solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-draw (Name="Draw language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help (Name="Help language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-impress (Name="Impress language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")" +requires = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-base,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-calc,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-math,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-res,%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-writer" +solarisrequires = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION,%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING (Name="Language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-base (Name="Base language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-calc (Name="Calc language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-math (Name="Math language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-res (Name="Resource language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING"),%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer (Name="Writer language module for %PRODUCTNAME %PRODUCTVERSION\, language %LANGUAGESTRING")" copyright = "1999-2009 by %PRODUCTNAME" solariscopyright = "solariscopyrightfile" vendor = "%PRODUCTNAME" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office_help.txt new/setup_native/source/packinfo/packinfo_office_help.txt --- old/setup_native/source/packinfo/packinfo_office_help.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_office_help.txt 2010-12-16 12:43:41.000000000 +0100 @@ -0,0 +1,36 @@ +# Format: + +# Start +# scpModule +# shellscript file (optional) +# solarispackagename +# solarisrequires (optional) +# solarisprovides (optional) +# packagename +# linuxreplaces (optional) +# requires (optional) +# provides (optional) +# copyright +# vendor +# description +# destpath +# End + +Start +module = "gid_Module_Helppack_Help" +solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help" +solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING" +packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help" +provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help" +requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" +copyright = "1999-2009 by OpenOffice.org" +solariscopyright = "solariscopyrightfile" +vendor = "The Document Foundation" +description = "Help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" +destpath = "/opt" +packageversion = "%OOOPACKAGEVERSION" +pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" +End + + +# END OF Language depended package definitions diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/packinfo_office_lang.txt new/setup_native/source/packinfo/packinfo_office_lang.txt --- old/setup_native/source/packinfo/packinfo_office_lang.txt 2010-11-02 12:43:32.000000000 +0100 +++ new/setup_native/source/packinfo/packinfo_office_lang.txt 2010-12-16 12:43:41.000000000 +0100 @@ -65,22 +65,6 @@ End Start -module = "gid_Module_Langpack_Help" -solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help" -solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING" -packagename = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING-help" -provides = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-help" -requires = "%BASISPACKAGEPREFIX%OOOBASEVERSION-%LANGUAGESTRING" -copyright = "1999-2009 by OpenOffice.org" -solariscopyright = "solariscopyrightfile" -vendor = "The Document Foundation" -description = "Language help module for LibreOffice %OOOBASEVERSION, language %LANGUAGESTRING" -destpath = "/opt" -packageversion = "%OOOPACKAGEVERSION" -pkg_list_entry = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-core01" -End - -Start module = "gid_Module_Langpack_Writer" solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING-writer" solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTOOOBASEVERSION-%LANGUAGESTRING" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/private1copyrightfile new/setup_native/source/packinfo/private1copyrightfile --- old/setup_native/source/packinfo/private1copyrightfile 1970-01-01 01:00:00.000000000 +0100 +++ new/setup_native/source/packinfo/private1copyrightfile 2010-11-11 16:12:41.000000000 +0100 @@ -0,0 +1,2 @@ +Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved. +Use is subject to license terms. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/setup_native/source/packinfo/solariscopyrightfile new/setup_native/source/packinfo/solariscopyrightfile --- old/setup_native/source/packinfo/solariscopyrightfile 1970-01-01 01:00:00.000000000 +0100 +++ new/setup_native/source/packinfo/solariscopyrightfile 2010-11-11 16:12:41.000000000 +0100 @@ -0,0 +1,2 @@ +Copyright 2000, 2010 Oracle and/or its affiliates. All rights reserved. +Use is subject to license terms. Files old/setup_native/source/packinfo/ure.pcp and new/setup_native/source/packinfo/ure.pcp differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 php5 for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at Fri Jan 7 09:45:21 CET 2011. -------- --- php5/php5.changes 2010-12-14 02:10:35.000000000 +0100 +++ /mounts/work_src_done/STABLE/php5/php5.changes 2011-01-06 23:47:48.000000000 +0100 @@ -1,0 +2,19 @@ +Thu Jan 6 22:44:12 UTC 2011 - cristian.rodriguez(a)opensuse.org + +- Update to version 5.3.5, Critical Update +* Fixed bug #53632 (PHP hangs on numeric value 2.2250738585072011e-308). (CVE-2010-4645) + Only 32 bit binaries affected, confirmed in factory i586. + +------------------------------------------------------------------- +Fri Dec 17 21:37:18 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- revert unsuitable patch php-5.3.4-dlopen.patch + +------------------------------------------------------------------- +Tue Dec 14 23:19:26 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Add php-5.3.4-dlopen.patch from fedora,makes dlopen to use + bind_now instead of lazy. +- Compiler is now in C99 mode for both core and extensions. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- php-5.3.4.tar.bz2 New: ---- php-5.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.UvJw1X/_old 2011-01-07 09:44:56.000000000 +0100 +++ /var/tmp/diff_new_pack.UvJw1X/_new 2011-01-07 09:44:56.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package php5 (Version 5.3.4) +# spec file for package php5 (Version 5.3.5) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -76,8 +76,8 @@ #define builtin_tz_ver 2007.9 ### ### -Version: 5.3.4 -Release: 2 +Version: 5.3.5 +Release: 1 License: The PHP License, version 3.01 Group: Development/Languages/Other Provides: php zend php-xml php-spl php-simplexml php-session php-pcre php-date php-reflection php-filter @@ -1223,6 +1223,7 @@ %patch25 %patch26 %patch27 + # we build three SAPI %{__mkdir_p} build-apache2 build-fpm %{__mkdir_p} build-fastcgi/sapi/cgi/libfcgi @@ -1242,12 +1243,10 @@ build-$sapi/Zend done %endif -#vtzdb=`grep timezonedb_builtin ext/date/lib/timezonedb.h | sed -e 's/[^"]*"$[^"]\+$"*[^"]*/\1\n/g' | head -n1` -#if test "x${vtzdb}" != "x%{builtin_tz_ver}"; then -# : Error: Built-in timezonedb version is now ${vtzdb}, expecting %{builtin_tz_ver}. -# : Update the builtin_tz_ver macro and rebuild. -# exit 1 -#fi + +for parser in `find -name "*.re"`;do + re2c --no-generation-date -gi "$parser" > ${parser%.*}.c +done # Safety check for API version change. vapi=`sed -n '/#define PHP_API_VERSION/{s/.* //;p}' main/php.h` if test "x${vapi}" != "x%{apiver}"; then @@ -1469,7 +1468,7 @@ %check cd build-cli # Run tests, using the CLI SAPI -export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 LANG=POSIX LC_ALL=POSIX +export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 LANG=POSIX LC_ALL=POSIX unset TZ #%{__make} test set +x @@ -1479,7 +1478,7 @@ echo "-- $f result ends." done set -x -unset NO_INTERACTION REPORT_EXIT_STATUS MALLOC_CHECK_ +unset NO_INTERACTION REPORT_EXIT_STATUS %install # install function ++++++ php-5.3.2-aconf26x.patch ++++++ --- /var/tmp/diff_new_pack.UvJw1X/_old 2011-01-07 09:44:57.000000000 +0100 +++ /var/tmp/diff_new_pack.UvJw1X/_new 2011-01-07 09:44:57.000000000 +0100 @@ -8,6 +8,16 @@ AC_PREREQ(2.13) AC_INIT(config.m4) +@@ -23,7 +23,8 @@ test -z "$CFLAGS" && auto_cflags=1 + abs_srcdir=`(cd $srcdir && pwd)` + abs_builddir=`pwd` + +-AC_PROG_CC([cc gcc]) ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS + PHP_DETECT_ICC + PHP_DETECT_SUNCC + AC_PROG_CC_C_O --- ext/standard/config.m4.orig +++ ext/standard/config.m4 @@ -1,6 +1,6 @@ @@ -30,7 +40,7 @@ --- configure.in.orig +++ configure.in @@ -1,7 +1,7 @@ - ## $Id: configure.in 306090 2010-12-08 21:38:51Z johannes $ -*- autoconf -*- + ## $Id: configure.in 307133 2011-01-05 16:35:33Z johannes $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. -divert(1) @@ -38,6 +48,21 @@ dnl ## Diversion 1 is the autoconf + automake setup phase. We also dnl ## set the PHP version, deal with platform-specific compile +@@ -125,12 +125,12 @@ rm -f libs/* + dnl Checks for programs. + dnl ------------------------------------------------------------------------- + +-AC_PROG_CC([cc gcc]) ++AC_USE_SYSTEM_EXTENSIONS + PHP_DETECT_ICC + PHP_DETECT_SUNCC + AC_PROG_CC_C_O + dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf +-dnl AC_PROG_CC_STDC ++AC_PROG_CC_STDC + AC_PROG_CPP + AC_AIX + AC_PROG_LN_S @@ -290,7 +290,7 @@ sinclude(TSRM/threads.m4) sinclude(TSRM/tsrm.m4) ++++++ php-5.3.4-format-string-issues.patch ++++++ --- /var/tmp/diff_new_pack.UvJw1X/_old 2011-01-07 09:44:57.000000000 +0100 +++ /var/tmp/diff_new_pack.UvJw1X/_new 2011-01-07 09:44:57.000000000 +0100 @@ -72,3 +72,74 @@ { char *buffer; int buffer_len, display; +Index: Zend/zend.h +=================================================================== +--- Zend/zend.h (revisión: 306414) ++++ Zend/zend.h (copia de trabajo) +@@ -146,6 +146,14 @@ + # define ZEND_ATTRIBUTE_MALLOC + #endif + ++#if ZEND_GCC_VERSION >= 4003 ++#define ZEND_ATTR_ALLOC_SIZE(x) __attribute__((__alloc_size__(x))) ++#define ZEND_ATTR_ALLOC_SIZE2(x,y) __attribute__((__alloc_size__(x,y))) ++#else ++#define ZEND_ATTR_ALLOC_SIZE(x) ++#define ZEND_ATTR_ALLOC_SIZE2(x,y) ++#endif ++ + #if ZEND_GCC_VERSION >= 2007 + # define ZEND_ATTRIBUTE_FORMAT(type, idx, first) __attribute__ ((format(type, idx, first))) + #else +Index: Zend/zend_alloc.h +=================================================================== +--- Zend/zend_alloc.h (revisión: 306414) ++++ Zend/zend_alloc.h (copia de trabajo) +@@ -54,14 +54,14 @@ + + ZEND_API char *zend_strndup(const char *s, unsigned int length) ZEND_ATTRIBUTE_MALLOC; + +-ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; +-ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; +-ZEND_API void *_safe_malloc(size_t nmemb, size_t size, size_t offset) ZEND_ATTRIBUTE_MALLOC; ++ZEND_API void *_emalloc(size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC ZEND_ATTR_ALLOC_SIZE(1); ++ZEND_API void *_safe_emalloc(size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC ZEND_ATTR_ALLOC_SIZE2(1,2); ++ZEND_API void *_safe_malloc(size_t nmemb, size_t size, size_t offset) ZEND_ATTRIBUTE_MALLOC ZEND_ATTR_ALLOC_SIZE2(1,2); + ZEND_API void _efree(void *ptr ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); +-ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; +-ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); +-ZEND_API void *_safe_erealloc(void *ptr, size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); +-ZEND_API void *_safe_realloc(void *ptr, size_t nmemb, size_t size, size_t offset); ++ZEND_API void *_ecalloc(size_t nmemb, size_t size ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC ZEND_ATTR_ALLOC_SIZE2(1,2); ++ZEND_API void *_erealloc(void *ptr, size_t size, int allow_failure ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTR_ALLOC_SIZE(2); ++ZEND_API void *_safe_erealloc(void *ptr, size_t nmemb, size_t size, size_t offset ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTR_ALLOC_SIZE2(2,3); ++ZEND_API void *_safe_realloc(void *ptr, size_t nmemb, size_t size, size_t offset) ZEND_ATTR_ALLOC_SIZE2(2,3); + ZEND_API char *_estrdup(const char *s ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; + ZEND_API char *_estrndup(const char *s, unsigned int length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) ZEND_ATTRIBUTE_MALLOC; + ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); +@@ -90,7 +90,7 @@ + #define estrndup_rel(s, length) _estrndup((s), (length) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) + #define zend_mem_block_size_rel(ptr) _zend_mem_block_size((ptr) TSRMLS_CC ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_CC) + +-inline static void * __zend_malloc(size_t len) ++inline static ZEND_ATTR_ALLOC_SIZE(1) void * __zend_malloc(size_t len) + { + void *tmp = malloc(len); + if (tmp) { +@@ -100,14 +100,14 @@ + exit(1); + } + +-inline static void * __zend_calloc(size_t nmemb, size_t len) ++inline static ZEND_ATTR_ALLOC_SIZE2(1,2) void * __zend_calloc(size_t nmemb, size_t len) + { + void *tmp = _safe_malloc(nmemb, len, 0); + memset(tmp, 0, nmemb * len); + return tmp; + } + +-inline static void * __zend_realloc(void *p, size_t len) ++inline static ZEND_ATTR_ALLOC_SIZE(2) void * __zend_realloc(void *p, size_t len) + { + p = realloc(p, len); + if (p) { ++++++ php-5.3.4.tar.bz2 -> php-5.3.5.tar.bz2 ++++++ php5/php-5.3.4.tar.bz2 /mounts/work_src_done/STABLE/php5/php-5.3.5.tar.bz2 differ: byte 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

commit kdebase4-workspace for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at Fri Jan 7 09:43:38 CET 2011. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2010-12-13 17:48:30.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2011-01-07 09:42:25.804419000 +0100 @@ -1,0 +2,18 @@ +Sun Jan 02 15:58:23 UTC 2011 - abrouwers(a)gmail.com + +- Horos is the default upstream wallpaper for 4.6 + +------------------------------------------------------------------- +Wed Dec 22 11:35:53 CET 2010 - dmueller(a)suse.de + +- update to 4.5.90 + * KDE 4.6 RC1 + * no upstream changelog available. + + +------------------------------------------------------------------- +Wed Dec 15 14:55:34 UTC 2010 - wstephenson(a)novell.com + +- Don't crash on panel relayout (bko#259793) + +------------------------------------------------------------------- @@ -8 +25,0 @@ - kdebase4-workspace.changes: same change python-kdebase4.changes: same change calling whatdependson for head-i586 Old: ---- kdebase-workspace-4.5.85.tar.bz2 New: ---- kdebase-workspace-4.5.90.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.fNkt41/_old 2011-01-07 09:43:07.000000000 +0100 +++ /var/tmp/diff_new_pack.fNkt41/_new 2011-01-07 09:43:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kdebase4-wallpapers (Version 4.5.85) +# spec file for package kdebase4-wallpapers (Version 4.5.90) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,7 +23,7 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.5.85 +Version: 4.5.90 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.fNkt41/_old 2011-01-07 09:43:07.000000000 +0100 +++ /var/tmp/diff_new_pack.fNkt41/_new 2011-01-07 09:43:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package kdebase4-workspace (Version 4.5.85) +# spec file for package kdebase4-workspace (Version 4.5.90) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,18 +50,14 @@ %ifnarch s390 s390x BuildRequires: libsensors4-devel %endif -%if %suse_version > 1130 -Requires: polkit-kde-agent-1 polkit-kde-kcmmodules-1 -%else %if %suse_version > 1110 -Requires: polkit-kde-1 -%endif +Requires: polkit-kde-agent-1 polkit-kde-kcmmodules-1 %endif License: GPLv2+ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.5.85 +Version: 4.5.90 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source1: rcksysguardd @@ -229,7 +225,7 @@ sed -ri "s,.*%{_kde_share_dir}/apps/kdm/themes/oxygen.*,," filelists/kdm sed -ri "s,.*%{_kde_share_dir}/apps/kdm/pics.*,," filelists/kdm ls -1 $RPM_BUILD_ROOT/usr/share/wallpapers/ | while read wallpaper; \ - do test "$wallpaper" = "Ethais" -o ! -d "$RPM_BUILD_ROOT/usr/share/wallpapers/$wallpaper" \ + do test "$wallpaper" = "Horos" -o ! -d "$RPM_BUILD_ROOT/usr/share/wallpapers/$wallpaper" \ || rm -r "$RPM_BUILD_ROOT/usr/share/wallpapers/$wallpaper"; done mkdir -p $RPM_BUILD_ROOT/etc #mv $RPM_BUILD_ROOT/usr/etc/systemsettingsrc $RPM_BUILD_ROOT/etc/ @@ -534,7 +530,7 @@ %_kde4_appsdir/kwin/titlebar_decor.png %_kde4_appsdir/ksplash/Themes/Default %dir %_kde4_wallpapersdir -%_kde4_wallpapersdir/Ethais +%_kde4_wallpapersdir/Horos %files -n kdm-branding-upstream %defattr(-,root,root) ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.fNkt41/_old 2011-01-07 09:43:07.000000000 +0100 +++ /var/tmp/diff_new_pack.fNkt41/_new 2011-01-07 09:43:07.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package python-kdebase4 (Version 4.5.85) +# spec file for package python-kdebase4 (Version 4.5.90) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,7 +28,7 @@ Group: System/GUI/KDE Summary: Python bindings for KDE 4 desktop shell Url: http://www.kde.org/ -Version: 4.5.85 +Version: 4.5.90 Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ kdebase4-workspace-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.fNkt41/_old 2011-01-07 09:43:08.000000000 +0100 +++ /var/tmp/diff_new_pack.fNkt41/_new 2011-01-07 09:43:08.000000000 +0100 @@ -1,2 +1,3 @@ addFilter("untranslated-desktop-file .*/usr/share/wallpapers/.*") - +addFilter("suse-dbus-unauthorized-service") +addFilter("polkit-unauthorized-privilege") ++++++ kdebase-workspace-4.5.85.tar.bz2 -> kdebase-workspace-4.5.90.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.5.85.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.5.90.tar.bz2 differ: byte 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

commit yast2-packager for openSUSE:Factory
by root＠hilbert.suse.de 07 Jan '11

07 Jan '11

Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at Fri Jan 7 09:37:34 CET 2011. -------- --- yast2-packager/yast2-packager.changes 2010-11-30 16:03:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-packager/yast2-packager.changes 2011-01-03 15:22:37.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Jan 3 14:15:53 UTC 2011 - lslezak(a)suse.cz + +- fixed partition evaluation (when thare are more than 10 + partitions) (bnc#660943) +- 2.20.14 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-packager-2.20.13.tar.bz2 New: ---- yast2-packager-2.20.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.rK3tcl/_old 2011-01-07 09:36:58.000000000 +0100 +++ /var/tmp/diff_new_pack.rK3tcl/_new 2011-01-07 09:36:58.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-packager (Version 2.20.13) +# spec file for package yast2-packager (Version 2.20.14) # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,11 +19,11 @@ Name: yast2-packager -Version: 2.20.13 +Version: 2.20.14 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-packager-2.20.13.tar.bz2 +Source0: yast2-packager-2.20.14.tar.bz2 Prefix: /usr @@ -100,7 +100,7 @@ (webpin) and installing them via OneClickInstall %prep -%setup -n yast2-packager-2.20.13 +%setup -n yast2-packager-2.20.14 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-packager-2.20.13.tar.bz2 -> yast2-packager-2.20.14.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.13/configure new/yast2-packager-2.20.14/configure --- old/yast2-packager-2.20.13/configure 2010-11-12 15:07:45.000000000 +0100 +++ new/yast2-packager-2.20.14/configure 2011-01-03 15:20:42.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for yast2-packager 2.20.12. +# Generated by GNU Autoconf 2.67 for yast2-packager 2.20.14. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -551,8 +551,8 @@ # Identity of this package. PACKAGE_NAME='yast2-packager' PACKAGE_TARNAME='yast2-packager' -PACKAGE_VERSION='2.20.12' -PACKAGE_STRING='yast2-packager 2.20.12' +PACKAGE_VERSION='2.20.14' +PACKAGE_STRING='yast2-packager 2.20.14' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1221,7 +1221,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-packager 2.20.12 to adapt to many kinds of systems. +\`configure' configures yast2-packager 2.20.14 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1292,7 +1292,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-packager 2.20.12:";; + short | recursive ) echo "Configuration of yast2-packager 2.20.14:";; esac cat <<\_ACEOF @@ -1372,7 +1372,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-packager configure 2.20.12 +yast2-packager configure 2.20.14 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1389,7 +1389,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-packager $as_me 2.20.12, which was +It was created by yast2-packager $as_me 2.20.14, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2319,7 +2319,7 @@ # Define the identity of the package. PACKAGE='yast2-packager' - VERSION='2.20.12' + VERSION='2.20.14' cat >>confdefs.h <<_ACEOF @@ -2441,7 +2441,7 @@ -VERSION="2.20.12" +VERSION="2.20.14" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" @@ -3359,7 +3359,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-packager $as_me 2.20.12, which was +This file was extended by yast2-packager $as_me 2.20.14, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3412,7 +3412,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-packager config.status 2.20.12 +yast2-packager config.status 2.20.14 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.13/configure.in new/yast2-packager-2.20.14/configure.in --- old/yast2-packager-2.20.13/configure.in 2010-11-12 15:07:41.000000000 +0100 +++ new/yast2-packager-2.20.14/configure.in 2011-01-03 15:20:38.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-packager, 2.20.12, http://bugs.opensuse.org/, yast2-packager) +AC_INIT(yast2-packager, 2.20.14, http://bugs.opensuse.org/, yast2-packager) 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.20.12" +VERSION="2.20.14" RPMNAME="yast2-packager" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.13/src/modules/SourceDialogs.ycp new/yast2-packager-2.20.14/src/modules/SourceDialogs.ycp --- old/yast2-packager-2.20.13/src/modules/SourceDialogs.ycp 2010-11-01 17:29:47.000000000 +0100 +++ new/yast2-packager-2.20.14/src/modules/SourceDialogs.ycp 2011-01-03 15:13:49.000000000 +0100 @@ -991,7 +991,7 @@ foreach(string part, (list<string>)disk["partitions"]:[], { - string partnum = regexpsub(part, ".*-part([0-9])*$", "\\1"); + string partnum = regexpsub(part, ".*-part([0-9]*)$", "\\1"); string disk_label = label + sformat(" (%1%2)", dev, partnum); found = found || (part == selected); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-2.20.13/VERSION new/yast2-packager-2.20.14/VERSION --- old/yast2-packager-2.20.13/VERSION 2010-11-30 16:01:36.000000000 +0100 +++ new/yast2-packager-2.20.14/VERSION 2011-01-03 15:17:25.000000000 +0100 @@ -1 +1 @@ -2.20.13 +2.20.14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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