]> git.pld-linux.org Git - packages/wxWidgets.git/blobdiff - wxWidgets.spec
- added format patch to allow build with -Werror=format-security
[packages/wxWidgets.git] / wxWidgets.spec
index 054adbe01a33f9dfe11115201465afd58fba69ce..aa844f304584816f2ec77ec39f50214a2970adb0 100644 (file)
@@ -7,49 +7,46 @@
 %bcond_with    debug                   # build with \--enable-debug
                                        # (binary incompatible with non-debug)
 #
-# Unpackaged files:
-#  /usr/bin/wxrc-2.8
-#  /usr/share/locale/it/LC_MESSAGES/wxmsw.mo
-#
-
 Summary:       wxWidgets library
 Summary(pl.UTF-8):     Biblioteka wxWidgets
 Name:          wxWidgets
-Version:       2.8.1
-Release:       2
-License:       wxWidgets Licence (LGPL with exception)
+Version:       2.8.12
+Release:       4
+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: fe01afe1c055bc82875682e5905c7378
+# Source0-md5: 4103e37e277abeb8aee607b990c215c4
 Patch0:                %{name}-samples.patch
 Patch1:                %{name}-ogl.patch
 Patch2:                %{name}-ac.patch
-Patch3:                %{name}-gif0delay.patch
-Patch4:                %{name}-x11unicode.patch
-Patch5:                %{name}-gcc4.patch
-Patch6:                %{name}-pickerbase.patch
+Patch3:                %{name}-x11unicode.patch
+Patch4:                %{name}-gcc4.patch
+Patch5:                wxGTK-2.8.10.1-odbc-defines.patch
+Patch6:                %{name}-cairo.patch
+Patch7:                %{name}-format.patch
 URL:           http://www.wxWidgets.org/
 BuildRequires: OpenGL-GLU-devel
 #BuildRequires:        SDL-devel
 BuildRequires: autoconf >= 2.59-9
 BuildRequires: automake
-#BuildRequires:        bakefile >= 0.2.1
-BuildRequires: cppunit-devel
-BuildRequires: esound-devel
+# for m4 files
+BuildRequires: bakefile >= 0.2.9
+BuildRequires: cairo-devel
+BuildRequires: cppunit-devel >= 1.8.0
 BuildRequires: expat-devel
-BuildRequires: flex
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 2.0.0
 %{?with_gnomeprint:BuildRequires:      libgnomeprintui-devel >= 2.8.0}
 BuildRequires: libjpeg-devel
-BuildRequires: libmng-devel
 BuildRequires: libmspack-devel
 BuildRequires: libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: libtiff-devel
 BuildRequires: libtool
 BuildRequires: pkgconfig
+%{?with_odbc:BuildRequires:    unixODBC-devel}
 %{?with_x11:BuildRequires:     xorg-lib-libXext-devel}
+%{?with_x11:BuildRequires:     xorg-lib-libXt-devel}
 # these are not supported by wxWidgets
 Obsoletes:     LDAPExplorerTool <= 0.6-1
 Obsoletes:     abridge <= 0.4.0-1
@@ -352,10 +349,10 @@ Requires: wxX11 = %{version}-%{release}
 Obsoletes:     wxWindows-utils
 
 %description utils
-Misc utils from wxWidgets project: helpviewer, makegen, etc.
+Misc utils from wxWidgets project: wxemulator, wxrc, etc.
 
 %description utils -l pl.UTF-8
-Różne narzędzia z projektu wxWidgets: helpviewer, makegen itp.
+Różne narzędzia z projektu wxWidgets: wxemulator, wxrc itp.
 
 %package -n wxX11
 Summary:       wxUniversal-based wxX11 library
@@ -473,12 +470,16 @@ obsługą UNICODE.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+# is this still needed?
+#%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+
+%{__rm} build/aclocal/bakefile*.m4
 
 %build
 # if bakefiles rebuild is needed:
@@ -491,17 +492,19 @@ cp -f /usr/share/automake/config.sub .
 %{__aclocal} -I build/aclocal
 %{__autoconf}
 
-CPPFLAGS="%{rpmcflags} -I`pwd`/include"; export CPPFLAGS
+CPPFLAGS="%{rpmcppflags} %{rpmcflags} -fPIC -I`pwd`/include"; export CPPFLAGS
 # avoid adding -s to LDFLAGS
 LDFLAGS=" "; export LDFLAGS
 args="%{?with_debug:--enable-debug}%{!?with_debug:--disable-debug} \
+       ac_cv_lib_iodbc_SQLAllocEnv=no \
+       ac_cv_lib_unixodbc_SQLAllocEnv=no \
+       --enable-calendar \
+       --enable-controls \
        --enable-plugins \
        --enable-std_iostreams \
+       --enable-tabdialog \
        --without-sdl \
-       --with-opengl \
-       --enable-calendar \
-       --enable-controls \
-       --enable-tabdialog"
+       --with-opengl"
 
 gui='--with-gtk'
 for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
@@ -512,6 +515,7 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
        ../%configure \
                ${args} \
                ${gui} \
+               --enable-graphics_ctx \
                --disable-universal \
                ${unicode} \
                %{!?with_gnomeprint:--without-gnomeprint}
@@ -563,7 +567,8 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                datadir=$RPM_BUILD_ROOT%{_datadir} \
                libdir=$RPM_BUILD_ROOT%{_libdir} \
                mandir=$RPM_BUILD_ROOT%{_mandir} \
-               includedir=$RPM_BUILD_ROOT%{_includedir}
+               includedir=$RPM_BUILD_ROOT%{_includedir} \
+               LOCALE_MSW_LINGUAS=
 
        %{__make} -C contrib/src install \
                prefix=$RPM_BUILD_ROOT%{_prefix} \
@@ -589,23 +594,15 @@ for unicode in %{?with_ansi:'--disable-unicode %{?with_odbc:--with-odbc}'} \
                datadir=$RPM_BUILD_ROOT%{_datadir} \
                libdir=$RPM_BUILD_ROOT%{_libdir} \
                mandir=$RPM_BUILD_ROOT%{_mandir} \
-               includedir=$RPM_BUILD_ROOT%{_includedir}
+               includedir=$RPM_BUILD_ROOT%{_includedir} \
+               LOCALE_MSW_LINGUAS=
        if echo $objdir| grep -q disable-unicode ; then
-#              install utils/dialoged/src/DialogEd $RPM_BUILD_ROOT%{_bindir}
                # 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/makegen/makegen $RPM_BUILD_ROOT%{_bindir}
                install utils/wxrc/wxrc $RPM_BUILD_ROOT%{_bindir}
-#              install -d $RPM_BUILD_ROOT%{_datadir}/wx/makegen/templates
-#              install -m644 utils/makegen/templates/* \
-#                      $RPM_BUILD_ROOT%{_datadir}/wx/makegen/templates
-#              install contrib/utils/wxrcedit/wxrcedit $RPM_BUILD_ROOT%{_bindir}
-#              install -d $RPM_BUILD_ROOT%{_datadir}/wx/wxrcedit
-#              install contrib/utils/wxrcedit/df/* \
-#                      $RPM_BUILD_ROOT%{_datadir}/wx/wxrcedit/
        fi
 
        %{__make} -C contrib/src install \
@@ -675,11 +672,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/wx
 %dir %{_libdir}/wx/include
 %dir %{_libdir}/wx/config
-%{_aclocaldir}/*.m4
+%{_aclocaldir}/wxwin.m4
 
 %files -n bakefile-wxWidgets
 %defattr(644,root,root,755)
-%{_datadir}/bakefile/presets/*.bkl
+%{_datadir}/bakefile/presets/wx*.bkl
 
 %files examples
 %defattr(644,root,root,755)
@@ -731,7 +728,7 @@ 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
-%{_libdir}/wx/config/gtk2-ansi-*
+%attr(755,root,root) %{_libdir}/wx/config/gtk2-ansi-*
 %{_libdir}/wx/include/gtk2-ansi-*
 %attr(755,root,root) %{_bindir}/wx-gtk2-ansi%{_configf}-config
 
@@ -756,7 +753,7 @@ 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
-%{_libdir}/wx/config/gtk2-unicode-*
+%attr(755,root,root) %{_libdir}/wx/config/gtk2-unicode-*
 %{_libdir}/wx/include/gtk2-unicode-*
 %attr(755,root,root) %{_bindir}/wx-gtk2-unicode%{_configf}-config
 
@@ -773,9 +770,11 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with ansi}
 %files utils
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%exclude %{_bindir}/HelpGen
-%exclude %{_bindir}/wx*-config
+%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-*
 
 %files -n wxX11
 %defattr(644,root,root,755)
@@ -789,7 +788,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libwx_x11univ%{_libf}_*-*.so
 %exclude %{_libdir}/libwx_x11univ%{_libf}_gl-*.so
-%{_libdir}/wx/config/x11univ-ansi-*
+%attr(755,root,root) %{_libdir}/wx/config/x11univ-ansi-*
 %{_libdir}/wx/include/x11univ-ansi-*
 %attr(755,root,root) %{_bindir}/wx-x11univ-ansi%{_configf}-config
 
@@ -814,7 +813,7 @@ 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
-%{_libdir}/wx/config/x11univ-unicode-*
+%attr(755,root,root) %{_libdir}/wx/config/x11univ-unicode-*
 %{_libdir}/wx/include/x11univ-unicode-*
 %attr(755,root,root) %{_bindir}/wx-x11univ-unicode%{_configf}-config
 
This page took 0.042879 seconds and 4 git commands to generate.