packages: wxWidgets/wxWidgets.spec, wxWidgets/wxWidgets-gcc4.patch - revert...

sls sls at pld-linux.org
Thu Oct 29 10:00:11 CET 2009 

Author: sls                          Date: Thu Oct 29 09:00:11 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- reverted (2.9.0 goes to DEVEL)

---- Files affected:
packages/wxWidgets:
   wxWidgets.spec (1.81 -> 1.82) , wxWidgets-gcc4.patch (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/wxWidgets/wxWidgets.spec
diff -u packages/wxWidgets/wxWidgets.spec:1.81 packages/wxWidgets/wxWidgets.spec:1.82
--- packages/wxWidgets/wxWidgets.spec:1.81	Sat Sep 12 21:28:51 2009
+++ packages/wxWidgets/wxWidgets.spec	Thu Oct 29 10:00:05 2009
@@ -11,16 +11,17 @@
 Summary:	wxWidgets library
 Summary(pl.UTF-8):	Biblioteka wxWidgets
 Name:		wxWidgets
-Version:	2.9.0
-Release:	1
+Version:	2.8.10
+Release:	2
 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:	09058928eeb72853142c062bdec056ce
+# Source0-md5:	0461c2085ac1ad7e648aa84c4ba51dd1
 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,6 +133,19 @@
 %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
@@ -457,6 +471,7 @@
 #%patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 # if bakefiles rebuild is needed:
@@ -469,7 +484,7 @@
 %{__aclocal} -I build/aclocal
 %{__autoconf}
 
-CPPFLAGS="%{rpmcppflags} %{rpmcflags} -I`pwd`/include -fPIC"; export CPPFLAGS
+CPPFLAGS="%{rpmcppflags} %{rpmcflags} -I`pwd`/include"; export CPPFLAGS
 # avoid adding -s to LDFLAGS
 LDFLAGS=" "; export LDFLAGS
 args="%{?with_debug:--enable-debug}%{!?with_debug:--disable-debug} \
@@ -494,6 +509,7 @@
 		${unicode} \
 		%{!?with_gnomeprint:--without-gnomeprint}
 	%{__make}
+	%{__make} -C contrib/src
 	cd ..
 done
 
@@ -510,10 +526,12 @@
 		--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
@@ -540,6 +558,15 @@
 		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
 
@@ -560,10 +587,22 @@
 		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
@@ -612,10 +651,11 @@
 
 %files -f wxstd.lang
 %defattr(644,root,root,755)
-%doc docs/{changes,licence,licendoc,preamble,readme}.txt
+%doc docs/{changes,licence,licendoc,preamble,readme,todo}.txt
 
 %files devel
 %defattr(644,root,root,755)
+%doc docs/html
 %doc docs/tech docs/univ
 %{_includedir}/wx*
 %dir %{_libdir}/wx
@@ -631,6 +671,12 @@
 %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)
@@ -714,6 +760,7 @@
 %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-*
@@ -775,8 +822,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.81  2009/09/12 19:28:51  arekm
-- up to 2.9.0
+Revision 1.82  2009/10/29 09:00:05  sls
+- reverted (2.9.0 goes to DEVEL)
 
 Revision 1.80  2009/07/12 02:42:44  arekm
 - release 2

================================================================
Index: packages/wxWidgets/wxWidgets-gcc4.patch
diff -u /dev/null packages/wxWidgets/wxWidgets-gcc4.patch:1.4
--- /dev/null	Thu Oct 29 10:00:11 2009
+++ packages/wxWidgets/wxWidgets-gcc4.patch	Thu Oct 29 10:00:05 2009
@@ -0,0 +1,11 @@
+--- 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());
+         }
+     }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wxWidgets/wxWidgets.spec?r1=1.81&r2=1.82&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/wxWidgets/wxWidgets-gcc4.patch?r1=1.3&r2=1.4&f=u

More information about the pld-cvs-commit mailing list