commit wxWidgets for openSUSE:11.4
Hello community,
here is the log from the commit of package wxWidgets for openSUSE:11.4
checked in at Tue Aug 9 17:59:39 CEST 2011.
--- old-versions/11.4/UPDATES/all/wxWidgets/wxWidgets-ansi.changes
2011-05-20 17:33:27.0 +0200
+++ 11.4/wxWidgets/wxWidgets-ansi.changes 2011-08-05 17:51:01.0
+0200
@@ -1,0 +2,5 @@
+Fri Aug 5 17:32:50 CEST 2011 - sbra...@suse.cz
+
+- Fix filezilla crash (bnc#708402).
+
+---
wxWidgets-wxcontainer.changes: same change
wxWidgets.changes: same change
calling whatdependson for 11.4-i586
New:
wxWidgets-bnc708402.patch
Other differences:
--
++ wxWidgets-ansi.spec ++
--- /var/tmp/diff_new_pack.n36iPF/_old 2011-08-09 17:59:05.0 +0200
+++ /var/tmp/diff_new_pack.n36iPF/_new 2011-08-09 17:59:05.0 +0200
@@ -49,7 +49,7 @@
License:GPLv2+
Group: System/Libraries
Version:2.8.11
-Release:3.RELEASE6
+Release:3.RELEASE7
%define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//')
# libdir for installing of all the stuff
%if %ENABLE_STL
@@ -87,6 +87,8 @@
# PATCH-FEATURE-OPENSUSE wxWidgets-config-force-rpath.patch sbra...@suse.cz --
Force rpath use for installed libraries.
Patch2: wxWidgets-config-force-rpath.patch
Patch3: wxGTK-datarootdir.patch
+# PATCH-FIX-UPSTREAM wxWidgets-bnc708402.patch bnc708402 wxWidgets12447
changeset65480 sbra...@suse.cz -- Fix filezilla crash.
+Patch4: wxWidgets-bnc708402.patch
# We cannot use standard Requires/Provides, as we can have several instances
of the library with the same soname.
%define _use_internal_dependency_generator 0
@@ -647,6 +649,7 @@
%patch2
%endif
%patch3
+%patch4 -p4
cp %{S:1} %{S:2} .
cp %{S:3} find-wx-provides
cp %{S:4} find-wx-requires
wxWidgets-wxcontainer.spec: same change
++ wxWidgets.spec ++
--- /var/tmp/diff_new_pack.n36iPF/_old 2011-08-09 17:59:05.0 +0200
+++ /var/tmp/diff_new_pack.n36iPF/_new 2011-08-09 17:59:05.0 +0200
@@ -49,7 +49,7 @@
License:GPLv2+
Group: System/Libraries
Version:2.8.11
-Release:4.RELEASE11
+Release:4.RELEASE13
%define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//')
# libdir for installing of all the stuff
%if %ENABLE_STL
@@ -87,6 +87,8 @@
# PATCH-FEATURE-OPENSUSE wxWidgets-config-force-rpath.patch sbra...@suse.cz --
Force rpath use for installed libraries.
Patch2: wxWidgets-config-force-rpath.patch
Patch3: wxGTK-datarootdir.patch
+# PATCH-FIX-UPSTREAM wxWidgets-bnc708402.patch bnc708402 wxWidgets12447
changeset65480 sbra...@suse.cz -- Fix filezilla crash.
+Patch4: wxWidgets-bnc708402.patch
# We cannot use standard Requires/Provides, as we can have several instances
of the library with the same soname.
%define _use_internal_dependency_generator 0
@@ -647,6 +649,7 @@
%patch2
%endif
%patch3
+%patch4 -p4
cp %{S:1} %{S:2} .
cp %{S:3} find-wx-provides
cp %{S:4} find-wx-requires
++ wxWidgets-bnc708402.patch ++
Index: /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/dnd.cpp
===
--- /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/dnd.cpp (revision 49608)
+++ /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/dnd.cpp (revision 65480)
@@ -947,19 +947,25 @@
void wxDropSource::UnregisterWindow()
{
-if (!m_widget)
-return;
-
-g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_data_get,
- this);
-g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_data_delete,
- this);
-g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_begin,
- this);
-g_signal_handlers_disconnect_by_func (m_widget,
- (gpointer) source_drag_end,
- this);
+if (m_widget)
+{
+g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer) source_drag_data_get,
+ this);
+g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer)
source_drag_data_delete,
+ this);
+g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer) source_drag_begin,
+ this);
+g_signal_handlers_disconnect_by_func (m_widget,
+ (gpointer)
commit wxWidgets for openSUSE:11.4
Hello community,
here is the log from the commit of package wxWidgets for openSUSE:11.4
checked in at Wed Apr 6 13:33:48 CEST 2011.
--- old-versions/11.4/all/wxWidgets/wxWidgets-ansi.changes 2011-01-15
03:43:58.0 +0100
+++ 11.4/wxWidgets/wxWidgets-ansi.changes 2011-03-29 19:36:07.0
+0200
@@ -1,0 +2,6 @@
+Tue Mar 29 19:35:10 CEST 2011 - sbra...@suse.cz
+
+- Fixed find-wx-requires to check directories instead of library
+ name. Provide find-wx-provides. (bnc#681409)
+
+---
wxWidgets-wxcontainer.changes: same change
wxWidgets.changes: same change
Package does not exist at destination yet. Using Fallback
old-versions/11.4/all/wxWidgets
Destination is old-versions/11.4/UPDATES/all/wxWidgets
calling whatdependson for 11.4-i586
New:
wxWidgets-find-wx-provides
wxWidgets-find-wx-requires
Other differences:
--
++ wxWidgets-ansi.spec ++
--- /var/tmp/diff_new_pack.v7tcJs/_old 2011-04-06 13:31:10.0 +0200
+++ /var/tmp/diff_new_pack.v7tcJs/_new 2011-04-06 13:31:10.0 +0200
@@ -49,7 +49,7 @@
License:GPLv2+
Group: System/Libraries
Version:2.8.11
-Release:1
+Release:1.RELEASE2
%define wx_minor %(echo %{version} | sed 's/\.[0-9][0-9]*$//')
# libdir for installing of all the stuff
%if %ENABLE_STL
@@ -74,10 +74,12 @@
Source: %{tarball_name}-%{version}.tar.bz2
Source1:README.SUSE
Source2:virtual-package.README
-Source3:rpmlintrc
+Source3:wxWidgets-find-wx-provides
+Source4:wxWidgets-find-wx-requires
+Source5:rpmlintrc
# This script is not used during build, but it makes possible to
# identify and backport wxPython fixes to wxWidgets.
-Source4:wxpython-mkdiff.sh
+Source6:wxpython-mkdiff.sh
Url:http://www.wxwidgets.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: wxGTK-2.6.3.3-decl.patch
@@ -646,6 +648,9 @@
%endif
%patch3
cp %{S:1} %{S:2} .
+cp %{S:3} find-wx-provides
+cp %{S:4} find-wx-requires
+chmod +x find-wx-provides find-wx-requires
%if %ENABLE_STL
# Remove sources of deprecated libraries that don't compile with STL.
# The build failure would be ignored but the package will be rejected by
@@ -759,21 +764,26 @@
# %%define _use_internal_dependency_generator 0
# %%define __find_requires %%wx_requires
#
-%%wx_requires %{wxlibdir}/wx/rpm/find-wx-requires
+# and use this line if you build wxWidgets variant-specific libraries or
+# modules
+#
+# %%define __find_provides %%wx_provides
+#
+%%wx_provides %{wxlibdir}/wx/rpm/find-wx-provides
+%%wx_requires %{wxlibdir}/wx/rpm/find-wx-requires %%{buildroot}
EOF
mkdir -p $RPM_BUILD_ROOT%{wxlibdir}/wx/rpm
-cat EOF $RPM_BUILD_ROOT%{wxlibdir}/wx/rpm/find-wx-requires
-#! /bin/sh
-# convert libfoo()() to libfoo(variant)()()
-/usr/lib/rpm/find-requires | sed
's/^\(\(libwx\|sound_sdl\)[^)]*\)(/\1(%{wx_variant})(/'
-EOF
-chmod 755 $RPM_BUILD_ROOT%{wxlibdir}/wx/rpm/find-wx-requires
+install find-wx-provides find-wx-requires $RPM_BUILD_ROOT%{wxlibdir}/wx/rpm/
# Modify provides/requires to prevent identical provides for different
libraries.
-%define wx_provides %{_builddir}/%{?buildsubdir}/wx-provides
-%define wx_requires %{_builddir}/%{?buildsubdir}/wx-requires
+%define build_wx_provides %{_builddir}/%{?buildsubdir}/build-wx-provides
+%define build_find_wx_provides %{_builddir}/%{?buildsubdir}/find-wx-provides
+%define build_wx_requires %{_builddir}/%{?buildsubdir}/find-wx-requires
+
+# We need a very special version of %%wx_provides here.
+# This version creates provides for compat-lib packages.
echo 0 wx-libno
-cat EOF %{wx_provides}
+cat EOF %{build_wx_provides}
#! /bin/sh
# convert libfoo()() to libfoo(variant)()() and create virtual symbols.
wx_libno=\$($PWD/wx-libno)
@@ -817,22 +827,18 @@
/usr/lib/rpm/find-provides
;;
*%{_docdir}* )
- echo \$REPLY | /usr/lib/rpm/find-provides | sed
's/^\(\(libwx\|sound_sdl\)[^)]*\)(/\1(%{wx_variant})(/'
+ echo \$REPLY | %{build_find_wx_provides}
;;
* )
- ( echo \$REPLY ; cat ) | /usr/lib/rpm/find-provides |
sed 's/^\(\(libwx\|sound_sdl\)[^)]*\)(/\1(%{wx_variant})(/'
+ ( echo \$REPLY ; cat ) | %{build_find_wx_provides}
;;
esac
done
EOF
-cat EOF %{wx_requires}
-#! /bin/sh
-# convert libfoo()() to libfoo(variant)()()
-/usr/lib/rpm/find-requires | sed
's/^\(\(libwx\|sound_sdl\)[^)]*\)(/\1(%{wx_variant})(/'
-EOF
-chmod 755 %{wx_provides} %{wx_requires}
-%define __find_provides %{wx_provides}
-%define __find_requires %{wx_requires}
+
+chmod 755 %{build_wx_provides}
+%define __find_provides %{build_wx_provides}
