November 2012 - openSUSE Commits - openSUSE Mailing Lists

commit lightspark for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package lightspark for openSUSE:Factory checked in at 2012-11-02 17:37:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightspark (Old) and /work/SRC/openSUSE:Factory/.lightspark.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightspark", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightspark/lightspark.changes 2012-09-23 08:05:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightspark.new/lightspark.changes 2012-11-02 17:37:50.000000000 +0100 @@ -1,0 +2,20 @@ +Wed Oct 31 10:09:51 UTC 2012 - reddwarf(a)opensuse.org + +- Update to 0.7.0 + * Support LZMA compressed SWFs [Requires liblzma] + * Improved BitmapData support + * Improved ActionScript compatibility + * Improved virtual machine performance and memory consumption + * Improved XML support + * Experimental support for bytecode optimization at runtime + * Improved ExternalInterface (browser integration) support + * Improved performance of JPEG loading + * Support for XMLSocket + * Completely redesigned and improved masking support +- Take minimum version of pkgconfig(libxml++-2.6) and llvm-devel + from CMakeLists.txt and specify them in the BuildRequires +- Add pkgconfig(liblzma), pkgconfig(gl) and pkgconfig(zlib) BuildRequires +- Remove pkgconfig(gobject-2.0) BuildRequire +- Add lightspark-0.7.0-no_glu.patch and remove explicit glu dependency + +------------------------------------------------------------------- Old: ---- lightspark-0.6.0.1.tar.gz New: ---- lightspark-0.7.0-no_glu.patch lightspark-0.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightspark.spec ++++++ --- /var/tmp/diff_new_pack.6QbnNv/_old 2012-11-02 17:37:53.000000000 +0100 +++ /var/tmp/diff_new_pack.6QbnNv/_new 2012-11-02 17:37:53.000000000 +0100 @@ -20,7 +20,7 @@ %bcond_with rtmp Name: lightspark -Version: 0.6.0.1 +Version: 0.7.0 Release: 0 Summary: Modern, free, open-source flash player implementation License: LGPL-3.0+ @@ -29,6 +29,8 @@ Source0: https://launchpad.net/lightspark/trunk/lightspark-%{version}/+download/ligh… # PATCH-FIX-UPSTREAM lightspark-0.5.7-underlinking.patch lp#1000818 reddwarf(a)opensuse.org -- Link against GTK Patch0: lightspark-0.5.7-underlinking.patch +# PATCH-FIX-UPSTREAM lightspark-0.7.0-no_glu.patch lp#1073536 reddwarf(a)opensuse.org -- Avoid the need for GLU +Patch1: lightspark-0.7.0-no_glu.patch BuildRequires: boost-devel BuildRequires: cmake BuildRequires: desktop-file-utils @@ -36,26 +38,27 @@ BuildRequires: gettext-tools BuildRequires: hicolor-icon-theme BuildRequires: libjpeg-devel -BuildRequires: llvm-devel +BuildRequires: llvm-devel >= 2.8 BuildRequires: nasm BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(gdk-2.0) +BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(glibmm-2.4) -BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gmodule-2.0) -BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(libxml++-2.6) +BuildRequires: pkgconfig(libxml++-2.6) >= 2.33.1 BuildRequires: pkgconfig(pango) BuildRequires: pkgconfig(pangocairo) BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(zlib) %if %{with rtmp} BuildRequires: pkgconfig(librtmp) %endif @@ -81,6 +84,7 @@ %prep %setup -q %patch0 +%patch1 %build export CFLAGS='%{optflags}' ++++++ lightspark-0.7.0-no_glu.patch ++++++ Index: src/backends/lsopengl.h =================================================================== --- src/backends/lsopengl.h.orig +++ src/backends/lsopengl.h @@ -39,6 +39,7 @@ #define glBufferData(...) #define glPixelStorei(...) #else + #define GLEW_NO_GLU #include <GL/glew.h> #ifndef _WIN32 #include <GL/glx.h> ++++++ lightspark-0.6.0.1.tar.gz -> lightspark-0.7.0.tar.gz ++++++ ++++ 28754 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 kiwi for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at 2012-11-02 17:37:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-27 07:39:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-11-02 17:37:26.000000000 +0100 @@ -1,0 +2,438 @@ +Fri Nov 2 16:24:42 CET 2012 - ms(a)suse.de + +- v5.04.22 released + +------------------------------------------------------------------- +Fri Nov 2 16:17:32 CET 2012 - ms(a)suse.de + +- removed vmxboot respectively image type vmx from arm code + branch. All arm images are oem's vmx is unused here + +------------------------------------------------------------------- +Fri Nov 2 13:10:35 CET 2012 - ms(a)suse.de + +- fixed device detection in the oemboot install code. The try to + remove the boot device from the list of possible install devices. + The sed statement used here caused a broken list of the substring + also matches other devices. The fix here changes this to exactly + match the device string of the boot device and nothing else + +------------------------------------------------------------------- +Fri Nov 2 12:45:29 CET 2012 - ms(a)suse.de + +- fixed etc/default/grub GRUB_DISTRIBUTOR name setup + +------------------------------------------------------------------- +Fri Nov 2 11:49:54 CET 2012 - ms(a)suse.de + +- include mdmon to handle raid array status changes if + a dmraid array is in use + +------------------------------------------------------------------- +Fri Nov 2 11:20:32 CET 2012 - ms(a)suse.de + +- fixed use of uninitialized values in the code now reported + due to the use of warnings at runtime + +------------------------------------------------------------------- +Fri Nov 2 10:33:07 CET 2012 - ms(a)suse.de + +- fixed setup of /etc/default/grub to contain the bootloader + setup in terms of boot title, timeout, etc... (bnc #786262) + +------------------------------------------------------------------- +Fri Nov 2 01:18:30 CET 2012 - rjschwei(a)suse.de + +- report an error when a <systemdisk> definition is specified in the + configuration and we cannot find the necessary command to obtain + LVM information +- implement consistency check for user settings + * if a user is specified in two <users> sections all given settings must + be the same + * the same user may not be specified twice in the same <users> section +- implement group setting consistency check + * a group id may only be used once + * a group name may only be used with one ID + +------------------------------------------------------------------- +Thu Nov 1 05:54:36 CET 2012 - rjschwei(a)suse.de + +- implement KIWIXMLUserData class to store user data +- implement unit test for new class +- implement unit tests for new methods +- tie new class into XML Class + * rename the following methods to *_legacy + __addVolume() + __populateImageTypeAndNode() + __updateDescriptionFromChangeSet() + __populateProfiledTypeInfo() + getUsers() + getTypes() + * add new getUsers method returning an array of UserData objects + * add new getType method return TypeData object for given type name +- fixup client code to call new _legacy methods +- update unit tests using _legacy + +------------------------------------------------------------------- +Wed Oct 31 21:32:01 CET 2012 - guillaume.gardet(a)suse.de + +- Added armv5 support + +------------------------------------------------------------------- +Wed Oct 31 17:40:55 CET 2012 - ms(a)suse.de + +- v5.04.21 released + +------------------------------------------------------------------- +Wed Oct 31 17:39:51 CET 2012 - ms(a)suse.de + +- fixed unit test, don't use remote URLs for a test they will + fail inside the buildservice because there is no network + access allowed + +------------------------------------------------------------------- +Wed Oct 31 17:31:06 CET 2012 - ms(a)suse.de + +- fixed spec file, added lvm2 to buildrequires. This is + required to let the unit tests work + +------------------------------------------------------------------- +Wed Oct 31 17:30:18 CET 2012 - ms(a)suse.de + +- fixed use of uninitialized values in the code now reported + due to the use of warnings at runtime + +------------------------------------------------------------------- +Wed Oct 31 17:12:44 CET 2012 - ms(a)suse.de + +- v5.04.20 released + +------------------------------------------------------------------- +Tue Oct 30 20:46:59 CET 2012 - ms(a)suse.de + +- fixed use of uninitialized values in the code now reported + due to the use of warnings at runtime + +------------------------------------------------------------------- +Tue Oct 30 17:39:29 CET 2012 - ms(a)suse.de + +- don't send data to a closed file descriptor + +------------------------------------------------------------------- +Tue Oct 30 17:17:19 CET 2012 - ms(a)suse.de + +- fixed use of uninitialized values in the code now reported + due to the use of warnings at runtime + +------------------------------------------------------------------- +Tue Oct 30 16:28:28 CET 2012 - ms(a)suse.de + +- fixed name for install media: + * install ISO has suffix: .install.iso + * install USB has suffix: .install.raw + * install PXE has suffix: .install.tgz + +------------------------------------------------------------------- +Tue Oct 30 16:15:36 CET 2012 - ms(a)suse.de + +- update pre-commit hook + +------------------------------------------------------------------- +Tue Oct 30 16:12:57 CET 2012 - ms(a)suse.de + +- put KIWIXML.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 15:37:25 CET 2012 - ms(a)suse.de + +- put KIWISharedMem.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 15:27:27 CET 2012 - ms(a)suse.de + +- put KIWISatSolver.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 15:25:13 CET 2012 - ms(a)suse.de + +- put KIWIRoot.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 15:22:18 CET 2012 - ms(a)suse.de + +- put KIWIRepoMetaHandler.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 15:02:30 CET 2012 - ms(a)suse.de + +- put KIWIProductData.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 14:37:17 CET 2012 - ms(a)suse.de + +- put KIWIMigrate.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 14:24:24 CET 2012 - ms(a)suse.de + +- put KIWIManager.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 14:03:59 CET 2012 - rjschwei(a)suse.de + +- add consistency check to verify a volume name is unique + within each <systemdisk> definition +- add unit test + +------------------------------------------------------------------- +Tue Oct 30 11:18:50 CET 2012 - ms(a)suse.de + +- put KIWILog.pm to perl critic level 4 + +------------------------------------------------------------------- +Tue Oct 30 11:02:00 CET 2012 - ms(a)suse.de + +- put KIWIImage.pm to perl critic level 4 + +------------------------------------------------------------------- ++++ 274 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kiwi/kiwi.changes ++++ and /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.Fj3ERH/_old 2012-11-02 17:37:29.000000000 +0100 +++ /var/tmp/diff_new_pack.Fj3ERH/_new 2012-11-02 17:37:29.000000000 +0100 @@ -21,11 +21,12 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.19 +Version: 5.04.22 Release: 0 # requirements to build packages BuildRequires: gcc-c++ BuildRequires: libxslt +BuildRequires: lvm2 BuildRequires: module-init-tools BuildRequires: perl-Config-IniFiles BuildRequires: perl-XML-LibXML @@ -616,7 +617,7 @@ %doc %{_datadir}/kiwi/image/isoboot/README.requires %endif -%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %arm +%ifarch %ix86 x86_64 ppc ppc64 s390 s390x %files -n kiwi-desc-vmxboot %defattr(-, root, root) ++++++ 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 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/system/repo/armv5tel new/system/repo/armv5tel --- old/system/repo/armv5tel 1970-01-01 01:00:00.000000000 +0100 +++ new/system/repo/armv5tel 2012-11-02 17:37:29.000000000 +0100 @@ -0,0 +1 @@ +symbolic link to armv7l ++++++ kiwi.tar.bz2 ++++++ ++++ 18268 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 hyper-v for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package hyper-v for openSUSE:Factory checked in at 2012-11-02 17:36:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hyper-v (Old) and /work/SRC/openSUSE:Factory/.hyper-v.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hyper-v", Maintainer is "OHering(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/hyper-v/hyper-v.changes 2012-10-23 19:37:43.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.hyper-v.new/hyper-v.changes 2012-11-02 17:36:59.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Oct 26 17:13:40 CEST 2012 - ohering(a)suse.de + +- update hv_set_ifconfig to work with our ifcfg + +------------------------------------------------------------------- @@ -12 +17 @@ -- update kv_kvp_daemon to 3.7-rc1 state [fate#31441] +- update kv_kvp_daemon to 3.7-rc1 state [fate#314441] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hyper-v.tools.hv.hv_set_ifconfig.sh ++++++ --- /var/tmp/diff_new_pack.bIqpxw/_old 2012-11-02 17:37:00.000000000 +0100 +++ /var/tmp/diff_new_pack.bIqpxw/_new 2012-11-02 17:37:00.000000000 +0100 @@ -1,7 +1,4 @@ #!/bin/bash - -# This example script activates an interface based on the specified -# configuration. # # In the interest of keeping the KVP daemon code free of distro specific # information; the kvp daemon code invokes this external script to configure @@ -10,13 +7,6 @@ # The only argument to this script is the configuration file that is to # be used to configure the interface. # -# Each Distro is expected to implement this script in a distro specific -# fashion. For instance on Distros that ship with Network Manager enabled, -# this script can be based on the Network Manager APIs for configuring the -# interface. -# -# This example script is based on a RHEL environment. -# # Here is the format of the ip configuration file: # # HWADDR=macaddr @@ -45,24 +35,49 @@ # is expected to return the configuration that is set via the SET # call. # - - - -echo "IPV6INIT=yes" >> $1 -echo "NM_CONTROLLED=no" >> $1 -echo "PEERDNS=yes" >> $1 -echo "ONBOOT=yes" >> $1 - -dhcp=$(grep "DHCP" $1 2>/dev/null) -if [ "$dhcp" != "" ]; +cfg=$1 +if ! test -f "${cfg}" then -echo "BOOTPROTO=dhcp" >> $1; + : expect configuration datafile as first argument + exit 1 +fi +# +( +unset DHCP +unset IF_NAME +. "$1" +if test -z "${IF_NAME}" +then + echo "Missing IF_NAME= in ${cfg}" + exit 1 +fi +# +t=`mktemp` +if test -z "${t}" +then + exit 1 fi -cp $1 /etc/sysconfig/network-scripts/ - +_exit() { + rm -f "${t}" +} +trap _exit EXIT +# +cat >> "${t}" <<_EOF_ +# contents from $0 $* +`cat "${cfg}"` +# +# additional options: +STARTMODE=auto +_EOF_ -interface=$(echo $1 | awk -F - '{ print $2 }') +if test "${DHCP}" = "yes" +then + echo "BOOTPROTO=dhcp" >> ${t}; +fi -/sbin/ifdown $interface 2>/dev/null -/sbin/ifup $interfac 2>/dev/null +echo "$0: working on network interface ifcfg-${IF_NAME}" +cp -b ${t} /etc/sysconfig/network/ifcfg-${IF_NAME} +ifdown ${IF_NAME} -o hotplug +ifup ${IF_NAME} -o hotplug +) 2>&1 | logger -t "${0##*/}[$PPID / $$]" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gtkwave for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package gtkwave for openSUSE:Factory checked in at 2012-11-02 17:36:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtkwave (Old) and /work/SRC/openSUSE:Factory/.gtkwave.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtkwave", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gtkwave/gtkwave.changes 2012-10-04 19:39:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtkwave.new/gtkwave.changes 2012-11-02 17:36:35.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Oct 31 18:33:11 UTC 2012 - dmitry(a)roshchin.org + +- Update to version 3.3.41 + * Fix for gtkwave::addSignalsFromList when encountering + signals of form a.b.MyBus[7:0] and a.b.MyBus[15:8] such + that brackets aren't stripped. + * Added experimental highlight_wavewindow rc variable which + allows signals also to be highlighted in the wave window + using the value for color_grid. + * Added use_standard_trace_select rc variable and related + menu option. + +------------------------------------------------------------------- Old: ---- gtkwave-3.3.40.tar.gz New: ---- gtkwave-3.3.41.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtkwave.spec ++++++ --- /var/tmp/diff_new_pack.A6ojtk/_old 2012-11-02 17:36:38.000000000 +0100 +++ /var/tmp/diff_new_pack.A6ojtk/_new 2012-11-02 17:36:38.000000000 +0100 @@ -11,31 +11,32 @@ # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gtkwave -Version: 3.3.40 +Version: 3.3.41 Release: 0 -License: GPL-2.0+ Summary: Waveform viewer for Ditital Signals +License: GPL-2.0+ Group: Productivity/Scientific/Electronics Url: http://sourceforge.net/projects/gtkwave/ Source0: %{name}-%{version}.tar.gz -BuildRequires: flex BuildRequires: fdupes +BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: gperf BuildRequires: gtk2-devel BuildRequires: judy-devel BuildRequires: tcl-devel BuildRequires: tk-devel +BuildRequires: update-desktop-files BuildRequires: xz-devel BuildRequires: zlib-devel -BuildRequires: update-desktop-files BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ gtkwave-3.3.40.tar.gz -> gtkwave-3.3.41.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/CHANGELOG.TXT new/gtkwave-3.3.41/CHANGELOG.TXT --- old/gtkwave-3.3.40/CHANGELOG.TXT 2012-09-10 22:39:19.000000000 +0200 +++ new/gtkwave-3.3.41/CHANGELOG.TXT 2012-10-30 19:37:45.000000000 +0100 @@ -1253,3 +1253,11 @@ of GTK2 (as it could be verified on that version). Fixed off-by-one buffer string allocation write overflow in calloc_2() call in maketraces(). +3.3.41 30sep12 Fix for gtkwave::addSignalsFromList when encountering + signals of form a.b.MyBus[7:0] and a.b.MyBus[15:8] such + that brackets aren't stripped. + Added experimental highlight_wavewindow rc variable which + allows signals also to be highlighted in the wave window + using the value for color_grid. + Added use_standard_trace_select rc variable and related + menu option. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/LICENSE.TXT new/gtkwave-3.3.41/LICENSE.TXT --- old/gtkwave-3.3.40/LICENSE.TXT 2012-08-16 02:33:19.000000000 +0200 +++ new/gtkwave-3.3.41/LICENSE.TXT 2012-10-30 19:37:45.000000000 +0100 @@ -1,6 +1,6 @@ ########################################################################## -GTKWave 3.3.40 Wave Viewer is Copyright (C) 1999-2012 Tony Bybell. +GTKWave 3.3.41 Wave Viewer is Copyright (C) 1999-2012 Tony Bybell. Portions of GTKWave are Copyright (C) 1999-2012 Udi Finkelstein. Context support is Copyright (C) 2007-2012 Kermin Elliott Fleming. Trace group support is Copyright (C) 2009-2012 Donald Baltus. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/configure new/gtkwave-3.3.41/configure --- old/gtkwave-3.3.40/configure 2012-08-16 02:33:19.000000000 +0200 +++ new/gtkwave-3.3.41/configure 2012-10-30 19:37:45.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for gtkwave 3.3.40. +# Generated by GNU Autoconf 2.63 for gtkwave 3.3.41. # # Report bugs to <bybell(a)rocketmail.com>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='gtkwave' PACKAGE_TARNAME='gtkwave' -PACKAGE_VERSION='3.3.40' -PACKAGE_STRING='gtkwave 3.3.40' +PACKAGE_VERSION='3.3.41' +PACKAGE_STRING='gtkwave 3.3.41' PACKAGE_BUGREPORT='bybell(a)rocketmail.com' ac_unique_file="src/vcd.c" @@ -1386,7 +1386,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 gtkwave 3.3.40 to adapt to many kinds of systems. +\`configure' configures gtkwave 3.3.41 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1452,7 +1452,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gtkwave 3.3.40:";; + short | recursive ) echo "Configuration of gtkwave 3.3.41:";; esac cat <<\_ACEOF @@ -1589,7 +1589,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gtkwave configure 3.3.40 +gtkwave configure 3.3.41 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1603,7 +1603,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gtkwave $as_me 3.3.40, which was +It was created by gtkwave $as_me 3.3.41, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2453,7 +2453,7 @@ # Define the identity of the package. PACKAGE='gtkwave' - VERSION='3.3.40' + VERSION='3.3.41' cat >>confdefs.h <<_ACEOF @@ -14297,7 +14297,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gtkwave $as_me 3.3.40, which was +This file was extended by gtkwave $as_me 3.3.41, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14360,7 +14360,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -gtkwave config.status 3.3.40 +gtkwave config.status 3.3.41 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/configure.ac new/gtkwave-3.3.41/configure.ac --- old/gtkwave-3.3.40/configure.ac 2012-08-16 02:33:19.000000000 +0200 +++ new/gtkwave-3.3.41/configure.ac 2012-10-30 19:37:45.000000000 +0100 @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(gtkwave, 3.3.40, bybell(a)rocketmail.com) +AC_INIT(gtkwave, 3.3.41, bybell(a)rocketmail.com) AC_CONFIG_SRCDIR([src/vcd.c]) AM_INIT_AUTOMAKE AC_CONFIG_HEADER([config.h]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/contrib/bundle_for_osx/Info-gtkwave.plist new/gtkwave-3.3.41/contrib/bundle_for_osx/Info-gtkwave.plist --- old/gtkwave-3.3.40/contrib/bundle_for_osx/Info-gtkwave.plist 2011-12-12 18:35:20.000000000 +0100 +++ new/gtkwave-3.3.41/contrib/bundle_for_osx/Info-gtkwave.plist 2012-10-30 19:37:36.000000000 +0100 @@ -8,7 +8,7 @@ <key>CFBundleExecutable</key> <string>gtkwave</string> <key>CFBundleGetInfoString</key> - <string>3.3.29, (C) 1999-2012 Tony Bybell http://gtkwave.sourceforge.net</string> + <string>3.3.41, (C) 1999-2012 Tony Bybell http://gtkwave.sourceforge.net</string> <key>CFBundleIconFile</key> <string>gtkwave.icns</string> <key>CFBundleIdentifier</key> @@ -18,11 +18,11 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>3.3.29</string> + <string>3.3.41</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>3.3.29</string> + <string>3.3.41</string> <key>NSHumanReadableCopyright</key> <string>Copyright 1999 - 2012 Tony Bybell, GNU General Public License.</string> <key>LSMinimumSystemVersion</key> Files old/gtkwave-3.3.40/doc/gtkwave.odt and new/gtkwave-3.3.41/doc/gtkwave.odt differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/examples/gtkwaverc new/gtkwave-3.3.41/examples/gtkwaverc --- old/gtkwave-3.3.40/examples/gtkwaverc 2012-03-15 06:48:40.000000000 +0100 +++ new/gtkwave-3.3.41/examples/gtkwaverc 2012-10-30 19:37:45.000000000 +0100 @@ -3,6 +3,8 @@ # (rename to .gtkwaverc and copy # to home directory to be loaded automatically) # +use_standard_trace_select no +highlight_wavewindow no alt_wheel_mode yes vcd_preserve_glitches no vcd_preserve_glitches_real no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/man/gtkwaverc.5 new/gtkwave-3.3.41/man/gtkwaverc.5 --- old/gtkwave-3.3.40/man/gtkwaverc.5 2012-03-24 20:47:01.000000000 +0100 +++ new/gtkwave-3.3.41/man/gtkwaverc.5 2012-10-30 19:37:45.000000000 +0100 @@ -79,7 +79,7 @@ color value for trace groupings. .TP \fBcolor_grid\fR <\fIvalue\fP> -grid color (use Alt-G/Shift-Alt-G to show/hide grid). +grid color (use Alt-G/Shift-Alt-G to show/hide grid). This is also the color used for \fBhighlight_wavewindow\fR when enabled. .TP \fBcolor_grid2\fR <\fIvalue\fP> grid color for secondary pattern search. @@ -220,6 +220,9 @@ \fBhier_max_level\fR <\fIvalue\fP> Sets the maximum hierarchy depth (from the right side) to display for trace names. Note that a value of zero displays the full hierarchy name. .TP +\fBhighlight_wavewindow\fR <\fIvalue\fP> +When enabled, this causes traces highlighted in the signal window also to be highlighted in the wave window. +.TP \fBhpane_pack\fR <\fIvalue\fP> A nonzero value indicates that the horizontal pane should be constructed using the gtk_paned_pack functions (default and recommended). A zero value indicates that gtk_paned_add will be used instead. .TP @@ -321,6 +324,9 @@ \fBuse_standard_clicking\fR <\fIvalue\fP> This option no longer has any effect in gtkwave: normal GTK click semantics are used in the signalwindow. .TP +\fBuse_standard_trace_select\fR <\fIvalue\fP> +A nonzero value keeps the currently selected traces from deselecting on mouse button press. This allows drag and drop to function more smoothly. As this behavior is not how GTK normally functions, it is by default disabled. +.TP \fBuse_toolbutton_interface\fR <\fIvalue\fP> A nonzero value indicates that a toolbar with buttons should be at the top of the screen instead of the traditional style gtkwave button groups. Default is on. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/globals.c new/gtkwave-3.3.41/src/globals.c --- old/gtkwave-3.3.40/src/globals.c 2012-08-09 03:25:05.000000000 +0200 +++ new/gtkwave-3.3.41/src/globals.c 2012-10-30 19:37:34.000000000 +0100 @@ -811,6 +811,8 @@ NULL, /* shift_click_trace 383 */ 0, /* trtarget_signalwindow_c_1 384 */ NULL, /* starting_unshifted_trace */ +0, /* standard_trace_dnd_degate */ +0, /* use_standard_trace_select */ 1, /* use_standard_clicking */ 0, /* std_collapse_pressed */ 0, /* std_dnd_tgt_on_signalarea */ @@ -1218,6 +1220,7 @@ /* * wavewindow.c */ +0, /* highlight_wavewindow */ 1, /* alt_wheel_mode */ 0, /* use_scrollwheel_as_y */ 0, /* enable_slider_zoom */ @@ -1802,6 +1805,8 @@ new_globals->ps_maxveclen = GLOBALS->ps_maxveclen; new_globals->show_base = GLOBALS->show_base; new_globals->display_grid = GLOBALS->display_grid; + new_globals->highlight_wavewindow = GLOBALS->highlight_wavewindow; + new_globals->use_standard_trace_select = GLOBALS->use_standard_trace_select; new_globals->use_big_fonts = GLOBALS->use_big_fonts; new_globals->use_full_precision = GLOBALS->use_full_precision; new_globals->use_frequency_delta = GLOBALS->use_frequency_delta; @@ -2661,6 +2666,8 @@ GLOBALS->use_full_precision = g_old->use_full_precision; GLOBALS->show_base = g_old->show_base; GLOBALS->display_grid = g_old->display_grid; + GLOBALS->highlight_wavewindow = g_old->highlight_wavewindow; + GLOBALS->use_standard_trace_select = g_old->use_standard_trace_select; GLOBALS->disable_mouseover = g_old->disable_mouseover; GLOBALS->keep_xz_colors = g_old->keep_xz_colors; GLOBALS->zoom_pow10_snap = g_old->zoom_pow10_snap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/globals.h new/gtkwave-3.3.41/src/globals.h --- old/gtkwave-3.3.40/src/globals.h 2012-08-09 03:25:05.000000000 +0200 +++ new/gtkwave-3.3.41/src/globals.h 2012-10-30 19:37:34.000000000 +0100 @@ -810,6 +810,8 @@ struct TraceEnt *shift_click_trace; /* from signalwindow.c 411 */ int trtarget_signalwindow_c_1; /* from signalwindow.c 412 */ Trptr starting_unshifted_trace; /* from signalwindow.c */ +unsigned char standard_trace_dnd_degate; /* from signalwindow.c */ +unsigned char use_standard_trace_select; /* from signalwindow.c */ unsigned char use_standard_clicking; /* from signalwindow.c */ unsigned char std_collapse_pressed; /* from signalwindow.c */ unsigned char std_dnd_tgt_on_signalarea; /* from signalwindow.c */ @@ -1203,6 +1205,7 @@ /* * wavewindow.c */ +char highlight_wavewindow; /* from wavewindow.c */ char alt_wheel_mode; /* from wavewindow.c */ char use_scrollwheel_as_y; /* from wavewindow.c */ char enable_slider_zoom; /* from wavewindow.c */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/main.c new/gtkwave-3.3.41/src/main.c --- old/gtkwave-3.3.40/src/main.c 2012-07-31 22:56:15.000000000 +0200 +++ new/gtkwave-3.3.41/src/main.c 2012-10-30 19:37:34.000000000 +0100 @@ -107,6 +107,8 @@ GLOBALS->use_full_precision = g_old->use_full_precision; GLOBALS->show_base = g_old->show_base; GLOBALS->display_grid = g_old->display_grid; +GLOBALS->highlight_wavewindow = g_old->highlight_wavewindow; +GLOBALS->use_standard_trace_select = g_old->use_standard_trace_select; GLOBALS->disable_mouseover = g_old->disable_mouseover; GLOBALS->keep_xz_colors = g_old->keep_xz_colors; GLOBALS->zoom_pow10_snap = g_old->zoom_pow10_snap; @@ -589,6 +591,8 @@ GLOBALS->ps_maxveclen = old_g->ps_maxveclen; GLOBALS->show_base = old_g->show_base; GLOBALS->display_grid = old_g->display_grid; + GLOBALS->highlight_wavewindow = old_g->highlight_wavewindow; + GLOBALS->use_standard_trace_select = old_g->use_standard_trace_select; GLOBALS->use_big_fonts = old_g->use_big_fonts; GLOBALS->use_full_precision = old_g->use_full_precision; GLOBALS->use_frequency_delta = old_g->use_frequency_delta; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/menu.c new/gtkwave-3.3.41/src/menu.c --- old/gtkwave-3.3.40/src/menu.c 2012-08-03 22:36:12.000000000 +0200 +++ new/gtkwave-3.3.41/src/menu.c 2012-10-30 19:37:34.000000000 +0100 @@ -1802,6 +1802,49 @@ #endif } /**/ +void menu_enable_standard_trace_select(gpointer null_data, guint callback_action, GtkWidget *widget) +{ +if(GLOBALS->helpbox_is_active) + { + help_text_bold("\n\nStandard Trace Select"); + help_text( + " when enabled," + " keeps the currently selected traces from deselecting on mouse button press." + " This allows drag and drop to function more smoothly. As this behavior is not" + " how GTK normally functions, it is by default disabled." + ); + } + else + { +#ifndef WAVE_USE_MLIST_T + if(!GLOBALS->use_standard_trace_select) + { + status_text("Standard Trace Select enabled.\n"); + GLOBALS->use_standard_trace_select=~0; + } + else + { + status_text("Standard Trace Select disabled.\n"); + GLOBALS->use_standard_trace_select=0; + } +#else + GLOBALS->use_standard_trace_select = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_ESTS])); + if(GLOBALS->use_standard_trace_select) + { + status_text("Standard Trace Select enabled.\n"); + } + else + { + status_text("Standard Trace Select disabled.\n"); + } +#endif + } + +#ifndef WAVE_USE_MLIST_T +GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_ESTS].path))->active=(GLOBALS->use_standard_trace_select)?TRUE:FALSE; +#endif +} +/**/ void menu_enable_dynamic_resize(gpointer null_data, guint callback_action, GtkWidget *widget) { if(GLOBALS->helpbox_is_active) @@ -5847,6 +5890,36 @@ } /**/ +void menu_show_wave_highlight(gpointer null_data, guint callback_action, GtkWidget *widget) +{ +if(GLOBALS->helpbox_is_active) + { + help_text_bold("\n\nShow Wave Highlight"); + help_text( + " toggles the drawing of highlighted waveforms (instead of gridlines) in the waveform display." + ); + } + else + { +#ifndef WAVE_USE_MLIST_T + GLOBALS->highlight_wavewindow=(GLOBALS->highlight_wavewindow)?0:~0; +#else + GLOBALS->highlight_wavewindow = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_SHW])); +#endif + if(GLOBALS->wave_hslider) + { + gtk_signal_emit_by_name (GTK_OBJECT (GTK_ADJUSTMENT(GLOBALS->wave_hslider)),"changed"); + gtk_signal_emit_by_name (GTK_OBJECT (GTK_ADJUSTMENT(GLOBALS->wave_hslider)),"value_changed"); + } + DEBUG(printf("Show Wave Highlight\n")); + } + +#ifndef WAVE_USE_MLIST_T +GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_SHW].path))->active=(GLOBALS->highlight_wavewindow)?TRUE:FALSE; +#endif +} + +/**/ void menu_show_mouseover(gpointer null_data, guint callback_action, GtkWidget *widget) { if(GLOBALS->helpbox_is_active) @@ -6109,11 +6182,15 @@ WAVE_GTKIFE("/View/Show Grid", "<Alt>G", menu_show_grid, WV_MENU_VSG, "<ToggleItem>"), WAVE_GTKIFE("/View/<separator>", NULL, NULL, WV_MENU_SEP9, "<Separator>"), + WAVE_GTKIFE("/View/Show Wave Highlight", NULL, menu_show_wave_highlight, WV_MENU_SHW, "<ToggleItem>"), + WAVE_GTKIFE("/View/<separator>", NULL, NULL, WV_MENU_SEP9B, "<Separator>"), WAVE_GTKIFE("/View/Show Mouseover", NULL, menu_show_mouseover, WV_MENU_VSMO, "<ToggleItem>"), WAVE_GTKIFE("/View/<separator>", NULL, NULL, WV_MENU_SEP9A, "<Separator>"), WAVE_GTKIFE("/View/Show Base Symbols", "<Alt>F1", menu_show_base, WV_MENU_VSBS, "<ToggleItem>"), WAVE_GTKIFE("/View/<separator>", NULL, NULL, WV_MENU_SEP10, "<Separator>"), /* 110 */ + WAVE_GTKIFE("/View/Standard Trace Select", NULL, menu_enable_standard_trace_select, WV_MENU_ESTS, "<ToggleItem>"), + WAVE_GTKIFE("/View/<separator>", NULL, NULL, WV_MENU_SEP10A, "<Separator>"), WAVE_GTKIFE("/View/Dynamic Resize", "<Alt>9", menu_enable_dynamic_resize, WV_MENU_VDR, "<ToggleItem>"), WAVE_GTKIFE("/View/<separator>", NULL, NULL, WV_MENU_SEP11, "<Separator>"), WAVE_GTKIFE("/View/Center Zooms", "F8", menu_center_zooms, WV_MENU_VCZ, "<ToggleItem>"), @@ -6230,6 +6307,8 @@ GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_VSG].path))->active=(GLOBALS->display_grid)?TRUE:FALSE; +GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_SHW].path))->active=(GLOBALS->highlight_wavewindow)?TRUE:FALSE; + GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_HSWM].path))->active=(GLOBALS->alt_wheel_mode)?TRUE:FALSE; GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1,menu_items[WV_MENU_VSMO].path))->active=(GLOBALS->disable_mouseover)?FALSE:TRUE; @@ -6238,6 +6317,8 @@ GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_VDR].path))->active=(GLOBALS->do_resize_signals)?TRUE:FALSE; +GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_ESTS].path))->active=(GLOBALS->use_standard_trace_select)?TRUE:FALSE; + GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_VCMU].path))->active=(GLOBALS->constant_marker_update)?TRUE:FALSE; GTK_CHECK_MENU_ITEM(gtk_item_factory_get_widget(GLOBALS->item_factory_menu_c_1, menu_items[WV_MENU_VCZ].path))->active=(GLOBALS->do_zoom_center)?TRUE:FALSE; @@ -6278,12 +6359,14 @@ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_VZPS]), GLOBALS->zoom_pow10_snap); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_VSG]), GLOBALS->display_grid); +gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_SHW]), GLOBALS->highlight_wavewindow); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_HSWM]), GLOBALS->alt_wheel_mode); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_VSMO]), !GLOBALS->disable_mouseover); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_VSBS]), GLOBALS->show_base); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_VDR]), GLOBALS->do_resize_signals); +gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_ESTS]), GLOBALS->use_standard_trace_select); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_VCMU]), GLOBALS->constant_marker_update); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_VCZ]), GLOBALS->do_zoom_center); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_wlist[WV_MENU_VDRV]), GLOBALS->use_roundcaps); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/menu.h new/gtkwave-3.3.41/src/menu.h --- old/gtkwave-3.3.40/src/menu.h 2012-08-01 00:00:43.000000000 +0200 +++ new/gtkwave-3.3.41/src/menu.h 2012-10-30 19:37:34.000000000 +0100 @@ -242,10 +242,14 @@ WV_MENU_MLKOFF, WV_MENU_VSG, WV_MENU_SEP9, +WV_MENU_SHW, +WV_MENU_SEP9B, WV_MENU_VSMO, WV_MENU_SEP9A, WV_MENU_VSBS, WV_MENU_SEP10, +WV_MENU_ESTS, +WV_MENU_SEP10A, WV_MENU_VDR, WV_MENU_SEP11, WV_MENU_VCZ, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/rc.c new/gtkwave-3.3.41/src/rc.c --- old/gtkwave-3.3.40/src/rc.c 2012-08-01 00:00:43.000000000 +0200 +++ new/gtkwave-3.3.41/src/rc.c 2012-10-30 19:37:34.000000000 +0100 @@ -319,6 +319,13 @@ return(0); } +int f_highlight_wavewindow(char *str) +{ +DEBUG(printf("f_highlight_wavewindow(\"%s\")\n",str)); +GLOBALS->highlight_wavewindow=atoi_64(str)?1:0; +return(0); +} + int f_ignore_savefile_pane_pos(char *str) { DEBUG(printf("f_ignore_savefile_pane_pos(\"%s\")\n",str)); @@ -488,17 +495,17 @@ return(0); } -int f_use_full_precision(char *str) +int f_use_frequency_display(char *str) { -DEBUG(printf("f_use_full_precision(\"%s\")\n",str)); -GLOBALS->use_full_precision=atoi_64(str)?1:0; +DEBUG(printf("f_use_frequency_display(\"%s\")\n",str)); +GLOBALS->use_frequency_delta=atoi_64(str)?1:0; return(0); } -int f_use_frequency_display(char *str) +int f_use_full_precision(char *str) { -DEBUG(printf("f_use_frequency_display(\"%s\")\n",str)); -GLOBALS->use_frequency_delta=atoi_64(str)?1:0; +DEBUG(printf("f_use_full_precision(\"%s\")\n",str)); +GLOBALS->use_full_precision=atoi_64(str)?1:0; return(0); } @@ -565,6 +572,13 @@ return(0); } +int f_use_standard_trace_select(char *str) +{ +DEBUG(printf("f_f_use_standard_trace_select(\"%s\")\n",str)); +GLOBALS->use_standard_trace_select=atoi_64(str)?1:0; +return(0); +} + int f_use_toolbutton_interface(char *str) { DEBUG(printf("f_use_toolbutton_interface(\"%s\")\n",str)); @@ -815,6 +829,7 @@ { "hier_delimeter", f_hier_delimeter }, { "hier_grouping", f_hier_grouping }, { "hier_max_level", f_hier_max_level }, +{ "highlight_wavewindow", f_highlight_wavewindow }, { "hpane_pack", f_hpane_pack }, { "ignore_savefile_pane_pos", f_ignore_savefile_pane_pos }, { "ignore_savefile_pos", f_ignore_savefile_pos }, @@ -848,6 +863,7 @@ { "use_scrollbar_only", f_use_scrollbar_only }, { "use_scrollwheel_as_y", f_use_scrollwheel_as_y }, { "use_standard_clicking", f_use_standard_clicking }, +{ "use_standard_trace_select", f_use_standard_trace_select }, { "use_toolbutton_interface", f_use_toolbutton_interface }, { "vcd_explicit_zero_subscripts", f_vcd_explicit_zero_subscripts }, { "vcd_preserve_glitches", f_vcd_preserve_glitches }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/signalwindow.c new/gtkwave-3.3.41/src/signalwindow.c --- old/gtkwave-3.3.40/src/signalwindow.c 2012-08-09 03:25:05.000000000 +0200 +++ new/gtkwave-3.3.41/src/signalwindow.c 2012-10-30 19:37:34.000000000 +0100 @@ -203,6 +203,7 @@ GLOBALS->dnd_cursor_timer = 0; GLOBALS->dnd_state = 0; +GLOBALS->standard_trace_dnd_degate = 1; } /* @@ -1136,8 +1137,9 @@ if(t) { t->flags |= TR_HIGHLIGHT; } /* scan-build */ } } - /* else if(!(t->flags & TR_HIGHLIGHT)) Ben Sferrazza suggested fix rather than a regular "else" */ -else + /* else if(!(t->flags & TR_HIGHLIGHT)) Ben Sferrazza suggested fix rather than a regular "else" 11aug08 */ + /* changed to add use_standard_trace_select below to make this selectable, Sophana K request 08oct12 */ +else if( (!GLOBALS->use_standard_trace_select) || (GLOBALS->standard_trace_dnd_degate) || ((t)&&(!(t->flags & TR_HIGHLIGHT))) ) { GLOBALS->starting_unshifted_trace = t; @@ -1151,6 +1153,8 @@ if(t) { t->flags |= TR_HIGHLIGHT; } /* scan-build */ } + GLOBALS->standard_trace_dnd_degate = 0; + if(event->type == GDK_2BUTTON_PRESS) { menu_toggle_group(NULL, 0, widget); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/tcl_commands.c new/gtkwave-3.3.41/src/tcl_commands.c --- old/gtkwave-3.3.40/src/tcl_commands.c 2012-02-23 22:42:57.000000000 +0100 +++ new/gtkwave-3.3.41/src/tcl_commands.c 2012-10-30 19:37:34.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (c) Tony Bybell 2008-2009. + * Copyright (c) Tony Bybell 2008-2012. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1012,7 +1012,7 @@ { for(i=0;i<l;i++) { - one_entry = make_single_tcl_list_name(elem[i], NULL, 0); + one_entry = make_single_tcl_list_name(elem[i], NULL, 0, 1); /* keep range */ WAVE_OE_ME } free_2(elem); @@ -1847,6 +1847,7 @@ GLOBALS->use_full_precision = g_old->use_full_precision; GLOBALS->show_base = g_old->show_base; GLOBALS->display_grid = g_old->display_grid; + GLOBALS->highlight_wavewindow = g_old->highlight_wavewindow; GLOBALS->disable_mouseover = g_old->disable_mouseover; GLOBALS->zoom_pow10_snap = g_old->zoom_pow10_snap; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/tcl_helper.c new/gtkwave-3.3.41/src/tcl_helper.c --- old/gtkwave-3.3.40/src/tcl_helper.c 2012-03-09 22:50:21.000000000 +0100 +++ new/gtkwave-3.3.41/src/tcl_helper.c 2012-10-30 19:37:34.000000000 +0100 @@ -1306,7 +1306,7 @@ * ---------------------------------------------------------------------------- */ -char *make_single_tcl_list_name(char *s, char *opt_value, int promote_to_bus) +char *make_single_tcl_list_name(char *s, char *opt_value, int promote_to_bus, int preserve_range) { char *rpnt = NULL; char *pnt, *pnt2; @@ -1336,6 +1336,7 @@ } pnt = s2; + while(*pnt) { if(*pnt == GLOBALS->hier_delimeter) @@ -1345,15 +1346,18 @@ else if(*pnt == '[') { lbrack = pnt; } else if(*pnt == ':') { colon = pnt; } else if(*pnt == ']') { rbrack = pnt; } - + pnt++; } - - if((lbrack && colon && rbrack && ((colon-lbrack)>0) && ((rbrack - colon)>0) && ((rbrack-lbrack)>0)) || (lbrack && promote_to_bus)) + + if(!preserve_range) /* added for gtkwave::addSignalsFromList */ { - is_bus = 1; - *lbrack = 0; - /* len = lbrack - s2; */ /* scan-build */ + if((lbrack && colon && rbrack && ((colon-lbrack)>0) && ((rbrack - colon)>0) && ((rbrack-lbrack)>0)) || (lbrack && promote_to_bus)) + { + is_bus = 1; + *lbrack = 0; + /* len = lbrack - s2; */ /* scan-build */ + } } names = calloc_2(delim_cnt+1, sizeof(char *)); @@ -1561,7 +1565,7 @@ { if((!s->vec_root)||(!GLOBALS->autocoalesce)) { - one_entry = make_single_tcl_list_name(s->n->nname, NULL, 0); + one_entry = make_single_tcl_list_name(s->n->nname, NULL, 0, 0); WAVE_OE_ME } else @@ -1570,7 +1574,7 @@ t=s->vec_root; while(t) { - one_entry = make_single_tcl_list_name(t->n->nname, NULL, 1); + one_entry = make_single_tcl_list_name(t->n->nname, NULL, 1, 0); WAVE_OE_ME if(get_s_selected(t)) @@ -1688,14 +1692,14 @@ sprintf(newname, "%s[%d:%d]", first_str, lidx, ridx); /* this disappears in make_single_tcl_list_name() but might be used in future code */ if(!mult_entry) { one_entry = make_gtkwave_pid(); WAVE_OE_ME one_entry = strdup_2(netoff); WAVE_OE_ME} - one_entry = is_from_tcl_command ? strdup_2s(newname) : make_single_tcl_list_name(newname, NULL, 0); + one_entry = is_from_tcl_command ? strdup_2s(newname) : make_single_tcl_list_name(newname, NULL, 0, 0); WAVE_OE_ME if(!is_from_tcl_command) { trace_val = give_value_string(t); if(trace_val) { - one_entry = make_single_tcl_list_name(newname, trace_val, 0); + one_entry = make_single_tcl_list_name(newname, trace_val, 0, 0); WAVE_OE_ME free_2(trace_val); } @@ -1737,7 +1741,7 @@ sprintf(str+strlen(str), "[%d]", which); if(!mult_entry) { one_entry = make_gtkwave_pid(); WAVE_OE_ME one_entry = strdup_2(netoff); WAVE_OE_ME } - one_entry = is_from_tcl_command ? strdup_2s(str) : make_single_tcl_list_name(str, NULL, 0); + one_entry = is_from_tcl_command ? strdup_2s(str) : make_single_tcl_list_name(str, NULL, 0, 0); WAVE_OE_ME if((bits)&&(!is_from_tcl_command)) @@ -1748,21 +1752,21 @@ else if(bitnum >= AN_COUNT) bitnum = AN_DASH; trace_val_vec_single[0] = AN_STR[(int)xfwd[bitnum]]; - one_entry = make_single_tcl_list_name(str, trace_val_vec_single, 0); + one_entry = make_single_tcl_list_name(str, trace_val_vec_single, 0, 0); WAVE_OE_ME } } else { if(!mult_entry) { one_entry = make_gtkwave_pid(); WAVE_OE_ME one_entry = strdup_2(netoff); WAVE_OE_ME} - one_entry = is_from_tcl_command ? strdup_2s(append_array_row(nodes[i])) : make_single_tcl_list_name(append_array_row(nodes[i]), NULL, 0); + one_entry = is_from_tcl_command ? strdup_2s(append_array_row(nodes[i])) : make_single_tcl_list_name(append_array_row(nodes[i]), NULL, 0, 0); WAVE_OE_ME if(!is_from_tcl_command) { trace_val = give_value_string(t); if(trace_val) { - one_entry = make_single_tcl_list_name(append_array_row(nodes[i]), trace_val, 0); + one_entry = make_single_tcl_list_name(append_array_row(nodes[i]), trace_val, 0, 0); WAVE_OE_ME free_2(trace_val); } @@ -1798,14 +1802,14 @@ sprintf(str+strlen(str), "[%d]", which); if(!mult_entry) { one_entry = make_gtkwave_pid(); WAVE_OE_ME one_entry = strdup_2(netoff); WAVE_OE_ME} - one_entry = is_from_tcl_command ? strdup_2s(str) : make_single_tcl_list_name(str, NULL, 0); + one_entry = is_from_tcl_command ? strdup_2s(str) : make_single_tcl_list_name(str, NULL, 0, 0); WAVE_OE_ME if(!is_from_tcl_command) { trace_val = give_value_string(t); if(trace_val) { - one_entry = make_single_tcl_list_name(str, trace_val, 0); + one_entry = make_single_tcl_list_name(str, trace_val, 0, 0); WAVE_OE_ME free_2(trace_val); } @@ -1814,14 +1818,14 @@ else { if(!mult_entry) { one_entry = make_gtkwave_pid(); WAVE_OE_ME one_entry = strdup_2(netoff); WAVE_OE_ME} - one_entry = is_from_tcl_command ? strdup_2s(append_array_row(t->n.nd)) : make_single_tcl_list_name(append_array_row(t->n.nd), NULL, 0); + one_entry = is_from_tcl_command ? strdup_2s(append_array_row(t->n.nd)) : make_single_tcl_list_name(append_array_row(t->n.nd), NULL, 0, 0); WAVE_OE_ME if(!is_from_tcl_command) { trace_val = give_value_string(t); if(trace_val) { - one_entry = make_single_tcl_list_name(append_array_row(t->n.nd), trace_val, 0); + one_entry = make_single_tcl_list_name(append_array_row(t->n.nd), trace_val, 0, 0); WAVE_OE_ME free_2(trace_val); } @@ -1890,14 +1894,14 @@ struct symbol *t = s->vec_root; while(t) { - one_entry = make_single_tcl_list_name(t->n->nname, NULL, 1); + one_entry = make_single_tcl_list_name(t->n->nname, NULL, 1, 0); WAVE_OE_ME break; /* t=t->vec_chain; ...no longer needed as this is resolved in process_tcl_list() */ } } else { - one_entry = make_single_tcl_list_name(s->n->nname, NULL, 0); + one_entry = make_single_tcl_list_name(s->n->nname, NULL, 0, 0); WAVE_OE_ME } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/tcl_helper.h new/gtkwave-3.3.41/src/tcl_helper.h --- old/gtkwave-3.3.40/src/tcl_helper.h 2011-05-30 04:19:08.000000000 +0200 +++ new/gtkwave-3.3.41/src/tcl_helper.h 2012-10-30 19:37:34.000000000 +0100 @@ -92,7 +92,7 @@ char* zMergeTclList(int argc, const char** argv); char** zSplitTclList(const char* list, int* argcPtr); -char *make_single_tcl_list_name(char *s, char *opt_value, int promote_to_bus); +char *make_single_tcl_list_name(char *s, char *opt_value, int promote_to_bus, int preserve_range); void make_tcl_interpreter(char *argv[]); const char *gtkwavetcl_setvar(const char *name1, const char *val, int flags); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gtkwave-3.3.40/src/wavewindow.c new/gtkwave-3.3.41/src/wavewindow.c --- old/gtkwave-3.3.40/src/wavewindow.c 2012-08-09 03:25:05.000000000 +0200 +++ new/gtkwave-3.3.41/src/wavewindow.c 2012-10-30 19:37:34.000000000 +0100 @@ -3168,10 +3168,19 @@ yu=(_y0+_y1)/2; ytext=yu-(GLOBALS->wavefont->ascent/2)+GLOBALS->wavefont->ascent; - if((GLOBALS->display_grid)&&(GLOBALS->enable_horiz_grid)&&(!kill_grid)) { - gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1,(GLOBALS->tims.start<GLOBALS->tims.first)?(GLOBALS->tims.first-GLOBALS->tims.start)*GLOBALS->pxns:0, liney,(GLOBALS->tims.last<=GLOBALS->tims.end)?(GLOBALS->tims.last-GLOBALS->tims.start)*GLOBALS->pxns:GLOBALS->wavewidth-1, liney); + if((GLOBALS->highlight_wavewindow) && (t) && (t->flags & TR_HIGHLIGHT) && (!GLOBALS->black_and_white)) + { + gdk_draw_rectangle(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + TRUE,0, liney - GLOBALS->fontheight, + GLOBALS->wavewidth, GLOBALS->fontheight); + } + else + { + gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + (GLOBALS->tims.start<GLOBALS->tims.first)?(GLOBALS->tims.first-GLOBALS->tims.start)*GLOBALS->pxns:0, liney,(GLOBALS->tims.last<=GLOBALS->tims.end)?(GLOBALS->tims.last-GLOBALS->tims.start)*GLOBALS->pxns:GLOBALS->wavewidth-1, liney); + } } if((h)&&(GLOBALS->tims.start==h->time)) @@ -3898,10 +3907,26 @@ Trptr tn = GiveNextTrace(t); if((t->flags & TR_ANALOGMASK) && (tn) && (tn->flags & TR_ANALOG_BLANK_STRETCH)) { + if((GLOBALS->highlight_wavewindow) && (t) && (t->flags & TR_HIGHLIGHT) && (!GLOBALS->black_and_white)) + { + gdk_draw_rectangle(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + TRUE,0, liney - GLOBALS->fontheight, + GLOBALS->wavewidth, GLOBALS->fontheight); + } } else { - gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1,(GLOBALS->tims.start<GLOBALS->tims.first)?(GLOBALS->tims.first-GLOBALS->tims.start)*GLOBALS->pxns:0, liney,(GLOBALS->tims.last<=GLOBALS->tims.end)?(GLOBALS->tims.last-GLOBALS->tims.start)*GLOBALS->pxns:GLOBALS->wavewidth-1, liney); + if((GLOBALS->highlight_wavewindow) && (t) && (t->flags & TR_HIGHLIGHT) && (!GLOBALS->black_and_white)) + { + gdk_draw_rectangle(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + TRUE,0, liney - GLOBALS->fontheight, + GLOBALS->wavewidth, GLOBALS->fontheight); + } + else + { + gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + (GLOBALS->tims.start<GLOBALS->tims.first)?(GLOBALS->tims.first-GLOBALS->tims.start)*GLOBALS->pxns:0, liney,(GLOBALS->tims.last<=GLOBALS->tims.end)?(GLOBALS->tims.last-GLOBALS->tims.start)*GLOBALS->pxns:GLOBALS->wavewidth-1, liney); + } } } @@ -3923,6 +3948,13 @@ } } + if((ext) && (GLOBALS->highlight_wavewindow) && (t) && (t->flags & TR_HIGHLIGHT) && (!GLOBALS->black_and_white)) + { + gdk_draw_rectangle(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + TRUE,0, liney, + GLOBALS->wavewidth, GLOBALS->fontheight * ext); + } + draw_hptr_trace_vector_analog(t, h, which, ext); GLOBALS->tims.start+=GLOBALS->shift_timebase; GLOBALS->tims.end+=GLOBALS->shift_timebase; @@ -4678,10 +4710,26 @@ Trptr tn = GiveNextTrace(t); if((t->flags & TR_ANALOGMASK) && (tn) && (tn->flags & TR_ANALOG_BLANK_STRETCH)) { + if((GLOBALS->highlight_wavewindow) && (t) && (t->flags & TR_HIGHLIGHT) && (!GLOBALS->black_and_white)) + { + gdk_draw_rectangle(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + TRUE,0, liney - GLOBALS->fontheight, + GLOBALS->wavewidth, GLOBALS->fontheight); + } } else { - gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1,(GLOBALS->tims.start<GLOBALS->tims.first)?(GLOBALS->tims.first-GLOBALS->tims.start)*GLOBALS->pxns:0, liney,(GLOBALS->tims.last<=GLOBALS->tims.end)?(GLOBALS->tims.last-GLOBALS->tims.start)*GLOBALS->pxns:GLOBALS->wavewidth-1, liney); + if((GLOBALS->highlight_wavewindow) && (t) && (t->flags & TR_HIGHLIGHT) && (!GLOBALS->black_and_white)) + { + gdk_draw_rectangle(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + TRUE,0, liney - GLOBALS->fontheight, + GLOBALS->wavewidth, GLOBALS->fontheight); + } + else + { + gdk_draw_line(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + (GLOBALS->tims.start<GLOBALS->tims.first)?(GLOBALS->tims.first-GLOBALS->tims.start)*GLOBALS->pxns:0, liney,(GLOBALS->tims.last<=GLOBALS->tims.end)?(GLOBALS->tims.last-GLOBALS->tims.start)*GLOBALS->pxns:GLOBALS->wavewidth-1, liney); + } } } @@ -4716,6 +4764,13 @@ } } + if((ext) && (GLOBALS->highlight_wavewindow) && (t) && (t->flags & TR_HIGHLIGHT) && (!GLOBALS->black_and_white)) + { + gdk_draw_rectangle(GLOBALS->wavepixmap_wavewindow_c_1, GLOBALS->gc.gc_grid_wavewindow_c_1, + TRUE,0, liney, + GLOBALS->wavewidth, GLOBALS->fontheight * ext); + } + draw_vptr_trace_analog(t, v, which, ext); GLOBALS->tims.start+=GLOBALS->shift_timebase; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit grantlee for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package grantlee for openSUSE:Factory checked in at 2012-11-02 17:33:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grantlee (Old) and /work/SRC/openSUSE:Factory/.grantlee.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "grantlee", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/grantlee/grantlee.changes 2011-11-07 14:17:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.grantlee.new/grantlee.changes 2012-11-02 17:33:30.000000000 +0100 @@ -1,0 +2,9 @@ +Fri Nov 2 13:14:04 UTC 2012 - cgiboudeaux(a)gmx.com + +- Update to 0.3.0 + * Implement dictsort filter + * Many new unit tests + * Bug fixes and performance improvements + * Roman numeral support in textdocument processing + +------------------------------------------------------------------- Old: ---- grantlee-0.2.0.tar.gz New: ---- grantlee-0.3.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grantlee.spec ++++++ --- /var/tmp/diff_new_pack.Ug1UoX/_old 2012-11-02 17:33:31.000000000 +0100 +++ /var/tmp/diff_new_pack.Ug1UoX/_new 2012-11-02 17:33:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package grantlee # -# 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: grantlee -Version: 0.2.0 -Release: 2 -License: LGPL-2.1+ +Version: 0.3.0 +Release: 0 Summary: Qt string template library -Url: http://grantlee.org/ +License: LGPL-2.1+ Group: System/Libraries +Url: http://grantlee.org/ Source0: http://downloads.grantlee.org/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: doxygen @@ -37,7 +36,6 @@ written in Qt. %package devel -License: LGPL-2.1+ Summary: Include Files and Libraries Mandatory for Development with Grantlee Group: Development/Libraries/C and C++ Requires: libgrantlee_core0 = %{version} @@ -48,7 +46,6 @@ grantlee. %package -n libgrantlee_core0 -License: LGPL-2.1+ Summary: Qt string template library Group: System/Libraries # grantlee was last used in openSUSE 11.4 (grantlee-0.1.7) @@ -60,7 +57,6 @@ written in Qt. %package -n libgrantlee_gui0 -License: LGPL-2.1+ Summary: Qt string template library Group: System/Libraries # grantlee was last used in openSUSE 11.4 (grantlee-0.1.7) ++++++ grantlee-0.2.0.tar.gz -> grantlee-0.3.0.tar.gz ++++++ ++++ 2332 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 gimp-help for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package gimp-help for openSUSE:Factory checked in at 2012-11-02 17:33:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gimp-help (Old) and /work/SRC/openSUSE:Factory/.gimp-help.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gimp-help", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/gimp-help/gimp-help.changes 2012-06-26 15:40:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gimp-help.new/gimp-help.changes 2012-11-02 17:33:06.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Oct 31 11:13:55 UTC 2012 - mvyskocil(a)suse.com + +- Since recent changes, fdupes can only link files of same + owner/permissions (bnc#784670). As we still want to make use + of fdupes, we adjust the permissions of the images folder's + content. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp-help.spec ++++++ --- /var/tmp/diff_new_pack.PD7ftg/_old 2012-11-02 17:33:09.000000000 +0100 +++ /var/tmp/diff_new_pack.PD7ftg/_new 2012-11-02 17:33:09.000000000 +0100 @@ -214,6 +214,9 @@ # Parallel build is broken make -f Makefile.GNU +# unify the permissions of images, to make fdupes working again (bnc#784670) +find images/ -type f -exec chmod 0644 {} + + %install #FIXME: we can't use the usual macro since we don't use the standard Makefile #%make_install -- 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-dds for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package gimp-dds for openSUSE:Factory checked in at 2012-11-02 17:32:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gimp-dds (Old) and /work/SRC/openSUSE:Factory/.gimp-dds.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gimp-dds", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/gimp-dds/gimp-dds.changes 2012-08-04 09:12:11.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gimp-dds.new/gimp-dds.changes 2012-11-02 17:32:38.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Aug 15 16:55:17 UTC 2012 - malcolmlewis(a)opensuse.org + +- Updated to version 2.2.1: + + Bugfix release. Fixes artifacts introduced by the compression + code in some images. +- Updates from version 2.2.0: + + Compressed non-power-of-2 texture support. + + Fix compressed mipmap images with width or height less than 4. +- Export CFLAGS in order to have a fully optimized build. Note: + as the Makefile does not support extending CFLAGS, we need to add + the content of the original variable as well, and invoke make -e. + +------------------------------------------------------------------- Old: ---- gimp-dds-2.1.0.tar.bz2 New: ---- gimp-dds-2.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gimp-dds.spec ++++++ --- /var/tmp/diff_new_pack.mZrdHX/_old 2012-11-02 17:32:39.000000000 +0100 +++ /var/tmp/diff_new_pack.mZrdHX/_new 2012-11-02 17:32:39.000000000 +0100 @@ -18,7 +18,7 @@ Name: gimp-dds -Version: 2.1.0 +Version: 2.2.1 Release: 0 Summary: Plugin for GIMP providing support for the DDS format License: GPL-2.0+ @@ -58,10 +58,12 @@ + Saving volume map images %prep -%setup +%setup -q %build -make %{?_smp_mflags} +# As we currently need to override CFLAGS, we also need to inject gtk2 and gimp cflags. +export CFLAGS="%{optflags} $(pkg-config --cflags gtk+-2.0 gimp-2.0)" +make %{?_smp_mflags} -e %install install -D -m 0755 dds %{buildroot}%{_libdir}/gimp/2.0/plug-ins/dds ++++++ gimp-dds-2.1.0.tar.bz2 -> gimp-dds-2.2.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/LICENSE new/gimp-dds-2.2.1/LICENSE --- old/gimp-dds-2.1.0/LICENSE 2012-05-04 04:09:52.000000000 +0200 +++ new/gimp-dds-2.2.1/LICENSE 2012-07-26 10:49:50.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2008 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/Makefile.mingw32 new/gimp-dds-2.2.1/Makefile.mingw32 --- old/gimp-dds-2.1.0/Makefile.mingw32 2012-06-23 15:57:54.000000000 +0200 +++ new/gimp-dds-2.2.1/Makefile.mingw32 2012-08-01 00:22:41.000000000 +0200 @@ -1,5 +1,5 @@ -GIMPTOOL=/usr/i686-w64-mingw32/sys-root/mingw/bin/gimptool-2.0 +GIMPTOOL=/usr/i686-w64-mingw32/sys-root/mingw/bin/gimptool-2.0.exe CC=i686-w64-mingw32-gcc CFLAGS=-pipe -g -O2 -Wall $(shell i686-w64-mingw32-pkg-config --cflags gtk+-2.0 gimp-2.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/Makefile.mingw64 new/gimp-dds-2.2.1/Makefile.mingw64 --- old/gimp-dds-2.1.0/Makefile.mingw64 2012-06-23 15:58:02.000000000 +0200 +++ new/gimp-dds-2.2.1/Makefile.mingw64 2012-08-01 00:22:37.000000000 +0200 @@ -1,5 +1,5 @@ -GIMPTOOL=/usr/x86_64-w64-mingw32/sys-root/mingw/bin/gimptool-2.0 +GIMPTOOL=wine64 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/gimptool-2.0.exe CC=x86_64-w64-mingw32-gcc CFLAGS=-pipe -g -O2 -Wall $(shell x86_64-w64-mingw32-pkg-config --cflags gtk+-2.0 gimp-2.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/color.c new/gimp-dds-2.2.1/color.c --- old/gimp-dds-2.1.0/color.c 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/color.c 2012-07-26 10:50:50.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <math.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/color.h new/gimp-dds-2.2.1/color.h --- old/gimp-dds-2.1.0/color.h 2010-05-13 10:30:35.000000000 +0200 +++ new/gimp-dds-2.2.1/color.h 2012-07-26 10:50:58.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef COLOR_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dds.c new/gimp-dds-2.2.1/dds.c --- old/gimp-dds-2.1.0/dds.c 2010-04-24 02:44:35.000000000 +0200 +++ new/gimp-dds-2.2.1/dds.c 2012-07-26 10:51:09.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <stdio.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dds.h new/gimp-dds-2.2.1/dds.h --- old/gimp-dds-2.1.0/dds.h 2011-08-08 17:24:37.000000000 +0200 +++ new/gimp-dds-2.2.1/dds.h 2012-07-26 10:51:20.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef DDS_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/ddsplugin.h new/gimp-dds-2.2.1/ddsplugin.h --- old/gimp-dds-2.1.0/ddsplugin.h 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/ddsplugin.h 2012-08-01 00:34:35.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,16 +16,16 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef __DDSPLUGIN_H #define __DDSPLUGIN_H #define DDS_PLUGIN_VERSION_MAJOR 2 -#define DDS_PLUGIN_VERSION_MINOR 0 -#define DDS_PLUGIN_VERSION_REVISION 10 +#define DDS_PLUGIN_VERSION_MINOR 2 +#define DDS_PLUGIN_VERSION_REVISION 1 #define DDS_PLUGIN_VERSION \ ((unsigned int)(DDS_PLUGIN_VERSION_MAJOR << 16) | \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/ddsread.c new/gimp-dds-2.2.1/ddsread.c --- old/gimp-dds-2.1.0/ddsread.c 2012-05-04 03:56:39.000000000 +0200 +++ new/gimp-dds-2.2.1/ddsread.c 2012-07-26 10:53:51.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ /* @@ -598,16 +598,8 @@ unsigned int size = hdr->pitch_or_linsize >> (2 * level); int format = DDS_COMPRESS_NONE; - if(hdr->pixelfmt.flags & DDPF_FOURCC) - { - width = MAX(width, 4); - height = MAX(height, 4); - } - else - { - if(width < 1) width = 1; - if(height < 1) height = 1; - } + if(width < 1) width = 1; + if(height < 1) height = 1; switch(d->bpp) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/ddswrite.c new/gimp-dds-2.2.1/ddswrite.c --- old/gimp-dds-2.1.0/ddswrite.c 2012-05-04 03:39:49.000000000 +0200 +++ new/gimp-dds-2.2.1/ddswrite.c 2012-07-26 10:53:39.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <stdio.h> @@ -732,7 +732,8 @@ { GimpDrawable *drawable; GimpPixelRgn rgn; - GimpImageType basetype, type; + GimpImageBaseType basetype; + GimpImageType type; unsigned char *src, *dst, *fmtdst, *tmp; unsigned char *palette = NULL; int i, c, x, y, size, fmtsize, offset, colors; @@ -977,7 +978,7 @@ unsigned char *palette = 0; GimpDrawable *drawable; GimpPixelRgn rgn; - GimpImageType type; + GimpImageBaseType type; type = gimp_image_base_type(image_id); @@ -1064,7 +1065,8 @@ static int write_image(FILE *fp, gint32 image_id, gint32 drawable_id) { GimpDrawable *drawable; - GimpImageType drawable_type, basetype; + GimpImageType drawable_type; + GimpImageBaseType basetype; GimpPixelRgn rgn; int i, w, h, bpp = 0, fmtbpp = 0, has_alpha = 0; int num_mipmaps; @@ -1088,23 +1090,6 @@ drawable_type = gimp_drawable_type(drawable_id); gimp_pixel_rgn_init(&rgn, drawable, 0, 0, w, h, 0, 0); - if((dds_write_vals.compression != DDS_COMPRESS_NONE) && - !(IS_MUL4(w) && IS_MUL4(h))) - { - dds_write_vals.compression = DDS_COMPRESS_NONE; - g_message("DDS: Cannot compress images whose dimensions are not multiples of 4.\n" - "Saved image will not be compressed."); - } - - if((dds_write_vals.compression != DDS_COMPRESS_NONE) && - dds_write_vals.mipmaps && - !(IS_POW2(w) && IS_POW2(h))) - { - dds_write_vals.mipmaps = 0; - g_message("DDS: Cannot generate mipmaps for compressed images whose dimensions are not powers of 2.\n" - "Saved image will not have mipmaps generated."); - } - switch(drawable_type) { case GIMP_RGB_IMAGE: bpp = 3; break; @@ -1629,7 +1614,7 @@ GtkWidget *check; GtkWidget *spin; GtkWidget *expander; - GimpImageType basetype; + GimpImageBaseType basetype; if(is_cubemap) dds_write_vals.savetype = DDS_SAVE_CUBEMAP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dxt.c new/gimp-dds-2.2.1/dxt.c --- old/gimp-dds-2.1.0/dxt.c 2012-05-04 03:37:58.000000000 +0200 +++ new/gimp-dds-2.2.1/dxt.c 2012-07-31 07:27:42.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ /* @@ -41,6 +41,8 @@ #include "dxt_tables.h" +#define SWAP(a, b) do { typeof(a) t; t = a; a = b; b = t; } while(0) + /* extract 4x4 BGRA block */ static void extract_block(const unsigned char *src, int x, int y, int w, int h, unsigned char *block) @@ -99,22 +101,21 @@ /* linear interpolation at 1/3 point between a and b */ static void lerp_rgb13(unsigned char *dst, unsigned char *a, unsigned char *b) { +#if 0 dst[0] = blerp(a[0], b[0], 0x55); dst[1] = blerp(a[1], b[1], 0x55); dst[2] = blerp(a[2], b[2], 0x55); - +#else /* * according to the S3TC/DX10 specs, this is the correct way to do the * interpolation (with no rounding bias) * * dst = (2 * a + b) / 3; - * - * TODO: Find a smart way to handle this. Straight-forward for the compressor - * (advanced option in the save dialog to disable the rounding bias used - * in the above code), but more tricky to handle with the decompressor - * from a user's standpoint (if we are decompressing an image that was - * not compressed with this plugin, which option do you choose?). */ + dst[0] = (2 * a[0] + b[0]) / 3; + dst[1] = (2 * a[1] + b[1]) / 3; + dst[2] = (2 * a[2] + b[2]) / 3; +#endif } static int color_distance(const unsigned char *c0, @@ -655,14 +656,8 @@ x1 = cmin[0]; y1 = cmin[1]; - if(covariance[0] < 0) - { - x0 ^= x1; x1 ^= x0; x0 ^= x1; - } - if(covariance[1] < 0) - { - y0 ^= y1; y1 ^= y0; y0 ^= y1; - } + if(covariance[0] < 0) SWAP(x0, x1); + if(covariance[1] < 0) SWAP(y0, y1); cmax[0] = MAX(0, MIN(255, x0)); cmax[1] = MAX(0, MIN(255, y0)); @@ -870,9 +865,7 @@ min16 = pack_rgb565(cmin); if(max16 > min16) - { - max16 ^= min16; min16 ^= max16; max16 ^= min16; - } + SWAP(max16, min16); eval_colors(color, max16, min16); mask = match_colors_block_DXT1a(block, color); @@ -943,7 +936,7 @@ if(max16 < min16) { - max16 ^= min16; min16 ^= max16; max16 ^= min16; + SWAP(max16, min16); mask ^= 0x55555555; } } @@ -1441,10 +1434,10 @@ int x, y, i; unsigned char *d; - for(y = 0; y < 4; ++y) + for(y = 0; y < 4 && ((by + y) < height); ++y) { d = dst + ((y + by) * width + bx) * bpp; - for(x = 0; x < 4; ++x) + for(x = 0; x < 4 && ((bx + x) < width); ++x) { for(i = 0; i < bpp; ++ i) *d++ = block[y * 16 + (x * 4) + i]; @@ -1460,9 +1453,6 @@ unsigned int i, x, y; unsigned char block[16 * 4]; - if(!(IS_MUL4(width) && IS_MUL4(height))) - return(0); - s = src; for(y = 0; y < height; y += 4) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dxt.h new/gimp-dds-2.2.1/dxt.h --- old/gimp-dds-2.1.0/dxt.h 2010-05-05 10:55:10.000000000 +0200 +++ new/gimp-dds-2.2.1/dxt.h 2012-07-26 10:53:19.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef DXT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/dxt_tables.h new/gimp-dds-2.2.1/dxt_tables.h --- old/gimp-dds-2.1.0/dxt_tables.h 2012-01-17 02:12:14.000000000 +0100 +++ new/gimp-dds-2.2.1/dxt_tables.h 2012-07-31 07:28:35.000000000 +0200 @@ -81,136 +81,136 @@ { {0x00, 0x00}, {0x00, 0x00}, {0x00, 0x01}, {0x00, 0x01}, {0x01, 0x00}, {0x01, 0x00}, {0x01, 0x00}, {0x01, 0x01}, - {0x01, 0x01}, {0x01, 0x01}, {0x01, 0x02}, {0x01, 0x02}, - {0x02, 0x01}, {0x02, 0x01}, {0x00, 0x05}, {0x02, 0x02}, - {0x02, 0x02}, {0x02, 0x02}, {0x02, 0x03}, {0x02, 0x03}, - {0x03, 0x02}, {0x03, 0x02}, {0x02, 0x04}, {0x03, 0x03}, - {0x03, 0x03}, {0x04, 0x01}, {0x03, 0x04}, {0x03, 0x04}, - {0x03, 0x04}, {0x04, 0x03}, {0x04, 0x03}, {0x04, 0x03}, - {0x03, 0x06}, {0x04, 0x04}, {0x04, 0x04}, {0x05, 0x03}, - {0x04, 0x05}, {0x05, 0x04}, {0x05, 0x04}, {0x05, 0x04}, - {0x05, 0x05}, {0x05, 0x05}, {0x05, 0x05}, {0x07, 0x02}, - {0x05, 0x06}, {0x06, 0x05}, {0x06, 0x05}, {0x04, 0x09}, - {0x06, 0x06}, {0x06, 0x06}, {0x06, 0x06}, {0x06, 0x07}, - {0x06, 0x07}, {0x07, 0x06}, {0x07, 0x06}, {0x06, 0x08}, - {0x07, 0x07}, {0x07, 0x07}, {0x08, 0x05}, {0x07, 0x08}, - {0x07, 0x08}, {0x07, 0x08}, {0x08, 0x07}, {0x08, 0x07}, - {0x08, 0x07}, {0x07, 0x0a}, {0x08, 0x08}, {0x08, 0x08}, - {0x09, 0x07}, {0x08, 0x09}, {0x09, 0x08}, {0x09, 0x08}, - {0x09, 0x08}, {0x09, 0x09}, {0x09, 0x09}, {0x09, 0x09}, - {0x0b, 0x06}, {0x09, 0x0a}, {0x0a, 0x09}, {0x0a, 0x09}, - {0x08, 0x0d}, {0x0a, 0x0a}, {0x0a, 0x0a}, {0x0a, 0x0a}, - {0x0a, 0x0b}, {0x0a, 0x0b}, {0x0b, 0x0a}, {0x0b, 0x0a}, - {0x0a, 0x0c}, {0x0b, 0x0b}, {0x0b, 0x0b}, {0x0c, 0x09}, - {0x0b, 0x0c}, {0x0b, 0x0c}, {0x0b, 0x0c}, {0x0c, 0x0b}, - {0x0c, 0x0b}, {0x0c, 0x0b}, {0x0b, 0x0e}, {0x0c, 0x0c}, - {0x0c, 0x0c}, {0x0d, 0x0b}, {0x0c, 0x0d}, {0x0d, 0x0c}, - {0x0d, 0x0c}, {0x0d, 0x0c}, {0x0d, 0x0d}, {0x0d, 0x0d}, - {0x0d, 0x0d}, {0x0f, 0x0a}, {0x0d, 0x0e}, {0x0e, 0x0d}, - {0x0e, 0x0d}, {0x0c, 0x11}, {0x0e, 0x0e}, {0x0e, 0x0e}, - {0x0e, 0x0e}, {0x0e, 0x0f}, {0x0e, 0x0f}, {0x0f, 0x0e}, - {0x0f, 0x0e}, {0x0e, 0x10}, {0x0f, 0x0f}, {0x0f, 0x0f}, - {0x10, 0x0d}, {0x0f, 0x10}, {0x0f, 0x10}, {0x0f, 0x10}, - {0x10, 0x0f}, {0x10, 0x0f}, {0x10, 0x0f}, {0x0f, 0x12}, - {0x10, 0x10}, {0x10, 0x10}, {0x11, 0x0f}, {0x10, 0x11}, - {0x11, 0x10}, {0x11, 0x10}, {0x11, 0x10}, {0x11, 0x11}, - {0x11, 0x11}, {0x11, 0x11}, {0x13, 0x0e}, {0x11, 0x12}, - {0x12, 0x11}, {0x12, 0x11}, {0x10, 0x15}, {0x12, 0x12}, - {0x12, 0x12}, {0x12, 0x12}, {0x12, 0x13}, {0x12, 0x13}, - {0x13, 0x12}, {0x13, 0x12}, {0x12, 0x14}, {0x13, 0x13}, - {0x13, 0x13}, {0x14, 0x11}, {0x13, 0x14}, {0x13, 0x14}, - {0x13, 0x14}, {0x14, 0x13}, {0x14, 0x13}, {0x14, 0x13}, - {0x13, 0x16}, {0x14, 0x14}, {0x14, 0x14}, {0x15, 0x13}, - {0x14, 0x15}, {0x15, 0x14}, {0x15, 0x14}, {0x15, 0x14}, - {0x15, 0x15}, {0x15, 0x15}, {0x15, 0x15}, {0x17, 0x12}, - {0x15, 0x16}, {0x16, 0x15}, {0x16, 0x15}, {0x14, 0x19}, - {0x16, 0x16}, {0x16, 0x16}, {0x16, 0x16}, {0x16, 0x17}, - {0x16, 0x17}, {0x17, 0x16}, {0x17, 0x16}, {0x16, 0x18}, - {0x17, 0x17}, {0x17, 0x17}, {0x18, 0x15}, {0x17, 0x18}, - {0x17, 0x18}, {0x17, 0x18}, {0x18, 0x17}, {0x18, 0x17}, - {0x18, 0x17}, {0x17, 0x1a}, {0x18, 0x18}, {0x18, 0x18}, - {0x19, 0x17}, {0x18, 0x19}, {0x19, 0x18}, {0x19, 0x18}, - {0x19, 0x18}, {0x19, 0x19}, {0x19, 0x19}, {0x19, 0x19}, - {0x1b, 0x16}, {0x19, 0x1a}, {0x1a, 0x19}, {0x1a, 0x19}, - {0x18, 0x1d}, {0x1a, 0x1a}, {0x1a, 0x1a}, {0x1a, 0x1a}, - {0x1a, 0x1b}, {0x1a, 0x1b}, {0x1b, 0x1a}, {0x1b, 0x1a}, - {0x1a, 0x1c}, {0x1b, 0x1b}, {0x1b, 0x1b}, {0x1c, 0x19}, - {0x1b, 0x1c}, {0x1b, 0x1c}, {0x1b, 0x1c}, {0x1c, 0x1b}, - {0x1c, 0x1b}, {0x1c, 0x1b}, {0x1b, 0x1e}, {0x1c, 0x1c}, - {0x1c, 0x1c}, {0x1d, 0x1b}, {0x1c, 0x1d}, {0x1d, 0x1c}, - {0x1d, 0x1c}, {0x1d, 0x1c}, {0x1d, 0x1d}, {0x1d, 0x1d}, - {0x1d, 0x1d}, {0x1f, 0x1a}, {0x1d, 0x1e}, {0x1e, 0x1d}, - {0x1e, 0x1d}, {0x1e, 0x1d}, {0x1e, 0x1e}, {0x1e, 0x1e}, - {0x1e, 0x1e}, {0x1e, 0x1f}, {0x1e, 0x1f}, {0x1f, 0x1e}, + {0x01, 0x01}, {0x01, 0x01}, {0x02, 0x00}, {0x02, 0x00}, + {0x02, 0x00}, {0x02, 0x01}, {0x00, 0x05}, {0x03, 0x00}, + {0x03, 0x00}, {0x03, 0x00}, {0x03, 0x01}, {0x03, 0x01}, + {0x03, 0x01}, {0x03, 0x02}, {0x04, 0x00}, {0x04, 0x00}, + {0x03, 0x03}, {0x04, 0x01}, {0x05, 0x00}, {0x05, 0x00}, + {0x05, 0x00}, {0x05, 0x01}, {0x05, 0x01}, {0x05, 0x01}, + {0x03, 0x06}, {0x06, 0x00}, {0x06, 0x00}, {0x06, 0x01}, + {0x04, 0x05}, {0x07, 0x00}, {0x07, 0x00}, {0x07, 0x00}, + {0x07, 0x01}, {0x07, 0x01}, {0x07, 0x01}, {0x07, 0x02}, + {0x08, 0x00}, {0x08, 0x00}, {0x07, 0x03}, {0x08, 0x01}, + {0x09, 0x00}, {0x09, 0x00}, {0x09, 0x00}, {0x09, 0x01}, + {0x09, 0x01}, {0x09, 0x01}, {0x07, 0x06}, {0x0a, 0x00}, + {0x0a, 0x00}, {0x0a, 0x01}, {0x08, 0x05}, {0x0b, 0x00}, + {0x0b, 0x00}, {0x0b, 0x00}, {0x0b, 0x01}, {0x0b, 0x01}, + {0x0b, 0x01}, {0x0b, 0x02}, {0x0c, 0x00}, {0x0c, 0x00}, + {0x0b, 0x03}, {0x0c, 0x01}, {0x0d, 0x00}, {0x0d, 0x00}, + {0x0d, 0x00}, {0x0d, 0x01}, {0x0d, 0x01}, {0x0d, 0x01}, + {0x0b, 0x06}, {0x0e, 0x00}, {0x0e, 0x00}, {0x0e, 0x01}, + {0x0c, 0x05}, {0x0f, 0x00}, {0x0f, 0x00}, {0x0f, 0x00}, + {0x0f, 0x01}, {0x0f, 0x01}, {0x0f, 0x01}, {0x0f, 0x02}, + {0x10, 0x00}, {0x10, 0x00}, {0x0f, 0x03}, {0x10, 0x01}, + {0x11, 0x00}, {0x11, 0x00}, {0x11, 0x00}, {0x11, 0x01}, + {0x11, 0x01}, {0x11, 0x01}, {0x0f, 0x06}, {0x12, 0x00}, + {0x12, 0x00}, {0x12, 0x01}, {0x10, 0x05}, {0x13, 0x00}, + {0x13, 0x00}, {0x13, 0x00}, {0x13, 0x01}, {0x13, 0x01}, + {0x13, 0x01}, {0x13, 0x02}, {0x14, 0x00}, {0x14, 0x00}, + {0x13, 0x03}, {0x14, 0x01}, {0x15, 0x00}, {0x15, 0x00}, + {0x15, 0x00}, {0x15, 0x01}, {0x15, 0x01}, {0x15, 0x01}, + {0x13, 0x06}, {0x16, 0x00}, {0x16, 0x00}, {0x16, 0x01}, + {0x14, 0x05}, {0x17, 0x00}, {0x17, 0x00}, {0x17, 0x00}, + {0x17, 0x01}, {0x17, 0x01}, {0x17, 0x01}, {0x17, 0x02}, + {0x18, 0x00}, {0x18, 0x00}, {0x17, 0x03}, {0x18, 0x01}, + {0x19, 0x00}, {0x19, 0x00}, {0x19, 0x00}, {0x19, 0x01}, + {0x19, 0x01}, {0x19, 0x01}, {0x17, 0x06}, {0x1a, 0x00}, + {0x1a, 0x00}, {0x1a, 0x01}, {0x18, 0x05}, {0x1b, 0x00}, + {0x1b, 0x00}, {0x1b, 0x00}, {0x1b, 0x01}, {0x1b, 0x01}, + {0x1b, 0x01}, {0x1b, 0x02}, {0x1c, 0x00}, {0x1c, 0x00}, + {0x1b, 0x03}, {0x1c, 0x01}, {0x1d, 0x00}, {0x1d, 0x00}, + {0x1d, 0x00}, {0x1d, 0x01}, {0x1d, 0x01}, {0x1d, 0x01}, + {0x1b, 0x06}, {0x1e, 0x00}, {0x1e, 0x00}, {0x1e, 0x01}, + {0x1c, 0x05}, {0x1f, 0x00}, {0x1f, 0x00}, {0x1f, 0x00}, + {0x1f, 0x01}, {0x1f, 0x01}, {0x1f, 0x01}, {0x1f, 0x02}, + {0x1e, 0x04}, {0x1f, 0x03}, {0x1f, 0x03}, {0x1c, 0x09}, + {0x1f, 0x04}, {0x1f, 0x04}, {0x1f, 0x04}, {0x1f, 0x05}, + {0x1f, 0x05}, {0x1f, 0x05}, {0x1f, 0x06}, {0x1e, 0x08}, + {0x1f, 0x07}, {0x1f, 0x07}, {0x1c, 0x0d}, {0x1f, 0x08}, + {0x1f, 0x08}, {0x1f, 0x08}, {0x1f, 0x09}, {0x1f, 0x09}, + {0x1f, 0x09}, {0x1f, 0x0a}, {0x1e, 0x0c}, {0x1f, 0x0b}, + {0x1f, 0x0b}, {0x1c, 0x11}, {0x1f, 0x0c}, {0x1f, 0x0c}, + {0x1f, 0x0c}, {0x1f, 0x0d}, {0x1f, 0x0d}, {0x1f, 0x0d}, + {0x1f, 0x0e}, {0x1e, 0x10}, {0x1f, 0x0f}, {0x1f, 0x0f}, + {0x1c, 0x15}, {0x1f, 0x10}, {0x1f, 0x10}, {0x1f, 0x10}, + {0x1f, 0x11}, {0x1f, 0x11}, {0x1f, 0x11}, {0x1f, 0x12}, + {0x1e, 0x14}, {0x1f, 0x13}, {0x1f, 0x13}, {0x1c, 0x19}, + {0x1f, 0x14}, {0x1f, 0x14}, {0x1f, 0x14}, {0x1f, 0x15}, + {0x1f, 0x15}, {0x1f, 0x15}, {0x1f, 0x16}, {0x1e, 0x18}, + {0x1f, 0x17}, {0x1f, 0x17}, {0x1c, 0x1d}, {0x1f, 0x18}, + {0x1f, 0x18}, {0x1f, 0x18}, {0x1f, 0x19}, {0x1f, 0x19}, + {0x1f, 0x19}, {0x1f, 0x1a}, {0x1e, 0x1c}, {0x1f, 0x1b}, + {0x1f, 0x1b}, {0x1f, 0x1b}, {0x1f, 0x1c}, {0x1f, 0x1c}, + {0x1f, 0x1c}, {0x1f, 0x1d}, {0x1f, 0x1d}, {0x1f, 0x1d}, {0x1f, 0x1e}, {0x1f, 0x1e}, {0x1f, 0x1f}, {0x1f, 0x1f}, }; static const unsigned char omatch6[256][2] = { {0x00, 0x00}, {0x00, 0x01}, {0x01, 0x00}, {0x01, 0x00}, - {0x01, 0x01}, {0x01, 0x02}, {0x02, 0x01}, {0x02, 0x01}, - {0x02, 0x02}, {0x02, 0x03}, {0x03, 0x02}, {0x03, 0x02}, - {0x03, 0x03}, {0x03, 0x04}, {0x04, 0x03}, {0x04, 0x03}, - {0x04, 0x04}, {0x04, 0x05}, {0x05, 0x04}, {0x05, 0x04}, - {0x05, 0x05}, {0x05, 0x06}, {0x06, 0x05}, {0x06, 0x05}, - {0x06, 0x06}, {0x06, 0x07}, {0x07, 0x06}, {0x07, 0x06}, - {0x07, 0x07}, {0x07, 0x08}, {0x08, 0x07}, {0x08, 0x07}, - {0x08, 0x08}, {0x08, 0x09}, {0x09, 0x08}, {0x09, 0x08}, - {0x09, 0x09}, {0x09, 0x0a}, {0x0a, 0x09}, {0x0a, 0x09}, - {0x0a, 0x0a}, {0x0a, 0x0b}, {0x0b, 0x0a}, {0x0b, 0x0a}, - {0x0b, 0x0b}, {0x0b, 0x0c}, {0x09, 0x10}, {0x0c, 0x0b}, - {0x0c, 0x0c}, {0x0c, 0x0d}, {0x0a, 0x11}, {0x0d, 0x0c}, - {0x0d, 0x0d}, {0x0d, 0x0e}, {0x0c, 0x10}, {0x0e, 0x0d}, - {0x0e, 0x0e}, {0x0e, 0x0f}, {0x0d, 0x11}, {0x0f, 0x0e}, - {0x0f, 0x0f}, {0x10, 0x0d}, {0x0f, 0x10}, {0x10, 0x0f}, - {0x0f, 0x12}, {0x10, 0x10}, {0x10, 0x11}, {0x12, 0x0e}, - {0x11, 0x10}, {0x11, 0x11}, {0x11, 0x12}, {0x13, 0x0f}, - {0x12, 0x11}, {0x12, 0x12}, {0x12, 0x13}, {0x15, 0x0e}, - {0x13, 0x12}, {0x13, 0x13}, {0x13, 0x14}, {0x16, 0x0f}, - {0x14, 0x13}, {0x14, 0x14}, {0x14, 0x15}, {0x15, 0x14}, - {0x15, 0x14}, {0x15, 0x15}, {0x15, 0x16}, {0x16, 0x15}, - {0x16, 0x15}, {0x16, 0x16}, {0x16, 0x17}, {0x17, 0x16}, - {0x17, 0x16}, {0x17, 0x17}, {0x17, 0x18}, {0x18, 0x17}, - {0x18, 0x17}, {0x18, 0x18}, {0x18, 0x19}, {0x19, 0x18}, - {0x19, 0x18}, {0x19, 0x19}, {0x19, 0x1a}, {0x1a, 0x19}, - {0x1a, 0x19}, {0x1a, 0x1a}, {0x1a, 0x1b}, {0x1b, 0x1a}, - {0x1b, 0x1a}, {0x1b, 0x1b}, {0x1b, 0x1c}, {0x19, 0x20}, - {0x1c, 0x1b}, {0x1c, 0x1c}, {0x1c, 0x1d}, {0x1a, 0x21}, - {0x1d, 0x1c}, {0x1d, 0x1d}, {0x1d, 0x1e}, {0x1c, 0x20}, - {0x1e, 0x1d}, {0x1e, 0x1e}, {0x1e, 0x1f}, {0x1d, 0x21}, - {0x1f, 0x1e}, {0x1f, 0x1f}, {0x20, 0x1d}, {0x1f, 0x20}, - {0x20, 0x1f}, {0x1f, 0x22}, {0x20, 0x20}, {0x20, 0x21}, - {0x22, 0x1e}, {0x21, 0x20}, {0x21, 0x21}, {0x21, 0x22}, - {0x23, 0x1f}, {0x22, 0x21}, {0x22, 0x22}, {0x22, 0x23}, - {0x25, 0x1e}, {0x23, 0x22}, {0x23, 0x23}, {0x23, 0x24}, - {0x26, 0x1f}, {0x24, 0x23}, {0x24, 0x24}, {0x24, 0x25}, - {0x25, 0x24}, {0x25, 0x24}, {0x25, 0x25}, {0x25, 0x26}, - {0x26, 0x25}, {0x26, 0x25}, {0x26, 0x26}, {0x26, 0x27}, - {0x27, 0x26}, {0x27, 0x26}, {0x27, 0x27}, {0x27, 0x28}, - {0x28, 0x27}, {0x28, 0x27}, {0x28, 0x28}, {0x28, 0x29}, - {0x29, 0x28}, {0x29, 0x28}, {0x29, 0x29}, {0x29, 0x2a}, - {0x2a, 0x29}, {0x2a, 0x29}, {0x2a, 0x2a}, {0x2a, 0x2b}, - {0x2b, 0x2a}, {0x2b, 0x2a}, {0x2b, 0x2b}, {0x2b, 0x2c}, - {0x29, 0x30}, {0x2c, 0x2b}, {0x2c, 0x2c}, {0x2c, 0x2d}, - {0x2a, 0x31}, {0x2d, 0x2c}, {0x2d, 0x2d}, {0x2d, 0x2e}, - {0x2c, 0x30}, {0x2e, 0x2d}, {0x2e, 0x2e}, {0x2e, 0x2f}, - {0x2d, 0x31}, {0x2f, 0x2e}, {0x2f, 0x2f}, {0x30, 0x2d}, - {0x2f, 0x30}, {0x30, 0x2f}, {0x2f, 0x32}, {0x30, 0x30}, - {0x30, 0x31}, {0x32, 0x2e}, {0x31, 0x30}, {0x31, 0x31}, - {0x31, 0x32}, {0x33, 0x2f}, {0x32, 0x31}, {0x32, 0x32}, - {0x32, 0x33}, {0x35, 0x2e}, {0x33, 0x32}, {0x33, 0x33}, - {0x33, 0x34}, {0x36, 0x2f}, {0x34, 0x33}, {0x34, 0x34}, - {0x34, 0x35}, {0x35, 0x34}, {0x35, 0x34}, {0x35, 0x35}, - {0x35, 0x36}, {0x36, 0x35}, {0x36, 0x35}, {0x36, 0x36}, - {0x36, 0x37}, {0x37, 0x36}, {0x37, 0x36}, {0x37, 0x37}, - {0x37, 0x38}, {0x38, 0x37}, {0x38, 0x37}, {0x38, 0x38}, - {0x38, 0x39}, {0x39, 0x38}, {0x39, 0x38}, {0x39, 0x39}, - {0x39, 0x3a}, {0x3a, 0x39}, {0x3a, 0x39}, {0x3a, 0x3a}, - {0x3a, 0x3b}, {0x3b, 0x3a}, {0x3b, 0x3a}, {0x3b, 0x3b}, - {0x3b, 0x3c}, {0x3c, 0x3b}, {0x3c, 0x3b}, {0x3c, 0x3c}, - {0x3c, 0x3d}, {0x3d, 0x3c}, {0x3d, 0x3c}, {0x3d, 0x3d}, - {0x3d, 0x3e}, {0x3e, 0x3d}, {0x3e, 0x3d}, {0x3e, 0x3e}, - {0x3e, 0x3f}, {0x3f, 0x3e}, {0x3f, 0x3e}, {0x3f, 0x3f}, + {0x01, 0x01}, {0x02, 0x00}, {0x02, 0x00}, {0x02, 0x01}, + {0x03, 0x00}, {0x03, 0x01}, {0x04, 0x00}, {0x04, 0x00}, + {0x04, 0x01}, {0x05, 0x00}, {0x05, 0x00}, {0x05, 0x01}, + {0x06, 0x00}, {0x06, 0x01}, {0x07, 0x00}, {0x07, 0x00}, + {0x07, 0x01}, {0x08, 0x00}, {0x00, 0x10}, {0x08, 0x01}, + {0x09, 0x00}, {0x09, 0x01}, {0x01, 0x11}, {0x0a, 0x00}, + {0x0a, 0x01}, {0x0b, 0x00}, {0x03, 0x10}, {0x0b, 0x01}, + {0x0c, 0x00}, {0x0c, 0x01}, {0x04, 0x11}, {0x0d, 0x00}, + {0x0d, 0x01}, {0x0e, 0x00}, {0x06, 0x10}, {0x0e, 0x01}, + {0x0f, 0x00}, {0x0f, 0x01}, {0x07, 0x11}, {0x10, 0x00}, + {0x0f, 0x03}, {0x10, 0x01}, {0x11, 0x00}, {0x11, 0x01}, + {0x0f, 0x06}, {0x12, 0x00}, {0x12, 0x01}, {0x13, 0x00}, + {0x0f, 0x09}, {0x13, 0x01}, {0x14, 0x00}, {0x14, 0x01}, + {0x0f, 0x0c}, {0x15, 0x00}, {0x15, 0x01}, {0x16, 0x00}, + {0x0f, 0x0f}, {0x16, 0x01}, {0x17, 0x00}, {0x17, 0x01}, + {0x0f, 0x12}, {0x18, 0x00}, {0x18, 0x01}, {0x19, 0x00}, + {0x11, 0x10}, {0x19, 0x01}, {0x1a, 0x00}, {0x1a, 0x01}, + {0x12, 0x11}, {0x1b, 0x00}, {0x1b, 0x01}, {0x1c, 0x00}, + {0x14, 0x10}, {0x1c, 0x01}, {0x1d, 0x00}, {0x1d, 0x01}, + {0x15, 0x11}, {0x1e, 0x00}, {0x1e, 0x01}, {0x1f, 0x00}, + {0x17, 0x10}, {0x1f, 0x01}, {0x1f, 0x02}, {0x20, 0x00}, + {0x20, 0x01}, {0x21, 0x00}, {0x1f, 0x05}, {0x21, 0x01}, + {0x22, 0x00}, {0x22, 0x01}, {0x1f, 0x08}, {0x23, 0x00}, + {0x23, 0x01}, {0x24, 0x00}, {0x1f, 0x0b}, {0x24, 0x01}, + {0x25, 0x00}, {0x25, 0x01}, {0x1f, 0x0e}, {0x26, 0x00}, + {0x26, 0x01}, {0x27, 0x00}, {0x1f, 0x11}, {0x27, 0x01}, + {0x28, 0x00}, {0x28, 0x01}, {0x20, 0x11}, {0x29, 0x00}, + {0x29, 0x01}, {0x2a, 0x00}, {0x22, 0x10}, {0x2a, 0x01}, + {0x2b, 0x00}, {0x2b, 0x01}, {0x23, 0x11}, {0x2c, 0x00}, + {0x2c, 0x01}, {0x2d, 0x00}, {0x25, 0x10}, {0x2d, 0x01}, + {0x2e, 0x00}, {0x2e, 0x01}, {0x26, 0x11}, {0x2f, 0x00}, + {0x2f, 0x01}, {0x2f, 0x02}, {0x30, 0x00}, {0x30, 0x01}, + {0x2f, 0x04}, {0x31, 0x00}, {0x31, 0x01}, {0x32, 0x00}, + {0x2f, 0x07}, {0x32, 0x01}, {0x33, 0x00}, {0x33, 0x01}, + {0x2f, 0x0a}, {0x34, 0x00}, {0x34, 0x01}, {0x35, 0x00}, + {0x2f, 0x0d}, {0x35, 0x01}, {0x36, 0x00}, {0x36, 0x01}, + {0x2f, 0x10}, {0x37, 0x00}, {0x37, 0x01}, {0x38, 0x00}, + {0x30, 0x10}, {0x38, 0x01}, {0x39, 0x00}, {0x39, 0x01}, + {0x31, 0x11}, {0x3a, 0x00}, {0x3a, 0x01}, {0x3b, 0x00}, + {0x33, 0x10}, {0x3b, 0x01}, {0x3c, 0x00}, {0x3c, 0x01}, + {0x34, 0x11}, {0x3d, 0x00}, {0x3d, 0x01}, {0x3e, 0x00}, + {0x36, 0x10}, {0x3e, 0x01}, {0x3f, 0x00}, {0x3f, 0x01}, + {0x37, 0x11}, {0x3f, 0x02}, {0x3f, 0x03}, {0x3f, 0x04}, + {0x39, 0x10}, {0x3f, 0x05}, {0x3f, 0x06}, {0x3f, 0x07}, + {0x3a, 0x11}, {0x3f, 0x08}, {0x3f, 0x09}, {0x3f, 0x0a}, + {0x3c, 0x10}, {0x3f, 0x0b}, {0x3f, 0x0c}, {0x3f, 0x0d}, + {0x3d, 0x11}, {0x3f, 0x0e}, {0x3f, 0x0f}, {0x36, 0x21}, + {0x3f, 0x10}, {0x3f, 0x11}, {0x3f, 0x12}, {0x38, 0x20}, + {0x3f, 0x13}, {0x3f, 0x14}, {0x3f, 0x15}, {0x39, 0x21}, + {0x3f, 0x16}, {0x3f, 0x17}, {0x3f, 0x18}, {0x3b, 0x20}, + {0x3f, 0x19}, {0x3f, 0x1a}, {0x3f, 0x1b}, {0x3c, 0x21}, + {0x3f, 0x1c}, {0x3f, 0x1d}, {0x3f, 0x1e}, {0x3e, 0x20}, + {0x3f, 0x1f}, {0x3f, 0x20}, {0x37, 0x30}, {0x3f, 0x21}, + {0x3f, 0x22}, {0x3f, 0x23}, {0x38, 0x31}, {0x3f, 0x24}, + {0x3f, 0x25}, {0x3f, 0x26}, {0x3a, 0x30}, {0x3f, 0x27}, + {0x3f, 0x28}, {0x3f, 0x29}, {0x3b, 0x31}, {0x3f, 0x2a}, + {0x3f, 0x2b}, {0x3f, 0x2c}, {0x3d, 0x30}, {0x3f, 0x2d}, + {0x3f, 0x2e}, {0x3f, 0x2f}, {0x3e, 0x31}, {0x3f, 0x30}, + {0x3f, 0x31}, {0x3f, 0x31}, {0x3f, 0x32}, {0x3f, 0x33}, + {0x3f, 0x34}, {0x3f, 0x34}, {0x3f, 0x35}, {0x3f, 0x36}, + {0x3f, 0x37}, {0x3f, 0x37}, {0x3f, 0x38}, {0x3f, 0x39}, + {0x3f, 0x3a}, {0x3f, 0x3a}, {0x3f, 0x3b}, {0x3f, 0x3c}, + {0x3f, 0x3d}, {0x3f, 0x3d}, {0x3f, 0x3e}, {0x3f, 0x3f}, }; #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/endian.h new/gimp-dds-2.2.1/endian.h --- old/gimp-dds-2.1.0/endian.h 2010-08-10 10:11:24.000000000 +0200 +++ new/gimp-dds-2.2.1/endian.h 2012-07-26 10:53:08.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef ENDIAN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/imath.h new/gimp-dds-2.2.1/imath.h --- old/gimp-dds-2.1.0/imath.h 2010-04-30 07:12:01.000000000 +0200 +++ new/gimp-dds-2.2.1/imath.h 2012-07-26 10:53:00.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef IMATH_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/mipmap.c new/gimp-dds-2.2.1/mipmap.c --- old/gimp-dds-2.1.0/mipmap.c 2011-08-08 17:24:48.000000000 +0200 +++ new/gimp-dds-2.2.1/mipmap.c 2012-07-26 10:52:48.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <string.h> @@ -51,7 +51,7 @@ unsigned int get_mipmapped_size(int width, int height, int bpp, int level, int num, int format) { - int w, h, cw, ch, n = 0; + int w, h, n = 0; unsigned int size = 0; w = width >> level; @@ -68,11 +68,7 @@ if(format == DDS_COMPRESS_NONE) size += (w * h); else - { - cw = MAX(w, 4); - ch = MAX(h, 4); - size += ((cw + 3) >> 2) * ((ch + 3) >> 2); - } + size += ((w + 3) >> 2) * ((h + 3) >> 2); ++n; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/mipmap.h new/gimp-dds-2.2.1/mipmap.h --- old/gimp-dds-2.1.0/mipmap.h 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/mipmap.h 2012-07-26 10:52:39.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef MIPMAP_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/misc.c new/gimp-dds-2.2.1/misc.c --- old/gimp-dds-2.1.0/misc.c 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/misc.c 2012-07-26 10:52:29.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #include <libgimp/gimp.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/misc.h new/gimp-dds-2.2.1/misc.h --- old/gimp-dds-2.1.0/misc.h 2010-04-23 09:57:01.000000000 +0200 +++ new/gimp-dds-2.2.1/misc.h 2012-07-26 10:52:14.000000000 +0200 @@ -1,7 +1,7 @@ /* DDS GIMP plugin - Copyright (C) 2004-2010 Shawn Kirst <skirst(a)insightbb.com>, + Copyright (C) 2004 Shawn Kirst <skirst(a)gmail.com>, with parts (C) 2003 Arne Reuter <homepage(a)arnereuter.de> where specified. This program is free software; you can redistribute it and/or @@ -16,8 +16,8 @@ You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to - the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + the Free Software Foundation, 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301 USA. */ #ifndef MISC_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gimp-dds-2.1.0/mktables.c new/gimp-dds-2.2.1/mktables.c --- old/gimp-dds-2.1.0/mktables.c 2012-01-17 02:12:07.000000000 +0100 +++ new/gimp-dds-2.2.1/mktables.c 2012-07-31 07:28:35.000000000 +0200 @@ -22,9 +22,9 @@ { minE = expand[mn]; maxE = expand[mx]; - e = abs(maxE + mul8bit(minE - maxE, 0x55) - i) * 100; + e = abs(maxE + mul8bit(minE - maxE, 0x55) - i); - e += abs(maxE - minE) * 3; + //e += abs(maxE - minE) * 3 / 100; if(e < bestE) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit faenza-icon-theme for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package faenza-icon-theme for openSUSE:Factory checked in at 2012-11-02 17:32:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/faenza-icon-theme (Old) and /work/SRC/openSUSE:Factory/.faenza-icon-theme.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "faenza-icon-theme", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/faenza-icon-theme/faenza-icon-theme.changes 2012-01-19 09:41:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.faenza-icon-theme.new/faenza-icon-theme.changes 2012-11-02 17:32:27.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Sep 14 16:40:54 UTC 2012 - nmo.marques(a)gmail.com + +- update faenza-install script; updated the spec file to use the + new syntax, cleaned up old stuff. + +------------------------------------------------------------------- New: ---- faenza-install ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ faenza-icon-theme.spec ++++++ --- /var/tmp/diff_new_pack.I9cPd3/_old 2012-11-02 17:32:28.000000000 +0100 +++ /var/tmp/diff_new_pack.I9cPd3/_new 2012-11-02 17:32:28.000000000 +0100 @@ -17,6 +17,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + + Name: faenza-icon-theme Version: 1.2 Release: 0 @@ -27,7 +29,10 @@ ## http://www.deviantart.com/download/173323228/faenza_icons_by_tiheum-d2v6x24… Source: faenza_icons_by_tiheum-d2v6x24.zip Source1: http://gnome-look.org/CONTENT/content-files/132681-Faenza-Mint.tar.gz +# script to rebrand and install stuff... +Source2: faenza-install BuildRequires: fdupes +BuildRequires: python %if 0%{?suse_version} # For all the icon themes macros BuildRequires: hicolor-icon-theme @@ -109,50 +114,18 @@ %prep %setup -q -c "faenza-%{version}" -a 1 -dist= -%if 0%{?suse_version:1} -dist=opensuse -%endif -%if 0%{?fedora_version:1} -dist=fedora -%endif -%if 0%{?mandriva_version:1} || 0%{?mdv_version:1} -dist=mandriva -%endif -[ -n "$dist" ] || { echo "Failed to determine distribution" >&2; exit 1; } for f in Faenza*.tar.gz; do tar xzf "$f" done -find . -maxdepth 1 -type d -name 'Faenza*' | while read f; do - f="${f#*/}" - n="${f##*/}" - n="${n%.tar.gz}" - find "$n/" -type f ! -perm 0644 -exec chmod 0644 {} \; - - pushd "$n" - find . -type f -name "distributor-logo-${dist}.*" | while read x; do - xf="${x##*/}" - xd="${x%/*}" - xe="${xf##*.}" - rm -f "$xd/distributor-logo.$xe" - ln -s "$xf" "$xd/distributor-logo.$xe" - rm -f "$xd/start-here.$xe" - ln -s "$xf" "$xd/start-here.$xe" - done - popd #$n -done - %build %install -install -d "%{buildroot}%{_datadir}/icons" -find . -maxdepth 1 -type d -name 'Faenza*' | while read d; do - n="${d##*/}" - cp -a "$d" "%{buildroot}%{_datadir}/icons/$n" - %fdupes -s "%{buildroot}%{_datadir}/icons/$n" -done +python %{S:2} --install %{buildroot}%{_datadir}/icons/ +%fdupes %{buildroot}%{_datadir}/icons +find %{buildroot}%{_datadir}/icons -type f -exec chmod 0644 {} \; + %if 0%{?suse_version} > 1130 %icon_theme_cache_create_ghost Faenza %icon_theme_cache_create_ghost Faenza-Ambiance ++++++ faenza-install ++++++ #!/usr/bin/env python # # Copyright (c) 2011-2012 Nelson Marques <nmo.marques(a)gmail.com> # # crap script to rebrand and install faenza icon theme; this is aimed to # be invoked from the .spec file during the install process. # import os, shutil, sys from fnmatch import fnmatch from optparse import OptionParser, OptionGroup VERSION = '0.2' icons = [] base = os.getcwd() variants = ( 'Faenza-Ambiance', 'Faenza-Dark', 'Faenza-Darker', 'Faenza-Darkest', 'Faenza-Mint', 'Faenza-Radiance', 'Faenza') class Faenza(): ''' print header ''' def header(self): print '\n faenza-install -- version %s \n' % VERSION print ' This script performs minimum rebranding and installs the' print ' faenza-icon-theme in INSTALL_DIR (sys.argv[1]). For help' print ' run the following this script with "-h" or "--help". \n' ''' returns a list of matching targets ''' def scan(self, target): for variant in variants: for root, dirs, files in os.walk(variant): for f in files: if fnmatch(f, target + '.png'): icons.append(root + '/' + f) return 0 ''' delete designated file ''' def delete(self, target): try: if os.path.exists(target): os.unlink(target) else: print ' - file not found: %s' % target except Exception, errno: print errno sys.exit(1) return 0 ''' install a file ''' def rebrand(self, distribution): self.scan('start-here') self.scan('distributor-logo') if not icons: print '\n - NO icons found.. Exiting!\n' sys.exit(1) else: for icon in icons: dirname, myfile = os.path.split(icon) filename, myext = os.path.splitext(myfile) print ' - %s' % icon try: self.delete(icon) print ' + delete file: %s' % icon except Exception, errno: print errno sys.exit(1) os.chdir(dirname) os.system('ln -s %s %s' % ( filename + '-' + dist + myext, myfile)) print ' + file rebranded to: %s' % ( filename + '-' + distribution + myext ) os.chdir(base) return 0 ''' install Faenza themes on sys.argv[1] ''' def install(self, target): print ' - Installation \n' for variant in variants: fs_dir = os.path.join(target, variant) if not os.path.isdir(fs_dir): try: shutil.copytree(variant, fs_dir) print ' + file installed: %s' % fs_dir except Exception, err: print err return 1 return 0 def main(): faenza = OptionParser( usage = '%prog [OPTIONS] INSTALL_DIR', epilog = ''' A simple python script to install icon theme with branding ''') f_group = OptionGroup(faenza, 'Distribution Options: \n' + ' - opensuse, fedora, debian, frugalware, linux-mint, \n' + ' archlinux, gnome, mandriva, slackware, archlinux, \n' + ' ubuntu') faenza.add_option('-v', '--version', action='store_true', dest='version', default=False, help='print version and exit to shell') faenza.add_option('-i', '--install', action='store_true', dest='install', default=False, help='install icon themes on INSTALL_DIR') faenza.add_option('-r', '--rebrand', action='store_true', dest='rebrand', default=True, help='rebrand "start-here" and "distributor-logo" (default)') faenza.add_option('--dist', action='store', dest='distribution', default='opensuse', help='set default distribution for branding') faenza.add_option_group(f_group) (option, args) = faenza.parse_args() if len(args) != 1: faenza.print_help() return 1 if option.version: print '\n faenza-install -- version %s \n' % VERSION print ' This script performs minimum rebranding and installs the' print ' faenza-icon-theme in INSTALL_DIR (sys.argv[1]). For help' print ' run the following this script with "-h" or "--help". \n' sys.exit(0) global dist dist = str(option.distribution) run = Faenza() fs = args[0] run.header() if option.rebrand: run.rebrand(dist) if option.install: if not os.path.isdir(fs): os.makedirs(fs) run.install(fs) return 0 if __name__ == '__main__': try: main() except KeyboardInterrupt: pass -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit colorhug-client for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package colorhug-client for openSUSE:Factory checked in at 2012-11-02 17:32:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/colorhug-client (Old) and /work/SRC/openSUSE:Factory/.colorhug-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "colorhug-client", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/colorhug-client/colorhug-client.changes 2012-04-23 16:10:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.colorhug-client.new/colorhug-client.changes 2012-11-02 17:32:15.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Nov 2 13:05:39 UTC 2012 - p.drouand(a)gmail.com + +- Update to 0.1.12 version : + New Features: + - Add colorhug-profile to compare the measurement modes (Richard Hughes) + - Add subcommands to get and set the measurement mode (Richard Hughes) + +Bugfixes: + - Accept full HID packets from devices with firmware >= 1.2.0 (Richard Hughes) + - Fix a small memory leak when commands with helpers and callbacks fail (Richard Hughes) + - Return a uint32 type for TAKE_READING_RAW (Richard Hughes) +- Remove unused conditional macros + +------------------------------------------------------------------- Old: ---- colorhug-client-0.1.8.tar.xz New: ---- colorhug-client-0.1.12.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ colorhug-client.spec ++++++ --- /var/tmp/diff_new_pack.C52Gov/_old 2012-11-02 17:32:18.000000000 +0100 +++ /var/tmp/diff_new_pack.C52Gov/_new 2012-11-02 17:32:18.000000000 +0100 @@ -12,24 +12,19 @@ Name: colorhug-client -Version: 0.1.8 +Version: 0.1.12 Summary: Tools for the Hughski Colorimeter -%if 0%{?suse_version} Release: 0 -%else -Release: 0.#BUILD#%{?alphatag}%{?dist} -%endif License: GPL-2.0+ Url: http://www.hughski.com/ Source0: http://people.freedesktop.org/~hughsient/releases/%{name}-%{version}.tar.xz -%if 0%{?suse_version} Group: Productivity/Graphics/Other BuildRequires: update-desktop-files BuildRequires: xz -%endif BuildRequires: docbook-utils BuildRequires: intltool -BuildRequires: pkgconfig(colord) >= 0.1.15 +BuildRequires: pkgconfig(colord) >= 0.1.20 +BuildRequires: pkgconfig(colord-gtk) >= 0.1.20 BuildRequires: pkgconfig(gio-2.0) >= 2.25.9 BuildRequires: pkgconfig(glib-2.0) >= 2.28.0 BuildRequires: pkgconfig(gmodule-2.0) @@ -80,18 +75,14 @@ %find_lang %{name} %post -%if 0%{?suse_version} > 1130 %glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post -%endif %postun -%if 0%{?suse_version} > 1130 %glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun -%endif %post -n libcolorhug1 -p /sbin/ldconfig @@ -119,7 +110,7 @@ %files -n libcolorhug1 %defattr(-,root,root) %{_libdir}/libcolorhug.so.1 -%{_libdir}/libcolorhug.so.1.0.0 +%{_libdir}/libcolorhug.so.1.0.2 %files -n libcolorhug-devel %defattr(-,root,root) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit calligra-l10n for openSUSE:Factory
by root＠hilbert.suse.de 02 Nov '12

02 Nov '12

Hello community, here is the log from the commit of package calligra-l10n for openSUSE:Factory checked in at 2012-11-02 17:32:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calligra-l10n (Old) and /work/SRC/openSUSE:Factory/.calligra-l10n.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "calligra-l10n", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/calligra-l10n/calligra-l10n.changes 2012-09-26 16:09:32.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calligra-l10n.new/calligra-l10n.changes 2012-11-02 17:32:07.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Oct 31 19:33:11 UTC 2012 - asterios.dramis(a)gmail.com + +- Update to 2.5.3. +- Removed work-around for bnc#457908 (not needed anymore). + +------------------------------------------------------------------- Old: ---- calligra-l10n-ca-2.5.2.tar.bz2 calligra-l10n-ca(a)valencia-2.5.2.tar.bz2 calligra-l10n-da-2.5.2.tar.bz2 calligra-l10n-de-2.5.2.tar.bz2 calligra-l10n-el-2.5.2.tar.bz2 calligra-l10n-en_GB-2.5.2.tar.bz2 calligra-l10n-es-2.5.2.tar.bz2 calligra-l10n-et-2.5.2.tar.bz2 calligra-l10n-fi-2.5.2.tar.bz2 calligra-l10n-fr-2.5.2.tar.bz2 calligra-l10n-gl-2.5.2.tar.bz2 calligra-l10n-hu-2.5.2.tar.bz2 calligra-l10n-it-2.5.2.tar.bz2 calligra-l10n-ja-2.5.2.tar.bz2 calligra-l10n-kk-2.5.2.tar.bz2 calligra-l10n-nb-2.5.2.tar.bz2 calligra-l10n-nds-2.5.2.tar.bz2 calligra-l10n-nl-2.5.2.tar.bz2 calligra-l10n-pl-2.5.2.tar.bz2 calligra-l10n-pt-2.5.2.tar.bz2 calligra-l10n-pt_BR-2.5.2.tar.bz2 calligra-l10n-ru-2.5.2.tar.bz2 calligra-l10n-sk-2.5.2.tar.bz2 calligra-l10n-sv-2.5.2.tar.bz2 calligra-l10n-uk-2.5.2.tar.bz2 calligra-l10n-zh_CN-2.5.2.tar.bz2 calligra-l10n-zh_TW-2.5.2.tar.bz2 New: ---- calligra-l10n-ca-2.5.3.tar.bz2 calligra-l10n-da-2.5.3.tar.bz2 calligra-l10n-de-2.5.3.tar.bz2 calligra-l10n-el-2.5.3.tar.bz2 calligra-l10n-en_GB-2.5.3.tar.bz2 calligra-l10n-es-2.5.3.tar.bz2 calligra-l10n-et-2.5.3.tar.bz2 calligra-l10n-fi-2.5.3.tar.bz2 calligra-l10n-fr-2.5.3.tar.bz2 calligra-l10n-gl-2.5.3.tar.bz2 calligra-l10n-hu-2.5.3.tar.bz2 calligra-l10n-it-2.5.3.tar.bz2 calligra-l10n-ja-2.5.3.tar.bz2 calligra-l10n-kk-2.5.3.tar.bz2 calligra-l10n-nb-2.5.3.tar.bz2 calligra-l10n-nds-2.5.3.tar.bz2 calligra-l10n-nl-2.5.3.tar.bz2 calligra-l10n-pl-2.5.3.tar.bz2 calligra-l10n-pt-2.5.3.tar.bz2 calligra-l10n-pt_BR-2.5.3.tar.bz2 calligra-l10n-ru-2.5.3.tar.bz2 calligra-l10n-sk-2.5.3.tar.bz2 calligra-l10n-sv-2.5.3.tar.bz2 calligra-l10n-uk-2.5.3.tar.bz2 calligra-l10n-zh_CN-2.5.3.tar.bz2 calligra-l10n-zh_TW-2.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calligra-l10n.spec ++++++ --- /var/tmp/diff_new_pack.TjfFyT/_old 2012-11-02 17:32:08.000000000 +0100 +++ /var/tmp/diff_new_pack.TjfFyT/_new 2012-11-02 17:32:08.000000000 +0100 @@ -14,46 +14,51 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - # icecream 0 -%define build_languages ca ca@valencia da de el en_GB es et fi fr gl hu it ja kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW + +%define build_languages ca da de el en_GB es et fi fr gl hu it ja kk nb nds nl pl pt pt_BR ru sk sv uk zh_CN zh_TW +# When a package provides autocorrect files with name like "$1_$2" and installs them in a directory named "$1" +# add the name "$1_$2" in the list below %define autocorrect_languages de_DE it_IT ru_RU uk_UA Name: calligra-l10n -Version: 2.5.2 +Version: 2.5.3 Release: 0 Summary: Translations for Calligra Suite License: GPL-2.0+ Group: System/Localization Url: http://www.calligra.org/ +# - Do not modify calligra-l10n.spec directly, instead modify calligra-l10n.spec.in if needed +# - When adding/removing a language, edit the "attributes" file to add/remove it +# - When a package adds/removes doc translations add/remove it also in the pre_checkin.sh script (above the splitdoc=true line) +# - Execute "sh pre_checkin.sh" to check the changes Source0: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source1: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source3: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source4: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source5: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source6: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source7: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source8: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source9: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source10: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source2: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source11: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source12: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source13: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source14: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source15: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source16: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source17: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source18: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source19: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source20: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source21: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source22: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source23: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source24: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source25: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… -Source26: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source1: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source2: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source3: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source4: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source5: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source6: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source7: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source8: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source9: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source10: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source11: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source12: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source13: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source14: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source15: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source16: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source17: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source18: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source19: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source20: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source21: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source22: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source23: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source24: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… +Source25: ftp://ftp.kde.org/pub/kde/stable/calligra-%{version}/calligra-l10n/%{name}-… #@SOURCES@ Source1000: update_spec.pl Source1001: attributes @@ -85,15 +90,6 @@ This package contains application manuals translations for Calligra Suite in Catalan. -%package ca@valencia -Summary: Valencian Translations for Calligra Suite Applications -License: LGPL-2.1+ -Group: System/Localization -Provides: locale(calligra:ca@valencia) - -%description ca@valencia -This package contains application translations for Calligra Suite in Valencian. - %package da Summary: Danish Translations for Calligra Suite Applications License: GPL-2.0+ @@ -103,16 +99,6 @@ %description da This package contains application translations for Calligra Suite in Danish. -%package da-doc -Summary: Danish Translations for Calligra Suite Manuals -License: GPL-2.0+ -Group: System/Localization -Provides: locale(calligra:da) - -%description da-doc -This package contains application manuals translations for Calligra Suite in -Danish. - %package de Summary: German Translations for Calligra Suite Applications License: LGPL-2.1+ @@ -215,6 +201,7 @@ %description fr-doc This package contains application manuals translations for Calligra Suite in +French. %package gl Summary: Galician Translations for Calligra Suite Applications @@ -224,7 +211,16 @@ %description gl This package contains application translations for Calligra Suite in Galician. -French. + +%package gl-doc +Summary: Galician Translations for Calligra Suite Manuals +License: GPL-2.0+ +Group: System/Localization +Provides: locale(calligra:gl) + +%description gl-doc +This package contains application manuals translations for Calligra Suite in +Galician. %package hu Summary: Hungarian Translations for Calligra Suite Applications @@ -255,13 +251,13 @@ Italian. %package ja -Summary: Calligra Suite Translations for ja +Summary: Japanese Translations for Calligra Suite Applications License: GPL-2.0+ -Group: System/GUI/KDE +Group: System/Localization Provides: locale(calligra:ja) %description ja -ja +This package contains application translations for Calligra Suite in Japanese. %package kk Summary: Kazakh Translations for Calligra Suite Applications @@ -329,16 +325,6 @@ This package contains application translations for Calligra Suite in Portuguese. -%package pt-doc -Summary: Portuguese Translations for Calligra Suite Manuals -License: LGPL-2.1+ -Group: System/Localization -Provides: locale(calligra:pt) - -%description pt-doc -This package contains application manuals translations for Calligra Suite in -Portuguese. - %package pt_BR Summary: Brazil Portuguese Translations for Calligra Suite Applications License: LGPL-2.1+ @@ -445,7 +431,7 @@ This package contains application translations for Calligra Suite in Chinese. %prep -%setup -q -n calligra-l10n-de-%{version} -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 -b 25 -b 26 +%setup -q -n calligra-l10n-de-%{version} -b 0 -b 1 -b 2 -b 3 -b 4 -b 5 -b 6 -b 7 -b 8 -b 9 -b 10 -b 11 -b 12 -b 13 -b 14 -b 15 -b 16 -b 17 -b 18 -b 19 -b 20 -b 21 -b 22 -b 23 -b 24 -b 25 %build cd .. @@ -464,9 +450,6 @@ pushd calligra-l10n-$i-%{version}/build || exit 1 %kde4_makeinstall popd - - # work-around for bnc#457908 - mkdir -p %{buildroot}%{_kde4_htmldir}/$i/common done for i in %{build_languages}; do @@ -518,11 +501,7 @@ %files ca-doc -f ../files.doc.ca -%files ca@valencia -f ../files.both.ca@valencia - -%files da -f ../files.da - -%files da-doc -f ../files.doc.da +%files da -f ../files.both.da %files de -f ../files.de @@ -546,7 +525,9 @@ %files fr-doc -f ../files.doc.fr -%files gl -f ../files.both.gl +%files gl -f ../files.gl + +%files gl-doc -f ../files.doc.gl %files hu -f ../files.both.hu @@ -568,9 +549,7 @@ %files pl -f ../files.both.pl -%files pt -f ../files.pt - -%files pt-doc -f ../files.doc.pt +%files pt -f ../files.both.pt %files pt_BR -f ../files.pt_BR ++++++ attributes ++++++ --- /var/tmp/diff_new_pack.TjfFyT/_old 2012-11-02 17:32:08.000000000 +0100 +++ /var/tmp/diff_new_pack.TjfFyT/_new 2012-11-02 17:32:08.000000000 +0100 @@ -1,10 +1,7 @@ license.calligra-l10n GPL-2.0+ license.calligra-l10n-ca LGPL-2.1+ license.calligra-l10n-ca-doc LGPL-2.1+ -license.calligra-l10n-ca@valencia LGPL-2.1+ -license.calligra-l10n-cs GPL-2.0+ license.calligra-l10n-da GPL-2.0+ -license.calligra-l10n-da-doc GPL-2.0+ license.calligra-l10n-de LGPL-2.1+ license.calligra-l10n-de-doc LGPL-2.1+ license.calligra-l10n-el LGPL-2.1+ @@ -16,9 +13,12 @@ license.calligra-l10n-fi LGPL-2.1+ license.calligra-l10n-fr LGPL-2.1+ license.calligra-l10n-fr-doc LGPL-2.1+ +license.calligra-l10n-gl GPL-2.0+ +license.calligra-l10n-gl-doc GPL-2.0+ license.calligra-l10n-hu LGPL-2.1+ license.calligra-l10n-it LGPL-2.1+ license.calligra-l10n-it-doc LGPL-2.1+ +license.calligra-l10n-ja GPL-2.0+ license.calligra-l10n-kk LGPL-2.1+ license.calligra-l10n-nb LGPL-2.1+ license.calligra-l10n-nds LGPL-2.1+ @@ -26,7 +26,6 @@ license.calligra-l10n-nl-doc LGPL-2.1+ license.calligra-l10n-pl LGPL-2.1+ license.calligra-l10n-pt LGPL-2.1+ -license.calligra-l10n-pt-doc LGPL-2.1+ license.calligra-l10n-pt_BR LGPL-2.1+ license.calligra-l10n-pt_BR-doc LGPL-2.1+ license.calligra-l10n-ru LGPL-2.1+ @@ -41,10 +40,7 @@ group.calligra-l10n System/Localization group.calligra-l10n-ca System/Localization group.calligra-l10n-ca-doc System/Localization -group.calligra-l10n-ca@valencia System/Localization -group.calligra-l10n-cs System/Localization group.calligra-l10n-da System/Localization -group.calligra-l10n-da-doc System/Localization group.calligra-l10n-de System/Localization group.calligra-l10n-de-doc System/Localization group.calligra-l10n-el System/Localization @@ -56,9 +52,12 @@ group.calligra-l10n-fi System/Localization group.calligra-l10n-fr System/Localization group.calligra-l10n-fr-doc System/Localization +group.calligra-l10n-gl System/Localization +group.calligra-l10n-gl-doc System/Localization group.calligra-l10n-hu System/Localization group.calligra-l10n-it System/Localization group.calligra-l10n-it-doc System/Localization +group.calligra-l10n-ja System/Localization group.calligra-l10n-kk System/Localization group.calligra-l10n-nb System/Localization group.calligra-l10n-nds System/Localization @@ -66,7 +65,6 @@ group.calligra-l10n-nl-doc System/Localization group.calligra-l10n-pl System/Localization group.calligra-l10n-pt System/Localization -group.calligra-l10n-pt-doc System/Localization group.calligra-l10n-pt_BR System/Localization group.calligra-l10n-pt_BR-doc System/Localization group.calligra-l10n-ru System/Localization @@ -81,10 +79,7 @@ summary.calligra-l10n Translations for Calligra Suite summary.calligra-l10n-ca Catalan Translations for Calligra Suite Applications summary.calligra-l10n-ca-doc Catalan Translations for Calligra Suite Manuals -summary.calligra-l10n-ca@valencia Valencian Translations for Calligra Suite Applications -summary.calligra-l10n-cs Czech Translations for Calligra Suite Applications summary.calligra-l10n-da Danish Translations for Calligra Suite Applications -summary.calligra-l10n-da-doc Danish Translations for Calligra Suite Manuals summary.calligra-l10n-de German Translations for Calligra Suite Applications summary.calligra-l10n-de-doc German Translations for Calligra Suite Manuals summary.calligra-l10n-el Greek Translations for Calligra Suite Applications @@ -96,9 +91,12 @@ summary.calligra-l10n-fi Finnish Translations for Calligra Suite Applications summary.calligra-l10n-fr French Translations for Calligra Suite Applications summary.calligra-l10n-fr-doc French Translations for Calligra Suite Manuals +summary.calligra-l10n-gl Galician Translations for Calligra Suite Applications +summary.calligra-l10n-gl-doc Galician Translations for Calligra Suite Manuals summary.calligra-l10n-hu Hungarian Translations for Calligra Suite Applications summary.calligra-l10n-it Italian Translations for Calligra Suite Applications summary.calligra-l10n-it-doc Italian Translations for Calligra Suite Manuals +summary.calligra-l10n-ja Japanese Translations for Calligra Suite Applications summary.calligra-l10n-kk Kazakh Translations for Calligra Suite Applications summary.calligra-l10n-nb Norwegian (Bokmaal) Translations for Calligra Suite Applications summary.calligra-l10n-nds Low Saxon Translations for Calligra Suite Applications @@ -106,7 +104,6 @@ summary.calligra-l10n-nl-doc Dutch Translations for Calligra Suite Manuals summary.calligra-l10n-pl Polish Translations for Calligra Suite Applications summary.calligra-l10n-pt Portuguese Translations for Calligra Suite Applications -summary.calligra-l10n-pt-doc Portuguese Translations for Calligra Suite Manuals summary.calligra-l10n-pt_BR Brazil Portuguese Translations for Calligra Suite Applications summary.calligra-l10n-pt_BR-doc Brazil Portuguese Translations for Calligra Suite Manuals summary.calligra-l10n-ru Russian Translations for Calligra Suite Applications @@ -128,19 +125,9 @@ This package contains application manuals translations for Calligra Suite in Catalan. -description.calligra-l10n-ca-doc -+description.calligra-l10n-ca@valencia -This package contains application translations for Calligra Suite in Valencian. --description.calligra-l10n-ca@valencia -+description.calligra-l10n-cs -This package contains application translations for Calligra Suite in Czech. --description.calligra-l10n-cs +description.calligra-l10n-da This package contains application translations for Calligra Suite in Danish. -description.calligra-l10n-da -+description.calligra-l10n-da-doc -This package contains application manuals translations for Calligra Suite in -Danish. --description.calligra-l10n-da-doc +description.calligra-l10n-de This package contains application translations for Calligra Suite in German. -description.calligra-l10n-de @@ -179,6 +166,13 @@ This package contains application manuals translations for Calligra Suite in French. -description.calligra-l10n-fr-doc ++description.calligra-l10n-gl +This package contains application translations for Calligra Suite in Galician. +-description.calligra-l10n-gl ++description.calligra-l10n-gl-doc +This package contains application manuals translations for Calligra Suite in +Galician. +-description.calligra-l10n-gl-doc +description.calligra-l10n-hu This package contains application translations for Calligra Suite in Hungarian. -description.calligra-l10n-hu @@ -189,6 +183,9 @@ This package contains application manuals translations for Calligra Suite in Italian. -description.calligra-l10n-it-doc ++description.calligra-l10n-ja +This package contains application translations for Calligra Suite in Japanese. +-description.calligra-l10n-ja +description.calligra-l10n-kk This package contains application translations for Calligra Suite in Kazakh. -description.calligra-l10n-kk @@ -213,10 +210,6 @@ This package contains application translations for Calligra Suite in Portuguese. -description.calligra-l10n-pt -+description.calligra-l10n-pt-doc -This package contains application manuals translations for Calligra Suite in -Portuguese. --description.calligra-l10n-pt-doc +description.calligra-l10n-pt_BR This package contains application translations for Calligra Suite in Brazil Portuguese. ++++++ calligra-l10n-ca-2.5.2.tar.bz2 -> calligra-l10n-ca-2.5.3.tar.bz2 ++++++ ++++ 8367 lines of diff (skipped) ++++++ calligra-l10n-da-2.5.2.tar.bz2 -> calligra-l10n-da-2.5.3.tar.bz2 ++++++ ++++ 2178 lines of diff (skipped) ++++++ calligra-l10n-de-2.5.2.tar.bz2 -> calligra-l10n-de-2.5.3.tar.bz2 ++++++ ++++ 2083 lines of diff (skipped) ++++++ calligra-l10n-el-2.5.2.tar.bz2 -> calligra-l10n-el-2.5.3.tar.bz2 ++++++ ++++ 2173 lines of diff (skipped) ++++++ calligra-l10n-en_GB-2.5.2.tar.bz2 -> calligra-l10n-en_GB-2.5.3.tar.bz2 ++++++ ++++ 2065 lines of diff (skipped) ++++++ calligra-l10n-es-2.5.2.tar.bz2 -> calligra-l10n-es-2.5.3.tar.bz2 ++++++ ++++ 2054 lines of diff (skipped) ++++++ calligra-l10n-et-2.5.2.tar.bz2 -> calligra-l10n-et-2.5.3.tar.bz2 ++++++ ++++ 2024 lines of diff (skipped) ++++++ calligra-l10n-fi-2.5.2.tar.bz2 -> calligra-l10n-fi-2.5.3.tar.bz2 ++++++ ++++ 4538 lines of diff (skipped) ++++++ calligra-l10n-fr-2.5.2.tar.bz2 -> calligra-l10n-fr-2.5.3.tar.bz2 ++++++ ++++ 2139 lines of diff (skipped) ++++++ calligra-l10n-gl-2.5.2.tar.bz2 -> calligra-l10n-gl-2.5.3.tar.bz2 ++++++ ++++ 2061 lines of diff (skipped) ++++++ calligra-l10n-hu-2.5.2.tar.bz2 -> calligra-l10n-hu-2.5.3.tar.bz2 ++++++ ++++ 2252 lines of diff (skipped) ++++++ calligra-l10n-it-2.5.2.tar.bz2 -> calligra-l10n-it-2.5.3.tar.bz2 ++++++ ++++ 2059 lines of diff (skipped) ++++++ calligra-l10n-ja-2.5.2.tar.bz2 -> calligra-l10n-ja-2.5.3.tar.bz2 ++++++ ++++ 2083 lines of diff (skipped) ++++++ calligra-l10n-kk-2.5.2.tar.bz2 -> calligra-l10n-kk-2.5.3.tar.bz2 ++++++ ++++ 2023 lines of diff (skipped) ++++++ calligra-l10n-nb-2.5.2.tar.bz2 -> calligra-l10n-nb-2.5.3.tar.bz2 ++++++ ++++ 2414 lines of diff (skipped) ++++++ calligra-l10n-nds-2.5.2.tar.bz2 -> calligra-l10n-nds-2.5.3.tar.bz2 ++++++ ++++ 2051 lines of diff (skipped) ++++++ calligra-l10n-nl-2.5.2.tar.bz2 -> calligra-l10n-nl-2.5.3.tar.bz2 ++++++ ++++ 2530 lines of diff (skipped) ++++++ calligra-l10n-pl-2.5.2.tar.bz2 -> calligra-l10n-pl-2.5.3.tar.bz2 ++++++ ++++ 2343 lines of diff (skipped) ++++++ calligra-l10n-pt-2.5.2.tar.bz2 -> calligra-l10n-pt-2.5.3.tar.bz2 ++++++ ++++ 53608 lines of diff (skipped) ++++++ calligra-l10n-pt_BR-2.5.2.tar.bz2 -> calligra-l10n-pt_BR-2.5.3.tar.bz2 ++++++ ++++ 3224 lines of diff (skipped) ++++++ calligra-l10n-ru-2.5.2.tar.bz2 -> calligra-l10n-ru-2.5.3.tar.bz2 ++++++ ++++ 2131 lines of diff (skipped) ++++++ calligra-l10n-sk-2.5.2.tar.bz2 -> calligra-l10n-sk-2.5.3.tar.bz2 ++++++ ++++ 2037 lines of diff (skipped) ++++++ calligra-l10n-sv-2.5.2.tar.bz2 -> calligra-l10n-sv-2.5.3.tar.bz2 ++++++ ++++ 2040 lines of diff (skipped) ++++++ calligra-l10n-uk-2.5.2.tar.bz2 -> calligra-l10n-uk-2.5.3.tar.bz2 ++++++ ++++ 2334 lines of diff (skipped) ++++++ calligra-l10n-zh_CN-2.5.2.tar.bz2 -> calligra-l10n-zh_CN-2.5.3.tar.bz2 ++++++ ++++ 2010 lines of diff (skipped) ++++++ calligra-l10n-zh_TW-2.5.2.tar.bz2 -> calligra-l10n-zh_TW-2.5.3.tar.bz2 ++++++ ++++ 2007 lines of diff (skipped) ++++++ calligra-l10n.spec.in ++++++ --- /var/tmp/diff_new_pack.TjfFyT/_old 2012-11-02 17:32:15.000000000 +0100 +++ /var/tmp/diff_new_pack.TjfFyT/_new 2012-11-02 17:32:15.000000000 +0100 @@ -18,15 +18,21 @@ # icecream 0 %define build_languages @LANGUAGES@ -%define autocorrect_languages it_IT ru_RU uk_UA +# When a package provides autocorrect files with name like "$1_$2" and installs them in a directory named "$1" +# add the name "$1_$2" in the list below +%define autocorrect_languages de_DE it_IT ru_RU uk_UA Name: calligra-l10n -Version: 2.5.2 +Version: 2.5.3 Release: 0 -License: GPL-2.0+ Summary: Translations for Calligra Suite -Url: http://www.calligra.org/ +License: GPL-2.0+ Group: System/Localization +Url: http://www.calligra.org/ +# - Do not modify calligra-l10n.spec directly, instead modify calligra-l10n.spec.in if needed +# - When adding/removing a language, edit the "attributes" file to add/remove it +# - When a package adds/removes doc translations add/remove it also in the pre_checkin.sh script (above the splitdoc=true line) +# - Execute "sh pre_checkin.sh" to check the changes #@SOURCES@ Source1000: update_spec.pl Source1001: attributes @@ -61,9 +67,6 @@ pushd calligra-l10n-$i-%{version}/build || exit 1 %kde4_makeinstall popd - - # work-around for bnc#457908 - mkdir -p %{buildroot}%{_kde4_htmldir}/$i/common done for i in %{build_languages}; do ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.TjfFyT/_old 2012-11-02 17:32:15.000000000 +0100 +++ /var/tmp/diff_new_pack.TjfFyT/_new 2012-11-02 17:32:15.000000000 +0100 @@ -27,7 +27,7 @@ splitdoc= - if test "$lang" = "ca" -o "$lang" = "da" -o "$lang" = "de" -o "$lang" = "es" -o "$lang" = "et" -o "$lang" = "fr" -o "$lang" = "it" -o "$lang" = "nl" -o "$lang" = "pt" -o "$lang" = "pt_BR" -o "$lang" = "ru" -o "$lang" = "sv" -o "$lang" = "uk"; then + if test "$lang" = "ca" -o "$lang" = "de" -o "$lang" = "es" -o "$lang" = "et" -o "$lang" = "fr" -o "$lang" = "gl" -o "$lang" = "it" -o "$lang" = "nl" -o "$lang" = "pt_BR" -o "$lang" = "ru" -o "$lang" = "sv" -o "$lang" = "uk"; then splitdoc=true fi -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0