[packages/wxWidgets/DEVEL] - up to 2.9.4
arekm
arekm at pld-linux.org
Fri Apr 19 18:24:26 CEST 2013
commit be77b93a53f4a2f05e64c0d78dec40e9ed91d149
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Apr 19 18:24:19 2013 +0200
- up to 2.9.4
wxWidgets-ac.patch | 38 +++++++++++++++++++-------------------
wxWidgets-build.patch | 29 +++++++++++++++++++++++++++++
wxWidgets.spec | 40 +++++++++++++++++++++-------------------
3 files changed, 69 insertions(+), 38 deletions(-)
---
diff --git a/wxWidgets.spec b/wxWidgets.spec
index 9cfccb0..62b9584 100644
--- a/wxWidgets.spec
+++ b/wxWidgets.spec
@@ -10,17 +10,18 @@
Summary: wxWidgets library
Summary(pl.UTF-8): Biblioteka wxWidgets
Name: wxWidgets
-Version: 2.9.1
-Release: 0.1
+Version: 2.9.4
+Release: 1
License: wxWindows Library Licence 3.1 (LGPL v2+ with exception)
Group: X11/Libraries
Source0: http://ftp.wxwidgets.org/pub/%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 81c20d7b2ba31becb18e467dbe09be8f
+# Source0-md5: f1348f740a569ce2945512d5b0e70e87
Patch0: %{name}-samples.patch
Patch1: %{name}-ogl.patch
Patch2: %{name}-ac.patch
Patch3: %{name}-x11unicode.patch
Patch4: %{name}-link.patch
+Patch5: %{name}-build.patch
URL: http://www.wxWidgets.org/
BuildRequires: OpenGL-GLU-devel
#BuildRequires: SDL-devel
@@ -459,6 +460,7 @@ obsługą UNICODE.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
# if bakefiles rebuild is needed:
@@ -639,8 +641,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libwx_base%{_libf}-*.so.*.*
%attr(755,root,root) %{_libdir}/libwx_base%{_libf}_*.so.*.*
#%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdl-*.so
-%attr(755,root,root) %ghost %{_libdir}/libwx_base%{_libf}-*.so.1
-%attr(755,root,root) %ghost %{_libdir}/libwx_base%{_libf}_*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_base%{_libf}-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_base%{_libf}_*.so.4
%files -n wxBase-devel
%defattr(644,root,root,755)
@@ -653,8 +655,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libwx_baseu%{_libf}-*.so.*.*
%attr(755,root,root) %{_libdir}/libwx_baseu%{_libf}_*.so.*.*
#%attr(755,root,root) %{_libdir}/wx/%{version}/sound_sdlu-*.so
-%attr(755,root,root) %ghost %{_libdir}/libwx_baseu%{_libf}-*.so.1
-%attr(755,root,root) %ghost %{_libdir}/libwx_baseu%{_libf}_*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_baseu%{_libf}-*.so.4
+%attr(755,root,root) %ghost %{_libdir}/libwx_baseu%{_libf}_*.so.4
%files -n wxBase-unicode-devel
%defattr(644,root,root,755)
@@ -666,8 +668,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_*.so.*.*
%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2%{_libf}_*.so.1
-%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2%{_libf}_*.so.4
+%exclude %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.4
%files -n wxGTK2-devel
%defattr(644,root,root,755)
@@ -680,7 +682,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n wxGTK2-gl
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2%{_libf}_gl-*.so.4
%files -n wxGTK2-gl-devel
%defattr(644,root,root,755)
@@ -691,8 +693,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.*.*
%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.1
-%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2u%{_libf}_*-*.so.4
+%exclude %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.4
%files -n wxGTK2-unicode-devel
%defattr(644,root,root,755)
@@ -705,7 +707,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n wxGTK2-unicode-gl
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_gtk2u%{_libf}_gl-*.so.4
%files -n wxGTK2-unicode-gl-devel
%defattr(644,root,root,755)
@@ -725,8 +727,8 @@ rm -rf $RPM_BUILD_ROOT
%doc docs/wxX11-readme.txt
%attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_*-*.so.*.*
%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_x11univ%{_libf}_*-*.so.1
-%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_x11univ%{_libf}_*-*.so.4
+%exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.4
%files -n wxX11-devel
%defattr(644,root,root,755)
@@ -739,7 +741,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n wxX11-gl
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_x11univ%{_libf}_gl-*.so.4
%files -n wxX11-gl-devel
%defattr(644,root,root,755)
@@ -750,8 +752,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_*-*.so.*.*
%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_x11univu%{_libf}_*-*.so.1
-%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_x11univu%{_libf}_*-*.so.4
+%exclude %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.4
%files -n wxX11-unicode-devel
%defattr(644,root,root,755)
@@ -764,7 +766,7 @@ rm -rf $RPM_BUILD_ROOT
%files -n wxX11-unicode-gl
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.*.*
-%attr(755,root,root) %ghost %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.1
+%attr(755,root,root) %ghost %{_libdir}/libwx_x11univu%{_libf}_gl-*.so.4
%files -n wxX11-unicode-gl-devel
%defattr(644,root,root,755)
diff --git a/wxWidgets-ac.patch b/wxWidgets-ac.patch
index 3abb625..b17accb 100644
--- a/wxWidgets-ac.patch
+++ b/wxWidgets-ac.patch
@@ -1,20 +1,20 @@
---- wxWidgets-2.5.3/configure.in.orig 2005-02-20 19:38:45.461014000 +0100
-+++ wxWidgets-2.5.3/configure.in 2005-02-20 20:58:15.485860176 +0100
-@@ -2670,7 +2670,7 @@
- dnl HAVE_STDLIB_H which are already defined and this provokes
- dnl a compiler warning which configure considers as an error...
- AC_MSG_CHECKING(for jpeglib.h)
-- AC_CACHE_VAL(ac_cv_header_jpeglib_h,
-+ AC_CACHE_VAL(ac_cv_header_jpeglib_h,[
- AC_TRY_COMPILE(
- [
- #undef HAVE_STDLIB_H
-@@ -2682,7 +2682,7 @@
- ac_cv_header_jpeglib_h=yes,
- ac_cv_header_jpeglib_h=no
- )
-- )
-+ ])
- AC_MSG_RESULT($ac_cv_header_jpeglib_h)
+--- wxWidgets-2.9.4/configure.in~ 2013-04-19 17:20:35.000000000 +0200
++++ wxWidgets-2.9.4/configure.in 2013-04-19 17:24:04.366820089 +0200
+@@ -2583,7 +2583,7 @@
+ dnl HAVE_STDLIB_H which are already defined and this provokes
+ dnl a compiler warning which configure considers as an error...
+ AC_MSG_CHECKING(for jpeglib.h)
+- AC_CACHE_VAL(ac_cv_header_jpeglib_h,
++ AC_CACHE_VAL(ac_cv_header_jpeglib_h,[
+ AC_TRY_COMPILE(
+ [
+ #undef HAVE_STDLIB_H
+@@ -2595,7 +2595,7 @@
+ ac_cv_header_jpeglib_h=yes,
+ ac_cv_header_jpeglib_h=no
+ )
+- )
++ ])
+ AC_MSG_RESULT($ac_cv_header_jpeglib_h)
- if test "$ac_cv_header_jpeglib_h" = "yes"; then
+ if test "$ac_cv_header_jpeglib_h" = "yes"; then
diff --git a/wxWidgets-build.patch b/wxWidgets-build.patch
new file mode 100644
index 0000000..bfc6a24
--- /dev/null
+++ b/wxWidgets-build.patch
@@ -0,0 +1,29 @@
+commit c8723b866e31b8a506a87b4bff5c2d6ed092dd80
+Author: Vadim Zeitlin <vadim at wxwidgets.org>
+Date: Fri Feb 15 12:40:17 2013 +0000
+
+ sAlways iInclude wx/encinfo.h from src/unix/fontutil.cpp.
+
+ We use wxNativeEncodingInfo in this file, so we always need this header, not
+ just when not using PCH.
+
+ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73519 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
+
+diff --git a/src/unix/fontutil.cpp b/src/unix/fontutil.cpp
+index 23fc29e..07ee323 100644
+--- a/src/unix/fontutil.cpp
++++ b/src/unix/fontutil.cpp
+@@ -29,12 +29,12 @@
+ #ifndef WX_PRECOMP
+ #include "wx/app.h"
+ #include "wx/font.h" // wxFont enums
+- #include "wx/encinfo.h"
+ #include "wx/hash.h"
+ #include "wx/utils.h" // for wxGetDisplay()
+ #include "wx/module.h"
+ #endif // PCH
+
++#include "wx/encinfo.h"
+ #include "wx/fontmap.h"
+ #include "wx/tokenzr.h"
+ #include "wx/fontenum.h"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/wxWidgets.git/commitdiff/be77b93a53f4a2f05e64c0d78dec40e9ed91d149
More information about the pld-cvs-commit
mailing list