December 2012 - openSUSE Commits - openSUSE Mailing Lists

commit krename for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package krename for openSUSE:Factory checked in at 2012-12-03 09:48:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/krename (Old) and /work/SRC/openSUSE:Factory/.krename.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "krename", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/krename/krename.changes 2012-05-07 22:48:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.krename.new/krename.changes 2012-12-03 09:48:36.000000000 +0100 @@ -1,0 +2,5 @@ +Sat Nov 24 21:40:30 UTC 2012 - alinm.elena(a)gmail.com + +- added freetype2 dependency + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ krename.spec ++++++ --- /var/tmp/diff_new_pack.OAVJbh/_old 2012-12-03 09:48:37.000000000 +0100 +++ /var/tmp/diff_new_pack.OAVJbh/_new 2012-12-03 09:48:37.000000000 +0100 @@ -32,6 +32,7 @@ Patch2: krename-4.0.7_add_common_names_to_FindLIBPODOFO.patch # PATCH-FIX-UPSTREAM remove-gplv2-code.diff dmueller(a)suse.de -- Remove GPLv2 only code (only used for self-testing) Patch3: remove-gplv2-code.diff +BuildRequires: freetype2-devel BuildRequires: libexiv2-devel BuildRequires: libkde4-devel BuildRequires: libpodofo-devel @@ -68,6 +69,9 @@ sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/" src/main.cpp %build + +export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -I%_includedir/freetype2" + %cmake_kde4 -d build %make_jobs -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kmod for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2012-12-03 09:46:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kmod", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2012-11-15 10:57:49.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2012-12-03 09:46:29.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Nov 23 17:18:03 UTC 2012 - jengelh(a)inai.de + +- Require suse-module-tools now that it is present in Base:System +- kmod-compat depends on kmod, add that missing Requires. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.TJp4E2/_old 2012-12-03 09:46:30.000000000 +0100 +++ /var/tmp/diff_new_pack.TJp4E2/_new 2012-12-03 09:46:30.000000000 +0100 @@ -30,13 +30,13 @@ #Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign - BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libxslt-tools BuildRequires: pkgconfig >= 0.21 BuildRequires: xz BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) +Requires: suse-module-tools %description kmod is a set of tools to handle common tasks with Linux kernel @@ -51,6 +51,7 @@ Summary: Compat symlinks for kernel module utilities License: GPL-2.0+ Group: System/Kernel +Requires: kmod Provides: modutils Conflicts: module-init-tools -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-12-03 09:43:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi (Old) and /work/SRC/openSUSE:Factory/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-11-28 10:36:45.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-12-03 09:43:38.000000000 +0100 @@ -1,0 +2,155 @@ +Fri Nov 30 14:29:07 CET 2012 - ms(a)suse.de + +- v5.04.28 released + +------------------------------------------------------------------- +Fri Nov 30 11:47:02 CET 2012 - ms(a)suse.de + +- removed obsolete and also never reached code + +------------------------------------------------------------------- +Fri Nov 30 10:24:20 CET 2012 - ms(a)suse.de + +- fixed user/group setup. kiwi used the given group name as a + supplementary group and not as the main group this user belongs + to. Together with a group name and a group id which matches + that group name this could lead to duplicate user views in + e.g YaST and to basically wrong user configuration (bnc #792058) + +------------------------------------------------------------------- +Thu Nov 29 17:30:18 CET 2012 - ms(a)suse.de + +- fixed legacy grub setup. the partition numbers starts at 0 here + +------------------------------------------------------------------- +Thu Nov 29 15:08:46 CET 2012 - ms(a)suse.de + +- fixed shell escaping for grub.cfg and /etc/default/grub +- also fixed importFile method to handle single quotes correctly + +------------------------------------------------------------------- +Wed Nov 28 17:19:56 CET 2012 - rjschwei(a)suse.de + +- implement <strip> data handling in new XML data structure +- rename the following methods: + * updateTypeList -> __updateTypeList_legacy + * updateXML -> __updateXML_legacy + * writeXMLDescription -> writeXMLDescription_legacy + * createURLList -> __createURLList_legacy + * getURLHash -> getURLHash_legacy + * getURLList -> __getURLList_legacy + * getLocale -> getLocale_legacy + * getStripDelete -> __getStripDelete_legacy + * getStripLibs -> __getStripLibs_legacy + * getStripTools -> __getStripTools_legacy + * addStrip -> __addStrip_legacy +- implement new methods to add and get data expressed as <strip> + in the XML +- update unit tests to use _legacy method names +- implement new unit tests for new methods + * create new config.xml file for new unit tests +- implement XMLStripData class + +------------------------------------------------------------------- +Wed Nov 28 15:41:55 CET 2012 - ms(a)suse.de + +- fixes use of custom disk size value via the <size> element + or the option --bootvm-disksize. In combination with LVM + volumes the result disk size is much bigger because kiwi + just added the requested volume sizes to the specified + disk size which is not the desired behavior + +------------------------------------------------------------------- +Wed Nov 28 11:08:18 CET 2012 - rjschwei(a)suse.de + +- fix array comparison in the test case + * at present names that contain "special" characters may not compare + properly, such that libstdc++ will not match a libstdc++ entry in + the other array. Use string interpolation to address the issue. + +------------------------------------------------------------------- +Tue Nov 27 15:09:12 CET 2012 - rjschwei(a)suse.de + +- use numbers for calculations, do not depend on implicit conversion + +------------------------------------------------------------------- +Tue Nov 27 11:00:12 CET 2012 - ms(a)suse.de + +- DB: rebuild documentation + +------------------------------------------------------------------- +Tue Nov 27 10:59:35 CET 2012 - ms(a)suse.de + +- DB: update documentation due to the new pxe unionfs mount method + +------------------------------------------------------------------- +Tue Nov 27 10:57:05 CET 2012 - ms(a)suse.de + +- added mountSystemUnionFS() function which uses fuse-unionfs + to overlay mount the root system according to the contents + of UNIONFS_CONFIG. So far this setup is only supported with + pxe images as requested in (bnc #776505) + +------------------------------------------------------------------- +Mon Nov 26 15:42:24 CET 2012 - ms(a)suse.de + +- remove searchUSBStickDevice() function. When kiwi was called + with a target disk device the assumption was made that the + install media should also be created on a device directly. + If the install media is a USB stick (installstick="true") + kiwi searches for stick devices during the process and: + + a) exits with an error if it can't find one + b) asks which one to use if it finds more than one + + This behavior is a pita for automatic build processes and + it also fails if the stick media does not set the 'removable' + state in its meta data correctly. Additionally the assumption + that the install media is present as a device just because + the image was created from an existing device also sucks + + This commit removes the search for stick devices and always + creates the install media through a loop as a file which + then needs to be dumped on the target device + +------------------------------------------------------------------- +Mon Nov 26 14:34:16 CET 2012 - ms(a)suse.de + +- fixed spec file, syslinux exists on ix86 and x86_64 only + +------------------------------------------------------------------- +Mon Nov 26 13:14:56 CET 2012 - ms(a)suse.de + +- cleanup global mount method to use the getPartDevice() function + to search for partition devices + +------------------------------------------------------------------- +Mon Nov 26 13:13:44 CET 2012 - ms(a)suse.de + +- cleanup setupInstallStick(), the reference to this->{loop} + might be undefined depending on the environment better use + the contents of $haveDiskDevice + +------------------------------------------------------------------- +Mon Nov 26 12:37:04 CET 2012 - ms(a)suse.de + +- removed obsolete mount code from setupInstallStick() + +------------------------------------------------------------------- +Mon Nov 26 12:11:24 CET 2012 - ms(a)suse.de + +- fixed setupInstallStick() if called in Studio mode. If this + function is called with a disk device as reference it expects + the target USB stick to be plugged in, in order to create the + install image directly on that stick. For Studio this does + not work because the target stick is never attached to the + containment within this call happens. Thus this fix creates + the install USB stick image in a loop device + +------------------------------------------------------------------- +Mon Nov 26 11:55:04 CET 2012 - ms(a)suse.de + +- added sanity check for mount() method to fail + if no source information is passed + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.bmbLW9/_old 2012-12-03 09:43:42.000000000 +0100 +++ /var/tmp/diff_new_pack.bmbLW9/_new 2012-12-03 09:43:42.000000000 +0100 @@ -21,7 +21,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.27 +Version: 5.04.28 Release: 0 # requirements to build packages BuildRequires: gcc-c++ @@ -190,7 +190,9 @@ %package -n kiwi-pxeboot PreReq: coreutils +%ifarch %ix86 x86_64 Requires: syslinux +%endif Summary: openSUSE - KIWI Image System PXE boot structure License: GPL-2.0+ Group: System/Management @@ -209,10 +211,12 @@ %ifarch %ix86 x86_64 %package -n kiwi-desc-isoboot -Requires: dosfstools Requires: e2fsprogs Requires: kiwi = %{version} +%ifarch %ix86 x86_64 Requires: syslinux +%endif +Requires: dosfstools %if 0%{?suse_version} Requires: genisoimage Requires: virt-utils @@ -253,7 +257,6 @@ Requires: e2fsprogs Requires: kiwi = %{version} Requires: parted -Requires: syslinux %if 0%{?suse_version} Requires: multipath-tools Requires: virt-utils @@ -263,6 +266,7 @@ Requires: qemu-img %endif %ifarch %ix86 x86_64 +Requires: syslinux %if 0%{?suse_version} >= 1220 Requires: grub2 %else @@ -339,7 +343,6 @@ Requires: e2fsprogs Requires: kiwi = %{version} Requires: parted -Requires: syslinux %if 0%{?suse_version} Requires: genisoimage Requires: multipath-tools @@ -350,6 +353,7 @@ Requires: qemu-img %endif %ifarch %ix86 x86_64 +Requires: syslinux %if 0%{?suse_version} >= 1220 Requires: grub2 %else ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ ++++++ kiwi.tar.bz2 ++++++ ++++ 3744 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdiff3 for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package kdiff3 for openSUSE:Factory checked in at 2012-12-03 09:42:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdiff3 (Old) and /work/SRC/openSUSE:Factory/.kdiff3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdiff3", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdiff3/kdiff3.changes 2011-10-12 16:12:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdiff3.new/kdiff3.changes 2012-12-03 09:42:38.000000000 +0100 @@ -1,0 +2,17 @@ +Tue Nov 20 16:10:19 UTC 2012 - nico.kruber(a)gmail.com + +- Fix the SLES build (%make_install is not expanded on SLES) + +------------------------------------------------------------------- +Tue Nov 20 16:08:20 UTC 2012 - nico.kruber(a)gmail.com + +- update to 0.9.97: + * Memory usage optimized for comparison of large directories. + * In overview for two way diff show if only one side contains text. + * If text is selected in either input or output window use that in Find dialog. + * Command line option --cs doesn't change the config value permanently anymore. + * Windows 64 bit specific installer. + * Bugfixes. +- removed libkdiff3part.so (not build anymore) + +------------------------------------------------------------------- Old: ---- kdiff3-0.9.96.tar.gz New: ---- kdiff3-0.9.97.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdiff3.spec ++++++ --- /var/tmp/diff_new_pack.NJbmSl/_old 2012-12-03 09:42:39.000000000 +0100 +++ /var/tmp/diff_new_pack.NJbmSl/_new 2012-12-03 09:42:39.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdiff3 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,14 +16,13 @@ # - Name: kdiff3 -Version: 0.9.96 -Release: 10 -License: GPL-2.0+ +Version: 0.9.97 +Release: 0 Summary: Feature-Rich Code Comparison Utility -Url: http://kdiff3.sourceforge.net/ +License: GPL-2.0+ Group: Development/Tools/Version Control +Url: http://kdiff3.sourceforge.net/ Source0: %{name}-%{version}.tar.gz BuildRequires: fdupes BuildRequires: kdebase4-workspace-devel @@ -56,7 +55,7 @@ %install pushd build - %make_install + make DESTDIR=%{buildroot} install popd %suse_update_desktop_file -r kdiff3 Qt KDE Utility TextEditor X-KDE-Utilities-File %kde_post_install @@ -74,7 +73,6 @@ %{_kde4_appsdir}/kdiff3part/ %{_kde4_bindir}/kdiff3 %{_kde4_iconsdir}/??color/*/apps/kdiff3.png -%{_kde4_modulesdir}/libkdiff3part.so %{_kde4_modulesdir}/kdiff3fileitemaction.so %{_kde4_servicesdir}/kdiff3part.desktop %{_kde4_servicesdir}/kdiff3fileitemaction.desktop ++++++ kdiff3-0.9.96.tar.gz -> kdiff3-0.9.97.tar.gz ++++++ ++++ 12779 lines of diff (skipped) -- 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-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package kdebase4-openSUSE for openSUSE:Factory checked in at 2012-12-03 09:41:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdebase4-openSUSE", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-openSUSE/kdebase4-openSUSE.changes 2012-11-22 13:58:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-openSUSE.new/kdebase4-openSUSE.changes 2012-12-03 09:41:24.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Nov 22 21:22:43 UTC 2012 - tittiatcoke(a)gmail.com + +- Darkened colorscheme and properly name it +- minor fixes (improvements) for taskbar +- Bump version to 12.3 + +------------------------------------------------------------------- Old: ---- kdebase4-openSUSE-12.2.tar.bz2 New: ---- kdebase4-openSUSE-12.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.j05vdB/_old 2012-12-03 09:41:26.000000000 +0100 +++ /var/tmp/diff_new_pack.j05vdB/_new 2012-12-03 09:41:26.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdebase4-openSUSE -Version: 12.2 +Version: 12.3 Release: 0 Summary: openSUSE KDE Extension License: GPL-2.0+ @@ -127,7 +127,7 @@ %install cd build - %make_install + %kde4_makeinstall cd .. for l in SUSEgreeter krpmview kde4-openSUSE kio_sysinfo; do %find_lang $l suse.lang ++++++ kdebase4-openSUSE-12.2.tar.bz2 -> kdebase4-openSUSE-12.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdeglobals new/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdeglobals --- old/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdeglobals 2012-11-22 09:31:35.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/etc/kde4/share/config/kdeglobals 2012-11-22 22:23:10.000000000 +0100 @@ -38,7 +38,7 @@ [Colors:Selection] BackgroundAlternate=62,138,204 -BackgroundNormal=122,182,73 +BackgroundNormal=131,175,119 DecorationFocus=93,153,45 DecorationHover=111,153,38 ForegroundActive=255,249,126 @@ -94,10 +94,11 @@ [General] ColorScheme=openSUSE +Name=openSUSE shadeSortColumn=true [KDE] -contrast=7 +contrast=5 [WM] activeBackground=131,175,119 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/color-schemes/openSUSE.colors new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/color-schemes/openSUSE.colors --- old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/color-schemes/openSUSE.colors 2012-11-22 09:31:35.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/color-schemes/openSUSE.colors 2012-11-22 22:23:10.000000000 +0100 @@ -34,7 +34,7 @@ [Colors:Selection] BackgroundAlternate=62,138,204 -BackgroundNormal=122,182,73 +BackgroundNormal=131,175,119 DecorationFocus=93,153,45 DecorationHover=111,153,38 ForegroundActive=255,249,126 @@ -89,8 +89,8 @@ ForegroundVisited=155,82,94 [General] -ColorScheme=Ordinary Green 3 -Name=Ordinary Green 3 +ColorScheme=openSUSE +Name=openSUSE shadeSortColumn=true [KDE] Files old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/widgets/button.svgz and new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/widgets/button.svgz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/widgets/tasks.svgz new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/widgets/tasks.svgz --- old/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/widgets/tasks.svgz 2012-11-22 09:31:35.000000000 +0100 +++ new/kdebase4-openSUSE/config-files/usr/share/kde4/apps/desktoptheme/openSUSE/widgets/tasks.svgz 2012-11-22 22:23:10.000000000 +0100 @@ -43,26 +43,6 @@ <stop stop-color="#485a61" offset="0.00000000000" stop-opacity="1.00000000000"/> <stop stop-color="#485a61" offset="1.00000000000" stop-opacity="0.30200656138"/> </linearGradient> - <linearGradient id="gradient10" gradientTransform="translate(-5, 48.0097)" gradientUnits="objectBoundingBox" x1="0.38461538462" y1="-47.04125369398" x2="1.38461538462" y2="-47.04125369398" spreadMethod="pad"> - <stop stop-color="#485a61" offset="0.00000000000" stop-opacity="1.00000000000"/> - <stop stop-color="#485a61" offset="1.00000000000" stop-opacity="0.30200656138"/> - </linearGradient> - <linearGradient id="gradient11" gradientTransform="translate(-5, 14)" gradientUnits="objectBoundingBox" x1="0.38461538462" y1="-13.34354163689" x2="1.38461538462" y2="-13.34354163689" spreadMethod="pad"> - <stop stop-color="#485a61" offset="0.00000000000" stop-opacity="1.00000000000"/> - <stop stop-color="#485a61" offset="1.00000000000" stop-opacity="0.30200656138"/> - </linearGradient> - <linearGradient id="gradient12" gradientTransform="translate(-16.2929, -3.12132)" gradientUnits="objectBoundingBox" x1="1.04788496296" y1="24.12400600000" x2="1.04788496296" y2="3.12118580000" spreadMethod="pad"> - <stop stop-color="#485a61" offset="0.00000000000" stop-opacity="1.00000000000"/> - <stop stop-color="#485a61" offset="1.00000000000" stop-opacity="0.30200656138"/> - </linearGradient> - <linearGradient id="gradient13" gradientTransform="translate(-43.2929, -3.12132)" gradientUnits="objectBoundingBox" x1="11.82322300000" y1="6.03043075000" x2="11.82322300000" y2="0.78043067500" spreadMethod="pad"> - <stop stop-color="#485a61" offset="0.00000000000" stop-opacity="1.00000000000"/> - <stop stop-color="#485a61" offset="1.00000000000" stop-opacity="0.30200656138"/> - </linearGradient> - <linearGradient id="gradient14" gradientTransform="translate(-12.2929, -3.12132)" gradientUnits="objectBoundingBox" x1="3.07122075000" y1="6.03043075000" x2="3.07122075000" y2="0.78043067500" spreadMethod="pad"> - <stop stop-color="#485a61" offset="0.00000000000" stop-opacity="1.00000000000"/> - <stop stop-color="#485a61" offset="1.00000000000" stop-opacity="0.30200656138"/> - </linearGradient> </defs> <g id="layer0"> <g id="g2424" transform="" fill="none" display="none"/> @@ -78,9 +58,9 @@ <g id="g6640" transform="" fill="none"/> <g id="g6716" transform="" fill="none"/> <g id="g6850" transform="" fill="none" opacity="0.45945943000"/> - <text id="text6990" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(1, 247)"/> + <text id="text6990" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(1, 245.75)"><tspan></tspan></text> <rect id="hint-stretch-borders" transform="translate(4.22259e-06, 0)" fill="#4e9a06" width="1.59999792000pt" height="1.60000000000pt"/> - <text id="text2705" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(24.2777, 231.581)"/> + <text id="text2705" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(24.2777, 230.331)"><tspan></tspan></text> <g id="layer1-5" transform="" fill="none" display="none"/> <g id="layer2-6" transform="" fill="none"/> <g id="g2424-1" transform="" fill="none" display="none"/> @@ -96,7 +76,7 @@ <g id="g6640-0" transform="" fill="none"/> <g id="g6716-4" transform="" fill="none"/> <g id="g6850-4" transform="" fill="none" opacity="0.45945943000"/> - <text id="text6990-4" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-161.668, 324.002)"/> + <text id="text6990-4" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-161.668, 322.752)"><tspan></tspan></text> <g id="g3175" transform="" fill="none" display="none"/> <g id="g3177" transform="" fill="none"/> <g id="g3179" transform="" fill="none" display="none"/> @@ -112,8 +92,8 @@ <g id="g3199" transform="" fill="none"/> <g id="g3201" transform="" fill="none"/> <g id="g3203" transform="" fill="none" opacity="0.45945943000"/> - <text id="text3205" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-202.668, 367.002)"/> - <text id="text2705-6" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-179.391, 351.582)"/> + <text id="text3205" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-202.668, 365.752)"><tspan></tspan></text> + <text id="text2705-6" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-179.391, 350.332)"><tspan></tspan></text> <g id="g3922" transform="" fill="none" display="none"/> <g id="g3387" transform="" fill="none"/> <g id="g3389" transform="" fill="none" display="none"/> @@ -129,7 +109,7 @@ <g id="g3409" transform="" fill="none"/> <g id="g3411" transform="" fill="none"/> <g id="g3413" transform="" fill="none" opacity="0.45945943000"/> - <text id="text3415" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-129.925, 1350.33)"/> + <text id="text3415" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-129.925, 1349.08)"><tspan></tspan></text> <g id="g5744" transform="" fill="none" display="none"/> <g id="g5746" transform="" fill="none"/> <g id="g5748" transform="" fill="none" display="none"/> @@ -145,7 +125,7 @@ <g id="g5768" transform="" fill="none"/> <g id="g5770" transform="" fill="none"/> <g id="g5772" transform="" fill="none" opacity="0.45945943000"/> - <text id="text5774" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-1029.01, 1240.74)"/> + <text id="text5774" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-1029.01, 1239.49)"><tspan></tspan></text> <g id="g3441" transform="" fill="none" display="none"/> <g id="g3443" transform="" fill="none"/> <g id="g3445" transform="" fill="none" display="none"/> @@ -161,7 +141,7 @@ <g id="g3465" transform="" fill="none"/> <g id="g3467" transform="" fill="none"/> <g id="g3469" transform="" fill="none" opacity="0.45945943000"/> - <text id="text3471" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-889.293, 340.002)"/> + <text id="text3471" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-889.293, 338.752)"><tspan></tspan></text> <g id="g3480" transform="" fill="none" display="none"/> <g id="g2817" transform="" fill="none"/> <g id="g2819" transform="" fill="none" display="none"/> @@ -177,7 +157,7 @@ <g id="g2839" transform="" fill="none"/> <g id="g2841" transform="" fill="none"/> <g id="g2843" transform="" fill="none" opacity="0.45945943000"/> - <text id="text2845" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-946.495, 927.024)"/> + <text id="text2845" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-946.495, 925.774)"><tspan></tspan></text> <g id="g3498" transform="" fill="none" display="none"/> <g id="g3500" transform="" fill="none"/> <g id="g3502" transform="" fill="none" display="none"/> @@ -193,7 +173,7 @@ <g id="g3522" transform="" fill="none"/> <g id="g3524" transform="" fill="none"/> <g id="g3526" transform="" fill="none" opacity="0.45945943000"/> - <text id="text3528" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-1845.58, 817.427)"/> + <text id="text3528" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-1845.58, 816.177)"><tspan></tspan></text> <g id="g4763" transform="" fill="none" display="none"/> <g id="g4765" transform="" fill="none"/> <g id="g4767" transform="" fill="none" display="none"/> @@ -209,7 +189,7 @@ <g id="g4787" transform="" fill="none"/> <g id="g4789" transform="" fill="none"/> <g id="g4791" transform="" fill="none" opacity="0.45945943000"/> - <text id="text4793" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-1132.89, 103.77)"/> + <text id="text4793" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-1132.89, 102.52)"><tspan></tspan></text> <g id="g4239" transform="" fill="none"> <g id="g7784" transform="" fill="none"/> </g> @@ -228,7 +208,7 @@ <g id="g7810" transform="" fill="none"/> <g id="g7812" transform="" fill="none"/> <g id="g7814" transform="" fill="none" opacity="0.45945943000"/> - <text id="text7816" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(67.3317, -689.25)"/> + <text id="text7816" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(67.3317, -690.5)"><tspan></tspan></text> <g id="layer4" transform="" fill="none"/> <g id="layer5" transform="" fill="none"/> <rect id="rect1327" transform="translate(-773.032, -646.411)" fill="#ffffff" display="none" opacity="0.57786889000" width="0.80000000000pt" height="0.00000100000pt"/> @@ -252,7 +232,7 @@ <g id="g5499" transform="" fill="none"/> <g id="g5501" transform="" fill="none"/> <g id="g5503" transform="" fill="none" opacity="0.45945943000"/> - <text id="text5505" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-5308.59, -850.5)"/> + <text id="text5505" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-5308.59, -851.75)"><tspan></tspan></text> <g id="g6557" transform="" fill="none" display="none"/> <g id="g6559" transform="" fill="none"/> <g id="g6561" transform="" fill="none" display="none"/> @@ -268,7 +248,7 @@ <g id="g6581" transform="" fill="none"/> <g id="g6583" transform="" fill="none"/> <g id="g6585" transform="" fill="none" opacity="0.45945943000"/> - <text id="text6588" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-571.418, -199.187)"/> + <text id="text6588" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-571.418, -200.437)"><tspan></tspan></text> <g id="g8959" transform="" fill="none" display="none"/> <g id="g8961" transform="" fill="none"/> <g id="g8963" transform="" fill="none" display="none"/> @@ -284,8 +264,8 @@ <g id="g8983" transform="" fill="none"/> <g id="g8985" transform="" fill="none"/> <g id="g9072" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9074" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(2274.33, -1493)"/> - <text id="text7319" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-69.6683, -396.25)"/> + <text id="text9074" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(2274.33, -1494.25)"><tspan></tspan></text> + <text id="text7319" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-69.6683, -397.5)"><tspan></tspan></text> <g id="g9024" transform="" fill="none" display="none"/> <g id="g9026" transform="" fill="none"/> <g id="g9028" transform="" fill="none" display="none"/> @@ -301,7 +281,7 @@ <g id="g9048" transform="" fill="none"/> <g id="g9050" transform="" fill="none"/> <g id="g9052" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9054" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-114.425, 786.361)"/> + <text id="text9054" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-114.425, 785.111)"><tspan></tspan></text> <g id="g9058" transform="" fill="none" display="none"/> <g id="g9060" transform="" fill="none"/> <g id="g9062" transform="" fill="none" display="none"/> @@ -317,7 +297,7 @@ <g id="g9083" transform="" fill="none"/> <g id="g9085" transform="" fill="none"/> <g id="g9087" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9089" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-1013.51, 676.764)"/> + <text id="text9089" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-1013.51, 675.514)"><tspan></tspan></text> <g id="g9145" transform="" fill="none" display="none"/> <g id="g9147" transform="" fill="none"/> <g id="g9149" transform="" fill="none" display="none"/> @@ -333,7 +313,7 @@ <g id="g9169" transform="" fill="none"/> <g id="g9171" transform="" fill="none"/> <g id="g9173" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9175" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-873.793, -223.972)"/> + <text id="text9175" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-873.793, -225.222)"><tspan></tspan></text> <g id="g9179" transform="" fill="none" display="none"/> <g id="g9181" transform="" fill="none"/> <g id="g9183" transform="" fill="none" display="none"/> @@ -349,7 +329,7 @@ <g id="g9203" transform="" fill="none"/> <g id="g9205" transform="" fill="none"/> <g id="g9207" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9209" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-930.995, 363.051)"/> + <text id="text9209" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-930.995, 361.801)"><tspan></tspan></text> <g id="g9213" transform="" fill="none" display="none"/> <g id="g9215" transform="" fill="none"/> <g id="g9217" transform="" fill="none" display="none"/> @@ -365,7 +345,7 @@ <g id="g9237" transform="" fill="none"/> <g id="g9239" transform="" fill="none"/> <g id="g9241" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9243" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-1830.08, 253.453)"/> + <text id="text9243" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-1830.08, 252.203)"><tspan></tspan></text> <g id="g9247" transform="" fill="none" display="none"/> <g id="g9249" transform="" fill="none"/> <g id="g9251" transform="" fill="none" display="none"/> @@ -381,7 +361,7 @@ <g id="g9271" transform="" fill="none"/> <g id="g9273" transform="" fill="none"/> <g id="g9275" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9277" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-1117.39, -460.204)"/> + <text id="text9277" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-1117.39, -461.454)"><tspan></tspan></text> <g id="g9307" transform="" fill="none"> <g id="g9309" transform="" fill="none"/> </g> @@ -400,7 +380,7 @@ <g id="g9335" transform="" fill="none"/> <g id="g9337" transform="" fill="none"/> <g id="g9339" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9341" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(82.8317, -1253.22)"/> + <text id="text9341" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(82.8317, -1254.47)"><tspan></tspan></text> <g id="g9345" transform="" fill="none"/> <g id="g9347" transform="" fill="none"/> <rect id="rect9349" transform="translate(-757.532, -1210.38)" fill="#ffffff" display="none" opacity="0.57786889000" width="0.80000000000pt" height="0.00000100000pt"/> @@ -424,7 +404,7 @@ <g id="g9385" transform="" fill="none"/> <g id="g9387" transform="" fill="none"/> <g id="g9389" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9391" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-5293.09, -1414.47)"/> + <text id="text9391" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-5293.09, -1415.72)"><tspan></tspan></text> <g id="g9395" transform="" fill="none" display="none"/> <g id="g9397" transform="" fill="none"/> <g id="g9399" transform="" fill="none" display="none"/> @@ -440,7 +420,7 @@ <g id="g9419" transform="" fill="none"/> <g id="g9421" transform="" fill="none"/> <g id="g9423" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9425" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-555.918, -763.161)"/> + <text id="text9425" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-555.918, -764.411)"><tspan></tspan></text> <g id="g9429" transform="" fill="none" display="none"/> <g id="g9431" transform="" fill="none"/> <g id="g9433" transform="" fill="none" display="none"/> @@ -456,8 +436,8 @@ <g id="g9453" transform="" fill="none"/> <g id="g9455" transform="" fill="none"/> <g id="g9457" transform="" fill="none" opacity="0.45945943000"/> - <text id="text9459" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(2289.83, -2056.97)"/> - <text id="text9463" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-54.1683, -960.223)"/> + <text id="text9459" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(2289.83, -2058.22)"><tspan></tspan></text> + <text id="text9463" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-54.1683, -961.473)"><tspan></tspan></text> <g id="g4418" transform="" fill="none" display="none"/> <g id="layer2-0" transform="" fill="none"/> <g id="g2424-9" transform="" fill="none" display="none"/> @@ -473,7 +453,7 @@ <g id="g6640-6" transform="" fill="none"/> <g id="g6716-0" transform="" fill="none"/> <g id="g6850-46" transform="" fill="none" opacity="0.45945943000"/> - <text id="text6990-7" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(333.555, -201.858)"/> + <text id="text6990-7" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(333.555, -203.108)"><tspan></tspan></text> <g id="g5909" transform="" fill="none" display="none"/> <g id="g5911" transform="" fill="none"/> <g id="g5913" transform="" fill="none" display="none"/> @@ -489,7 +469,7 @@ <g id="g5933" transform="" fill="none"/> <g id="g5935" transform="" fill="none"/> <g id="g5937" transform="" fill="none" opacity="0.45945943000"/> - <text id="text5939" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(277.333, -580.959)"/> + <text id="text5939" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(277.333, -582.209)"><tspan></tspan></text> <g id="g4240" transform="" fill="none" display="none"/> <g id="g4242" transform="" fill="none"/> <g id="g4244" transform="" fill="none" display="none"/> @@ -505,7 +485,7 @@ <g id="g4264" transform="" fill="none"/> <g id="g4266" transform="" fill="none"/> <g id="g4268" transform="" fill="none" opacity="0.45945943000"/> - <text id="text4270" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-188.787, -269.102)"/> + <text id="text4270" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-188.787, -270.352)"><tspan></tspan></text> <g id="g4418-7" transform="" fill="none" display="none"/> <g id="layer2-5" transform="" fill="none"/> <g id="g2424-4" transform="" fill="none" display="none"/> @@ -521,7 +501,7 @@ <g id="g6640-67" transform="" fill="none"/> <g id="g6716-43" transform="" fill="none"/> <g id="g6850-0" transform="" fill="none" opacity="0.45945943000"/> - <text id="text6990-9" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(309.555, -185.858)"/> + <text id="text6990-9" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(309.555, -187.108)"><tspan></tspan></text> <g id="g5909-0" transform="" fill="none" display="none"/> <g id="g5911-4" transform="" fill="none"/> <g id="g5913-5" transform="" fill="none" display="none"/> @@ -537,7 +517,7 @@ <g id="g5933-1" transform="" fill="none"/> <g id="g5935-7" transform="" fill="none"/> <g id="g5937-7" transform="" fill="none" opacity="0.45945943000"/> - <text id="text5939-8" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(253.333, -564.959)"/> + <text id="text5939-8" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(253.333, -566.209)"><tspan></tspan></text> <g id="g4240-8" transform="" fill="none" display="none"/> <g id="g4242-9" transform="" fill="none"/> <g id="g4244-7" transform="" fill="none" display="none"/> @@ -553,7 +533,7 @@ <g id="g4264-8" transform="" fill="none"/> <g id="g4266-0" transform="" fill="none"/> <g id="g4268-6" transform="" fill="none" opacity="0.45945943000"/> - <text id="text4270-2" fill="#000000" x="0.00000000000pt" y="24.00000000000pt" transform="translate(-212.787, -253.102)"/> + <text id="text4270-2" fill="#000000" font-family="Lato" font-size="9.50000000000pt" x="0.00000000000pt" y="25.00000000000pt" transform="translate(-212.787, -254.352)"><tspan></tspan></text> <g id="focus-center" transform="translate(3.375, 11.375)" fill="none"> <rect id="rect3497" transform="matrix(1 0 0 -1 0.625 13.625)" fill="#131718" opacity="0.80000000000" width="21.60000000000pt" height="10.40000000000pt"/> </g> @@ -569,13 +549,13 @@ <rect id="rect3517" transform="matrix(0 -1 -0.988992 0 4.61812 13.625)" fill="#131718" opacity="0.80000000000" width="10.40000000000pt" height="3.23561856000pt"/> <rect id="rect3519" transform="matrix(0 -1 -0.988992 0 4.61266 13.625)" fill="url(#gradient0)" width="10.40000000000pt" height="0.80780160000pt"/> </g> - <g id="focus-left" transform="translate(-0.617756, 11.375)" fill="none"> + <g id="focus-left" transform="translate(-0.617752, 11.375)" fill="none"> <rect id="rect3535" transform="matrix(0 -1 -0.98841 0 4.61776 13.625)" fill="#131718" opacity="0.80000000000" width="10.40000000000pt" height="3.23752216000pt"/> <rect id="rect3537" transform="matrix(0 -1 -0.98841 0 1.61776 13.625)" fill="url(#gradient1)" width="10.40000000000pt" height="0.80938032000pt"/> </g> - <g id="focus-bottomleft" transform="translate(-0.623749, 24.375)" fill="none"> - <path id="path3541" transform="matrix(0.998001 0 0 -1 0.623749 4.625)" fill="#131718" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path3543" transform="matrix(0.998001 0 0 -1 0.631744 4.625)" fill="#485a61" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="focus-bottomleft" transform="translate(-0.623748, 24.375)" fill="none"> + <path id="path3541" transform="matrix(0.998001 0 0 -1 0.623748 4.625)" fill="#131718" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> + <path id="path3543" transform="matrix(0.998001 0 0 -1 0.631743 4.625)" fill="#485a61" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> </g> <g id="focus-top" transform="translate(3.375, 7.37468)" fill="none"> <rect id="rect4692" transform="matrix(1 0 0 0.999866 0.625 0.624916)" fill="#131718" opacity="0.80000000000" width="21.60000000000pt" height="3.20042992000pt"/> @@ -585,9 +565,9 @@ <path id="path4698" transform="translate(0.625, 0.625)" fill="#131718" opacity="0.80000000000" d="M4 4L0 4L0 0C2.96698 0 3.95597 1.01372 4 4Z"/> <path id="path4700" transform="translate(0.625001, 0.625)" fill="url(#gradient3)" d="M0 1L0 0C3 0 4 1 4 4L3 4C3 2 2 1 0 1Z"/> </g> - <g id="focus-topleft" transform="translate(-0.623749, 7.3746)" fill="none"> - <path id="path4704" transform="matrix(0.998001 0 0 1 0.623749 0.625)" fill="#131718" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path4706" transform="matrix(0.998001 0 0 1 0.631744 0.625)" fill="url(#gradient4)" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="focus-topleft" transform="translate(-0.623748, 7.3746)" fill="none"> + <path id="path4704" transform="matrix(0.998001 0 0 1 0.623748 0.625)" fill="#131718" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> + <path id="path4706" transform="matrix(0.998001 0 0 1 0.631743 0.625)" fill="url(#gradient4)" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> </g> <g id="normal-center" transform="translate(3.375, 38.3754)" fill="none"> <g id="g6358" transform="" fill="none"> @@ -606,13 +586,13 @@ <rect id="rect6376" transform="matrix(0 -1 -0.988992 0 4.61812 13.625)" fill="#131718" opacity="0.40000000000" width="10.40000000000pt" height="3.23561856000pt"/> <rect id="rect6378" transform="matrix(0 -1 -0.988992 0 4.61266 13.625)" fill="url(#gradient5)" opacity="0.40000000000" width="10.40000000000pt" height="0.80780160000pt"/> </g> - <g id="normal-left" transform="translate(-0.617756, 38.3754)" fill="none"> + <g id="normal-left" transform="translate(-0.617752, 38.3754)" fill="none"> <rect id="rect6382" transform="matrix(0 -1 -0.98841 0 4.61776 13.625)" fill="#131718" opacity="0.40000000000" width="10.40000000000pt" height="3.23752216000pt"/> <rect id="rect6384" transform="matrix(0 -1 -0.98841 0 1.61776 13.625)" fill="url(#gradient6)" opacity="0.40000000000" width="10.40000000000pt" height="0.80938032000pt"/> </g> - <g id="normal-bottomleft" transform="translate(-0.623749, 51.3754)" fill="none"> - <path id="path6388" transform="matrix(0.998001 0 0 -1 0.623749 4.625)" fill="#131718" opacity="0.40000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path6390" transform="matrix(0.998001 0 0 -1 0.631744 4.625)" fill="#485a61" opacity="0.40000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="normal-bottomleft" transform="translate(-0.623748, 51.3754)" fill="none"> + <path id="path6388" transform="matrix(0.998001 0 0 -1 0.623748 4.625)" fill="#131718" opacity="0.40000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> + <path id="path6390" transform="matrix(0.998001 0 0 -1 0.631743 4.625)" fill="#485a61" opacity="0.40000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> </g> <g id="normal-top" transform="translate(3.375, 34.3751)" fill="none"> <rect id="rect6394" transform="matrix(1 0 0 0.999866 0.625 0.624916)" fill="#131718" opacity="0.40000000000" width="21.60000000000pt" height="3.20042992000pt"/> @@ -622,9 +602,9 @@ <path id="path6400" transform="translate(0.625, 0.625)" fill="#131718" opacity="0.40000000000" d="M4 4L0 4L0 0C2.96698 0 3.95597 1.01372 4 4Z"/> <path id="path6402" transform="translate(0.625001, 0.625)" fill="url(#gradient8)" opacity="0.40000000000" d="M0 1L0 0C3 0 4 1 4 4L3 4C3 2 2 1 0 1Z"/> </g> - <g id="normal-topleft" transform="translate(-0.623749, 34.375)" fill="none"> - <path id="path6406" transform="matrix(0.998001 0 0 1 0.623749 0.625)" fill="#131718" opacity="0.40000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path6408" transform="matrix(0.998001 0 0 1 0.631744 0.625)" fill="url(#gradient9)" opacity="0.40000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="normal-topleft" transform="translate(-0.623748, 34.375)" fill="none"> + <path id="path6406" transform="matrix(0.998001 0 0 1 0.623748 0.625)" fill="#131718" opacity="0.40000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> + <path id="path6408" transform="matrix(0.998001 0 0 1 0.631743 0.625)" fill="url(#gradient9)" opacity="0.40000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> </g> <g id="minimized-center" transform="translate(3.375, 63.375)" fill="none"> <g id="g7614" transform="" fill="none"> @@ -633,35 +613,27 @@ </g> <g id="minimized-bottom" transform="translate(3.375, 76.3751)" fill="none"> <rect id="rect7620" transform="matrix(1 0 0 -0.999866 0.625 4.62492)" fill="#131718" opacity="0.10000000000" width="21.60000000000pt" height="3.20042992000pt"/> - <rect id="rect7622" transform="matrix(1 0 0 -0.999866 0.625 4.62438)" fill="#485a61" opacity="0.40000000000" width="21.60000000000pt" height="0.80000000000pt"/> </g> <g id="minimized-bottomright" transform="translate(30.375, 76.375)" fill="none"> <path id="path7626" transform="matrix(1 0 0 -1 0.625 4.625)" fill="#131718" opacity="0.10000000000" d="M4 4L0 4L0 0C2.96698 0 3.95597 1.01372 4 4Z"/> - <path id="path7628" transform="matrix(1 0 0 -1 0.625001 4.625)" fill="#485a61" opacity="0.40000000000" d="M0 1L0 0C3 0 4 1 4 4L3 4C3 2 2 1 0 1Z"/> </g> <g id="minimized-bright" transform="translate(30.3819, 63.375)" fill="none"> <rect id="rect7632" transform="matrix(0 -1 -0.988992 0 4.61812 13.625)" fill="#131718" opacity="0.10000000000" width="10.40000000000pt" height="3.23561856000pt"/> - <rect id="rect7634" transform="matrix(0 -1 -0.988992 0 4.61266 13.625)" fill="url(#gradient10)" opacity="0.40000000000" width="10.40000000000pt" height="0.80780160000pt"/> </g> - <g id="minimized-left" transform="translate(-0.617756, 63.375)" fill="none"> + <g id="minimized-left" transform="translate(-0.617752, 63.375)" fill="none"> <rect id="rect7638" transform="matrix(0 -1 -0.98841 0 4.61776 13.625)" fill="#131718" opacity="0.10000000000" width="10.40000000000pt" height="3.23752216000pt"/> - <rect id="rect7640" transform="matrix(0 -1 -0.98841 0 1.61776 13.625)" fill="url(#gradient11)" opacity="0.40000000000" width="10.40000000000pt" height="0.80938032000pt"/> </g> - <g id="minimized-bottomleft" transform="translate(-0.623749, 76.375)" fill="none"> - <path id="path7644" transform="matrix(0.998001 0 0 -1 0.623749 4.625)" fill="#131718" opacity="0.10000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path7646" transform="matrix(0.998001 0 0 -1 0.631744 4.625)" fill="#485a61" opacity="0.40000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="minimized-bottomleft" transform="translate(-0.623748, 76.375)" fill="none"> + <path id="path7644" transform="matrix(0.998001 0 0 -1 0.623748 4.625)" fill="#131718" opacity="0.10000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> </g> <g id="minimized-top" transform="translate(3.375, 59.3747)" fill="none"> <rect id="rect7650" transform="matrix(1 0 0 0.999866 0.625 0.624916)" fill="#131718" opacity="0.10000000000" width="21.60000000000pt" height="3.20042992000pt"/> - <rect id="rect7652" transform="matrix(1 0 0 0.999866 0.625 0.625453)" fill="url(#gradient12)" opacity="0.40000000000" width="21.60000000000pt" height="0.80000000000pt"/> </g> <g id="minimized-topright" transform="translate(30.375, 59.3746)" fill="none"> <path id="path7656" transform="translate(0.625, 0.625)" fill="#131718" opacity="0.10000000000" d="M4 4L0 4L0 0C2.96698 0 3.95597 1.01372 4 4Z"/> - <path id="path7658" transform="translate(0.625001, 0.625)" fill="url(#gradient13)" opacity="0.40000000000" d="M0 1L0 0C3 0 4 1 4 4L3 4C3 2 2 1 0 1Z"/> </g> - <g id="minimized-topleft" transform="translate(-0.623749, 59.3746)" fill="none"> - <path id="path7662" transform="matrix(0.998001 0 0 1 0.623749 0.625)" fill="#131718" opacity="0.10000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path7664" transform="matrix(0.998001 0 0 1 0.631744 0.625)" fill="url(#gradient14)" opacity="0.40000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="minimized-topleft" transform="translate(-0.623748, 59.3746)" fill="none"> + <path id="path7662" transform="matrix(0.998001 0 0 1 0.623748 0.625)" fill="#131718" opacity="0.10000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> </g> <g id="hover-center" transform="translate(3.375, 88.375)" fill="none"> <g id="g8934" transform="" fill="none"> @@ -680,13 +652,13 @@ <rect id="rect8952" transform="matrix(0 -1 -0.988992 0 4.61812 13.625)" fill="#131718" opacity="0.80000000000" width="10.40000000000pt" height="3.23561856000pt"/> <rect id="rect8954" transform="matrix(0 -1 -0.988992 0 4.61266 13.625)" fill="#5d992d" opacity="0.80000000000" width="10.40000000000pt" height="0.80780160000pt"/> </g> - <g id="hover-left" transform="translate(-0.617756, 88.375)" fill="none"> + <g id="hover-left" transform="translate(-0.617752, 88.375)" fill="none"> <rect id="rect8958" transform="matrix(0 -1 -0.98841 0 4.61776 13.625)" fill="#131718" opacity="0.80000000000" width="10.40000000000pt" height="3.23752216000pt"/> <rect id="rect8960" transform="matrix(0 -1 -0.98841 0 1.61776 13.625)" fill="#5d992d" opacity="0.80000000000" width="10.40000000000pt" height="0.80938032000pt"/> </g> - <g id="hover-bottomleft" transform="translate(-0.623749, 101.375)" fill="none"> - <path id="path8964" transform="matrix(0.998001 0 0 -1 0.623749 4.625)" fill="#131718" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path8966" transform="matrix(0.998001 0 0 -1 0.631744 4.625)" fill="#5d992d" opacity="0.80000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="hover-bottomleft" transform="translate(-0.623748, 101.375)" fill="none"> + <path id="path8964" transform="matrix(0.998001 0 0 -1 0.623748 4.625)" fill="#131718" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> + <path id="path8966" transform="matrix(0.998001 0 0 -1 0.631743 4.625)" fill="#5d992d" opacity="0.80000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> </g> <g id="hover-top" transform="translate(3.375, 84.3747)" fill="none"> <rect id="rect8970" transform="matrix(1 0 0 0.999866 0.625 0.624916)" fill="#131718" opacity="0.80000000000" width="21.60000000000pt" height="3.20042992000pt"/> @@ -696,9 +668,9 @@ <path id="path8976" transform="translate(0.625, 0.625)" fill="#131718" opacity="0.80000000000" d="M4 4L0 4L0 0C2.96698 0 3.95597 1.01372 4 4Z"/> <path id="path8978" transform="translate(0.625001, 0.625)" fill="#5d992d" opacity="0.80000000000" d="M0 1L0 0C3 0 4 1 4 4L3 4C3 2 2 1 0 1Z"/> </g> - <g id="hover-topleft" transform="translate(-0.623749, 84.3746)" fill="none"> - <path id="path8982" transform="matrix(0.998001 0 0 1 0.623749 0.625)" fill="#131718" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path8984" transform="matrix(0.998001 0 0 1 0.631744 0.625)" fill="#5d992d" opacity="0.80000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="hover-topleft" transform="translate(-0.623748, 84.3746)" fill="none"> + <path id="path8982" transform="matrix(0.998001 0 0 1 0.623748 0.625)" fill="#131718" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> + <path id="path8984" transform="matrix(0.998001 0 0 1 0.631743 0.625)" fill="#5d992d" opacity="0.80000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> </g> <g id="attention-center" transform="translate(3.375, 113.375)" fill="none" opacity="0.80000000000"> <g id="g12562" transform="" fill="none"> @@ -717,13 +689,13 @@ <rect id="rect12580" transform="matrix(0 -1 -0.988992 0 4.61812 13.625)" fill="#5d992d" opacity="0.80000000000" width="10.40000000000pt" height="3.23561856000pt"/> <rect id="rect12582" transform="matrix(0 -1 -0.988992 0 4.61266 13.625)" fill="#5d992d" opacity="0.80000000000" width="10.40000000000pt" height="0.80780160000pt"/> </g> - <g id="attention-left" transform="translate(-0.617756, 113.375)" fill="none" opacity="0.80000000000"> + <g id="attention-left" transform="translate(-0.617752, 113.375)" fill="none" opacity="0.80000000000"> <rect id="rect12586" transform="matrix(0 -1 -0.98841 0 4.61776 13.625)" fill="#5d992d" opacity="0.80000000000" width="10.40000000000pt" height="3.23752216000pt"/> <rect id="rect12588" transform="matrix(0 -1 -0.98841 0 1.61776 13.625)" fill="#5d992d" opacity="0.80000000000" width="10.40000000000pt" height="0.80938032000pt"/> </g> - <g id="attention-bottomleft" transform="translate(-0.623749, 126.375)" fill="none" opacity="0.80000000000"> - <path id="path12592" transform="matrix(0.998001 0 0 -1 0.623749 4.625)" fill="#5d992d" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path12594" transform="matrix(0.998001 0 0 -1 0.631744 4.625)" fill="#5d992d" opacity="0.80000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="attention-bottomleft" transform="translate(-0.623748, 126.375)" fill="none" opacity="0.80000000000"> + <path id="path12592" transform="matrix(0.998001 0 0 -1 0.623748 4.625)" fill="#5d992d" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> + <path id="path12594" transform="matrix(0.998001 0 0 -1 0.631743 4.625)" fill="#5d992d" opacity="0.80000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> </g> <g id="attention-top" transform="translate(3.375, 109.375)" fill="none" opacity="0.80000000000"> <rect id="rect12598" transform="matrix(1 0 0 0.999866 0.625 0.624916)" fill="#5d992d" opacity="0.80000000000" width="21.60000000000pt" height="3.20042992000pt"/> @@ -733,9 +705,9 @@ <path id="path12604" transform="translate(0.625, 0.625)" fill="#5d992d" opacity="0.80000000000" d="M4 4L0 4L0 0C2.96698 0 3.95597 1.01372 4 4Z"/> <path id="path12606" transform="translate(0.625001, 0.625)" fill="#5d992d" opacity="0.80000000000" d="M0 1L0 0C3 0 4 1 4 4L3 4C3 2 2 1 0 1Z"/> </g> - <g id="attention-topleft" transform="translate(-0.623749, 109.375)" fill="none" opacity="0.80000000000"> - <path id="path12610" transform="matrix(0.998001 0 0 1 0.623749 0.625)" fill="#5d992d" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> - <path id="path12612" transform="matrix(0.998001 0 0 1 0.631744 0.625)" fill="#5d992d" opacity="0.80000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> + <g id="attention-topleft" transform="translate(-0.623748, 109.375)" fill="none" opacity="0.80000000000"> + <path id="path12610" transform="matrix(0.998001 0 0 1 0.623748 0.625)" fill="#5d992d" opacity="0.80000000000" d="M4.00801 0L4.00801 4L0 4C0.0079 1.01372 0.998911 0 4.00801 0Z"/> + <path id="path12612" transform="matrix(0.998001 0 0 1 0.631743 0.625)" fill="#5d992d" opacity="0.80000000000" d="M4 1L4 0C1 0 0 1 0 4L1 4C1 2 2 1 4 1Z"/> </g> </g> </svg> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit IPython for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package IPython for openSUSE:Factory checked in at 2012-12-03 09:40:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/IPython (Old) and /work/SRC/openSUSE:Factory/.IPython.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "IPython", Maintainer is "JMatejek(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/IPython/python3-IPython.changes 2012-11-24 21:10:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.IPython.new/python3-IPython.changes 2012-12-03 09:40:21.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Nov 30 14:04:52 UTC 2012 - toddrme2178(a)gmail.com + +- Fix building on openSUSE 12.1 and 12.2 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-IPython.spec ++++++ --- /var/tmp/diff_new_pack.g9jCo4/_old 2012-12-03 09:40:22.000000000 +0100 +++ /var/tmp/diff_new_pack.g9jCo4/_new 2012-12-03 09:40:22.000000000 +0100 @@ -26,6 +26,7 @@ Summary: An Enhanced Interactive Python Shell License: LGPL-2.1+ Group: Development/Languages/Python +BuildRequires: python3 BuildRequires: python3-2to3 BuildRequires: python3-devel BuildRequires: python3-distribute -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit hplip for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package hplip for openSUSE:Factory checked in at 2012-12-03 09:39:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hplip (Old) and /work/SRC/openSUSE:Factory/.hplip.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hplip", Maintainer is "jsmeix(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hplip/hplip.changes 2012-10-12 08:11:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hplip.new/hplip.changes 2012-12-03 09:39:33.000000000 +0100 @@ -1,0 +2,15 @@ +Thu Nov 29 15:27:51 CET 2012 - jsmeix(a)suse.de + +- Version upgrade to 3.12.11: + Several more supported printers and all-in-one devices + (in particular several "HP LaserJet Enterprise" models). + Several bug fixes. + For details see + http://hplipopensource.com/hplip-web/release_notes.html +- fix-no-return-in-nonvoid-function.diff is no longer needed + because it is now completely fixed in the upstream sources. +- disable-chgrp_lp.diff replaces no-chgrp_lp_hplip_Logdir.diff + and does basically the same but is adapted for HPLIP 3.12.11. +- Adapted no-hplip_cron.diff for HPLIP 3.12.11. + +------------------------------------------------------------------- @@ -47 +62 @@ -- Fixed fix-no-return-in-nonvoid-function.diff because +- Adapted fix-no-return-in-nonvoid-function.diff because Old: ---- fix-no-return-in-nonvoid-function.diff hplip-3.12.10a.tar.gz no-chgrp_lp_hplip_Logdir.diff New: ---- disable-chgrp_lp.diff hplip-3.12.11.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hplip.spec ++++++ --- /var/tmp/diff_new_pack.TOLyjW/_old 2012-12-03 09:39:36.000000000 +0100 +++ /var/tmp/diff_new_pack.TOLyjW/_new 2012-12-03 09:39:36.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: hplip # BuildRequires foomatic-filters to avoid /usr/lib/rpm/brp-symlink ERROR: # link target doesn't exist (neither in build root nor in installed system): @@ -53,17 +54,20 @@ License: BSD-3-Clause and GPL-2.0+ and MIT Group: Hardware/Printing # HPLIP has reached 1.0 status. With this release a date encoded revision number is used: -# x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) +# x.y.m : x = major release number, y = year (e.g.: 12 = 2012), m = month (e.g.: 10 = October) +# additionally the month could have an 'a' 'b' 'c' suffix (e.g.: 10a = second release in October) +# where 'a' or 'b' do not mean 'alpha' or 'beta' but 'second' or 'third' release in the month +# (usually bugfix releases have the suffix like 3.12.10a = first bugfix release for 3.12.10). # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc -Version: 3.12.10a +Version: 3.12.11 Release: 0 Url: http://hplipopensource.com # Source0...Source9 is for sources from HP: -# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.10a.tar.gz -# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.10a.tar.gz.asc +# URL for Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.11.tar.gz +# URL to verify Source0: http://prdownloads.sourceforge.net/hplip/hplip-3.12.11.tar.gz.asc # How to verify Source0 see: http://hplipopensource.com/node/327 # For example: /usr/bin/gpg --keyserver pgp.mit.edu --recv-keys 0xA59047B9 -# /usr/bin/gpg --verify hplip-3.12.10a.tar.gz.asc hplip-3.12.10a.tar.gz +# /usr/bin/gpg --verify hplip-3.12.11.tar.gz.asc hplip-3.12.11.tar.gz # must result: Good signature from "HPLIP (HP Linux Imaging and Printing) <hplip(a)hp.com>" Source0: hplip-%{version}.tar.gz # Patch0...Patch9 is for patches from HP: @@ -73,10 +77,6 @@ # Patch11 fix_gcc44_glib.diff is obsolete since version 3.9.6b because it is fixed in the source. # Patch12 hplip-3.9.8-CVE-2010-4267.patch fixes a remote buffer overflow in hpmud/pml.c: Patch12: hplip-3.9.8-CVE-2010-4267.patch -# Fix validation errors about no return values for non-void functions. -# An upstream bug report is open at -# https://bugs.launchpad.net/hplip/+bug/1017496 -Patch13: fix-no-return-in-nonvoid-function.diff # Source100... is for special Suse sources: # Source100 is the primary source for the suse_update_desktop_file stuff. # It is found automatically in $RPM_SOURCE_DIR by 'suse_update_desktop_file -i hplip': @@ -104,11 +104,13 @@ # Patch100... is for special Suse patches: # Patch101 changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules: Patch101: change-udev-rules.diff -# Patch102 no-chgrp_lp_hplip_Logdir.diff deactivates the "chgrp lp -R /var/log/hp" in Makefile.am -# because during install this results "Operation not permitted" -# this is done in the files section via attr(0774,root,lp) -# where mode 0774 matches to what is set in Makefile.am: -Patch102: no-chgrp_lp_hplip_Logdir.diff +# Patch102 disable-chgrp_lp.diff deactivates the "chgrp lp" in Makefile.am +# because during build this results "Operation not permitted". +# Instead it is done in the files section via attr(0775,root,lp) +# where mode 0775 is used instead of mode 0777 as in Makefile.am +# because a public writable directory /var/log/hp/ is not allowed +# to avoid security issues: +Patch102: disable-chgrp_lp.diff # Patch103 no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am # because it lets build fail on SLE11 products (possibly an autoconf issue) # and we (i.e. SUSE) do not allow to install /etc/cron.daily/hplip_cron @@ -318,16 +320,15 @@ # Patch12 hplip-3.9.8-CVE-2010-4267.patch # fixes a remote buffer overflow in hpmud/pml.c: %patch12 -# Patch13 fix-no-return-in-nonvoid-function.diff -# fixes no-return-in-nonvoid-function errors -%patch13 # Patch101 change-udev-rules.diff # changes the udev rules files 55-hpmud.rules and 56-hpmud_support.rules: %patch101 -# Patch102 no-chgrp_lp_hplip_Logdir.diff deactivates the "chgrp lp -R /var/log/hp" in Makefile.am -# because during install this results "Operation not permitted" -# this is done in the files section via attr(0774,root,lp) -# where mode 0774 matches to what is set in Makefile.am: +# Patch102 disable-chgrp_lp.diff deactivates the "chgrp lp" in Makefile.am +# because during build this results "Operation not permitted". +# Instead it is done in the files section via attr(0775,root,lp) +# where mode 0775 is used instead of mode 0777 as in Makefile.am +# because a public writable directory /var/log/hp/ is not allowed +# to avoid security issues: %patch102 # Patch103 no-hplip_cron.diff deactivates the "cron" stuff in Makefile.am # because it lets build fail on SLE11 products (possibly an autoconf issue) @@ -507,8 +508,16 @@ # Change /etc/xdg/autostart/hplip-systray.desktop to call hp-systray.wrapper: sed -i -e '/^Exec=hp-systray$/s/hp-systray/hp-systray.wrapper/;' %{buildroot}/etc/xdg/autostart/hplip-systray.desktop # End of "Desktop autostart notification tray stuff". -# Find duplicate files: -%fdupes -s %{buildroot} +# Run fdupes: +# The RPM macro fdupes runs /usr/bin/fdupes that links files with identical content. +# Never run fdupes carelessly over the whole buildroot directory +# because in older openSUSE and SLE11 versions fdupes +# links files with different owner, group, or permissions +# see https://bugzilla.novell.com/show_bug.cgi?id=784670 +# and even in current openSUSE versions fdupes links across sub-package boundaries, +# compare https://bugzilla.novell.com/show_bug.cgi?id=784869 +# so that fdupes can only run for specific directories where linking files is safe: +%fdupes -s %{buildroot}/%{_datadir}/hplip/data/images %post %if 0%{?suse_version} > 1130 @@ -665,8 +674,8 @@ %{_datadir}/cups/model/manufacturer-PPDs/%{name}/ %{_datadir}/%{name}/data/models/models.dat # Use fixed "/var/log/hp" because this is hardcoded in the HPLIP sources. -# Regarding attr(0774,root,lp) see no-chgrp_lp_hplip_Logdir.diff (Patch102): -%dir %attr(0774,root,lp) /var/log/hp +# Regarding attr(0775,root,lp) see disable-chgrp_lp.diff (Patch102): +%dir %attr(0775,root,lp) /var/log/hp # Use fixed "/var/lib/hp" because this is hardcoded in the HPLIP sources: %dir /var/lib/hp ++++++ disable-chgrp_lp.diff ++++++ --- Makefile.am.orig 2012-11-20 10:55:15.000000000 +0100 +++ Makefile.am 2012-11-29 16:08:51.000000000 +0100 @@ -552,24 +552,24 @@ endif install-dist_hplip_LogDATA: if FULL_BUILD test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) - chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) chmod 777 $(DESTDIR)$(hplip_Logdir) endif #FULL_BUILD if HPLIP_BUILD test -z "$(DESTDIR)$(hplip_Logdir)" || mkdir -p $(DESTDIR)$(hplip_Logdir) - chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_Logdir) chmod 777 $(DESTDIR)$(hplip_Logdir) endif #FULL_BUILD install-dist_hplip_tmpDATA: if FULL_BUILD test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) - chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) chmod 1777 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD if HPLIP_BUILD test -z "$(DESTDIR)$(hplip_tmpdir)" || mkdir -p $(DESTDIR)$(hplip_tmpdir) - chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) +# chgrp "lp" -R $(DESTDIR)$(hplip_tmpdir) chmod 1777 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD ++++++ hplip-3.12.10a.tar.gz -> hplip-3.12.11.tar.gz ++++++ /work/SRC/openSUSE:Factory/hplip/hplip-3.12.10a.tar.gz /work/SRC/openSUSE:Factory/.hplip.new/hplip-3.12.11.tar.gz differ: char 5, line 1 ++++++ no-hplip_cron.diff ++++++ --- /var/tmp/diff_new_pack.TOLyjW/_old 2012-12-03 09:39:36.000000000 +0100 +++ /var/tmp/diff_new_pack.TOLyjW/_new 2012-12-03 09:39:36.000000000 +0100 @@ -1,5 +1,5 @@ ---- Makefile.am.after-no-chgrp_lp_hplip_Logdir.diff 2012-09-28 15:17:30.000000000 +0200 -+++ Makefile.am 2012-09-28 15:19:34.000000000 +0200 +--- Makefile.am.disable-chgrp_lp.diff.applied 2012-11-29 16:49:56.000000000 +0100 ++++ Makefile.am 2012-11-29 16:51:13.000000000 +0100 @@ -107,8 +107,8 @@ hp_mkuri_LDADD = -ldl libhpmud.la hp_mkuri_CFLAGS = -DCONFDIR=\"$(hplip_confdir)\" @@ -12,7 +12,7 @@ # hpmud.rules rulesdir = /etc/udev/rules.d @@ -573,17 +573,17 @@ if HPLIP_BUILD - chmod 1774 $(DESTDIR)$(hplip_tmpdir) + chmod 1777 $(DESTDIR)$(hplip_tmpdir) endif #FULL_BUILD -install-dist_cronDATA:$(dist_cron_DATA) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gnutls for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package gnutls for openSUSE:Factory checked in at 2012-12-03 09:36:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnutls (Old) and /work/SRC/openSUSE:Factory/.gnutls.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gnutls", Maintainer is "GJHe(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/gnutls/gnutls.changes 2012-11-28 10:29:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gnutls.new/gnutls.changes 2012-12-03 09:36:30.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Nov 27 20:31:26 UTC 2012 - crrodriguez(a)opensuse.org + +- Test suite breaks on qemu-arm some calls not implemented. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnutls.spec ++++++ --- /var/tmp/diff_new_pack.cVrvaA/_old 2012-12-03 09:36:32.000000000 +0100 +++ /var/tmp/diff_new_pack.cVrvaA/_new 2012-12-03 09:36:32.000000000 +0100 @@ -158,7 +158,9 @@ %find_lang libgnutls --all-name %check +%if ! 0%{?qemu_user_space_build} %__make check +%endif %clean rm -rf %{buildroot} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glibc for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package glibc for openSUSE:Factory checked in at 2012-12-03 09:35:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glibc (Old) and /work/SRC/openSUSE:Factory/.glibc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibc", Maintainer is "schwab(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/glibc/glibc.changes 2012-11-29 10:12:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.glibc.new/glibc.changes 2012-12-03 09:35:10.000000000 +0100 @@ -1,0 +2,24 @@ +Sat Dec 1 08:55:05 UTC 2012 - aj(a)suse.de + +- Update to f638872ab422: + Fix regression introduced with last update in sunrpc code + Fix assertion failure in resolver + Bug fixes +- Remove upstreamed patch glibc-resolv-assert.diff + +------------------------------------------------------------------- +Fri Nov 30 09:15:15 UTC 2012 - aj(a)suse.de + +- Update to c93ec1f091ec: + Warn about unsupported DT_FLAGS_1 flags + Add Interlingua locale + Bug fixes + +------------------------------------------------------------------- +Thu Nov 29 14:30:11 UTC 2012 - schwab(a)suse.de + +- Remove obsolete patches: + glibc-strict-aliasing.diff + nscd-avoid-gcc-warning.diff + +------------------------------------------------------------------- Old: ---- glibc-2.16.90-e3c6aa3a5848.tar.xz glibc-resolv-assert.diff glibc-strict-aliasing.diff nscd-avoid-gcc-warning.diff New: ---- glibc-2.16.90-f638872ab422.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.yxboK0/_old 2012-12-03 09:35:12.000000000 +0100 +++ /var/tmp/diff_new_pack.yxboK0/_new 2012-12-03 09:35:12.000000000 +0100 @@ -123,7 +123,7 @@ Version: 2.16.90 Release: 0 %define glibc_major_version 2.16.90 -%define git_id e3c6aa3a5848 +%define git_id f638872ab422 Url: http://www.gnu.org/software/libc/libc.html BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: glibc-%{version}-%{git_id}.tar.xz @@ -232,12 +232,6 @@ # PATCH-FIX-OPENSUSE disable rewriting ::1 to 127.0.0.1 for /etc/hosts bnc#684534, bnc#706719 Patch306: glibc-fix-double-loopback.diff -### Misc patches -# FIX-OPENSUSE compile some files with -fno-strict-aliasing -Patch401: glibc-strict-aliasing.diff -# PATCH-FIX-OPENSUSE avoid false positive warning that triggers brp postcheck fail -Patch402: nscd-avoid-gcc-warning.diff - ### # Patches from upstream ### @@ -245,8 +239,6 @@ ### # Patches awaiting upstream approval ### -# PATCH-FIX-UPSTREAM Fix assertion error in res_query.c (bso#13013) -Patch2001: glibc-resolv-assert.diff # PATCH-FIX-OPENSUSE Fix LD_PROFILE (glibc bug#13818) - aj(a)suse.de Patch2008: glibc-ld-profile.patch @@ -468,14 +460,10 @@ %patch305 -p1 %patch306 -p1 -%patch401 -p1 -%patch402 -p1 - %ifarch armv7l armv7hl %patch20 -p1 %endif -%patch2001 -p1 # XXX Disable, it breaks the testsuite, test elf/tst-audit2 # %patch2008 -p1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gimp for openSUSE:Factory
by root＠hilbert.suse.de 03 Dec '12

03 Dec '12

Hello community, here is the log from the commit of package gimp for openSUSE:Factory checked in at 2012-12-03 09:34:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gimp (Old) and /work/SRC/openSUSE:Factory/.gimp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gimp", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gimp/gimp.changes 2012-09-15 17:27:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gimp.new/gimp.changes 2012-12-03 09:34:33.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 27 11:11:04 UTC 2012 - dimstar(a)opensuse.org + +- Add gimp-CVE-2012-5576.patch: fix memory corruption vulnerability + when reading XWD files (bnc#791372, bgo#687392, CVE-2012-5576). + +------------------------------------------------------------------- New: ---- gimp-CVE-2012-5576.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp.spec ++++++ --- /var/tmp/diff_new_pack.yhgWYY/_old 2012-12-03 09:34:35.000000000 +0100 +++ /var/tmp/diff_new_pack.yhgWYY/_new 2012-12-03 09:34:35.000000000 +0100 @@ -31,6 +31,8 @@ # openSUSE palette file Source2: openSUSE.gpl Source99: baselibs.conf +# PATCH-FIX-UPSTREAM gimp-CVE-2012-5576.patch bnc#791372 bgo#687392 CVE-2012-5576 dimstar(a)opensuse.org -- Memory corruption vulnerability when reading XWD files, taken from git. +Patch0: gimp-CVE-2012-5576.patch BuildRequires: aalib-devel BuildRequires: alsa-devel >= 1.0.0 BuildRequires: babl-devel >= 0.1.10 @@ -233,6 +235,7 @@ %lang_package %prep %setup -q +%patch0 -p1 translation-update-upstream translation-update-upstream po-libgimp gimp20-libgimp translation-update-upstream po-python gimp20-python ++++++ gimp-CVE-2012-5576.patch ++++++ >From 0b35f6a082a0b3c372c568ea6bde39a4796acde2 Mon Sep 17 00:00:00 2001 From: Michael Natterer <mitch(a)gimp.org> Date: Wed, 07 Nov 2012 23:16:31 +0000 Subject: Bug 687392 - Memory corruption vulnerability when reading XWD files Applied and enhanced patch from andres which makes file-xwd detect this kind of file corruption and abort loading with an error message. --- diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c index 4e8a95e..f91d757 100644 --- a/plug-ins/common/file-xwd.c +++ b/plug-ins/common/file-xwd.c @@ -186,11 +186,13 @@ static gint32 load_xwd_f2_d16_b16 (const gchar *, static gint32 load_xwd_f2_d24_b32 (const gchar *, FILE *, L_XWDFILEHEADER *, - L_XWDCOLOR *); + L_XWDCOLOR *, + GError **); static gint32 load_xwd_f1_d24_b1 (const gchar *, FILE *, L_XWDFILEHEADER *, - L_XWDCOLOR *); + L_XWDCOLOR *, + GError **); static L_CARD32 read_card32 (FILE *, gint *); @@ -540,7 +542,8 @@ load_image (const gchar *filename, case 1: /* Single plane pixmap */ if ((depth <= 24) && (bpp == 1)) { - image_ID = load_xwd_f1_d24_b1 (filename, ifp, &xwdhdr, xwdcolmap); + image_ID = load_xwd_f1_d24_b1 (filename, ifp, &xwdhdr, xwdcolmap, + error); } break; @@ -559,7 +562,8 @@ load_image (const gchar *filename, } else if ((depth <= 24) && ((bpp == 24) || (bpp == 32))) { - image_ID = load_xwd_f2_d24_b32 (filename, ifp, &xwdhdr, xwdcolmap); + image_ID = load_xwd_f2_d24_b32 (filename, ifp, &xwdhdr, xwdcolmap, + error); } break; } @@ -570,7 +574,7 @@ load_image (const gchar *filename, if (xwdcolmap) g_free (xwdcolmap); - if (image_ID == -1) + if (image_ID == -1 && ! (error && *error)) g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, _("XWD-file %s has format %d, depth %d and bits per pixel %d. " "Currently this is not supported."), @@ -1624,10 +1628,11 @@ load_xwd_f2_d16_b16 (const gchar *filename, /* Load XWD with pixmap_format 2, pixmap_depth up to 24, bits_per_pixel 24/32 */ static gint32 -load_xwd_f2_d24_b32 (const gchar *filename, - FILE *ifp, - L_XWDFILEHEADER *xwdhdr, - L_XWDCOLOR *xwdcolmap) +load_xwd_f2_d24_b32 (const gchar *filename, + FILE *ifp, + L_XWDFILEHEADER *xwdhdr, + L_XWDCOLOR *xwdcolmap, + GError **error) { register guchar *dest, lsbyte_first; gint width, height, linepad, i, j, c0, c1, c2, c3; @@ -1652,12 +1657,6 @@ load_xwd_f2_d24_b32 (const gchar *filename, width = xwdhdr->l_pixmap_width; height = xwdhdr->l_pixmap_height; - image_ID = create_new_image (filename, width, height, GIMP_RGB, - &layer_ID, &drawable, &pixel_rgn); - - tile_height = gimp_tile_height (); - data = g_malloc (tile_height * width * 3); - redmask = xwdhdr->l_red_mask; greenmask = xwdhdr->l_green_mask; bluemask = xwdhdr->l_blue_mask; @@ -1685,6 +1684,22 @@ load_xwd_f2_d24_b32 (const gchar *filename, maxblue = 0; while (bluemask >> (blueshift + maxblue)) maxblue++; maxblue = (1 << maxblue) - 1; + if (maxred > sizeof (redmap) || + maxgreen > sizeof (greenmap) || + maxblue > sizeof (bluemap)) + { + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("XWD-file %s is corrupt."), + gimp_filename_to_utf8 (filename)); + return -1; + } + + image_ID = create_new_image (filename, width, height, GIMP_RGB, + &layer_ID, &drawable, &pixel_rgn); + + tile_height = gimp_tile_height (); + data = g_malloc (tile_height * width * 3); + /* Set map-arrays for red, green, blue */ for (red = 0; red <= maxred; red++) redmap[red] = (red * 255) / maxred; @@ -1825,10 +1840,11 @@ load_xwd_f2_d24_b32 (const gchar *filename, /* Load XWD with pixmap_format 1, pixmap_depth up to 24, bits_per_pixel 1 */ static gint32 -load_xwd_f1_d24_b1 (const gchar *filename, - FILE *ifp, - L_XWDFILEHEADER *xwdhdr, - L_XWDCOLOR *xwdcolmap) +load_xwd_f1_d24_b1 (const gchar *filename, + FILE *ifp, + L_XWDFILEHEADER *xwdhdr, + L_XWDCOLOR *xwdcolmap, + GError **error) { register guchar *dest, outmask, inmask, do_reverse; gint width, height, i, j, plane, fromright; @@ -1863,13 +1879,6 @@ load_xwd_f1_d24_b1 (const gchar *filename, indexed = (xwdhdr->l_pixmap_depth <= 8); bytes_per_pixel = (indexed ? 1 : 3); - image_ID = create_new_image (filename, width, height, - indexed ? GIMP_INDEXED : GIMP_RGB, - &layer_ID, &drawable, &pixel_rgn); - - tile_height = gimp_tile_height (); - data = g_malloc (tile_height * width * bytes_per_pixel); - for (j = 0; j < 256; j++) /* Create an array for reversing bits */ { inmask = 0; @@ -1913,6 +1922,16 @@ load_xwd_f1_d24_b1 (const gchar *filename, maxblue = 0; while (bluemask >> (blueshift + maxblue)) maxblue++; maxblue = (1 << maxblue) - 1; + if (maxred > sizeof (redmap) || + maxgreen > sizeof (greenmap) || + maxblue > sizeof (bluemap)) + { + g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED, + _("XWD-file %s is corrupt."), + gimp_filename_to_utf8 (filename)); + return -1; + } + /* Set map-arrays for red, green, blue */ for (red = 0; red <= maxred; red++) redmap[red] = (red * 255) / maxred; @@ -1922,6 +1941,13 @@ load_xwd_f1_d24_b1 (const gchar *filename, bluemap[blue] = (blue * 255) / maxblue; } + image_ID = create_new_image (filename, width, height, + indexed ? GIMP_INDEXED : GIMP_RGB, + &layer_ID, &drawable, &pixel_rgn); + + tile_height = gimp_tile_height (); + data = g_malloc (tile_height * width * bytes_per_pixel); + ncols = xwdhdr->l_colormap_entries; if (xwdhdr->l_ncolors < ncols) ncols = xwdhdr->l_ncolors; -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0