commit kdelibs4 for openSUSE:Factory
Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2013-05-16 16:49:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old)
and /work/SRC/openSUSE:Factory/.kdelibs4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2013-04-15 11:15:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2013-05-16 16:49:18.000000000 +0200
@@ -2 +2,28 @@
-Thu Apr 11 06:25:59 UTC 2013 - mmeister@suse.com
+Sun May 12 15:26:36 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added exclude-qtuitools-symbols-from-public-libraries.patch:
+ We are using -Bsymbolic-functions link flags in kde4 macros,
+ so this patch exlcudes qtuitools symbols from libs that link to
+ qtuitools, as otherwise users of those libs are crashing
+ (bnc#819437, kde#303576, kde#231077, qtbug#437)
+
+-------------------------------------------------------------------
+Fri May 10 14:00:37 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added patches from upstream:
+ fix-freeX11Pixmaps.patch, fixes crashing of plasma-desktop and
+ Amarok (kde#319137)
+ dont-show-passwords-contained-in-HTTP-URLs-in-error-messages.patch,
+ the patch fixes an old issue where password was passed in error
+ messages
+
+-------------------------------------------------------------------
+Sat May 4 16:47:51 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.3
+ * Bugfix release
+ * See http://www.kde.org/announcements/announce-4.10.3.php
+ * resolves bnc#818500
+
+-------------------------------------------------------------------
+Thu Apr 11 06:22:25 UTC 2013 - mmeister@suse.com
@@ -5,0 +33,5 @@
+
+-------------------------------------------------------------------
+Tue Apr 9 06:36:04 UTC 2013 - lnt-sysadmin@lists.lrz.de
+
+- Drop kio_revert_slow_filesystems.patch, fixed upstream (kde#288824).
--- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2013-04-15 11:15:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2013-05-16 16:49:18.000000000 +0200
@@ -1,0 +2,27 @@
+Sun May 12 15:26:36 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added exclude-qtuitools-symbols-from-public-libraries.patch:
+ We are using -Bsymbolic-functions link flags in kde4 macros,
+ so this patch exlcudes qtuitools symbols from libs that link to
+ qtuitools, as otherwise users of those libs are crashing
+ (bnc#819437, kde#303576, kde#231077, qtbug#437)
+
+-------------------------------------------------------------------
+Fri May 10 14:00:37 UTC 2013 - hrvoje.senjan@gmail.com
+
+- Added patches from upstream:
+ fix-freeX11Pixmaps.patch, fixes crashing of plasma-desktop and
+ Amarok (kde#319137)
+ dont-show-passwords-contained-in-HTTP-URLs-in-error-messages.patch,
+ the patch fixes an old issue where password was passed in error
+ messages
+
+-------------------------------------------------------------------
+Sat May 4 16:47:51 UTC 2013 - tittiatcoke@gmail.com
+
+- Update to 4.10.3
+ * Bugfix release
+ * See http://www.kde.org/announcements/announce-4.10.3.php
+ * resolves bnc#818500
+
+-------------------------------------------------------------------
Old:
----
kdelibs-4.10.2.tar.xz
New:
----
dont-show-passwords-contained-in-HTTP-URLs-in-error-messages.patch
exclude-qtuitools-symbols-from-public-libraries.patch
fix-freeX11Pixmaps.patch
kdelibs-4.10.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4-apidocs.spec ++++++
--- /var/tmp/diff_new_pack.CE2nON/_old 2013-05-16 16:49:19.000000000 +0200
+++ /var/tmp/diff_new_pack.CE2nON/_new 2013-05-16 16:49:19.000000000 +0200
@@ -17,7 +17,7 @@
Name: kdelibs4-apidocs
-Version: 4.10.2
+Version: 4.10.3
Release: 0
Summary: KDE 4 API documentation
License: LGPL-2.1+
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.CE2nON/_old 2013-05-16 16:49:19.000000000 +0200
+++ /var/tmp/diff_new_pack.CE2nON/_new 2013-05-16 16:49:19.000000000 +0200
@@ -24,7 +24,7 @@
%define kderev 0
Name: kdelibs4
-Version: 4.10.2
+Version: 4.10.3
Release: 0
%define default_branding 4.10
BuildRequires: OpenEXR-devel
@@ -113,6 +113,14 @@
Patch20: ignore-inline-menu.diff
Patch24: ksuseinstall.diff
Patch26: fix_kdeclarative_install_location.diff
+# PATCH-FIX-OPENSUSE exclude-qtuitools-symbols-from-public-libraries.patch -- We are using -Bsymbolic-functions link flags in kde4 macros,
+# this patch exlcudes qtuitools symbols from libs that link to qtuitools, as otherwise users of
+# those libs are crashing(bnc#819437, kde#303576, kde#231077, qtbug#437)
+Patch27: exclude-qtuitools-symbols-from-public-libraries.patch
+# PATCH-FIX-UPSTREAM fix-freeX11Pixmaps.patch -- fixes crash at DialogShadows::Private::freeX11Pixmaps, kde#319137
+Patch100: fix-freeX11Pixmaps.patch
+# PATCH-FIX-UPSTREAM dont-show-passwords-contained-in-HTTP-URLs-in-error-messages.patch -- Ommits passwords contained in HTTP URLs in error messages kde#319428
+Patch101: dont-show-passwords-contained-in-HTTP-URLs-in-error-messages.patch
PreReq: permissions
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`)
Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`)
@@ -182,6 +190,9 @@
%patch20
%patch24
%patch26 -p1
+%patch27 -p1
+%patch100 -p1
+%patch101 -p1
#
# define KDE version exactly
++++++ dont-show-passwords-contained-in-HTTP-URLs-in-error-messages.patch ++++++
commit 65d736dab592bced4410ccfa4699de89f78c96ca
Author: Grégory Oestreicher
From 87dd1e894da87b871eb86329c35a15e7d235c9a7 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan
Date: Sun, 12 May 2013 16:14:20 +0200 Subject: [PATCH 1/1] Exclude QtUiTools symbols from public libraries
Otherwise it makes users of those libs crash when linked with -Bsymbolic-functions --- kjsembed/kjsembed/CMakeLists.txt | 3 ++- kross/modules/CMakeLists.txt | 3 +++ kross/qts/CMakeLists.txt | 3 +++ plasma/CMakeLists.txt | 3 +++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/kjsembed/kjsembed/CMakeLists.txt b/kjsembed/kjsembed/CMakeLists.txt index d70f260..5760313 100644 --- a/kjsembed/kjsembed/CMakeLists.txt +++ b/kjsembed/kjsembed/CMakeLists.txt @@ -71,7 +71,8 @@ target_link_libraries(${KJSEMBEDLIBNAME} ${KDE4_KDECORE_LIBS} ${QT_QTUITOOLS_LIB set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} ) install(TARGETS ${KJSEMBEDLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) - +# Do not export QtUiTools internal symbols +set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES LINK_FLAGS "-Wl,--exclude-libs -Wl,libQtUiTools.a") diff --git a/kross/modules/CMakeLists.txt b/kross/modules/CMakeLists.txt index d245fd8..e21fb4c 100644 --- a/kross/modules/CMakeLists.txt +++ b/kross/modules/CMakeLists.txt @@ -15,6 +15,9 @@ if( QT_QTDESIGNER_FOUND ) target_link_libraries(krossmoduleforms ${QT_QTUITOOLS_LIBRARY} ${KDE4_KPARTS_LIBS} ${KDE4_KFILE_LIBS} krosscore krossui) install(TARGETS krossmoduleforms DESTINATION ${PLUGIN_INSTALL_DIR}) + + # Do not export QtUiTools internal symbols + set_target_properties(krossmoduleforms PROPERTIES LINK_FLAGS "-Wl,--exclude-libs -Wl,libQtUiTools.a") endif( QT_QTDESIGNER_FOUND ) ############################################ diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt index 674550d..03c983d 100644 --- a/plasma/CMakeLists.txt +++ b/plasma/CMakeLists.txt @@ -282,6 +282,9 @@ target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS}) +# Do not export QtUiTools internal symbols +set_target_properties(plasma PROPERTIES LINK_FLAGS "-Wl,--exclude-libs -Wl,libQtUiTools.a") + if(QCA2_FOUND) target_link_libraries(plasma ${QCA2_LIBRARIES}) endif(QCA2_FOUND) diff --git a/kross/qts/CMakeLists.txt b/kross/qts/CMakeLists.txt index d8cb4a5..a4aff36 100644 --- a/kross/qts/CMakeLists.txt +++ b/kross/qts/CMakeLists.txt @@ -30,3 +30,6 @@ kde4_add_plugin(krossqts ${krossqts_PART_SRCS}) target_link_libraries(krossqts ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} krosscore ${QT_QTSCRIPT_LIBRARY}) install(TARGETS krossqts DESTINATION ${PLUGIN_INSTALL_DIR}) + +# Do not export QtUiTools internal symbols +set_target_properties(krossqts PROPERTIES LINK_FLAGS "-Wl,--exclude-libs -Wl,libQtUiTools.a") \ No newline at end of file -- 1.8.2.2 ++++++ fix-freeX11Pixmaps.patch ++++++
From a9bd6d530344082630c1cd9383b59ce35b08f7c1 Mon Sep 17 00:00:00 2001 From: Anne-Marie Mahfouf
Date: Fri, 10 May 2013 14:17:20 +0200 Subject: [PATCH] Fixes crash as reported in bug 319137
--- plasma/private/dialogshadows.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plasma/private/dialogshadows.cpp b/plasma/private/dialogshadows.cpp index b54fb1a..dceee9c 100644 --- a/plasma/private/dialogshadows.cpp +++ b/plasma/private/dialogshadows.cpp @@ -336,6 +336,9 @@ void DialogShadows::Private::freeX11Pixmaps() { #ifdef Q_WS_X11 foreach (const QPixmap &pixmap, m_shadowPixmaps) { + if (!QX11Info::display()) + return; + if (!pixmap.isNull()) { XFreePixmap(QX11Info::display(), pixmap.handle()); } -- 1.8.1.4 ++++++ kdelibs-4.10.2.tar.xz -> kdelibs-4.10.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdelibs4/kdelibs-4.10.2.tar.xz /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs-4.10.3.tar.xz differ: char 25, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de