From c659806b8be88287529d25d4548c5762d9c5b460 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 12 Sep 2009 19:28:51 +0000 Subject: [PATCH] - up to 2.9.0 Changed files: wxWidgets-gcc4.patch -> 1.3 wxWidgets.spec -> 1.81 --- wxWidgets-gcc4.patch | 11 --------- wxWidgets.spec | 57 ++++---------------------------------------- 2 files changed, 5 insertions(+), 63 deletions(-) delete mode 100644 wxWidgets-gcc4.patch diff --git a/wxWidgets-gcc4.patch b/wxWidgets-gcc4.patch deleted file mode 100644 index 02fa2ff..0000000 --- a/wxWidgets-gcc4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- wxWidgets-2.6.2/src/common/uri.cpp.orig 2006-02-01 08:34:16.664085500 +0100 -+++ wxWidgets-2.6.2/src/common/uri.cpp 2006-02-01 08:27:23.390257500 +0100 -@@ -889,7 +889,7 @@ - op += 3; - } - -- m_path = base.m_path.substr(0, bp - base.m_path.c_str()) + -+ m_path = (const wxString)base.m_path.substr(0, bp - base.m_path.c_str()) + - m_path.substr((op - m_path.c_str()), m_path.Length()); - } - } diff --git a/wxWidgets.spec b/wxWidgets.spec index 22bbde1..7ce14a5 100644 --- a/wxWidgets.spec +++ b/wxWidgets.spec @@ -10,17 +10,16 @@ Summary: wxWidgets library Summary(pl.UTF-8): Biblioteka wxWidgets Name: wxWidgets -Version: 2.8.10 -Release: 2 +Version: 2.9.0 +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: 0461c2085ac1ad7e648aa84c4ba51dd1 +# Source0-md5: 09058928eeb72853142c062bdec056ce Patch0: %{name}-samples.patch Patch1: %{name}-ogl.patch Patch2: %{name}-ac.patch Patch3: %{name}-x11unicode.patch -Patch4: %{name}-gcc4.patch URL: http://www.wxWidgets.org/ BuildRequires: OpenGL-GLU-devel #BuildRequires: SDL-devel @@ -132,19 +131,6 @@ wxWidgets example programs. %description examples -l pl.UTF-8 Przykładowe programy wxWidgets. -%package HelpGen -Summary: Help file generator for wxWidgets programs -Summary(pl.UTF-8): Generator plików pomocy dla programów wxWidgets -Group: Development/Tools -Requires: wxBase = %{version}-%{release} -Obsoletes: wxWindows-HelpGen - -%description HelpGen -Help file generator for wxWidgets programs. - -%description HelpGen -l pl.UTF-8 -Generator plików pomocy dla programów wxWidgets. - %package -n wxBase Summary: wxBase library - non-GUI support classes of wxWidgets toolkit Summary(pl.UTF-8): wxBase - biblioteka klas wxWidgets nie związanych z GUI @@ -470,7 +456,6 @@ obsługą UNICODE. #%patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %build # if bakefiles rebuild is needed: @@ -483,7 +468,7 @@ cp -f /usr/share/automake/config.sub . %{__aclocal} -I build/aclocal %{__autoconf} -CPPFLAGS="%{rpmcppflags} %{rpmcflags} -I`pwd`/include"; export CPPFLAGS +CPPFLAGS="%{rpmcppflags} %{rpmcflags} -I`pwd`/include -fPIC"; export CPPFLAGS # avoid adding -s to LDFLAGS LDFLAGS=" "; export LDFLAGS args="%{?with_debug:--enable-debug}%{!?with_debug:--disable-debug} \ @@ -508,7 +493,6 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \ ${unicode} \ %{!?with_gnomeprint:--without-gnomeprint} %{__make} - %{__make} -C contrib/src cd .. done @@ -525,12 +509,10 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \ --enable-universal \ ${unicode} %{__make} - %{__make} -C contrib/src if echo $objdir| grep -q disable-unicode ; then %{__make} -C utils %{__make} -C utils/emulator %{__make} -C utils/hhp2cached - # %{__make} -C contrib/utils fi cd .. done @@ -557,15 +539,6 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \ mandir=$RPM_BUILD_ROOT%{_mandir} \ includedir=$RPM_BUILD_ROOT%{_includedir} \ LOCALE_MSW_LINGUAS= - - %{__make} -C contrib/src install \ - prefix=$RPM_BUILD_ROOT%{_prefix} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - datadir=$RPM_BUILD_ROOT%{_datadir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} cd .. done @@ -586,22 +559,10 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \ LOCALE_MSW_LINGUAS= if echo $objdir| grep -q disable-unicode ; then # TODO: install default config files and default backgrouds - install utils/HelpGen/src/HelpGen $RPM_BUILD_ROOT%{_bindir} install utils/emulator/src/wxemulator $RPM_BUILD_ROOT%{_bindir} - install utils/tex2rtf/src/tex2rtf $RPM_BUILD_ROOT%{_bindir} install utils/hhp2cached/hhp2cached $RPM_BUILD_ROOT%{_bindir} install utils/wxrc/wxrc $RPM_BUILD_ROOT%{_bindir} fi - - %{__make} -C contrib/src install \ - prefix=$RPM_BUILD_ROOT%{_prefix} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - datadir=$RPM_BUILD_ROOT%{_datadir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} - cd .. done %endif @@ -650,11 +611,10 @@ rm -rf $RPM_BUILD_ROOT %files -f wxstd.lang %defattr(644,root,root,755) -%doc docs/{changes,licence,licendoc,preamble,readme,todo}.txt +%doc docs/{changes,licence,licendoc,preamble,readme}.txt %files devel %defattr(644,root,root,755) -%doc docs/html %doc docs/tech docs/univ %{_includedir}/wx* %dir %{_libdir}/wx @@ -670,12 +630,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{_examplesdir}/%{name}-%{version} -%if %{with x11} -%files HelpGen -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/HelpGen -%endif - %if %{with ansi} %files -n wxBase %defattr(644,root,root,755) @@ -759,7 +713,6 @@ rm -rf $RPM_BUILD_ROOT %files utils %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/hhp2cached -%attr(755,root,root) %{_bindir}/tex2rtf %attr(755,root,root) %{_bindir}/wxemulator %attr(755,root,root) %{_bindir}/wxrc %attr(755,root,root) %{_bindir}/wxrc-* -- 2.44.0