openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
June 2014
- 1 participants
- 1147 discussions
Hello community,
here is the log from the commit of package yast2-ldap for openSUSE:Factory checked in at 2014-06-30 21:44:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-ldap (Old)
and /work/SRC/openSUSE:Factory/.yast2-ldap.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ldap"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ldap/yast2-ldap.changes 2014-04-05 14:42:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-ldap.new/yast2-ldap.changes 2014-06-30 21:45:08.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jun 11 13:26:04 UTC 2014 - varkoly(a)suse.com
+
+- Do not add MenuButton to ButtonBox
+- 3.1.10
+
+-------------------------------------------------------------------
Old:
----
yast2-ldap-3.1.9.tar.bz2
New:
----
yast2-ldap-3.1.10.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap.spec ++++++
--- /var/tmp/diff_new_pack.5sl6SZ/_old 2014-06-30 21:45:11.000000000 +0200
+++ /var/tmp/diff_new_pack.5sl6SZ/_new 2014-06-30 21:45:11.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-ldap
-Version: 3.1.9
+Version: 3.1.10
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-ldap-3.1.9.tar.bz2 -> yast2-ldap-3.1.10.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.9/MAINTAINER new/yast2-ldap-3.1.10/MAINTAINER
--- old/yast2-ldap-3.1.9/MAINTAINER 2014-03-26 17:33:06.000000000 +0100
+++ new/yast2-ldap-3.1.10/MAINTAINER 2014-05-09 12:13:46.000000000 +0200
@@ -1 +1 @@
-Jiri Suchomel <jsuchome(a)suse.cz>
+Peter Varkoly <varkoly(a)suse.com>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.9/package/yast2-ldap.changes new/yast2-ldap-3.1.10/package/yast2-ldap.changes
--- old/yast2-ldap-3.1.9/package/yast2-ldap.changes 2014-03-26 17:33:06.000000000 +0100
+++ new/yast2-ldap-3.1.10/package/yast2-ldap.changes 2014-06-27 12:23:24.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Jun 11 13:26:04 UTC 2014 - varkoly(a)suse.com
+
+- Do not add MenuButton to ButtonBox
+- 3.1.10
+
+-------------------------------------------------------------------
Wed Mar 26 14:16:45 UTC 2014 - varkoly(a)suse.com
- Remove some not used variables and functions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.9/package/yast2-ldap.spec new/yast2-ldap-3.1.10/package/yast2-ldap.spec
--- old/yast2-ldap-3.1.9/package/yast2-ldap.spec 2014-03-26 17:33:06.000000000 +0100
+++ new/yast2-ldap-3.1.10/package/yast2-ldap.spec 2014-06-27 12:23:24.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-ldap
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,7 +17,7 @@
Name: yast2-ldap
-Version: 3.1.9
+Version: 3.1.10
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-3.1.9/src/LdapPopup.rb new/yast2-ldap-3.1.10/src/LdapPopup.rb
--- old/yast2-ldap-3.1.9/src/LdapPopup.rb 2014-03-26 17:33:06.000000000 +0100
+++ new/yast2-ldap-3.1.10/src/LdapPopup.rb 2014-06-27 12:23:24.000000000 +0200
@@ -369,11 +369,13 @@
PushButton(Id(:cancel), Opt(:key_F9), Label.CancelButton),
PushButton(Id(:help), Opt(:key_F2), Label.HelpButton)
) :
- ButtonBox(
- PushButton(Id(:ok), Opt(:default, :key_F10), Label.OKButton),
- PushButton(Id(:cancel), Opt(:key_F9), Label.CancelButton),
- PushButton(Id(:help), Opt(:key_F2), Label.HelpButton),
- add_button
+ HBox(
+ add_button,
+ ButtonBox(
+ PushButton(Id(:ok), Opt(:default, :key_F10), Label.OKButton),
+ PushButton(Id(:cancel), Opt(:key_F9), Label.CancelButton),
+ PushButton(Id(:help), Opt(:key_F2), Label.HelpButton)
+ )
)
),
HSpacing(1)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xf86-video-modesetting for openSUSE:Factory checked in at 2014-06-30 21:44:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-modesetting (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-modesetting.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-modesetting"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-modesetting/xf86-video-modesetting.changes 2014-04-26 19:35:08.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xf86-video-modesetting.new/xf86-video-modesetting.changes 2014-06-30 21:45:06.000000000 +0200
@@ -1,0 +2,16 @@
+Fri Jun 27 01:53:06 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de
+
+- Update to version 0.9.0:
+ + modesetting: Don't (brokenly) double-track software cursor
+ + Use own thunk function instead of shadowUpdatePackedWeak
+ + modesetting: query cursor size from the kernel
+ + modesetting: move closing fd to after we check outputs
+ + modesetting: try and use hotspot cursor support
+ + modesetting: fix cursor rendering with hotspots.
+ + modesetting: fix use after free.
+ + modesetting: fix build regression against older servers.
+ + Add support for server managed fds
+- Remove patch(es):
+ + U_Handle_new_DamageUnregister_API_which_has_only_one_argument.patch
+
+-------------------------------------------------------------------
Old:
----
U_Handle_new_DamageUnregister_API_which_has_only_one_argument.patch
xf86-video-modesetting-0.8.0.tar.bz2
New:
----
xf86-video-modesetting-0.9.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-modesetting.spec ++++++
--- /var/tmp/diff_new_pack.KbB5rR/_old 2014-06-30 21:45:07.000000000 +0200
+++ /var/tmp/diff_new_pack.KbB5rR/_new 2014-06-30 21:45:07.000000000 +0200
@@ -17,7 +17,7 @@
Name: xf86-video-modesetting
-Version: 0.8.0
+Version: 0.9.0
Release: 0
Summary: Generic modesetting driver
License: MIT
@@ -35,7 +35,6 @@
# by default.
Supplements: xorg-x11-server
-Patch1: U_Handle_new_DamageUnregister_API_which_has_only_one_argument.patch
Patch2: N_modesetting-default-swcursor.diff
%x11_abi_videodrv_req
@@ -49,7 +48,6 @@
%prep
%setup -q -n %{name}-%{version}
-%patch1 -p1
%patch2 -p1
%build
++++++ xf86-video-modesetting-0.8.0.tar.bz2 -> xf86-video-modesetting-0.9.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-modesetting-0.8.0/ChangeLog new/xf86-video-modesetting-0.9.0/ChangeLog
--- old/xf86-video-modesetting-0.8.0/ChangeLog 2013-06-12 14:13:08.000000000 +0200
+++ new/xf86-video-modesetting-0.9.0/ChangeLog 2014-06-26 10:38:37.000000000 +0200
@@ -1,3 +1,154 @@
+commit 1e4cb922617990a3005ac23b0c90f89147c3564b
+Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com>
+Date: Thu Jun 26 10:37:19 2014 +0200
+
+ bump to 0.9.0
+
+commit d1c6e27759ea1d2c30cabc62ff2bc315bbbec5fc
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Wed May 21 10:16:39 2014 -0400
+
+ Use own thunk function instead of shadowUpdatePackedWeak
+
+ I plan to remove the Weak functions from a future server.
+
+ Signed-off-by: Adam Jackson <ajax(a)redhat.com>
+
+commit 07c5d9cb782fde2a073efdc437489d6c4b432d46
+Author: Dave Airlie <airlied(a)redhat.com>
+Date: Fri May 2 13:16:05 2014 +1000
+
+ modesetting: fix build regression against older servers.
+
+ Signed-off-by: Dave Airlie <airlied(a)redhat.com>
+
+commit 32fb5f2d821e5e13038eab7db35c5048ad807ccc
+Author: Dave Airlie <airlied(a)redhat.com>
+Date: Fri May 2 13:14:30 2014 +1000
+
+ modesetting: fix use after free.
+
+ Signed-off-by: Dave Airlie <airlied(a)redhat.com>
+
+commit 509dbe8cab339e44b02fed3728bbef7de5c60d05
+Author: Hans de Goede <hdegoede(a)redhat.com>
+Date: Tue Mar 18 15:48:22 2014 +0100
+
+ Add support for server managed fds
+
+ Signed-off-by: Hans de Goede <hdegoede(a)redhat.com>
+
+commit c9d377a19201973012bb6bbb07e3b8c3e9c3b856
+Author: Dave Airlie <airlied(a)redhat.com>
+Date: Fri Feb 28 12:04:30 2014 +1000
+
+ modesetting: fix cursor rendering with hotspots.
+
+ older kernels report EINVAL not ENOSYS, doh.
+
+ Signed-off-by: Dave Airlie <airlied(a)redhat.com>
+
+commit b8840f5442f9fbd8ce47ab2dd555b75cf4bb114a
+Author: Adam Jackson <ajax(a)redhat.com>
+Date: Tue Feb 25 09:06:55 2014 -0500
+
+ modesetting: Don't (brokenly) double-track software cursor
+
+ Signed-off-by: Adam Jackson <ajax(a)redhat.com>
+
+commit c36a5e298c36deb5f6fd0eef3029235aa58de295
+Author: Dave Airlie <airlied(a)redhat.com>
+Date: Mon Jan 20 11:06:42 2014 +1000
+
+ modesetting: try and use hotspot cursor support
+
+ Signed-off-by: Dave Airlie <airlied(a)redhat.com>
+
+commit bf359b118a0870f18a229d33979270ac2f0f5dcd
+Author: Dave Airlie <airlied(a)redhat.com>
+Date: Fri Feb 21 12:48:42 2014 +1000
+
+ modesetting: move closing fd to after we check outputs
+
+ On something like cirrus, start X, then attempt to start a second
+ X while the first is running, if fbdev is installed it'll fail
+ hard.
+
+ Signed-off-by: Dave Airlie <airlied(a)redhat.com>
+
+commit 677935b2d20f54f21c645b5eb386b6c9485fee5f
+Author: Alex Deucher <alexander.deucher(a)amd.com>
+Date: Wed Feb 12 13:06:51 2014 -0500
+
+ modesetting: query cursor size from the kernel
+
+ Use new drm caps. This allows hw cursors to work
+ correctly on gpus with non-64x64 cursors.
+
+ Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com>
+
+commit da64ee70f96fcac32c08128559b293732b318a00
+Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com>
+Date: Tue Dec 3 17:01:28 2013 +0100
+
+ bump to 0.8.1
+
+commit c9f899bf34530d54eb96dda9f5e7d9135967fc11
+Author: Thierry Reding <thierry.reding(a)gmail.com>
+Date: Tue Nov 26 17:08:03 2013 +0100
+
+ Properly identify DSI outputs
+
+ Newer Linux kernels support DSI outputs. To be able to identify them
+ properly, add DSI to the list of output names.
+
+ Reviewed-by: Aaron Plattner <aplattner(a)nvidia.com>
+ Signed-off-by: Thierry Reding <treding(a)nvidia.com>
+
+commit d2403d5a1fb17f925e907296398ba14e8b104e89
+Author: Thierry Reding <thierry.reding(a)gmail.com>
+Date: Tue Nov 26 17:08:02 2013 +0100
+
+ Staticise and constify output names
+
+ This array isn't used anywhere outside this file, so it can be made
+ static. While at it, make the array const as well.
+
+ Signed-off-by: Thierry Reding <treding(a)nvidia.com>
+ Reviewed-by: Aaron Plattner <aplattner(a)nvidia.com>
+
+commit beca4dfb0e4d11d3729214967a1fe56ee5669831
+Author: Keith Packard <keithp(a)keithp.com>
+Date: Fri Nov 15 13:39:52 2013 +0900
+
+ Handle new DamageUnregister API which has only one argument
+
+ API change in 1.15
+
+ Signed-off-by: Keith Packard <keithp(a)keithp.com>
+
+commit 75e6ae5de483bad6bfdea0ec1d9030bb44af335f
+Author: Keith Packard <keithp(a)keithp.com>
+Date: Fri Nov 15 13:26:36 2013 +0900
+
+ Clean up compiler warnings.
+
+ Add const to any immutable string pointers.
+ Rename 'range' to 'prop_range' to avoid redefined warning.
+ Eliminate some unused return values.
+
+ Signed-off-by: Keith Packard <keithp(a)keithp.com>
+
+commit e8bd7c2dc3329fa0da3078b6d2cc0ffa43b428e5
+Author: Dave Airlie <airlied(a)redhat.com>
+Date: Wed Jul 31 11:24:48 2013 +1000
+
+ modesetting: change output names for secondary GPUs
+
+ if we are a secondary GPU modify the output name to avoid clashes.
+
+ Signed-off-by: Dave Airlie <airlied(a)redhat.com>
+
commit 58d3dc53a89c5aa2acfc93e4ae5719dd92b785b9
Author: Maarten Lankhorst <maarten.lankhorst(a)canonical.com>
Date: Wed Jun 12 14:11:53 2013 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-modesetting-0.8.0/aclocal.m4 new/xf86-video-modesetting-0.9.0/aclocal.m4
--- old/xf86-video-modesetting-0.8.0/aclocal.m4 2013-06-12 14:11:00.000000000 +0200
+++ new/xf86-video-modesetting-0.9.0/aclocal.m4 2014-06-26 10:38:18.000000000 +0200
@@ -2058,10 +2058,10 @@
dnl from the copyright holders.
dnl
-# XORG_DRIVER_CHECK_EXT()
+# XORG_DRIVER_CHECK_EXT(MACRO, PROTO)
# --------------------------
-# Checks for the $1 define in xorg-server.h (from the sdk). If it
-# is defined, then add $1 to $REQUIRED_MODULES.
+# Checks for the MACRO define in xorg-server.h (from the sdk). If it
+# is defined, then add the given PROTO to $REQUIRED_MODULES.
AC_DEFUN([XORG_DRIVER_CHECK_EXT],[
AC_REQUIRE([PKG_PROG_PKG_CONFIG])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-modesetting-0.8.0/configure new/xf86-video-modesetting-0.9.0/configure
--- old/xf86-video-modesetting-0.8.0/configure 2013-06-12 14:11:01.000000000 +0200
+++ new/xf86-video-modesetting-0.9.0/configure 2014-06-26 10:38:18.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xf86-video-modesetting 0.8.0.
+# Generated by GNU Autoconf 2.69 for xf86-video-modesetting 0.9.0.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='xf86-video-modesetting'
PACKAGE_TARNAME='xf86-video-modesetting'
-PACKAGE_VERSION='0.8.0'
-PACKAGE_STRING='xf86-video-modesetting 0.8.0'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='xf86-video-modesetting 0.9.0'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1370,7 +1370,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 xf86-video-modesetting 0.8.0 to adapt to many kinds of systems.
+\`configure' configures xf86-video-modesetting 0.9.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1441,7 +1441,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-video-modesetting 0.8.0:";;
+ short | recursive ) echo "Configuration of xf86-video-modesetting 0.9.0:";;
esac
cat <<\_ACEOF
@@ -1573,7 +1573,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-video-modesetting configure 0.8.0
+xf86-video-modesetting configure 0.9.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1897,7 +1897,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-video-modesetting $as_me 0.8.0, which was
+It was created by xf86-video-modesetting $as_me 0.9.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3771,7 +3771,7 @@
# Define the identity of the package.
PACKAGE='xf86-video-modesetting'
- VERSION='0.8.0'
+ VERSION='0.9.0'
cat >>confdefs.h <<_ACEOF
@@ -18253,12 +18253,12 @@
pkg_cv_DRM_CFLAGS="$DRM_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm >= 2.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.46\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.46") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.2" 2>/dev/null`
+ pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm >= 2.4.46" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -18270,12 +18270,12 @@
pkg_cv_DRM_LIBS="$DRM_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.2\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libdrm >= 2.2") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdrm >= 2.4.46\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libdrm >= 2.4.46") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.2" 2>/dev/null`
+ pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm >= 2.4.46" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -18296,14 +18296,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm >= 2.2" 2>&1`
+ DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdrm >= 2.4.46" 2>&1`
else
- DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm >= 2.2" 2>&1`
+ DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdrm >= 2.4.46" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DRM_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libdrm >= 2.2) were not met:
+ as_fn_error $? "Package requirements (libdrm >= 2.4.46) were not met:
$DRM_PKG_ERRORS
@@ -19071,7 +19071,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-video-modesetting $as_me 0.8.0, which was
+This file was extended by xf86-video-modesetting $as_me 0.9.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -19137,7 +19137,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xf86-video-modesetting config.status 0.8.0
+xf86-video-modesetting config.status 0.9.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-modesetting-0.8.0/configure.ac new/xf86-video-modesetting-0.9.0/configure.ac
--- old/xf86-video-modesetting-0.8.0/configure.ac 2013-06-12 14:10:45.000000000 +0200
+++ new/xf86-video-modesetting-0.9.0/configure.ac 2014-06-26 10:37:16.000000000 +0200
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-modesetting],
- [0.8.0],
+ [0.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
[xf86-video-modesetting])
AC_CONFIG_SRCDIR([Makefile.am])
@@ -74,7 +74,7 @@
# Checks for header files.
AC_HEADER_STDC
-PKG_CHECK_MODULES(DRM, [libdrm >= 2.2])
+PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.46])
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.10])
AM_CONDITIONAL(DRM, test "x$DRM" = xyes)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-modesetting-0.8.0/src/driver.c new/xf86-video-modesetting-0.9.0/src/driver.c
--- old/xf86-video-modesetting-0.8.0/src/driver.c 2013-06-12 14:07:36.000000000 +0200
+++ new/xf86-video-modesetting-0.9.0/src/driver.c 2014-06-26 10:20:17.000000000 +0200
@@ -183,7 +183,7 @@
Chipsets);
}
-static int open_hw(char *dev)
+static int open_hw(const char *dev)
{
int fd;
if (dev)
@@ -213,9 +213,20 @@
return ret;
}
-static Bool probe_hw(char *dev)
+static Bool probe_hw(const char *dev, struct xf86_platform_device *platform_dev)
{
- int fd = open_hw(dev);
+ int fd;
+
+#if XF86_PDEV_SERVER_FD
+ if (platform_dev && (platform_dev->flags & XF86_PDEV_SERVER_FD)) {
+ fd = xf86_get_platform_device_int_attrib(platform_dev, ODEV_ATTRIB_FD, -1);
+ if (fd == -1)
+ return FALSE;
+ return check_outputs(fd);
+ }
+#endif
+
+ fd = open_hw(dev);
if (fd != -1) {
int ret = check_outputs(fd);
close(fd);
@@ -237,7 +248,7 @@
}
-static Bool probe_hw_pci(char *dev, struct pci_device *pdev)
+static Bool probe_hw_pci(const char *dev, struct pci_device *pdev)
{
int ret = FALSE, fd = open_hw(dev);
char *id, *devid;
@@ -258,11 +269,11 @@
id = drmGetBusid(fd);
devid = ms_DRICreatePCIBusID(pdev);
- close(fd);
if (id && devid && !strcmp(id, devid))
ret = check_outputs(fd);
+ close(fd);
free(id);
free(devid);
return ret;
@@ -283,6 +294,10 @@
flag = (CARD32 *)data;
(*flag) = 0;
return TRUE;
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,15,99,902,0)
+ case SUPPORTS_SERVER_FDS:
+ return TRUE;
+#endif
default:
return FALSE;
}
@@ -298,7 +313,7 @@
scrn = xf86ConfigPciEntity(scrn, 0, entity_num, NULL,
NULL, NULL, NULL, NULL, NULL);
if (scrn) {
- char *devpath;
+ const char *devpath;
GDevPtr devSection = xf86GetDevFromEntity(scrn->entityList[0],
scrn->entityInstanceList[0]);
@@ -335,13 +350,13 @@
int entity_num, int flags, struct xf86_platform_device *dev, intptr_t match_data)
{
ScrnInfoPtr scrn = NULL;
- char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
+ const char *path = xf86_get_platform_device_attrib(dev, ODEV_ATTRIB_PATH);
int scr_flags = 0;
if (flags & PLATFORM_PROBE_GPU_SCREEN)
scr_flags = XF86_ALLOCATE_GPU_SCREEN;
- if (probe_hw(path)) {
+ if (probe_hw(path, dev)) {
scrn = xf86AllocateScreen(driver, scr_flags);
xf86AddEntityToScreen(scrn, entity_num);
@@ -369,7 +384,7 @@
int i, numDevSections;
GDevPtr *devSections;
Bool foundScreen = FALSE;
- char *dev;
+ const char *dev;
ScrnInfoPtr scrn = NULL;
/* For now, just bail out for PROBE_DETECT. */
@@ -387,7 +402,7 @@
for (i = 0; i < numDevSections; i++) {
dev = xf86FindOptionValue(devSections[i]->options,"kmsdev");
- if (probe_hw(dev)) {
+ if (probe_hw(dev, NULL)) {
int entity;
entity = xf86ClaimFbSlot(drv, 0, devSections[i], TRUE);
scrn = xf86ConfigFbEntity(scrn, 0, entity,
@@ -558,13 +573,26 @@
if (ms->pEnt->location.type == BUS_PCI)
ret = drmClose(ms->fd);
else
+#ifdef XF86_PDEV_SERVER_FD
+ if (!(ms->pEnt->location.type == BUS_PLATFORM &&
+ (ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD)))
+#endif
ret = close(ms->fd);
+ (void) ret;
}
free(ms->Options);
free(ms);
}
+#ifndef DRM_CAP_CURSOR_WIDTH
+#define DRM_CAP_CURSOR_WIDTH 0x8
+#endif
+
+#ifndef DRM_CAP_CURSOR_HEIGHT
+#define DRM_CAP_CURSOR_HEIGHT 0x9
+#endif
+
static Bool
PreInit(ScrnInfoPtr pScrn, int flags)
{
@@ -572,7 +600,8 @@
rgb defaultWeight = { 0, 0, 0 };
EntityInfoPtr pEnt;
EntPtr msEnt = NULL;
- char *BusID = NULL, *devicename;
+ char *BusID = NULL;
+ const char *devicename;
Bool prefer_shadow = TRUE;
uint64_t value = 0;
int ret;
@@ -620,8 +649,15 @@
#if XSERVER_PLATFORM_BUS
if (pEnt->location.type == BUS_PLATFORM) {
- char *path = xf86_get_platform_device_attrib(pEnt->location.id.plat, ODEV_ATTRIB_PATH);
- ms->fd = open_hw(path);
+#ifdef XF86_PDEV_SERVER_FD
+ if (pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD)
+ ms->fd = xf86_get_platform_device_int_attrib(pEnt->location.id.plat, ODEV_ATTRIB_FD, -1);
+ else
+#endif
+ {
+ char *path = xf86_get_platform_device_attrib(pEnt->location.id.plat, ODEV_ATTRIB_PATH);
+ ms->fd = open_hw(path);
+ }
}
else
#endif
@@ -704,6 +740,17 @@
prefer_shadow = !!value;
}
+ ms->cursor_width = 64;
+ ms->cursor_height = 64;
+ ret = drmGetCap(ms->fd, DRM_CAP_CURSOR_WIDTH, &value);
+ if (!ret) {
+ ms->cursor_width = value;
+ }
+ ret = drmGetCap(ms->fd, DRM_CAP_CURSOR_HEIGHT, &value);
+ if (!ret) {
+ ms->cursor_height = value;
+ }
+
ms->drmmode.shadow_enable = xf86ReturnOptValBool(ms->Options, OPTION_SHADOW_FB, prefer_shadow);
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "ShadowFB: preferred %s, enabled %s\n", prefer_shadow ? "YES" : "NO", ms->drmmode.shadow_enable ? "YES" : "NO");
@@ -763,6 +810,12 @@
return ((uint8_t *)ms->drmmode.front_bo->ptr + row * stride + offset);
}
+static void
+msUpdatePacked(ScreenPtr pScreen, shadowBufPtr pBuf)
+{
+ shadowUpdatePacked(pScreen, pBuf);
+}
+
static Bool
CreateScreenResources(ScreenPtr pScreen)
{
@@ -780,7 +833,7 @@
drmmode_uevent_init(pScrn, &ms->drmmode);
- if (!ms->SWCursor)
+ if (!ms->drmmode.sw_cursor)
drmmode_map_cursor_bos(pScrn, &ms->drmmode);
pixels = drmmode_map_front_bo(&ms->drmmode);
if (!pixels)
@@ -795,7 +848,7 @@
FatalError("Couldn't adjust screen pixmap\n");
if (ms->drmmode.shadow_enable) {
- if (!shadowAdd(pScreen, rootPixmap, shadowUpdatePackedWeak(),
+ if (!shadowAdd(pScreen, rootPixmap, msUpdatePacked,
msShadowWindow, 0, 0))
return FALSE;
}
@@ -844,21 +897,37 @@
#endif
static Bool
+SetMaster(ScrnInfoPtr pScrn)
+{
+ modesettingPtr ms = modesettingPTR(pScrn);
+ int ret;
+
+#ifdef XF86_PDEV_SERVER_FD
+ if (ms->pEnt->location.type == BUS_PLATFORM &&
+ (ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD))
+ return TRUE;
+#endif
+
+ ret = drmSetMaster(ms->fd);
+ if (ret)
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "drmSetMaster failed: %s\n",
+ strerror(errno));
+
+ return ret == 0;
+}
+
+static Bool
ScreenInit(SCREEN_INIT_ARGS_DECL)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(pScrn);
VisualPtr visual;
- int ret;
pScrn->pScreen = pScreen;
- ret = drmSetMaster(ms->fd);
- if (ret) {
- ErrorF("Unable to set master\n");
+ if (!SetMaster(pScrn))
return FALSE;
- }
-
+
/* HW dependent - FIXME */
pScrn->displayWidth = pScrn->virtualX;
if (!drmmode_create_initial_bos(pScrn, &ms->drmmode))
@@ -931,7 +1000,7 @@
/* Need to extend HWcursor support to handle mask interleave */
if (!ms->drmmode.sw_cursor)
- xf86_cursors_init(pScreen, 64, 64,
+ xf86_cursors_init(pScreen, ms->cursor_width, ms->cursor_height,
HARDWARE_CURSOR_SOURCE_MASK_INTERLEAVE_64 |
HARDWARE_CURSOR_ARGB);
@@ -989,6 +1058,12 @@
pScrn->vtSema = FALSE;
+#ifdef XF86_PDEV_SERVER_FD
+ if (ms->pEnt->location.type == BUS_PLATFORM &&
+ (ms->pEnt->location.id.plat->flags & XF86_PDEV_SERVER_FD))
+ return;
+#endif
+
drmDropMaster(ms->fd);
}
@@ -1003,10 +1078,7 @@
pScrn->vtSema = TRUE;
- if (drmSetMaster(ms->fd)) {
- xf86DrvMsg(pScrn->scrnIndex, X_WARNING, "drmSetMaster failed: %s\n",
- strerror(errno));
- }
+ SetMaster(pScrn);
if (!drmmode_set_desired_modes(pScrn, &ms->drmmode))
return FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-modesetting-0.8.0/src/driver.h new/xf86-video-modesetting-0.9.0/src/driver.h
--- old/xf86-video-modesetting-0.8.0/src/driver.h 2012-07-17 17:06:33.000000000 +0200
+++ new/xf86-video-modesetting-0.9.0/src/driver.h 2014-06-26 10:20:17.000000000 +0200
@@ -59,7 +59,6 @@
#endif
Bool noAccel;
- Bool SWCursor;
CloseScreenProcPtr CloseScreen;
/* Broken-out options. */
@@ -76,6 +75,7 @@
DamagePtr damage;
Bool dirty_enabled;
+ uint32_t cursor_width, cursor_height;
} modesettingRec, *modesettingPtr;
#define modesettingPTR(p) ((modesettingPtr)((p)->driverPrivate))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-modesetting-0.8.0/src/drmmode_display.c new/xf86-video-modesetting-0.9.0/src/drmmode_display.c
--- old/xf86-video-modesetting-0.8.0/src/drmmode_display.c 2013-06-12 14:07:36.000000000 +0200
+++ new/xf86-video-modesetting-0.9.0/src/drmmode_display.c 2014-06-26 10:20:17.000000000 +0200
@@ -43,6 +43,8 @@
#include "xf86Crtc.h"
#include "drmmode_display.h"
+#include <cursorstr.h>
+
/* DPMS */
#ifdef HAVE_XEXTPROTO_71
#include <X11/extensions/dpmsconst.h>
@@ -52,6 +54,8 @@
#endif
#include "compat-api.h"
+#include "driver.h"
+
static struct dumb_bo *dumb_bo_create(int fd,
const unsigned width, const unsigned height,
const unsigned bpp)
@@ -445,6 +449,7 @@
static void
drmmode_load_cursor_argb (xf86CrtcPtr crtc, CARD32 *image)
{
+ modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
int i;
uint32_t *ptr;
@@ -453,10 +458,11 @@
/* cursor should be mapped already */
ptr = (uint32_t *)(drmmode_crtc->cursor_bo->ptr);
- for (i = 0; i < 64 * 64; i++)
+ for (i = 0; i < ms->cursor_width * ms->cursor_height; i++)
ptr[i] = image[i];// cpu_to_le32(image[i]);
- ret = drmModeSetCursor(drmmode_crtc->drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, 64, 64);
+ ret = drmModeSetCursor(drmmode_crtc->drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle,
+ ms->cursor_width, ms->cursor_height);
if (ret) {
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
xf86CursorInfoPtr cursor_info = xf86_config->cursor_info;
@@ -471,21 +477,37 @@
static void
drmmode_hide_cursor (xf86CrtcPtr crtc)
{
+ modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
- drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, 0, 64, 64);
+ drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, 0,
+ ms->cursor_width, ms->cursor_height);
}
static void
drmmode_show_cursor (xf86CrtcPtr crtc)
{
+ modesettingPtr ms = modesettingPTR(crtc->scrn);
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
drmmode_ptr drmmode = drmmode_crtc->drmmode;
uint32_t handle = drmmode_crtc->cursor_bo->handle;
+ static Bool use_set_cursor2 = TRUE;
- drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, 64, 64);
+ if (use_set_cursor2) {
+ xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
+ CursorPtr cursor = xf86_config->cursor;
+ int ret;
+ ret = drmModeSetCursor2(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle, ms->cursor_width, ms->cursor_height, cursor->bits->xhot, cursor->bits->yhot);
+ if (ret == -EINVAL)
+ use_set_cursor2 = FALSE;
+ else
+ return;
+ }
+
+ drmModeSetCursor(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id, handle,
+ ms->cursor_width, ms->cursor_height);
}
static void
@@ -534,14 +556,13 @@
DamageRegister(&ppix->drawable, drmmode_crtc->slave_damage);
if (ppriv->fb_id == 0) {
- int r;
- r = drmModeAddFB(drmmode->fd, ppix->drawable.width,
- ppix->drawable.height,
- ppix->drawable.depth,
- ppix->drawable.bitsPerPixel,
- ppix->devKind,
- ppriv->backing_bo->handle,
- &ppriv->fb_id);
+ drmModeAddFB(drmmode->fd, ppix->drawable.width,
+ ppix->drawable.height,
+ ppix->drawable.depth,
+ ppix->drawable.bitsPerPixel,
+ ppix->devKind,
+ ppriv->backing_bo->handle,
+ &ppriv->fb_id);
}
return TRUE;
}
@@ -757,11 +778,11 @@
drmModeFreeProperty(drmmode_output->props[i].mode_prop);
free(drmmode_output->props[i].atoms);
}
+ free(drmmode_output->props);
for (i = 0; i < drmmode_output->mode_output->count_encoders; i++) {
drmModeFreeEncoder(drmmode_output->mode_encoders[i]);
- free(drmmode_output->mode_encoders);
}
- free(drmmode_output->props);
+ free(drmmode_output->mode_encoders);
drmModeFreeConnector(drmmode_output->mode_output);
free(drmmode_output);
output->driver_private = NULL;
@@ -830,7 +851,7 @@
drmmode_prop = p->mode_prop;
if (drmmode_prop->flags & DRM_MODE_PROP_RANGE) {
- INT32 range[2];
+ INT32 prop_range[2];
INT32 value = p->value;
p->num_atoms = 1;
@@ -838,12 +859,12 @@
if (!p->atoms)
continue;
p->atoms[0] = MakeAtom(drmmode_prop->name, strlen(drmmode_prop->name), TRUE);
- range[0] = drmmode_prop->values[0];
- range[1] = drmmode_prop->values[1];
+ prop_range[0] = drmmode_prop->values[0];
+ prop_range[1] = drmmode_prop->values[1];
err = RRConfigureOutputProperty(output->randr_output, p->atoms[0],
FALSE, TRUE,
drmmode_prop->flags & DRM_MODE_PROP_IMMUTABLE ? TRUE : FALSE,
- 2, range);
+ 2, prop_range);
if (err != 0) {
xf86DrvMsg(output->scrn->scrnIndex, X_ERROR,
"RRConfigureOutputProperty error, %d\n", err);
@@ -962,22 +983,23 @@
SubPixelVerticalBGR,
SubPixelNone };
-const char *output_names[] = { "None",
- "VGA",
- "DVI",
- "DVI",
- "DVI",
- "Composite",
- "S-video",
- "LVDS",
- "CTV",
- "DIN",
- "DisplayPort",
- "HDMI",
- "HDMI",
- "TV",
- "eDP",
- "Virtual"
+static const char * const output_names[] = { "None",
+ "VGA",
+ "DVI",
+ "DVI",
+ "DVI",
+ "Composite",
+ "S-video",
+ "LVDS",
+ "CTV",
+ "DIN",
+ "DisplayPort",
+ "HDMI",
+ "HDMI",
+ "TV",
+ "eDP",
+ "Virtual",
+ "DSI",
};
static void
@@ -1010,6 +1032,10 @@
/* need to do smart conversion here for compat with non-kms ATI driver */
if (koutput->connector_type >= MS_ARRAY_SIZE(output_names))
snprintf(name, 32, "Unknown-%d", koutput->connector_type_id - 1);
+#ifdef MODESETTING_OUTPUT_SLAVE_SUPPORT
+ else if (pScrn->is_gpu)
+ snprintf(name, 32, "%s-%d-%d", output_names[koutput->connector_type], pScrn->scrnIndex - GPU_SCREEN_OFFSET + 1, koutput->connector_type_id - 1);
+#endif
else
snprintf(name, 32, "%s-%d", output_names[koutput->connector_type], koutput->connector_type_id - 1);
@@ -1481,6 +1507,7 @@
/* create front and cursor BOs */
Bool drmmode_create_initial_bos(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
{
+ modesettingPtr ms = modesettingPTR(pScrn);
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
int width;
int height;
@@ -1496,7 +1523,8 @@
return FALSE;
pScrn->displayWidth = drmmode->front_bo->pitch / cpp;
- width = height = 64;
+ width = ms->cursor_width;
+ height = ms->cursor_height;
bpp = 32;
for (i = 0; i < xf86_config->num_crtc; i++) {
xf86CrtcPtr crtc = xf86_config->crtc[i];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xf86-video-modesetting-0.8.0/src/drmmode_display.h new/xf86-video-modesetting-0.9.0/src/drmmode_display.h
--- old/xf86-video-modesetting-0.8.0/src/drmmode_display.h 2013-06-12 14:07:36.000000000 +0200
+++ new/xf86-video-modesetting-0.9.0/src/drmmode_display.h 2013-12-03 17:08:08.000000000 +0100
@@ -37,6 +37,10 @@
#define MODESETTING_OUTPUT_SLAVE_SUPPORT 1
#endif
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
+#define DamageUnregister(d, dd) DamageUnregister(dd)
+#endif
+
struct dumb_bo {
uint32_t handle;
uint32_t size;
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xf86-video-ati for openSUSE:Factory checked in at 2014-06-30 21:44:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-ati (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-ati.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-ati"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-ati/xf86-video-ati.changes 2014-03-22 19:46:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xf86-video-ati.new/xf86-video-ati.changes 2014-06-30 21:45:05.000000000 +0200
@@ -1,0 +2,31 @@
+Fri Jun 27 01:48:16 UTC 2014 - tobias.johannes.klausmann(a)mni.thm.de
+
+- Update to version 7.4.0:
+ + kms: Use own thunk function instead of shadowUpdatePackedWeak
+ + radeon: don't install colormap handling if there are no crtcs
+ + radeon: require libdrm 2.4.51
+ + radeon: enable tiling by default on CIK
+ + update man page to reflect tiling changes for CI parts
+ + radeon: require libdrm_radeon 2.4.54 for mullins support
+ + radeon: enable tiling for mullins
+ + radeon: fix use-after-free in modesetting cleanup
+ + radeon_open_drm_master get rid of unnecessary goto
+ + Add radeon_get_drm_master_fd helper function
+ + Add support for server managed fds
+ + Fix building on older servers without xf86platformBus.h
+ + evergreen: fix shader constant upload on ppc
+ + return immediately in preinit when called with PROBE_DETECT
+ + Only log debugging output about initializing colormaps when we're doing so
+ + Allow enabling glamor on R500 (and R300) class 3D engines as well.
+ + Build against glamor in the xserver tree if available
+ + dri2: Fix conflicting CreatePixmap usage flag definitions
+ + glamor: Fix test for creating shared pixmaps
+ + Adapt to load_cursor_argb signature change in xserver 1.15.99.902
+ + dri2: Handle PRIME for source buffer as well in radeon_dri2_copy_region2
+ + Revert "Adapt to load_cursor_argb signature change in xserver 1.15.99.902"
+ + Don't disable acceleration on >= SI on attempts to force EXA
+ + Rename Option "NoAccel" to "Accel"
+ + radeon: add support for Mullins.
+ + radeon: add Mullins pci ids.
+
+-------------------------------------------------------------------
Old:
----
xf86-video-ati-7.3.0.1.tar.bz2
New:
----
xf86-video-ati-7.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-ati.spec ++++++
--- /var/tmp/diff_new_pack.ioC32F/_old 2014-06-30 21:45:06.000000000 +0200
+++ /var/tmp/diff_new_pack.ioC32F/_new 2014-06-30 21:45:06.000000000 +0200
@@ -19,7 +19,7 @@
%define xserver_glamor 1
Name: xf86-video-ati
-Version: 7.3.0.1
+Version: 7.4.0
Release: 0
Summary: ATI video driver for the Xorg X server
License: MIT
++++++ xf86-video-ati-7.3.0.1.tar.bz2 -> xf86-video-ati-7.4.0.tar.bz2 ++++++
++++ 77911 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
Hello community,
here is the log from the commit of package libqt5-qtxmlpatterns for openSUSE:Factory checked in at 2014-06-30 21:44:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtxmlpatterns (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtxmlpatterns.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtxmlpatterns"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtxmlpatterns/libqt5-qtxmlpatterns.changes 2014-06-04 18:38:50.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtxmlpatterns.new/libqt5-qtxmlpatterns.changes 2014-06-30 21:45:01.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 25 10:38:12 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.1
+ * Bugfix release, for more details please see:
+ http://blog.qt.digia.com/blog/2014/06/25/qt-5-3-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtxmlpatterns-opensource-src-5.3.0.tar.xz
New:
----
qtxmlpatterns-opensource-src-5.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtxmlpatterns.spec ++++++
--- /var/tmp/diff_new_pack.gYG7lW/_old 2014-06-30 21:45:03.000000000 +0200
+++ /var/tmp/diff_new_pack.gYG7lW/_new 2014-06-30 21:45:03.000000000 +0200
@@ -21,15 +21,15 @@
%define libname libQt5XmlPatterns5
Name: libqt5-qtxmlpatterns
-Version: 5.3.0
+Version: 5.3.1
Release: 0
Summary: Qt 5 XmlPatterns Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: System/Libraries
Url: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.3.0
-%define so_version 5.3.0
+%define real_version 5.3.1
+%define so_version 5.3.1
%if %qt5_snapshot
%define tar_version qtxmlpatterns-%{real_version}
%else
++++++ qtxmlpatterns-opensource-src-5.3.0.tar.xz -> qtxmlpatterns-opensource-src-5.3.1.tar.xz ++++++
++++ 3732 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
Hello community,
here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2014-06-30 21:44:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2014-06-04 18:38:52.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2014-06-30 21:44:57.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 25 10:38:08 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.1
+ * Bugfix release, for more details please see:
+ http://blog.qt.digia.com/blog/2014/06/25/qt-5-3-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtwebkit-opensource-src-5.3.0.tar.xz
New:
----
qtwebkit-opensource-src-5.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebkit.spec ++++++
--- /var/tmp/diff_new_pack.lzSCzI/_old 2014-06-30 21:45:01.000000000 +0200
+++ /var/tmp/diff_new_pack.lzSCzI/_new 2014-06-30 21:45:01.000000000 +0200
@@ -21,11 +21,11 @@
%define libname libQt5WebKitWidgets5
Name: libqt5-qtwebkit
-Version: 5.3.0
+Version: 5.3.1
Release: 0
%define base_name libqt5
-%define real_version 5.3.0
-%define so_version 5.3.0
+%define real_version 5.3.1
+%define so_version 5.3.1
%if %qt5_snapshot
%define tar_version qtwebkit-%{real_version}
%else
++++++ no-Werror-rpath.diff ++++++
--- /var/tmp/diff_new_pack.lzSCzI/_old 2014-06-30 21:45:01.000000000 +0200
+++ /var/tmp/diff_new_pack.lzSCzI/_new 2014-06-30 21:45:01.000000000 +0200
@@ -9,12 +9,12 @@
}
}
-@@ -58,7 +58,7 @@ linux-*g++* {
- QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions
+@@ -56,7 +56,7 @@ linux-*g++* {
+ }
}
-
+
-contains(TEMPLATE, app): CONFIG += rpath
+#contains(TEMPLATE, app): CONFIG += rpath
-
+
CONFIG(debug, debug|release)|force_debug_info|separate_debug_info {
# Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase.
++++++ qtwebkit-opensource-src-5.3.0.tar.xz -> qtwebkit-opensource-src-5.3.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qtwebkit/qtwebkit-opensource-src-5.3.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/qtwebkit-opensource-src-5.3.1.tar.xz differ: char 27, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtx11extras for openSUSE:Factory checked in at 2014-06-30 21:44:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtx11extras (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtx11extras"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtx11extras/libqt5-qtx11extras.changes 2014-06-04 18:38:45.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new/libqt5-qtx11extras.changes 2014-06-30 21:44:56.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 25 10:38:11 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.1
+ * Bugfix release, for more details please see:
+ http://blog.qt.digia.com/blog/2014/06/25/qt-5-3-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtx11extras-opensource-src-5.3.0.tar.xz
New:
----
qtx11extras-opensource-src-5.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtx11extras.spec ++++++
--- /var/tmp/diff_new_pack.RZwNwR/_old 2014-06-30 21:44:57.000000000 +0200
+++ /var/tmp/diff_new_pack.RZwNwR/_new 2014-06-30 21:44:57.000000000 +0200
@@ -21,11 +21,11 @@
%define libname libQt5X11Extras5
Name: libqt5-qtx11extras
-Version: 5.3.0
+Version: 5.3.1
Release: 0
%define base_name libqt5
-%define real_version 5.3.0
-%define so_version 5.3.0
+%define real_version 5.3.1
+%define so_version 5.3.1
%if %qt5_snapshot
%define tar_version qtx11extras-%{real_version}
%else
++++++ qtx11extras-opensource-src-5.3.0.tar.xz -> qtx11extras-opensource-src-5.3.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.0/.qmake.conf new/qtx11extras-opensource-src-5.3.1/.qmake.conf
--- old/qtx11extras-opensource-src-5.3.0/.qmake.conf 2014-05-15 19:12:41.000000000 +0200
+++ new/qtx11extras-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:28.000000000 +0200
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.3.0
+MODULE_VERSION = 5.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.0/.tag new/qtx11extras-opensource-src-5.3.1/.tag
--- old/qtx11extras-opensource-src-5.3.0/.tag 2014-05-15 19:12:41.000000000 +0200
+++ new/qtx11extras-opensource-src-5.3.1/.tag 2014-06-19 12:08:28.000000000 +0200
@@ -1 +1 @@
-947361a7dc8db093d0b8e1ec5ac953470a180259
+2d84caf5ef1b5dace0d678df4581db3c955be6ee
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-opensource-src-5.3.0/include/QtX11Extras/qtx11extrasversion.h new/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/qtx11extrasversion.h
--- old/qtx11extras-opensource-src-5.3.0/include/QtX11Extras/qtx11extrasversion.h 2014-05-15 19:12:41.000000000 +0200
+++ new/qtx11extras-opensource-src-5.3.1/include/QtX11Extras/qtx11extrasversion.h 2014-06-19 12:08:28.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTX11EXTRAS_VERSION_H
#define QT_QTX11EXTRAS_VERSION_H
-#define QTX11EXTRAS_VERSION_STR "5.3.0"
+#define QTX11EXTRAS_VERSION_STR "5.3.1"
-#define QTX11EXTRAS_VERSION 0x050300
+#define QTX11EXTRAS_VERSION 0x050301
#endif // QT_QTX11EXTRAS_VERSION_H
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtwebsockets for openSUSE:Factory checked in at 2014-06-30 21:44:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebsockets (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebsockets"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtwebsockets/libqt5-qtwebsockets.changes 2014-06-04 18:38:48.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtwebsockets.new/libqt5-qtwebsockets.changes 2014-06-30 21:44:55.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 25 10:38:10 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.1
+ * Bugfix release, for more details please see:
+ http://blog.qt.digia.com/blog/2014/06/25/qt-5-3-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtwebsockets-opensource-src-5.3.0.tar.xz
New:
----
qtwebsockets-opensource-src-5.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtwebsockets.spec ++++++
--- /var/tmp/diff_new_pack.I8KiEQ/_old 2014-06-30 21:44:56.000000000 +0200
+++ /var/tmp/diff_new_pack.I8KiEQ/_new 2014-06-30 21:44:56.000000000 +0200
@@ -21,15 +21,15 @@
%define libname libQt5WebSockets5
Name: libqt5-qtwebsockets
-Version: 5.3.0
+Version: 5.3.1
Release: 0
Summary: Qt 5 WebSockets Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.3.0
-%define so_version 5.3.0
+%define real_version 5.3.1
+%define so_version 5.3.1
%if %qt5_snapshot
%define tar_version qtwebsockets-%{real_version}
%else
++++++ qtwebsockets-opensource-src-5.3.0.tar.xz -> qtwebsockets-opensource-src-5.3.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/.qmake.conf new/qtwebsockets-opensource-src-5.3.1/.qmake.conf
--- old/qtwebsockets-opensource-src-5.3.0/.qmake.conf 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:33.000000000 +0200
@@ -3,4 +3,4 @@
CONFIG += qt_example_installs
CONFIG += warning_clean
-MODULE_VERSION = 5.3.0
+MODULE_VERSION = 5.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/.tag new/qtwebsockets-opensource-src-5.3.1/.tag
--- old/qtwebsockets-opensource-src-5.3.0/.tag 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/.tag 2014-06-19 12:08:33.000000000 +0200
@@ -1 +1 @@
-6419556a2bebe81244198e84696aa6eeebdf463d
+eb16b1970293dfeb5918751afbdf1fb7f62028e1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qdefaultmaskgenerator_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qdefaultmaskgenerator_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qdefaultmaskgenerator_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qsslserver_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qsslserver_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qsslserver_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qsslserver_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qsslserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocket_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocket_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocket_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketdataprocessor_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketdataprocessor_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketdataprocessor_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketframe_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketframe_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketframe_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketframe_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsockethandshakerequest_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsockethandshakerequest_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsockethandshakerequest_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsockethandshakeresponse_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketprotocol_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketprotocol_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketprotocol_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketprotocol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketserver_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketserver_p.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.0/QtWebSockets/private/qwebsocketserver_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/websockets/qwebsocketserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qdefaultmaskgenerator_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qdefaultmaskgenerator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qsslserver_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qsslserver_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qsslserver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qsslserver_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qsslserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocket_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocket_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocket_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocket_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocket_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketcorsauthenticator_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketcorsauthenticator_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketdataprocessor_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketdataprocessor_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketframe_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketframe_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketframe_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketframe_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketframe_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakerequest_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsockethandshakerequest_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsockethandshakeresponse_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsockethandshakeresponse_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketprotocol_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketprotocol_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketprotocol_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketprotocol_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketprotocol_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketserver_p.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketserver_p.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketserver_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/5.3.1/QtWebSockets/private/qwebsocketserver_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/websockets/qwebsocketserver_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/qtwebsocketsversion.h new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qtwebsocketsversion.h
--- old/qtwebsockets-opensource-src-5.3.0/include/QtWebSockets/qtwebsocketsversion.h 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/include/QtWebSockets/qtwebsocketsversion.h 2014-06-19 12:08:33.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTWEBSOCKETS_VERSION_H
#define QT_QTWEBSOCKETS_VERSION_H
-#define QTWEBSOCKETS_VERSION_STR "5.3.0"
+#define QTWEBSOCKETS_VERSION_STR "5.3.1"
-#define QTWEBSOCKETS_VERSION 0x050300
+#define QTWEBSOCKETS_VERSION 0x050301
#endif // QT_QTWEBSOCKETS_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-opensource-src-5.3.0/src/imports/qmlwebsockets/qqmlwebsocket.cpp new/qtwebsockets-opensource-src-5.3.1/src/imports/qmlwebsockets/qqmlwebsocket.cpp
--- old/qtwebsockets-opensource-src-5.3.0/src/imports/qmlwebsockets/qqmlwebsocket.cpp 2014-05-15 19:12:46.000000000 +0200
+++ new/qtwebsockets-opensource-src-5.3.1/src/imports/qmlwebsockets/qqmlwebsocket.cpp 2014-06-19 12:08:33.000000000 +0200
@@ -99,6 +99,11 @@
\sa WebSocket::status
*/
+/*!
+ \qmlmethod void WebSocket::sendTextMessage(string message)
+ Sends \c message to the server.
+ */
+
#include "qqmlwebsocket.h"
#include <QtWebSockets/QWebSocket>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qttranslations for openSUSE:Factory checked in at 2014-06-30 21:44:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qttranslations (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qttranslations.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qttranslations"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qttranslations/libqt5-qttranslations.changes 2014-05-22 06:39:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qttranslations.new/libqt5-qttranslations.changes 2014-06-30 21:44:53.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 25 10:38:07 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.1
+ * Bugfix release, for more details please see:
+ http://blog.qt.digia.com/blog/2014/06/25/qt-5-3-1-released/
+
+-------------------------------------------------------------------
Old:
----
qttranslations-opensource-src-5.3.0.tar.xz
New:
----
qttranslations-opensource-src-5.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qttranslations.spec ++++++
--- /var/tmp/diff_new_pack.7lgRMK/_old 2014-06-30 21:44:54.000000000 +0200
+++ /var/tmp/diff_new_pack.7lgRMK/_new 2014-06-30 21:44:54.000000000 +0200
@@ -17,15 +17,15 @@
Name: libqt5-qttranslations
-Version: 5.3.0
+Version: 5.3.1
Release: 0
Summary: Qt 5 Graphical Effects
License: BSD-3-Clause and (SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0)
Group: Development/Libraries/X11
Url: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.3.0
-%define so_version 5.3.0
+%define real_version 5.3.1
+%define so_version 5.3.1
%define tar_version qttranslations-opensource-src-%{real_version}
Source: %{tar_version}.tar.xz
BuildRequires: libqt5-qttools-devel >= %{version}
++++++ qttranslations-opensource-src-5.3.0.tar.xz -> qttranslations-opensource-src-5.3.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.0/.qmake.conf new/qttranslations-opensource-src-5.3.1/.qmake.conf
--- old/qttranslations-opensource-src-5.3.0/.qmake.conf 2014-05-15 19:12:20.000000000 +0200
+++ new/qttranslations-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:10.000000000 +0200
@@ -1,3 +1,3 @@
load(qt_build_config)
-MODULE_VERSION = 5.3.0
+MODULE_VERSION = 5.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.0/.tag new/qttranslations-opensource-src-5.3.1/.tag
--- old/qttranslations-opensource-src-5.3.0/.tag 2014-05-15 19:12:20.000000000 +0200
+++ new/qttranslations-opensource-src-5.3.1/.tag 2014-06-19 12:08:10.000000000 +0200
@@ -1 +1 @@
-56c55b5db6905b93145cc7e05d4a87326718851e
+ed43bd824d647605e8ffa482dbf034eae5de7bc4
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.0/translations/qt_help_it.ts new/qttranslations-opensource-src-5.3.1/translations/qt_help_it.ts
--- old/qttranslations-opensource-src-5.3.0/translations/qt_help_it.ts 1970-01-01 01:00:00.000000000 +0100
+++ new/qttranslations-opensource-src-5.3.1/translations/qt_help_it.ts 2014-06-19 12:08:10.000000000 +0200
@@ -0,0 +1,381 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="it_IT">
+<context>
+ <name>QCLuceneResultWidget</name>
+ <message>
+ <location filename="../../qttools/src/assistant/help/qhelpsearchresultwidget.cpp" line="+110"/>
+ <source>Search Results</source>
+ <translation>Risultati della ricerca</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Note:</source>
+ <translation>Nota:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>The search results may not be complete since the documentation is still being indexed!</source>
+ <translation>I risultati della ricerca potrebbero non essere completi perchè è ancora in corso l'indicizzazione della documentazione!</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Your search did not match any documents.</source>
+ <translation>La tua ricerca non ha trovato corrispondenze in nessun documento.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>(The reason for this might be that the documentation is still being indexed.)</source>
+ <translation>(La causa di ciò potrebbe essere che l'indicizzazione della documentazione è ancora in corso.)</translation>
+ </message>
+</context>
+<context>
+ <name>QHelp</name>
+ <message>
+ <location filename="../../qttools/src/assistant/help/qhelp_global.cpp" line="+62"/>
+ <source>Untitled</source>
+ <translation>Senza titolo</translation>
+ </message>
+</context>
+<context>
+ <name>QHelpCollectionHandler</name>
+ <message>
+ <location filename="../../qttools/src/assistant/help/qhelpcollectionhandler.cpp" line="+79"/>
+ <source>The collection file '%1' is not set up yet!</source>
+ <translation>Il file di collezione '%1' non è ancora stato configurato!</translation>
+ </message>
+ <message>
+ <location line="+23"/>
+ <source>Cannot load sqlite database driver!</source>
+ <translation>Impossibile caricare il driver per i database sqlite!</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <location line="+52"/>
+ <source>Cannot open collection file: %1</source>
+ <translation>Impossibile caricare il file di collezione: %1</translation>
+ </message>
+ <message>
+ <location line="-40"/>
+ <source>Cannot create tables in file %1!</source>
+ <translation>Impossibile creare tabelle nel file %1!</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <source>The collection file '%1' already exists!</source>
+ <translation>Il file di collezione '%1' esiste già!</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Cannot create directory: %1</source>
+ <translation>Impossibile creare la cartella: %1</translation>
+ </message>
+ <message>
+ <location line="+26"/>
+ <source>Cannot copy collection file: %1</source>
+ <translation>Impossibile copiare il file di collezione: %1</translation>
+ </message>
+ <message>
+ <location line="+119"/>
+ <source>Unknown filter '%1'!</source>
+ <translation>Filtro sconosciuto '%1'!</translation>
+ </message>
+ <message>
+ <location line="+53"/>
+ <source>Cannot register filter %1!</source>
+ <translation>Impossibile registrare il filtro %1!</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>Cannot open documentation file %1!</source>
+ <translation>Impossibile aprire il file %1 della documentazione!</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Invalid documentation file '%1'!</source>
+ <translation>Il file '%1' della documentazione non è valido!</translation>
+ </message>
+ <message>
+ <location line="+34"/>
+ <source>The namespace %1 was not registered!</source>
+ <translation>Il namespace %1 non è stato registrato!</translation>
+ </message>
+ <message>
+ <location line="+120"/>
+ <source>Namespace %1 already exists!</source>
+ <translation>Il namespace %1 esiste già!</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Cannot register namespace '%1'!</source>
+ <translation>Impossibile registrare il namespace '%1'!</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Cannot open database '%1' to optimize!</source>
+ <translation>Impossibile aprire il database '%1' per l'ottimizzazione!</translation>
+ </message>
+</context>
+<context>
+ <name>QHelpDBReader</name>
+ <message>
+ <location filename="../../qttools/src/assistant/help/qhelpdbreader.cpp" line="+99"/>
+ <source>Cannot open database '%1' '%2': %3</source>
+ <extracomment>The placeholders are: %1 - The name of the database which cannot be opened %2 - The unique id for the connection %3 - The actual error string</extracomment>
+ <translation>Impossibile aprire il database '%1' '%2': %3</translation>
+ </message>
+</context>
+<context>
+ <name>QHelpEngineCore</name>
+ <message>
+ <location filename="../../qttools/src/assistant/help/qhelpenginecore.cpp" line="+122"/>
+ <source>Cannot open documentation file %1: %2!</source>
+ <translation>Impossibile aprire il file %1 della documentazione: %2!</translation>
+ </message>
+ <message>
+ <location line="+404"/>
+ <source>The specified namespace does not exist!</source>
+ <translation>Il namespace specificato non esiste!</translation>
+ </message>
+</context>
+<context>
+ <name>QHelpGenerator</name>
+ <message>
+ <location filename="../../qttools/src/assistant/help/qhelpgenerator.cpp" line="+158"/>
+ <source>Invalid help data!</source>
+ <translation>Dati della guida non validi!</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>No output file name specified!</source>
+ <translation>Nessun nome del file di output specificato!</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>The file %1 cannot be overwritten!</source>
+ <translation>Il file %1 non può essere sovrascritto!</translation>
+ </message>
+ <message>
+ <location line="+7"/>
+ <source>Building up file structure...</source>
+ <translation>Costruzione della struttura del file...</translation>
+ </message>
+ <message>
+ <location line="+11"/>
+ <source>Cannot open data base file %1!</source>
+ <translation>Impossibile aprire il file %1 del database!</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Cannot register namespace %1!</source>
+ <translation>Impossibile registrare il namespace %1!</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Insert custom filters...</source>
+ <translation>Inserimento di filtri personalizzati...</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Insert help data for filter section (%1 of %2)...</source>
+ <translation>Inserimento dei dati della guida per la sezione del filtro (%1 di %2)...</translation>
+ </message>
+ <message>
+ <location line="+18"/>
+ <source>Documentation successfully generated.</source>
+ <translation>La documentazione è stata generata correttamente.</translation>
+ </message>
+ <message>
+ <location line="+72"/>
+ <source>Some tables already exist!</source>
+ <translation>Alcune tabelle esistono già!</translation>
+ </message>
+ <message>
+ <location line="+61"/>
+ <source>Cannot create tables!</source>
+ <translation>Impossibile creare le tabelle!</translation>
+ </message>
+ <message>
+ <location line="+86"/>
+ <source>Cannot register virtual folder!</source>
+ <translation>Impossibile registrare la cartella virtuale!</translation>
+ </message>
+ <message>
+ <location line="+10"/>
+ <source>Insert files...</source>
+ <translation>Inserimento file...</translation>
+ </message>
+ <message>
+ <location line="+44"/>
+ <source>The file %1 does not exist! Skipping it.</source>
+ <translation>Il file %1 non esiste! Lo salto.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Cannot open file %1! Skipping it.</source>
+ <translation>Impossibile aprire il file %1! Lo salto.</translation>
+ </message>
+ <message>
+ <location line="+133"/>
+ <source>The filter %1 is already registered!</source>
+ <translation>Il filtro %1 è già registrato!</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Cannot register filter %1!</source>
+ <translation>Impossibile registrare il filtro %1!</translation>
+ </message>
+ <message>
+ <location line="+24"/>
+ <source>Insert indices...</source>
+ <translation>Inserimento indici...</translation>
+ </message>
+ <message>
+ <location line="+92"/>
+ <source>Insert contents...</source>
+ <translation>Inserimento contenuti...</translation>
+ </message>
+ <message>
+ <location line="+8"/>
+ <source>Cannot insert contents!</source>
+ <translation>Impossibile inserire i contenuti!</translation>
+ </message>
+ <message>
+ <location line="+12"/>
+ <source>Cannot register contents!</source>
+ <translation>Impossibile registrare i contenuti!</translation>
+ </message>
+ <message>
+ <location line="+56"/>
+ <source>File '%1' does not exist.</source>
+ <translation>Il file '%1' non esiste.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>File '%1' cannot be opened.</source>
+ <translation>Il file '%1' non può essere aperto.</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>File '%1' contains an invalid link to file '%2'</source>
+ <translation>Il file '%1' contiene un collegamento non valido al file '%2'</translation>
+ </message>
+ <message>
+ <location line="+9"/>
+ <source>Invalid links in HTML files.</source>
+ <translation>Collegamenti non validi nei file HTML.</translation>
+ </message>
+</context>
+<context>
+ <name>QHelpProject</name>
+ <message>
+ <location filename="../../qttools/src/assistant/help/qhelpprojectdata.cpp" line="+88"/>
+ <source>Unknown token in file "%1".</source>
+ <translation>Simbolo sconosciuto nel file "%1".</translation>
+ </message>
+ <message>
+ <location line="+13"/>
+ <source>Unknown token. Expected "QtHelpProject"!</source>
+ <translation>Simbolo sconosciuto. Era previsto "QtHelpProject"!</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>Error in line %1: %2</source>
+ <translation>Errore nella linea %1: %2</translation>
+ </message>
+ <message>
+ <location line="+14"/>
+ <source>Virtual folder has invalid syntax in file: "%1"</source>
+ <translation>La cartella virtuale ha una sintassi non valida nel file: "%1"</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>Namespace "%1" has invalid syntax in file: "%2"</source>
+ <translation>Il namespace "%1" ha una sintassi non valida nel file: "%2"</translation>
+ </message>
+ <message>
+ <location line="+19"/>
+ <source>Missing namespace in QtHelpProject file: "%1"</source>
+ <translation>Namespace mancante nel file QtHelpProject: "%1"</translation>
+ </message>
+ <message>
+ <location line="+3"/>
+ <source>Missing virtual folder in QtHelpProject file: "%1"</source>
+ <translation>Cartella virtuale mancante nel file QtHelpProject: "%1"</translation>
+ </message>
+ <message>
+ <location line="+233"/>
+ <source>The input file %1 could not be opened!</source>
+ <translation>Il file di input %1 non può essere aperto!</translation>
+ </message>
+</context>
+<context>
+ <name>QHelpSearchQueryWidget</name>
+ <message>
+ <location filename="../../qttools/src/assistant/help/qhelpsearchquerywidget.cpp" line="+126"/>
+ <source>Search for:</source>
+ <translation>Cerca:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Previous search</source>
+ <translation>Ricerca precedente</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Next search</source>
+ <translation>Ricerca successiva</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>Search</source>
+ <translation>Ricerca</translation>
+ </message>
+ <message>
+ <location line="+2"/>
+ <source>Advanced search</source>
+ <translation>Ricerca avanzata</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>words <B>similar</B> to:</source>
+ <translation>parole <B>simili</A> a:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source><B>without</B> the words:</source>
+ <translation><B>senza</B> le parole:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>with <B>exact phrase</B>:</source>
+ <translation>con <B>la frase esatta</B>:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>with <B>all</B> of the words:</source>
+ <translation>con <B>tutte</B> le parole:</translation>
+ </message>
+ <message>
+ <location line="+1"/>
+ <source>with <B>at least one</B> of the words:</source>
+ <translation>con <B>almeno una</B> delle parole:</translation>
+ </message>
+</context>
+<context>
+ <name>QHelpSearchResultWidget</name>
+ <message numerus="yes">
+ <location filename="../../qttools/src/assistant/help/qhelpsearchresultwidget.cpp" line="+174"/>
+ <source>%1 - %2 of %n Hits</source>
+ <translation>
+ <numerusform>%1 - %2 di %n corrispondenza</numerusform>
+ <numerusform>%1 - %2 di %n corrispondenze</numerusform>
+ </translation>
+ </message>
+ <message>
+ <location line="+61"/>
+ <source>0 - 0 of 0 Hits</source>
+ <translation>0 - 0 di 0 corrispondenze</translation>
+ </message>
+</context>
+</TS>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.0/translations/qtbase_it.ts new/qttranslations-opensource-src-5.3.1/translations/qtbase_it.ts
--- old/qttranslations-opensource-src-5.3.0/translations/qtbase_it.ts 2014-05-15 19:12:19.000000000 +0200
+++ new/qttranslations-opensource-src-5.3.1/translations/qtbase_it.ts 2014-06-19 12:08:09.000000000 +0200
@@ -141,6 +141,25 @@
</message>
</context>
<context>
+ <name>QAndroidPlatformTheme</name>
+ <message>
+ <source>Yes</source>
+ <translation>Sì</translation>
+ </message>
+ <message>
+ <source>Yes to All</source>
+ <translation>Sì a tutti</translation>
+ </message>
+ <message>
+ <source>No</source>
+ <translation>No</translation>
+ </message>
+ <message>
+ <source>No to All</source>
+ <translation>No a tutti</translation>
+ </message>
+</context>
+<context>
<name>QApplication</name>
<message>
<source>Executable '%1' requires Qt %2, found Qt %3.</source>
@@ -191,6 +210,13 @@
</message>
</context>
<context>
+ <name>QCocoaTheme</name>
+ <message>
+ <source>Don't Save</source>
+ <translation>Non salvare</translation>
+ </message>
+</context>
+<context>
<name>QColorDialog</name>
<message>
<source>Hu&e:</source>
@@ -658,6 +684,10 @@
<translation>Inizializzazione del risolutore non riuscita</translation>
</message>
<message>
+ <source>IPv6 addresses for nameservers is currently not supported</source>
+ <translation>Gli indirizzi IPv6 per i server di risoluzione dei nomi non sono al momento supportati</translation>
+ </message>
+ <message>
<source>Server could not process query</source>
<translation>Il server non può elaborare la query</translation>
</message>
@@ -717,6 +747,35 @@
<source>Resolver library can't be loaded: No runtime library loading support</source>
<translation>La libreria di risoluzione non può essere caricata. Nessun supporto per il caricamento di librerie</translation>
</message>
+ <message>
+ <source>No hostname given</source>
+ <translation>Nessun nome host inserito</translation>
+ </message>
+ <message>
+ <source>Invalid hostname</source>
+ <translation>Nome dell'host non valido</translation>
+ </message>
+</context>
+<context>
+ <name>QDockWidget</name>
+ <message>
+ <source>Float</source>
+ <extracomment>Accessible name for button undocking a dock widget (floating state)</extracomment>
+ <translation>Fluttua</translation>
+ </message>
+ <message>
+ <source>Undocks and re-attaches the dock widget</source>
+ <translation>Separa e ri-collega l'oggetto contenitore</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <extracomment>Accessible name for button closing a dock widget</extracomment>
+ <translation>Chiudi</translation>
+ </message>
+ <message>
+ <source>Closes the dock widget</source>
+ <translation>Chiudi l'oggetto contenitore</translation>
+ </message>
</context>
<context>
<name>QErrorMessage</name>
@@ -1399,6 +1458,29 @@
</message>
</context>
<context>
+ <name>QGnomeTheme</name>
+ <message>
+ <source>&OK</source>
+ <translation>&OK</translation>
+ </message>
+ <message>
+ <source>&Save</source>
+ <translation>&Salva</translation>
+ </message>
+ <message>
+ <source>&Cancel</source>
+ <translation>&Annulla</translation>
+ </message>
+ <message>
+ <source>&Close</source>
+ <translation>&Chiudi</translation>
+ </message>
+ <message>
+ <source>Close without Saving</source>
+ <translation>Chiudi senza salvare</translation>
+ </message>
+</context>
+<context>
<name>QHostInfo</name>
<message>
<source>No host name given</source>
@@ -1622,6 +1704,10 @@
<source>Unknown error</source>
<translation>Errore sconosciuto</translation>
</message>
+ <message>
+ <source>file to open is a directory</source>
+ <translation>il file da aprire è una cartella</translation>
+ </message>
</context>
<context>
<name>QInputDialog</name>
@@ -2613,6 +2699,52 @@
<translation>Punti (pt)</translation>
</message>
<message>
+ <source>Pica (P̸)</source>
+ <translation>Pica (P̸)</translation>
+ </message>
+ <message>
+ <source>Didot (DD)</source>
+ <translation>Didot (DD)</translation>
+ </message>
+ <message>
+ <source>Cicero (CC)</source>
+ <translation>Cicero (CC)</translation>
+ </message>
+ <message>
+ <source>Custom</source>
+ <translation>Personalizzata</translation>
+ </message>
+ <message>
+ <source>mm</source>
+ <extracomment>Unit 'Millimeter'</extracomment>
+ <translation>mm</translation>
+ </message>
+ <message>
+ <source>pt</source>
+ <extracomment>Unit 'Points'</extracomment>
+ <translation>pt</translation>
+ </message>
+ <message>
+ <source>in</source>
+ <extracomment>Unit 'Inch'</extracomment>
+ <translation>in</translation>
+ </message>
+ <message>
+ <source>P̸</source>
+ <extracomment>Unit 'Pica'</extracomment>
+ <translation>P̸</translation>
+ </message>
+ <message>
+ <source>DD</source>
+ <extracomment>Unit 'Didot'</extracomment>
+ <translation>DD</translation>
+ </message>
+ <message>
+ <source>CC</source>
+ <extracomment>Unit 'Cicero'</extracomment>
+ <translation>CC</translation>
+ </message>
+ <message>
<source>Page Layout</source>
<translation>Impaginazione</translation>
</message>
@@ -2626,6 +2758,559 @@
</message>
</context>
<context>
+ <name>QPageSize</name>
+ <message>
+ <source>Custom (%1mm x %2mm)</source>
+ <extracomment>Custom size name in millimeters</extracomment>
+ <translation>Personalizzata (%1mm x %2mm)</translation>
+ </message>
+ <message>
+ <source>Custom (%1pt x %2pt)</source>
+ <extracomment>Custom size name in points</extracomment>
+ <translation>Personalizzata (%1pt x %2pt)</translation>
+ </message>
+ <message>
+ <source>Custom (%1in x %2in)</source>
+ <extracomment>Custom size name in inches</extracomment>
+ <translation>Personalizzata (%1in x %2in)</translation>
+ </message>
+ <message>
+ <source>Custom (%1pc x %2pc)</source>
+ <extracomment>Custom size name in picas</extracomment>
+ <translation>Personalizzata (%1pc x %2pc)</translation>
+ </message>
+ <message>
+ <source>Custom (%1DD x %2DD)</source>
+ <extracomment>Custom size name in didots</extracomment>
+ <translation>Personalizzata (%1DD x %2DD)</translation>
+ </message>
+ <message>
+ <source>Custom (%1CC x %2CC)</source>
+ <extracomment>Custom size name in ciceros</extracomment>
+ <translation>Personalizzata (%1CC x %2CC)</translation>
+ </message>
+ <message>
+ <source>%1 x %2 in</source>
+ <extracomment>Page size in 'Inch'.</extracomment>
+ <translation>%1 x %2 pollici</translation>
+ </message>
+ <message>
+ <source>A0</source>
+ <translation>A0</translation>
+ </message>
+ <message>
+ <source>A1</source>
+ <translation>A1</translation>
+ </message>
+ <message>
+ <source>A2</source>
+ <translation>A2</translation>
+ </message>
+ <message>
+ <source>A3</source>
+ <translation>A3</translation>
+ </message>
+ <message>
+ <source>A4</source>
+ <translation>A4</translation>
+ </message>
+ <message>
+ <source>A5</source>
+ <translation>A5</translation>
+ </message>
+ <message>
+ <source>A6</source>
+ <translation>A6</translation>
+ </message>
+ <message>
+ <source>A7</source>
+ <translation>A7</translation>
+ </message>
+ <message>
+ <source>A8</source>
+ <translation>A8</translation>
+ </message>
+ <message>
+ <source>A9</source>
+ <translation>A9</translation>
+ </message>
+ <message>
+ <source>A10</source>
+ <translation>A10</translation>
+ </message>
+ <message>
+ <source>B0</source>
+ <translation>B0</translation>
+ </message>
+ <message>
+ <source>B1</source>
+ <translation>B1</translation>
+ </message>
+ <message>
+ <source>B2</source>
+ <translation>B2</translation>
+ </message>
+ <message>
+ <source>B3</source>
+ <translation>B3</translation>
+ </message>
+ <message>
+ <source>B4</source>
+ <translation>B4</translation>
+ </message>
+ <message>
+ <source>B5</source>
+ <translation>B5</translation>
+ </message>
+ <message>
+ <source>B6</source>
+ <translation>B6</translation>
+ </message>
+ <message>
+ <source>B7</source>
+ <translation>B7</translation>
+ </message>
+ <message>
+ <source>B8</source>
+ <translation>B8</translation>
+ </message>
+ <message>
+ <source>B9</source>
+ <translation>B9</translation>
+ </message>
+ <message>
+ <source>B10</source>
+ <translation>B10</translation>
+ </message>
+ <message>
+ <source>Executive (7.5 x 10 in)</source>
+ <translation>Esecutivo (7.5 x 10 pollici)</translation>
+ </message>
+ <message>
+ <source>Executive (7.25 x 10.5 in)</source>
+ <translation>Esecutivo (7.25 x 10.5 pollici)</translation>
+ </message>
+ <message>
+ <source>Folio (8.27 x 13 in)</source>
+ <translation>Folio (8.27 x 13 pollici)</translation>
+ </message>
+ <message>
+ <source>Legal</source>
+ <translation>Legale</translation>
+ </message>
+ <message>
+ <source>Letter / ANSI A</source>
+ <translation>Lettera / ANSI A</translation>
+ </message>
+ <message>
+ <source>Tabloid / ANSI B</source>
+ <translation>Tabloid / ANSI B</translation>
+ </message>
+ <message>
+ <source>Ledger / ANSI B</source>
+ <translation>Libro mastro / ANSI B</translation>
+ </message>
+ <message>
+ <source>Custom</source>
+ <translation>Personalizzata</translation>
+ </message>
+ <message>
+ <source>A3 Extra</source>
+ <translation>A3 Extra</translation>
+ </message>
+ <message>
+ <source>A4 Extra</source>
+ <translation>A4 Extra</translation>
+ </message>
+ <message>
+ <source>A4 Plus</source>
+ <translation>A4 Plus</translation>
+ </message>
+ <message>
+ <source>A4 Small</source>
+ <translation>A4 Piccolo</translation>
+ </message>
+ <message>
+ <source>A5 Extra</source>
+ <translation>A5 Extra</translation>
+ </message>
+ <message>
+ <source>B5 Extra</source>
+ <translation>B5 Extra</translation>
+ </message>
+ <message>
+ <source>JIS B0</source>
+ <translation>JIS B0</translation>
+ </message>
+ <message>
+ <source>JIS B1</source>
+ <translation>JIS B1</translation>
+ </message>
+ <message>
+ <source>JIS B2</source>
+ <translation>JIS B2</translation>
+ </message>
+ <message>
+ <source>JIS B3</source>
+ <translation>JIS B3</translation>
+ </message>
+ <message>
+ <source>JIS B4</source>
+ <translation>JIS B4</translation>
+ </message>
+ <message>
+ <source>JIS B5</source>
+ <translation>JIS B5</translation>
+ </message>
+ <message>
+ <source>JIS B6</source>
+ <translation>JIS B6</translation>
+ </message>
+ <message>
+ <source>JIS B7</source>
+ <translation>JIS B7</translation>
+ </message>
+ <message>
+ <source>JIS B8</source>
+ <translation>JIS B8</translation>
+ </message>
+ <message>
+ <source>JIS B9</source>
+ <translation>JIS B9</translation>
+ </message>
+ <message>
+ <source>JIS B10</source>
+ <translation>JIS B10</translation>
+ </message>
+ <message>
+ <source>ANSI C</source>
+ <translation>ANSI C</translation>
+ </message>
+ <message>
+ <source>ANSI D</source>
+ <translation>ANSI D</translation>
+ </message>
+ <message>
+ <source>ANSI E</source>
+ <translation>ANSI E</translation>
+ </message>
+ <message>
+ <source>Legal Extra</source>
+ <translation>Legale extra</translation>
+ </message>
+ <message>
+ <source>Letter Extra</source>
+ <translation>Lettera extra</translation>
+ </message>
+ <message>
+ <source>Letter Plus</source>
+ <translation>Lettera plus</translation>
+ </message>
+ <message>
+ <source>Letter Small</source>
+ <translation>Lettera piccola</translation>
+ </message>
+ <message>
+ <source>Tabloid Extra</source>
+ <translation>Tabloid extra</translation>
+ </message>
+ <message>
+ <source>Architect A</source>
+ <translation>Architetto A</translation>
+ </message>
+ <message>
+ <source>Architect B</source>
+ <translation>Architetto B</translation>
+ </message>
+ <message>
+ <source>Architect C</source>
+ <translation>Architetto C</translation>
+ </message>
+ <message>
+ <source>Architect D</source>
+ <translation>Architetto D</translation>
+ </message>
+ <message>
+ <source>Architect E</source>
+ <translation>Architetto E</translation>
+ </message>
+ <message>
+ <source>Note</source>
+ <translation>Nota</translation>
+ </message>
+ <message>
+ <source>Quarto</source>
+ <translation>Quarto</translation>
+ </message>
+ <message>
+ <source>Statement</source>
+ <translation>Dichiarazione</translation>
+ </message>
+ <message>
+ <source>Super A</source>
+ <translation>Super A</translation>
+ </message>
+ <message>
+ <source>Super B</source>
+ <translation>Super B</translation>
+ </message>
+ <message>
+ <source>Postcard</source>
+ <translation>Cartolina</translation>
+ </message>
+ <message>
+ <source>Double Postcard</source>
+ <translation>Cartolina doppia</translation>
+ </message>
+ <message>
+ <source>PRC 16K</source>
+ <translation>PRC 16K</translation>
+ </message>
+ <message>
+ <source>PRC 32K</source>
+ <translation>PRC 32K</translation>
+ </message>
+ <message>
+ <source>PRC 32K Big</source>
+ <translation>PRC 32K Grande</translation>
+ </message>
+ <message>
+ <source>Fan-fold US (14.875 x 11 in)</source>
+ <translation>Pieghevole US (14.875 x 11 pollici)</translation>
+ </message>
+ <message>
+ <source>Fan-fold German (8.5 x 12 in)</source>
+ <translation>Pieghevole tedesco (8.5 x 12 pollici)</translation>
+ </message>
+ <message>
+ <source>Fan-fold German Legal (8.5 x 13 in)</source>
+ <translation>Pieghevole tedesco legale (8.5 x 13 pollici)</translation>
+ </message>
+ <message>
+ <source>Envelope B4</source>
+ <translation>Busta B4</translation>
+ </message>
+ <message>
+ <source>Envelope B5</source>
+ <translation>Busta B5</translation>
+ </message>
+ <message>
+ <source>Envelope B6</source>
+ <translation>Busta B6</translation>
+ </message>
+ <message>
+ <source>Envelope C0</source>
+ <translation>Busta C0</translation>
+ </message>
+ <message>
+ <source>Envelope C1</source>
+ <translation>Busta C1</translation>
+ </message>
+ <message>
+ <source>Envelope C2</source>
+ <translation>Busta C2</translation>
+ </message>
+ <message>
+ <source>Envelope C3</source>
+ <translation>Busta C3</translation>
+ </message>
+ <message>
+ <source>Envelope C4</source>
+ <translation>Busta C4</translation>
+ </message>
+ <message>
+ <source>Envelope C5</source>
+ <translation>Busta C5</translation>
+ </message>
+ <message>
+ <source>Envelope C6</source>
+ <translation>Busta C6</translation>
+ </message>
+ <message>
+ <source>Envelope C65</source>
+ <translation>Busta C65</translation>
+ </message>
+ <message>
+ <source>Envelope C7</source>
+ <translation>Busta C7</translation>
+ </message>
+ <message>
+ <source>Envelope DL</source>
+ <translation>Busta DL</translation>
+ </message>
+ <message>
+ <source>Envelope US 9</source>
+ <translation>Busta US 9</translation>
+ </message>
+ <message>
+ <source>Envelope US 10</source>
+ <translation>Busta US 10</translation>
+ </message>
+ <message>
+ <source>Envelope US 11</source>
+ <translation>Busta US 11</translation>
+ </message>
+ <message>
+ <source>Envelope US 12</source>
+ <translation>Busta US 12</translation>
+ </message>
+ <message>
+ <source>Envelope US 14</source>
+ <translation>Busta US 14</translation>
+ </message>
+ <message>
+ <source>Envelope Monarch</source>
+ <translation>Busta Monarch</translation>
+ </message>
+ <message>
+ <source>Envelope Personal</source>
+ <translation>Busta personale</translation>
+ </message>
+ <message>
+ <source>Envelope Chou 3</source>
+ <translation>Busta Chou 3</translation>
+ </message>
+ <message>
+ <source>Envelope Chou 4</source>
+ <translation>Busta Chou 4</translation>
+ </message>
+ <message>
+ <source>Envelope Invite</source>
+ <translation>Busta invito</translation>
+ </message>
+ <message>
+ <source>Envelope Italian</source>
+ <translation>Busta italiana</translation>
+ </message>
+ <message>
+ <source>Envelope Kaku 2</source>
+ <translation>Busta Kaku 2</translation>
+ </message>
+ <message>
+ <source>Envelope Kaku 3</source>
+ <translation>Busta Kaku 3</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 1</source>
+ <translation>Busta PRC 1</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 2</source>
+ <translation>Busta PRC 2</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 3</source>
+ <translation>Busta PRC 3</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 4</source>
+ <translation>Busta PRC 4</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 5</source>
+ <translation>Busta PRC 5</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 6</source>
+ <translation>Busta PRC 6</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 7</source>
+ <translation>Busta PRC 7</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 8</source>
+ <translation>Busta PRC 8</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 9</source>
+ <translation>Busta PRC 9</translation>
+ </message>
+ <message>
+ <source>Envelope PRC 10</source>
+ <translation>Busta PRC 10</translation>
+ </message>
+ <message>
+ <source>Envelope You 4</source>
+ <translation>Busta You 4</translation>
+ </message>
+</context>
+<context>
+ <name>QPlatformTheme</name>
+ <message>
+ <source>OK</source>
+ <translation>OK</translation>
+ </message>
+ <message>
+ <source>Save</source>
+ <translation>Salva</translation>
+ </message>
+ <message>
+ <source>Save All</source>
+ <translation>Salva tutti</translation>
+ </message>
+ <message>
+ <source>Open</source>
+ <translation>Apri</translation>
+ </message>
+ <message>
+ <source>&Yes</source>
+ <translation>&Sì</translation>
+ </message>
+ <message>
+ <source>Yes to &All</source>
+ <translation>Sì &a tutti</translation>
+ </message>
+ <message>
+ <source>&No</source>
+ <translation>&No</translation>
+ </message>
+ <message>
+ <source>N&o to All</source>
+ <translation>N&o a tutti</translation>
+ </message>
+ <message>
+ <source>Abort</source>
+ <translation>Interrompi</translation>
+ </message>
+ <message>
+ <source>Retry</source>
+ <translation>Riprova</translation>
+ </message>
+ <message>
+ <source>Ignore</source>
+ <translation>Ignora</translation>
+ </message>
+ <message>
+ <source>Close</source>
+ <translation>Chiudi</translation>
+ </message>
+ <message>
+ <source>Cancel</source>
+ <translation>Annulla</translation>
+ </message>
+ <message>
+ <source>Discard</source>
+ <translation>Tralascia</translation>
+ </message>
+ <message>
+ <source>Help</source>
+ <translation>Aiuto</translation>
+ </message>
+ <message>
+ <source>Apply</source>
+ <translation>Applica</translation>
+ </message>
+ <message>
+ <source>Reset</source>
+ <translation>Ripristina</translation>
+ </message>
+ <message>
+ <source>Restore Defaults</source>
+ <translation>Ripristina valori predefiniti</translation>
+ </message>
+</context>
+<context>
<name>QPluginLoader</name>
<message>
<source>The plugin was not loaded.</source>
@@ -2894,6 +3579,10 @@
<source>OK</source>
<translation>OK</translation>
</message>
+ <message>
+ <source>Automatic</source>
+ <translation>Automatico</translation>
+ </message>
</context>
<context>
<name>QPrintPreviewDialog</name>
@@ -4663,7 +5352,7 @@
</message>
<message>
<source>Num</source>
- <translation type="unfinished"></translation>
+ <translation>Num</translation>
</message>
<message>
<source>+</source>
@@ -5269,6 +5958,10 @@
<translation>Configurazione</translation>
</message>
<message>
+ <source>Shared Configuration</source>
+ <translation>Configurazione condivisa</translation>
+ </message>
+ <message>
<source>Shared Cache</source>
<translation>Cache condivisa</translation>
</message>
@@ -5376,7 +6069,7 @@
</message>
<message>
<source>Could not seek to image read footer</source>
- <translation type="unfinished"></translation>
+ <translation>Impossibile saltare al fondo del file dell'immagine</translation>
</message>
<message>
<source>Could not read footer</source>
@@ -5483,6 +6176,22 @@
<translation>PDF ripristina impostazioni di direzione del testo</translation>
</message>
<message>
+ <source>LRI Left-to-right isolate</source>
+ <translation>LRI Isolato da sinistra a destra</translation>
+ </message>
+ <message>
+ <source>RLI Right-to-left isolate</source>
+ <translation>RLI Isolato da destra a sinistra</translation>
+ </message>
+ <message>
+ <source>FSI First strong isolate</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <source>PDI Pop directional isolate</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Insert Unicode control character</source>
<translation>Inserisci carattere di controllo Unicode</translation>
</message>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qttranslations-opensource-src-5.3.0/translations/qtmultimedia_it.ts new/qttranslations-opensource-src-5.3.1/translations/qtmultimedia_it.ts
--- old/qttranslations-opensource-src-5.3.0/translations/qtmultimedia_it.ts 2014-05-15 19:12:20.000000000 +0200
+++ new/qttranslations-opensource-src-5.3.1/translations/qtmultimedia_it.ts 2014-06-19 12:08:10.000000000 +0200
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE TS>
-<TS version="2.0" language="it_IT">
+<TS version="2.1" language="it_IT">
<context>
<name>AudioCaptureSession</name>
<message>
@@ -174,6 +174,10 @@
<source>Service has not been started</source>
<translation>Il servizio non è stato avviato</translation>
</message>
+ <message>
+ <source>Recording permissions are not available</source>
+ <translation>I permessi per la registrazione non sono disponibili</translation>
+ </message>
</context>
<context>
<name>CameraBinSession</name>
@@ -399,6 +403,7 @@
</message>
<message>
<source>Drive mode not supported</source>
+ <extracomment>Drive mode is the camera's shutter mode, for example single shot, continuos exposure, etc.</extracomment>
<translation>Modalità di guida non supportata</translation>
</message>
<message>
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qttools for openSUSE:Factory checked in at 2014-06-30 21:44:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qttools (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qttools.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qttools"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qttools/libqt5-qttools.changes 2014-06-04 18:38:53.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qttools.new/libqt5-qttools.changes 2014-06-30 21:44:52.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 25 10:38:07 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.1
+ * Bugfix release, for more details please see:
+ http://blog.qt.digia.com/blog/2014/06/25/qt-5-3-1-released/
+
+-------------------------------------------------------------------
Old:
----
qttools-opensource-src-5.3.0.tar.xz
New:
----
qttools-opensource-src-5.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qttools.spec ++++++
--- /var/tmp/diff_new_pack.3utaYm/_old 2014-06-30 21:44:53.000000000 +0200
+++ /var/tmp/diff_new_pack.3utaYm/_new 2014-06-30 21:44:53.000000000 +0200
@@ -19,15 +19,15 @@
%define qt5_snapshot 0
Name: libqt5-qttools
-Version: 5.3.0
+Version: 5.3.1
Release: 0
Summary: Qt 5 QtTools Module
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.3.0
-%define so_version 5.3.0
+%define real_version 5.3.1
+%define so_version 5.3.1
%if %qt5_snapshot
%define tar_version qttools-%{real_version}
%else
++++++ qttools-opensource-src-5.3.0.tar.xz -> qttools-opensource-src-5.3.1.tar.xz ++++++
/work/SRC/openSUSE:Factory/libqt5-qttools/qttools-opensource-src-5.3.0.tar.xz /work/SRC/openSUSE:Factory/.libqt5-qttools.new/qttools-opensource-src-5.3.1.tar.xz differ: char 27, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libqt5-qtsvg for openSUSE:Factory checked in at 2014-06-30 21:44:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtsvg (Old)
and /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtsvg"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libqt5-qtsvg/libqt5-qtsvg.changes 2014-06-04 18:38:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtsvg.new/libqt5-qtsvg.changes 2014-06-30 21:44:51.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Jun 25 10:38:06 UTC 2014 - hrvoje.senjan(a)gmail.com
+
+- Update to 5.3.1
+ * Bugfix release, for more details please see:
+ http://blog.qt.digia.com/blog/2014/06/25/qt-5-3-1-released/
+
+-------------------------------------------------------------------
Old:
----
qtsvg-opensource-src-5.3.0.tar.xz
New:
----
qtsvg-opensource-src-5.3.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libqt5-qtsvg.spec ++++++
--- /var/tmp/diff_new_pack.gu9LwF/_old 2014-06-30 21:44:51.000000000 +0200
+++ /var/tmp/diff_new_pack.gu9LwF/_new 2014-06-30 21:44:51.000000000 +0200
@@ -21,15 +21,15 @@
%define libname libQt5Svg5
Name: libqt5-qtsvg
-Version: 5.3.0
+Version: 5.3.1
Release: 0
Summary: Qt 5 SVG Library
License: SUSE-LGPL-2.1-with-digia-exception-1.1 or GPL-3.0
Group: Development/Libraries/X11
Url: http://qt.digia.com
%define base_name libqt5
-%define real_version 5.3.0
-%define so_version 5.3.0
+%define real_version 5.3.1
+%define so_version 5.3.1
%if %qt5_snapshot
%define tar_version qtsvg-%{real_version}
%else
++++++ qtsvg-opensource-src-5.3.0.tar.xz -> qtsvg-opensource-src-5.3.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/.qmake.conf new/qtsvg-opensource-src-5.3.1/.qmake.conf
--- old/qtsvg-opensource-src-5.3.0/.qmake.conf 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/.qmake.conf 2014-06-19 12:08:33.000000000 +0200
@@ -2,4 +2,4 @@
CONFIG += qt_example_installs
CONFIG += warning_clean
-MODULE_VERSION = 5.3.0
+MODULE_VERSION = 5.3.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/.tag new/qtsvg-opensource-src-5.3.1/.tag
--- old/qtsvg-opensource-src-5.3.0/.tag 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/.tag 2014-06-19 12:08:33.000000000 +0200
@@ -1 +1 @@
-bbf16bd90285658571bc30161e9687e0cc40e387
+35a2f0880831d38c60d2b4820dac808f48f6f3a8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/examples/svg/embedded/weatherinfo/weatherinfo.cpp new/qtsvg-opensource-src-5.3.1/examples/svg/embedded/weatherinfo/weatherinfo.cpp
--- old/qtsvg-opensource-src-5.3.0/examples/svg/embedded/weatherinfo/weatherinfo.cpp 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/examples/svg/embedded/weatherinfo/weatherinfo.cpp 2014-06-19 12:08:33.000000000 +0200
@@ -44,6 +44,11 @@
#include <QtNetwork>
#include <QtSvg>
+#define GET_DATA_ATTR(val) xml.attributes().value(val).toString()
+#define GET_DATETIME(val) QDateTime::fromString(val, "yyyy-MM-ddThh:mm:ss")
+#define FORMAT_TEMPERATURE(val) val + QChar(176) + "C"
+#define TEXTCOLOR palette().color(QPalette::WindowText)
+
class WeatherInfo: public QMainWindow
{
Q_OBJECT
@@ -56,6 +61,8 @@
QGraphicsRectItem *m_statusItem;
QGraphicsTextItem *m_temperatureItem;
QGraphicsTextItem *m_conditionItem;
+ QGraphicsTextItem *m_cityItem;
+ QGraphicsTextItem *m_copyright;
QGraphicsSvgItem *m_iconItem;
QList<QGraphicsRectItem*> m_forecastItems;
QList<QGraphicsTextItem*> m_dayItems;
@@ -82,9 +89,9 @@
QStringList cities;
cities << "Oslo";
cities << "Berlin";
- cities << "Brisbane";
+ cities << "Moscow";
cities << "Helsinki";
- cities << "San Diego";
+ cities << "Santa Clara";
for (int i = 0; i < cities.count(); ++i) {
QAction *action = new QAction(cities[i], this);
connect(action, SIGNAL(triggered()), SLOT(chooseCity()));
@@ -100,15 +107,26 @@
private slots:
void delayedInit() {
- request("Oslo");
+ request("http://www.yr.no/place/Norge/Oslo/Oslo/Oslo/varsel.xml");
}
private slots:
void chooseCity() {
QAction *action = qobject_cast<QAction*>(sender());
- if (action)
- request(action->text());
+ if (action) {
+ if (action->text() == "Oslo") {
+ request("http://www.yr.no/place/Norge/Oslo/Oslo/Oslo/varsel.xml");
+ } else if (action->text() == "Berlin") {
+ request("http://www.yr.no/place/Germany/Berlin/Berlin/varsel.xml");
+ } else if (action->text() == "Moscow") {
+ request("http://www.yr.no/place/Russia/Moscow/Moscow/varsel.xml");
+ } else if (action->text() == "Helsinki") {
+ request("http://www.yr.no/place/Finland/Southern_Finland/Helsinki/varsel.xml");
+ } else if (action->text() == "Santa Clara") {
+ request("http://www.yr.no/place/United_States/California/Santa_Clara/varsel.xml");
+ }
+ }
}
void handleNetworkData(QNetworkReply *networkReply) {
@@ -145,17 +163,23 @@
private:
void setupScene() {
-
- QColor textColor = palette().color(QPalette::WindowText);
QFont textFont = font();
textFont.setBold(true);
- textFont.setPointSize(textFont.pointSize() * 2);
+ textFont.setPointSize(static_cast<int>(textFont.pointSize() * 1.5));
m_temperatureItem = m_scene.addText(QString(), textFont);
- m_temperatureItem->setDefaultTextColor(textColor);
+ m_temperatureItem->setDefaultTextColor(TEXTCOLOR);
m_conditionItem = m_scene.addText(QString(), textFont);
- m_conditionItem->setDefaultTextColor(textColor);
+ m_conditionItem->setDefaultTextColor(TEXTCOLOR);
+
+ m_cityItem = m_scene.addText(QString(), textFont);
+ m_cityItem->setDefaultTextColor(TEXTCOLOR);
+
+ m_copyright = m_scene.addText(QString());
+ m_copyright->setDefaultTextColor(TEXTCOLOR);
+ m_copyright->setOpenExternalLinks(true);
+ m_copyright->setTextInteractionFlags(Qt::TextBrowserInteraction);
m_iconItem = new QGraphicsSvgItem;
m_scene.addItem(m_iconItem);
@@ -166,6 +190,7 @@
m_temperatureItem->setParentItem(m_statusItem);
m_conditionItem->setParentItem(m_statusItem);
m_iconItem->setParentItem(m_statusItem);
+ m_copyright->setParentItem(m_statusItem);
connect(&m_timeLine, SIGNAL(frameChanged(int)), SLOT(animate(int)));
m_timeLine.setDuration(1100);
@@ -174,12 +199,7 @@
}
void request(const QString &location) {
- QUrl url("http://www.google.com/ig/api");
- QUrlQuery query;
- query.addQueryItem("hl", "en");
- query.addQueryItem("weather", location);
- url.setQuery(query);
-
+ QUrl url(location);
m_manager.get(QNetworkRequest(url));
city = QString();
@@ -188,63 +208,44 @@
QString extractIcon(const QString &data) {
if (m_icons.isEmpty()) {
- m_icons["mostly_cloudy"] = "weather-few-clouds";
- m_icons["cloudy"] = "weather-overcast";
- m_icons["mostly_sunny"] = "weather-sunny-very-few-clouds";
- m_icons["partly_cloudy"] = "weather-sunny-very-few-clouds";
- m_icons["sunny"] = "weather-sunny";
- m_icons["flurries"] = "weather-snow";
- m_icons["fog"] = "weather-fog";
- m_icons["haze"] = "weather-haze";
- m_icons["icy"] = "weather-icy";
- m_icons["sleet"] = "weather-sleet";
- m_icons["chance_of_sleet"] = "weather-sleet";
- m_icons["snow"] = "weather-snow";
- m_icons["chance_of_snow"] = "weather-snow";
- m_icons["mist"] = "weather-showers";
- m_icons["rain"] = "weather-showers";
- m_icons["chance_of_rain"] = "weather-showers";
- m_icons["storm"] = "weather-storm";
- m_icons["chance_of_storm"] = "weather-storm";
- m_icons["thunderstorm"] = "weather-thundershower";
- m_icons["chance_of_tstorm"] = "weather-thundershower";
- }
- QRegExp regex("([\\w]+).gif$");
- if (regex.indexIn(data) != -1) {
- QString i = regex.cap();
- i = i.left(i.length() - 4);
- QString name = m_icons.value(i);
- if (!name.isEmpty()) {
- name.prepend(":/icons/");
- name.append(".svg");
- return name;
- }
+ m_icons["Partly cloudy"] = "weather-few-clouds";
+ m_icons["Cloudy"] = "weather-overcast";
+ m_icons["Fair"] = "weather-sunny-very-few-clouds";
+ m_icons["Sun"] = "weather-sunny";
+ m_icons["Sun/clear sky"] = "weather-sunny";
+ m_icons["Clear sky"] = "weather-sunny";
+ m_icons["Snow showers"] = "weather-snow";
+ m_icons["Snow"] = "weather-snow";
+ m_icons["Fog"] = "weather-fog";
+ m_icons["Sleet"] = "weather-sleet";
+ m_icons["Sleet showers"] = "weather-sleet";
+ m_icons["Rain showers"] = "weather-showers";
+ m_icons["Rain"] = "weather-showers";
+ m_icons["Heavy rain"] = "weather-showers";
+ m_icons["Rain showers with thunder"] = "weather-thundershower";
+ m_icons["Rain and thunder"] = "weather-thundershower";
+ m_icons["Sleet and thunder"] = "weather-thundershower";
+ m_icons["Heavy rain and thunder"] = "weather-thundershower";
+ m_icons["Snow and thunder"] = "weather-thundershower";
+ m_icons["Sleet showers and thunder"] = "weather-thundershower";
+ m_icons["Snow showers and thunder"] = "weather-thundershower";
+ }
+ QString name = m_icons.value(data);
+ if (!name.isEmpty()) {
+ name.prepend(":/icons/");
+ name.append(".svg");
+ return name;
}
return QString();
}
- static QString toCelcius(QString t, QString unit) {
- bool ok = false;
- int degree = t.toInt(&ok);
- if (!ok)
- return QString();
- if (unit != "SI")
- degree = ((degree - 32) * 5 + 8)/ 9;
- return QString::number(degree) + QChar(176);
- }
-
-
-#define GET_DATA_ATTR xml.attributes().value("data").toString()
-
void digest(const QString &data) {
-
- QColor textColor = palette().color(QPalette::WindowText);
- QString unitSystem;
-
delete m_iconItem;
m_iconItem = new QGraphicsSvgItem();
m_scene.addItem(m_iconItem);
m_iconItem->setParentItem(m_statusItem);
+ m_conditionItem->setPlainText(QString());
+
qDeleteAll(m_dayItems);
qDeleteAll(m_conditionItems);
qDeleteAll(m_rangeItems);
@@ -255,102 +256,181 @@
m_forecastItems.clear();
QXmlStreamReader xml(data);
+
+ bool foundCurrentForecast = false;
while (!xml.atEnd()) {
xml.readNext();
if (xml.tokenType() == QXmlStreamReader::StartElement) {
- if (xml.name() == "city") {
- city = GET_DATA_ATTR;
- setWindowTitle(city);
- }
- if (xml.name() == "unit_system")
- unitSystem = xml.attributes().value("data").toString();
- // Parse current weather conditions
- if (xml.name() == "current_conditions") {
+ if (xml.name() == "location") {
while (!xml.atEnd()) {
xml.readNext();
- if (xml.name() == "current_conditions")
- break;
if (xml.tokenType() == QXmlStreamReader::StartElement) {
- if (xml.name() == "condition") {
- m_conditionItem->setPlainText(GET_DATA_ATTR);
- }
- if (xml.name() == "icon") {
- QString name = extractIcon(GET_DATA_ATTR);
- if (!name.isEmpty()) {
- delete m_iconItem;
- m_iconItem = new QGraphicsSvgItem(name);
- m_scene.addItem(m_iconItem);
- m_iconItem->setParentItem(m_statusItem);
- }
- }
- if (xml.name() == "temp_c") {
- QString s = GET_DATA_ATTR + QChar(176);
- m_temperatureItem->setPlainText(s);
+ if (xml.name() == "name") {
+ city = xml.readElementText();
+ m_cityItem->setPlainText(city);
+ setWindowTitle(city);
+ xml.skipCurrentElement();
+ break;
}
}
}
- }
- // Parse and collect the forecast conditions
- if (xml.name() == "forecast_conditions") {
- QGraphicsTextItem *dayItem = 0;
- QGraphicsSvgItem *statusItem = 0;
- QString lowT, highT;
+ } else if (xml.name() == "credit") {
while (!xml.atEnd()) {
xml.readNext();
- if (xml.name() == "forecast_conditions") {
- if (dayItem && statusItem &&
- !lowT.isEmpty() && !highT.isEmpty()) {
- m_dayItems << dayItem;
- m_conditionItems << statusItem;
- QString txt = highT + '/' + lowT;
- QGraphicsTextItem* rangeItem;
- rangeItem = m_scene.addText(txt);
- rangeItem->setDefaultTextColor(textColor);
- m_rangeItems << rangeItem;
- QGraphicsRectItem *box;
- box = m_scene.addRect(0, 0, 10, 10);
- box->setPen(Qt::NoPen);
- box->setBrush(Qt::NoBrush);
- m_forecastItems << box;
- dayItem->setParentItem(box);
- statusItem->setParentItem(box);
- rangeItem->setParentItem(box);
- } else {
- delete dayItem;
- delete statusItem;
+ if (xml.tokenType() == QXmlStreamReader::StartElement) {
+ if (xml.name() == "link") {
+ m_copyright->setHtml(QString("<td align=\"center\">%1 <a href=\"%2\">(source)</a></td>").arg(GET_DATA_ATTR("text")).arg(GET_DATA_ATTR("url")));
+ xml.skipCurrentElement();
+ break;
}
- break;
}
+ }
+ } else if (xml.name() == "tabular") {
+ while (!xml.atEnd()) {
+ xml.readNext();
if (xml.tokenType() == QXmlStreamReader::StartElement) {
- if (xml.name() == "day_of_week") {
- QString s = GET_DATA_ATTR;
- dayItem = m_scene.addText(s.left(3));
- dayItem->setDefaultTextColor(textColor);
- }
- if (xml.name() == "icon") {
- QString name = extractIcon(GET_DATA_ATTR);
- if (!name.isEmpty()) {
- statusItem = new QGraphicsSvgItem(name);
- m_scene.addItem(statusItem);
+ if (xml.name() == "time") {
+ if (!foundCurrentForecast) {
+ QString temperature;
+ QString symbol;
+ getSymbolTemp(xml, symbol, temperature);
+ if (!symbol.isEmpty()) {
+ delete m_iconItem;
+ m_iconItem = new QGraphicsSvgItem(symbol);
+ m_scene.addItem(m_iconItem);
+ m_iconItem->setParentItem(m_statusItem);
+ }
+ QString s = FORMAT_TEMPERATURE(temperature);
+ m_temperatureItem->setPlainText(s);
+ foundCurrentForecast = true;
+ } else {
+ createNewDay(xml);
}
+
}
- if (xml.name() == "low")
- lowT = toCelcius(GET_DATA_ATTR, unitSystem);
- if (xml.name() == "high")
- highT = toCelcius(GET_DATA_ATTR, unitSystem);
}
}
+ } else if (xml.name() != "weatherdata" && xml.name() != "forecast" && xml.name() != "credit"){
+ xml.skipCurrentElement();
}
-
}
}
+
+
+
+
m_timeLine.stop();
layoutItems();
animate(0);
m_timeLine.start();
}
+ void createNewDay(QXmlStreamReader &xml) {
+ QGraphicsTextItem *dayItem = 0;
+ QString lowT;
+ QString highT;
+ QString period = GET_DATA_ATTR("period");
+ QString datetime;
+ if (period == "0")
+ datetime = GET_DATA_ATTR("to");
+ else
+ datetime = GET_DATA_ATTR("from");
+ QString temperature;
+ QString symbol;
+ getSymbolTemp(xml, symbol, temperature);
+ lowT = highT = temperature;
+ QDateTime date = GET_DATETIME(datetime);
+ dayItem = m_scene.addText(date.date().toString("ddd"));
+ dayItem->setDefaultTextColor(TEXTCOLOR);
+
+ // check for other info same day
+ bool saved = false;
+ while (!xml.atEnd()) {
+ xml.readNext();
+ if (xml.tokenType() == QXmlStreamReader::StartElement) {
+ if (xml.name() == "time") {
+ QString period = GET_DATA_ATTR("period");
+ // save data if new day starts
+ if (period == "0") {
+ saveDayItem(dayItem, lowT, highT, symbol);
+ createNewDay(xml);
+ saved = true;
+ } else {
+ updateDay(xml, lowT, highT, symbol, period == "2");
+ }
+ }
+ }
+ }
+ if (!saved)// last Item
+ saveDayItem(dayItem, lowT, highT, symbol);
+ }
+
+ void updateDay(QXmlStreamReader &xml, QString &lowT, QString &highT, QString &symbolToShow, bool updateSymbol) {
+ QString temperature;
+ QString symbol;
+ getSymbolTemp(xml, symbol, temperature);
+ if (lowT.toFloat() > temperature.toFloat())
+ lowT = temperature;
+ if (highT.toFloat() < temperature.toFloat())
+ highT = temperature;
+ if (updateSymbol)
+ symbolToShow = symbol;
+ }
+
+ void saveDayItem(QGraphicsTextItem *dayItem, QString lowT, QString highT, QString symbolToShow) {
+ QGraphicsSvgItem *statusItem = 0;
+ if (!symbolToShow.isEmpty()) {
+ statusItem = new QGraphicsSvgItem(symbolToShow);
+ m_scene.addItem(statusItem);
+ }
+ if (m_dayItems.count() < 4 && dayItem && statusItem && // Show 4 days
+ !lowT.isEmpty() && !highT.isEmpty()) {
+ m_dayItems << dayItem;
+ m_conditionItems << statusItem;
+ QString txt = FORMAT_TEMPERATURE(lowT) + '/' + FORMAT_TEMPERATURE(highT);
+ QGraphicsTextItem* rangeItem;
+ rangeItem = m_scene.addText(txt);
+ rangeItem->setDefaultTextColor(TEXTCOLOR);
+ m_rangeItems << rangeItem;
+ QGraphicsRectItem *box;
+ box = m_scene.addRect(0, 0, 10, 10);
+ box->setPen(Qt::NoPen);
+ box->setBrush(Qt::NoBrush);
+ m_forecastItems << box;
+ dayItem->setParentItem(box);
+ statusItem->setParentItem(box);
+ rangeItem->setParentItem(box);
+ } else {
+ delete dayItem;
+ delete statusItem;
+ }
+ }
+
+ void getSymbolTemp(QXmlStreamReader &xml, QString &symbol, QString &temp) {
+ bool foundIcon = false;
+ bool foundTemp = false;
+ while (!xml.atEnd()) {
+ xml.readNext();
+ if (xml.tokenType() == QXmlStreamReader::StartElement) {
+ if (xml.name() == "symbol") {
+ QString condition = GET_DATA_ATTR("name");
+ symbol = extractIcon(condition);
+ if (m_conditionItem->toPlainText().isEmpty())
+ m_conditionItem->setPlainText(condition);
+ foundIcon = true;
+ }
+ if (xml.name() == "temperature") {
+ temp = GET_DATA_ATTR("value");
+ foundTemp = true;
+ }
+ if (foundIcon && foundTemp)
+ break;
+ }
+ }
+ }
+
+
void layoutItems() {
m_scene.setSceneRect(0, 0, width() - 1, height() - 1);
m_view->centerOn(width() / 2, height() / 2);
@@ -361,30 +441,36 @@
}
void layoutItemsLandscape() {
- m_statusItem->setRect(0, 0, width() / 2 - 1, height() - 1);
+ qreal statusItemWidth = width() / 2 - 1;
+ m_statusItem->setRect(0, 0, statusItemWidth, height() - 1);
+
+ m_temperatureItem->setPos(10, 2);
+ qreal wtemp = m_temperatureItem->boundingRect().width();
+ qreal h1 = m_conditionItem->boundingRect().height();
+ m_conditionItem->setPos(wtemp + 20, 2);
+
+ m_copyright->setTextWidth(statusItemWidth);
+
+ qreal wcity = m_cityItem->boundingRect().width();
+ m_cityItem->setPos(statusItemWidth - wcity - 1, 2);;
+
+ qreal h2 = m_copyright->boundingRect().height();
+ m_copyright->setPos(0, height() - h2);
if (!m_iconItem->boundingRect().isEmpty()) {
- qreal dim = qMin(width() * 0.6, height() * 0.8);
- qreal pad = (height() - dim) / 2;
- qreal sw = dim / m_iconItem->boundingRect().width();
- qreal sh = dim / m_iconItem->boundingRect().height();
+ qreal sizeLeft = qMin(statusItemWidth, height() - h2 - h1 - 10);
+ qreal sw = sizeLeft / m_iconItem->boundingRect().width();
+ qreal sh = sizeLeft / m_iconItem->boundingRect().height();
m_iconItem->setTransform(QTransform().scale(sw, sh));
- m_iconItem->setPos(1, pad);
+ m_iconItem->setPos(statusItemWidth/2 - sizeLeft/2, h1 + 5);
}
- m_temperatureItem->setPos(2, 2);
- qreal h = m_conditionItem->boundingRect().height();
- m_conditionItem->setPos(10, height() - h);
-
if (m_dayItems.count()) {
qreal left = width() * 0.6;
- qreal h = height() / m_dayItems.count();
- QFont textFont = font();
- textFont.setPixelSize(static_cast<int>(h * 0.3));
qreal statusWidth = 0;
qreal rangeWidth = 0;
+ qreal h = height() / m_dayItems.count();
for (int i = 0; i < m_dayItems.count(); ++i) {
- m_dayItems[i]->setFont(textFont);
QRectF brect = m_dayItems[i]->boundingRect();
statusWidth = qMax(statusWidth, brect.width());
brect = m_rangeItems[i]->boundingRect();
@@ -416,23 +502,22 @@
}
void layoutItemsPortrait() {
+ qreal statusItemWidth = width() - 1;
+ m_statusItem->setRect(0, 0, statusItemWidth, height() / 2 - 1);
- m_statusItem->setRect(0, 0, width() - 1, height() / 2 - 1);
-
- if (!m_iconItem->boundingRect().isEmpty()) {
- qreal dim = qMin(width() * 0.8, height() * 0.4);
- qreal ofsy = (height() / 2 - dim) / 2;
- qreal ofsx = (width() - dim) / 3;
- qreal sw = dim / m_iconItem->boundingRect().width();
- qreal sh = dim / m_iconItem->boundingRect().height();
- m_iconItem->setTransform(QTransform().scale(sw, sh));
- m_iconItem->setPos(ofsx, ofsy);
- }
-
- m_temperatureItem->setPos(2, 2);
- qreal ch = m_conditionItem->boundingRect().height();
- qreal cw = m_conditionItem->boundingRect().width();
- m_conditionItem->setPos(width() - cw , height() / 2 - ch - 20);
+ m_temperatureItem->setPos(10, 2);
+ qreal wtemp = m_temperatureItem->boundingRect().width();
+ qreal h1 = m_conditionItem->boundingRect().height();
+ m_conditionItem->setPos(wtemp + 20, 2);
+
+ m_copyright->setTextWidth(statusItemWidth);
+
+ qreal wcity = m_cityItem->boundingRect().width();
+ m_cityItem->setPos(statusItemWidth - wcity - 1, 2);;
+
+ m_copyright->setTextWidth(statusItemWidth);
+ qreal h2 = m_copyright->boundingRect().height();
+ m_copyright->setPos(0, height() - h2);
if (m_dayItems.count()) {
qreal top = height() * 0.5;
@@ -452,6 +537,14 @@
qreal boxh = statusHeight + rangeHeight + dim;
qreal pad = (height() - top - boxh) / 2;
+ if (!m_iconItem->boundingRect().isEmpty()) {
+ qreal sizeLeft = qMin(statusItemWidth - 10, height() - top - 10);
+ qreal sw = sizeLeft / m_iconItem->boundingRect().width();
+ qreal sh = sizeLeft / m_iconItem->boundingRect().height();
+ m_iconItem->setTransform(QTransform().scale(sw, sh));
+ m_iconItem->setPos(statusItemWidth/2 - sizeLeft/2, h1 + 5);
+ }
+
for (int i = 0; i < m_dayItems.count(); ++i) {
qreal base = w * i;
m_forecastItems[i]->setPos(base, top);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/examples/svg/svgviewer/svgviewer.pro new/qtsvg-opensource-src-5.3.1/examples/svg/svgviewer/svgviewer.pro
--- old/qtsvg-opensource-src-5.3.0/examples/svg/svgviewer/svgviewer.pro 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/examples/svg/svgviewer/svgviewer.pro 2014-06-19 12:08:33.000000000 +0200
@@ -4,7 +4,7 @@
SOURCES = main.cpp \
mainwindow.cpp \
svgview.cpp
-QT += widgets svg xml
+QT += widgets svg
qtHaveModule(opengl): QT += opengl
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgfont_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgfont_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgfont_p.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgfont_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgfunctions_wince_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgfunctions_wince_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgfunctions_wince_p.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgfunctions_wince_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvggraphics_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvggraphics_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvggraphics_p.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvggraphics_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvghandler_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvghandler_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvghandler_p.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvghandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgnode_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgnode_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgnode_p.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgnode_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgstructure_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgstructure_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgstructure_p.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgstructure_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgstyle_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgstyle_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgstyle_p.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgstyle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgtinydocument_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.0/QtSvg/private/qsvgtinydocument_p.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.0/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-#include "../../../../../src/svg/qsvgtinydocument_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgfont_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgfont_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgfont_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgfont_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/svg/qsvgfont_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgfunctions_wince_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgfunctions_wince_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgfunctions_wince_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgfunctions_wince_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/svg/qsvgfunctions_wince_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvggraphics_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvggraphics_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvggraphics_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvggraphics_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/svg/qsvggraphics_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvghandler_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvghandler_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvghandler_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvghandler_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/svg/qsvghandler_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgnode_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgnode_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgnode_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgnode_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/svg/qsvgnode_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgstructure_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgstructure_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgstructure_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgstructure_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/svg/qsvgstructure_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgstyle_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgstyle_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgstyle_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgstyle_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/svg/qsvgstyle_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgtinydocument_p.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgtinydocument_p.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/5.3.1/QtSvg/private/qsvgtinydocument_p.h 1970-01-01 01:00:00.000000000 +0100
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/5.3.1/QtSvg/private/qsvgtinydocument_p.h 2014-06-19 12:08:33.000000000 +0200
@@ -0,0 +1 @@
+#include "../../../../../src/svg/qsvgtinydocument_p.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/include/QtSvg/qtsvgversion.h new/qtsvg-opensource-src-5.3.1/include/QtSvg/qtsvgversion.h
--- old/qtsvg-opensource-src-5.3.0/include/QtSvg/qtsvgversion.h 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/include/QtSvg/qtsvgversion.h 2014-06-19 12:08:33.000000000 +0200
@@ -2,8 +2,8 @@
#ifndef QT_QTSVG_VERSION_H
#define QT_QTSVG_VERSION_H
-#define QTSVG_VERSION_STR "5.3.0"
+#define QTSVG_VERSION_STR "5.3.1"
-#define QTSVG_VERSION 0x050300
+#define QTSVG_VERSION 0x050301
#endif // QT_QTSVG_VERSION_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/src/plugins/iconengines/iconengines.pro new/qtsvg-opensource-src-5.3.1/src/plugins/iconengines/iconengines.pro
--- old/qtsvg-opensource-src-5.3.0/src/plugins/iconengines/iconengines.pro 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/src/plugins/iconengines/iconengines.pro 2014-06-19 12:08:33.000000000 +0200
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets): SUBDIRS += svgiconengine
+SUBDIRS += svgiconengine
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp new/qtsvg-opensource-src-5.3.1/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp
--- old/qtsvg-opensource-src-5.3.0/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp 2014-06-19 12:08:33.000000000 +0200
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the plugins of the Qt Toolkit.
@@ -46,12 +46,10 @@
#include "qpixmap.h"
#include "qsvgrenderer.h"
#include "qpixmapcache.h"
-#include "qstyle.h"
-#include "qapplication.h"
-#include "qstyleoption.h"
#include "qfileinfo.h"
#include <QAtomicInt>
#include "qdebug.h"
+#include <private/qguiapplication_p.h>
QT_BEGIN_NAMESPACE
@@ -178,10 +176,8 @@
renderer.render(&p);
p.end();
pm = QPixmap::fromImage(img);
- if (qobject_cast<QApplication *>(QCoreApplication::instance())) {
- QStyleOption opt(0);
- opt.palette = QGuiApplication::palette();
- QPixmap generated = QApplication::style()->generatedIconPixmap(mode, pm, &opt);
+ if (qobject_cast<QGuiApplication *>(QCoreApplication::instance())) {
+ const QPixmap generated = QGuiApplicationPrivate::instance()->applyQIconStyleHelper(mode, pm);
if (!generated.isNull())
pm = generated;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/src/plugins/iconengines/svgiconengine/svgiconengine.pro new/qtsvg-opensource-src-5.3.1/src/plugins/iconengines/svgiconengine/svgiconengine.pro
--- old/qtsvg-opensource-src-5.3.0/src/plugins/iconengines/svgiconengine/svgiconengine.pro 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/src/plugins/iconengines/svgiconengine/svgiconengine.pro 2014-06-19 12:08:33.000000000 +0200
@@ -9,4 +9,4 @@
SOURCES += main.cpp \
qsvgiconengine.cpp
OTHER_FILES += qsvgiconengine.json
-QT += xml svg gui
+QT += svg core-private gui-private
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/src/plugins/imageformats/svg/svg.pro new/qtsvg-opensource-src-5.3.1/src/plugins/imageformats/svg/svg.pro
--- old/qtsvg-opensource-src-5.3.0/src/plugins/imageformats/svg/svg.pro 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/src/plugins/imageformats/svg/svg.pro 2014-06-19 12:08:33.000000000 +0200
@@ -8,4 +8,4 @@
HEADERS += qsvgiohandler.h
SOURCES += main.cpp \
qsvgiohandler.cpp
-QT += xml svg
+QT += svg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/src/svg/svg.pro new/qtsvg-opensource-src-5.3.1/src/svg/svg.pro
--- old/qtsvg-opensource-src-5.3.0/src/svg/svg.pro 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/src/svg/svg.pro 2014-06-19 12:08:33.000000000 +0200
@@ -53,9 +53,3 @@
else: \
INCLUDEPATH += $$[QT_INSTALL_HEADERS/src]/QtZlib
}
-
-ANDROID_LIB_DEPENDENCIES = \
- lib/libQt5Xml.so
-
-ANDROID_BUNDLED_FILES += \
- lib/libQt5Xml.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/tests/auto/qicon_svg/qicon_svg.pro new/qtsvg-opensource-src-5.3.1/tests/auto/qicon_svg/qicon_svg.pro
--- old/qtsvg-opensource-src-5.3.0/tests/auto/qicon_svg/qicon_svg.pro 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/tests/auto/qicon_svg/qicon_svg.pro 2014-06-19 12:08:33.000000000 +0200
@@ -6,7 +6,7 @@
RESOURCES = tst_qicon_svg.qrc
wince* {
- QT += xml svg
+ QT += svg
DEPLOYMENT_PLUGIN += qsvg
}
TESTDATA += icons/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtsvg-opensource-src-5.3.0/tests/auto/qsvgdevice/qsvgdevice.pro new/qtsvg-opensource-src-5.3.1/tests/auto/qsvgdevice/qsvgdevice.pro
--- old/qtsvg-opensource-src-5.3.0/tests/auto/qsvgdevice/qsvgdevice.pro 2014-05-15 19:12:47.000000000 +0200
+++ new/qtsvg-opensource-src-5.3.1/tests/auto/qsvgdevice/qsvgdevice.pro 2014-06-19 12:08:33.000000000 +0200
@@ -1,5 +1,5 @@
TARGET = tst_qsvgdevice
CONFIG += testcase
SOURCES += tst_qsvgdevice.cpp
-QT += xml testlib widgets gui-private
+QT += testlib widgets gui-private
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0