X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a8098f8653e770e4bf10f7dcf468819ad0675071..6c4f88a317d1b7c41d98631187a9f549475c9b79:/wxX11.spec diff --git a/wxX11.spec b/wxX11.spec index 28a5e33373..ab1b782d29 100644 --- a/wxX11.spec +++ b/wxX11.spec @@ -105,9 +105,8 @@ cd obj-shared %if %{unicode} --enable-unicode \ %else - --with-odbc \ + --disable-unicode \ %endif - --with-opengl $MAKE cd contrib/src @@ -120,7 +119,7 @@ cd obj-static %if %{unicode} --enable-unicode \ %else - --with-odbc \ + --disable-unicode \ %endif --with-opengl $MAKE @@ -149,6 +148,7 @@ wx/build.h wx/chartype.h wx/chkconf.h wx/clntdata.h +wx/cmdargs.h wx/cmdline.h wx/confbase.h wx/config.h @@ -163,6 +163,7 @@ wx/debug.h wx/defs.h wx/dir.h wx/dlimpexp.h +wx/dlist.h wx/dynarray.h wx/dynlib.h wx/dynload.h @@ -194,8 +195,7 @@ wx/iosfwrap.h wx/ioswrap.h wx/ipc.h wx/ipcbase.h -wx/isql.h -wx/isqlext.h +wx/kbdstate.h wx/link.h wx/list.h wx/listimpl.cpp @@ -207,6 +207,7 @@ wx/memory.h wx/memtext.h wx/mimetype.h wx/module.h +wx/mousestate.h wx/msgout.h wx/mstream.h wx/object.h @@ -215,6 +216,7 @@ wx/platinfo.h wx/power.h wx/process.h wx/ptr_scpd.h +wx/ptr_shrd.h wx/recguard.h wx/regex.h wx/scopeguard.h @@ -238,16 +240,20 @@ wx/textfile.h wx/thread.h wx/thrimpl.cpp wx/timer.h +wx/tls.h wx/tokenzr.h +wx/tracker.h wx/txtstrm.h wx/types.h wx/unichar.h wx/uri.h +wx/ustring.h wx/utils.h wx/variant.h wx/vector.h wx/version.h wx/volume.h +wx/weakref.h wx/wfstream.h wx/wx.h wx/wxchar.h @@ -255,22 +261,29 @@ wx/wxcrt.h wx/wxcrtbase.h wx/wxcrtvararg.h wx/wxprec.h +wx/xlocale.h wx/xti.h wx/xtistrm.h wx/zipstrm.h wx/zstream.h +wx/meta/convertible.h +wx/meta/if.h +wx/meta/int2type.h +wx/meta/movable.h +wx/private/fdiodispatcher.h +wx/private/selectdispatcher.h wx/unix/app.h wx/unix/apptbase.h wx/unix/apptrait.h -wx/unix/execute.h +wx/unix/chkconf.h wx/unix/evtloop.h -wx/unix/mimetype.h wx/unix/pipe.h -wx/unix/private.h -wx/unix/stackwalk.h wx/unix/stdpaths.h +wx/unix/stackwalk.h +wx/unix/tls.h +wx/unix/execute.h +wx/unix/mimetype.h wx/fs_inet.h -wx/gsocket.h wx/protocol/file.h wx/protocol/ftp.h wx/protocol/http.h @@ -280,12 +293,8 @@ wx/sckipc.h wx/sckstrm.h wx/socket.h wx/url.h -wx/unix/gsockunx.h wx/xml/xml.h wx/xtixml.h -wx/db.h -wx/dbkeyg.h -wx/dbtable.h EOF # --- wxBase headers list ends here --- for f in `cat wxbase-headers-list` ; do @@ -359,9 +368,6 @@ rm -f %{_bindir}/%{wxconfiglink} %doc COPYING.LIB *.txt %{_libdir}/libwx_%{portname}*_adv-%{ver2}.so.* %{_libdir}/libwx_%{portname}*_core-%{ver2}.so.* -%if !%{unicode} - %{_libdir}/libwx_%{portname}*_dbgrid-%{ver2}.so.* -%endif %{_libdir}/libwx_%{portname}*_html-%{ver2}.so.* %{_libdir}/libwx_%{portname}*_media-%{ver2}.so.* %{_libdir}/libwx_%{portname}*_qa-%{ver2}.so.* @@ -372,9 +378,6 @@ rm -f %{_bindir}/%{wxconfiglink} %defattr(-,root,root) %{_libdir}/libwx_%{portname}*_adv-%{ver2}.so %{_libdir}/libwx_%{portname}*_core-%{ver2}.so -%if !%{unicode} - %{_libdir}/libwx_%{portname}*_dbgrid-%{ver2}.so -%endif %{_libdir}/libwx_%{portname}*_gl-%{ver2}.so %{_libdir}/libwx_%{portname}*_html-%{ver2}.so %{_libdir}/libwx_%{portname}*_media-%{ver2}.so