rpms/wxGTK/devel wxGTK-2.8.0.1-cvs.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wxGTK.spec, 1.23, 1.24 wxGTK-2.6.3.2-cvs.patch, 1.1, NONE wxGTK-2.6.3.3-cvs.patch, 1.1, NONE
Matthew Miller (mattdm)
fedora-extras-commits at redhat.com
Fri Dec 15 14:55:39 UTC 2006
Author: mattdm
Update of /cvs/extras/rpms/wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2147
Modified Files:
.cvsignore sources wxGTK.spec
Added Files:
wxGTK-2.8.0.1-cvs.patch
Removed Files:
wxGTK-2.6.3.2-cvs.patch wxGTK-2.6.3.3-cvs.patch
Log Message:
Update to 2.8.0, plus patch to 2.8.0.1 wxPython level.
* Thu Dec 14 2006 Matthew Miller <mattdm at mattdm.org> - 2.8.0-2.8.0.1.1
- patch to 2.8.0.1 wxPython subrelease (following upstream wxPython)
from wxWidgets CVS
* Thu Dec 14 2006 Matthew Miller <mattdm at mattdm.org> - 2.8.0-2.8.0.0.1
- update to 2.8.0 release
- gtk2 is now the default (and gtk1.2 gone -- about time!)
- compatibility with wxWidgets 2.2 is now gone; add flag to build 2.4 with
compatibility, though (now off by default)
- added "--enable-no_deps" for faster builds
- added "--enable-intl", because that seems like a good idea
- added disable-rpath, enable-geometry, enable-graphics_ctx, enable-sound,
enable-mediactrl, and enable-display to better match upstream wxPython
package.
- buildrequires: gstreamer-devel
- "animate" contributed module no longer exists.
- enable the svg contributed module
- build the .mo files explicitly -- not sure why that's not happening
automatically.
- minor -- location of doc files in src tarball has changed
wxGTK-2.8.0.1-cvs.patch:
--- NEW FILE wxGTK-2.8.0.1-cvs.patch ---
# Generated with `cvs diff -u -R -N -r WX_2_8_0 -r wxPy_2_8_0_1`, and then
# trimmed for non-platform-relevant changes
Index: wxWidgets/Makefile.in
===================================================================
RCS file: /pack/cvsroots/wxwidgets/wxWidgets/Makefile.in,v
retrieving revision 1.669
retrieving revision 1.670
diff -u -r1.669 -r1.670
--- wxWidgets/Makefile.in 2006/12/04 01:14:25 1.669
+++ wxWidgets/Makefile.in 2006/12/11 06:19:27 1.670
@@ -2157,6 +2157,7 @@
wx/mac/sound.h \
wx/mac/spinbutt.h \
wx/mac/spinctrl.h \
+ wx/mac/srchctrl.h \
wx/mac/statbmp.h \
wx/mac/statbox.h \
wx/mac/statline.h \
@@ -2230,6 +2231,9 @@
wx/mac/carbon/printdlg.h \
wx/mac/carbon/printmac.h \
wx/mac/carbon/private.h \
+ wx/mac/carbon/private/mactext.h \
+ wx/mac/carbon/private/overlay.h \
+ wx/mac/carbon/private/print.h \
wx/mac/carbon/radiobox.h \
wx/mac/carbon/radiobut.h \
wx/mac/carbon/region.h \
@@ -2237,6 +2241,7 @@
wx/mac/carbon/slider.h \
wx/mac/carbon/spinbutt.h \
wx/mac/carbon/spinctrl.h \
+ wx/mac/carbon/srchctrl.h \
wx/mac/carbon/statbmp.h \
wx/mac/carbon/statbox.h \
wx/mac/carbon/statline.h \
@@ -2871,6 +2876,7 @@
wx/generic/scrolwin.h \
wx/generic/spinctlg.h \
wx/generic/splitter.h \
+ wx/generic/srchctlg.h \
wx/generic/textdlgg.h \
wx/generic/timer.h \
wx/generic/treectlg.h \
@@ -2988,6 +2994,7 @@
wx/spinbutt.h \
wx/spinctrl.h \
wx/splitter.h \
+ wx/srchctrl.h \
wx/statline.h \
wx/tab.h \
wx/tabctrl.h \
@@ -3497,6 +3504,7 @@
monodll_rgncmn.o \
monodll_settcmn.o \
monodll_sizer.o \
+ monodll_srchcmn.o \
monodll_statbar.o \
monodll_stockitem.o \
monodll_tbarbase.o \
@@ -3532,6 +3540,7 @@
monodll_selstore.o \
monodll_spinctlg.o \
monodll_splitter.o \
+ monodll_srchctlg.o \
monodll_textdlgg.o \
monodll_tipwin.o \
monodll_toolbkg.o \
@@ -3670,6 +3679,7 @@
monodll_rgncmn.o \
monodll_settcmn.o \
monodll_sizer.o \
+ monodll_srchcmn.o \
monodll_statbar.o \
monodll_stockitem.o \
monodll_tbarbase.o \
@@ -3705,6 +3715,7 @@
monodll_selstore.o \
monodll_spinctlg.o \
monodll_splitter.o \
+ monodll_srchctlg.o \
monodll_textdlgg.o \
monodll_tipwin.o \
monodll_toolbkg.o \
@@ -4263,6 +4274,7 @@
monodll_slider.o \
monodll_spinbutt.o \
monodll_spinctrl.o \
+ monodll_srchctrl.o \
monodll_statbmp.o \
monodll_statbox.o \
monodll_statbrma.o \
@@ -5271,6 +5283,7 @@
monolib_rgncmn.o \
monolib_settcmn.o \
monolib_sizer.o \
+ monolib_srchcmn.o \
monolib_statbar.o \
monolib_stockitem.o \
monolib_tbarbase.o \
@@ -5306,6 +5319,7 @@
monolib_selstore.o \
monolib_spinctlg.o \
monolib_splitter.o \
+ monolib_srchctlg.o \
monolib_textdlgg.o \
monolib_tipwin.o \
monolib_toolbkg.o \
@@ -5444,6 +5458,7 @@
monolib_rgncmn.o \
monolib_settcmn.o \
monolib_sizer.o \
+ monolib_srchcmn.o \
monolib_statbar.o \
monolib_stockitem.o \
monolib_tbarbase.o \
@@ -5479,6 +5494,7 @@
monolib_selstore.o \
monolib_spinctlg.o \
monolib_splitter.o \
+ monolib_srchctlg.o \
monolib_textdlgg.o \
monolib_tipwin.o \
monolib_toolbkg.o \
@@ -6038,6 +6054,7 @@
monolib_slider.o \
monolib_spinbutt.o \
monolib_spinctrl.o \
+ monolib_srchctrl.o \
monolib_statbmp.o \
monolib_statbox.o \
monolib_statbrma.o \
@@ -7275,6 +7292,7 @@
coredll_rgncmn.o \
coredll_settcmn.o \
coredll_sizer.o \
+ coredll_srchcmn.o \
coredll_statbar.o \
coredll_stockitem.o \
coredll_tbarbase.o \
@@ -7310,6 +7328,7 @@
coredll_selstore.o \
coredll_spinctlg.o \
coredll_splitter.o \
+ coredll_srchctlg.o \
coredll_textdlgg.o \
coredll_tipwin.o \
coredll_toolbkg.o \
@@ -7448,6 +7467,7 @@
coredll_rgncmn.o \
coredll_settcmn.o \
coredll_sizer.o \
+ coredll_srchcmn.o \
coredll_statbar.o \
coredll_stockitem.o \
coredll_tbarbase.o \
@@ -7483,6 +7503,7 @@
coredll_selstore.o \
coredll_spinctlg.o \
coredll_splitter.o \
+ coredll_srchctlg.o \
coredll_textdlgg.o \
coredll_tipwin.o \
coredll_toolbkg.o \
@@ -8042,6 +8063,7 @@
coredll_slider.o \
coredll_spinbutt.o \
coredll_spinctrl.o \
+ coredll_srchctrl.o \
coredll_statbmp.o \
coredll_statbox.o \
coredll_statbrma.o \
@@ -8723,6 +8745,7 @@
corelib_rgncmn.o \
corelib_settcmn.o \
corelib_sizer.o \
+ corelib_srchcmn.o \
corelib_statbar.o \
corelib_stockitem.o \
corelib_tbarbase.o \
@@ -8758,6 +8781,7 @@
corelib_selstore.o \
corelib_spinctlg.o \
corelib_splitter.o \
+ corelib_srchctlg.o \
corelib_textdlgg.o \
corelib_tipwin.o \
corelib_toolbkg.o \
@@ -8896,6 +8920,7 @@
corelib_rgncmn.o \
corelib_settcmn.o \
corelib_sizer.o \
+ corelib_srchcmn.o \
corelib_statbar.o \
corelib_stockitem.o \
corelib_tbarbase.o \
@@ -8931,6 +8956,7 @@
corelib_selstore.o \
[...4849 lines suppressed...]
+ wxPropertyValidatorRegistry *registry = (wxPropertyValidatorRegistry *)node->Data();
+ wxPropertyValidator *validator = registry->GetValidator(property->GetRole());
+ if (validator)
+ return validator;
+ node = node->Next();
+ }
+ return NULL;
+/*
+ if (!wxDefaultPropertyValidator)
+ wxDefaultPropertyValidator = new wxPropertyListValidator;
+ return wxDefaultPropertyValidator;
+*/
+}
+
+/*
+ * Property sheet
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxPropertySheet, wxObject)
+
+wxPropertySheet::wxPropertySheet(void):m_properties(wxKEY_STRING)
+{
+}
+
+wxPropertySheet::~wxPropertySheet(void)
+{
+ Clear();
+}
+
+bool wxPropertySheet::Save( ostream& WXUNUSED(str) )
+{
+ return FALSE;
+}
+
+bool wxPropertySheet::Load( ostream& WXUNUSED(str) )
+{
+ return FALSE;
+}
+
+void wxPropertySheet::UpdateAllViews( wxPropertyView *WXUNUSED(thisView) )
+{
+}
+
+// Add a property
+void wxPropertySheet::AddProperty(wxProperty *property)
+{
+ m_properties.Append((const char*) property->GetName(), property);
+}
+
+// Get property by name
+wxProperty *wxPropertySheet::GetProperty(wxString name)
+{
+ wxNode *node = m_properties.Find((const char*) name);
+ if (!node)
+ return NULL;
+ else
+ return (wxProperty *)node->Data();
+}
+
+// Clear all properties
+void wxPropertySheet::Clear(void)
+{
+ wxNode *node = m_properties.First();
+ while (node)
+ {
+ wxProperty *prop = (wxProperty *)node->Data();
+ wxNode *next = node->Next();
+ delete prop;
+ delete node;
+ node = next;
+ }
+}
+
+// Sets/clears the modified flag for each property value
+void wxPropertySheet::SetAllModified(bool flag)
+{
+ wxNode *node = m_properties.First();
+ while (node)
+ {
+ wxProperty *prop = (wxProperty *)node->Data();
+ prop->GetValue().SetModified(flag);
+ node = node->Next();
+ }
+}
+
+/*
+ * Property validator registry
+ *
+ */
+
+IMPLEMENT_DYNAMIC_CLASS(wxPropertyValidatorRegistry, wxHashTable)
+
+wxPropertyValidatorRegistry::wxPropertyValidatorRegistry(void):wxHashTable(wxKEY_STRING)
+{
+}
+
+wxPropertyValidatorRegistry::~wxPropertyValidatorRegistry(void)
+{
+ ClearRegistry();
+}
+
+void wxPropertyValidatorRegistry::RegisterValidator(const wxString& typeName, wxPropertyValidator *validator)
+{
+ Put((const char*) typeName, validator);
+}
+
+wxPropertyValidator *wxPropertyValidatorRegistry::GetValidator(const wxString& typeName)
+{
+ return (wxPropertyValidator *)Get((const char*) typeName);
+}
+
+void wxPropertyValidatorRegistry::ClearRegistry(void)
+{
+ BeginFind();
+ wxNode *node;
+ while (node = Next())
+ {
+ delete (wxPropertyValidator *)node->Data();
+ }
+}
+
+ /*
+ * Property validator
+ */
+
+
+IMPLEMENT_ABSTRACT_CLASS(wxPropertyValidator, wxEvtHandler)
+
+wxPropertyValidator::wxPropertyValidator(long flags)
+{
+ m_validatorFlags = flags;
+ m_validatorProperty = NULL;
+}
+
+wxPropertyValidator::~wxPropertyValidator(void)
+{}
+
+bool wxPropertyValidator::StringToFloat (char *s, float *number) {
+ double num;
+ bool ok = StringToDouble (s, &num);
+ *number = (float) num;
+ return ok;
+}
+
+bool wxPropertyValidator::StringToDouble (char *s, double *number) {
+ bool ok = TRUE;
+ char *value_ptr;
+ *number = strtod (s, &value_ptr);
+ if (value_ptr) {
+ int len = strlen (value_ptr);
+ for (int i = 0; i < len; i++) {
+ ok = (isspace (value_ptr[i]) != 0);
+ if (!ok) return FALSE;
+ }
+ }
+ return ok;
+}
+
+bool wxPropertyValidator::StringToInt (char *s, int *number) {
+ long num;
+ bool ok = StringToLong (s, &num);
+ *number = (int) num;
+ return ok;
+}
+
+bool wxPropertyValidator::StringToLong (char *s, long *number) {
+ bool ok = TRUE;
+ char *value_ptr;
+ *number = strtol (s, &value_ptr, 10);
+ if (value_ptr) {
+ int len = strlen (value_ptr);
+ for (int i = 0; i < len; i++) {
+ ok = (isspace (value_ptr[i]) != 0);
+ if (!ok) return FALSE;
+ }
+ }
+ return ok;
+}
+
+char *wxPropertyValidator::FloatToString (float number) {
+ static char buf[20];
+ sprintf (buf, "%.6g", number);
+ return buf;
+}
+
+char *wxPropertyValidator::DoubleToString (double number) {
+ static char buf[20];
+ sprintf (buf, "%.6g", number);
+ return buf;
+}
+
+char *wxPropertyValidator::IntToString (int number) {
+ return ::IntToString (number);
+}
+
+char *wxPropertyValidator::LongToString (long number) {
+ return ::LongToString (number);
+ }
+
+
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 29 Mar 2006 20:59:01 -0000 1.5
+++ .cvsignore 15 Dec 2006 14:55:09 -0000 1.6
@@ -1 +1 @@
-wxGTK-2.6.3.tar.bz2
+wxGTK-2.8.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 29 Mar 2006 20:59:01 -0000 1.5
+++ sources 15 Dec 2006 14:55:09 -0000 1.6
@@ -1 +1 @@
-3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2
+9de30aeaad9bac6f8869907fa42fe950 wxGTK-2.8.0.tar.bz2
Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wxGTK.spec 28 Aug 2006 20:06:51 -0000 1.23
+++ wxGTK.spec 15 Dec 2006 14:55:09 -0000 1.24
@@ -5,8 +5,8 @@
%define withodbc 0
Name: wxGTK
-Version: 2.6.3
-Release: 2.6.3.2.3%{?dist}
+Version: 2.8.0
+Release: 2.8.0.1.1%{?dist}
Summary: GTK2 port of the wxWidgets GUI library
# The wxWindows licence is the LGPL with a specific exemption allowing
# distribution of derived binaries under any terms. (This will eventually
@@ -15,13 +15,15 @@
Group: System Environment/Libraries
URL: http://www.wxwidgets.org/
Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0: wxGTK-2.6.3.2-cvs.patch
+Patch0: wxGTK-2.8.0.1-cvs.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, zlib-devel >= 1.1.4
BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel
BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel
BuildRequires: libGL-devel, libGLU-devel
+BuildRequires: gstreamer-devel >= 0.10
+BuildRequires: autoconf
%if %{withodbc}
BuildRequires: unixODBC-devel
%endif
@@ -89,19 +91,22 @@
%prep
%setup -q
-%patch0 -p1 -b .2.6.3.2
+%patch0 -p1 -b .2.8.0.1
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
%build
+
+# must do this to regenerate ./configure after the 2.8.0.1 patch.
+autoconf
+
export GDK_USE_XFT=1
# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
# (see OPTIMISE in configure).
%configure \
--x-libraries=%{x11libdir} \
- --with-gtk=2 \
--with-opengl \
%if %{withodbc}
--with-odbc \
@@ -112,14 +117,25 @@
--enable-soname \
--disable-optimise \
--enable-debug_info \
+ --enable-intl \
--enable-unicode \
- --enable-compat22
+ --enable-no_deps \
+ --disable-rpath \
+ --enable-geometry \
+ --enable-graphics_ctx \
+ --enable-sound \
+ --enable-mediactrl \
+ --enable-display \
+ --enable-compat24
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/ogl
make %{?_smp_mflags} -C contrib/src/gizmos
-make %{?_smp_mflags} -C contrib/src/animate
+make %{?_smp_mflags} -C contrib/src/svg
+
+# Why isn't this this part of the main build? Need to investigate.
+make %{?_smp_mflags} -C locale allmo
%install
rm -rf $RPM_BUILD_ROOT
@@ -129,12 +145,13 @@
%makeinstall -C contrib/src/stc
%makeinstall -C contrib/src/ogl
%makeinstall -C contrib/src/gizmos
-%makeinstall -C contrib/src/animate
+%makeinstall -C contrib/src/svg
+
# this ends up being a symlink into the buildroot directly --
# not what we want!
rm $RPM_BUILD_ROOT%{_bindir}/wx-config
-ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.6 $RPM_BUILD_ROOT%{_bindir}/wx-config
+ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.8 $RPM_BUILD_ROOT%{_bindir}/wx-config
%find_lang wxstd
%find_lang wxmsw
@@ -153,27 +170,29 @@
%files -f wxstd.lang
%defattr(-,root,root,-)
-%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
+%doc docs/changes.txt docs/gpl.txt docs/lgpl.txt docs/licence.txt
+%doc docs/licendoc.txt docs/preamble.txt docs/readme.txt
%{_libdir}/libwx_baseu-*.so.*
%{_libdir}/libwx_baseu_net-*.so.*
%{_libdir}/libwx_baseu_xml-*.so.*
%{_libdir}/libwx_gtk2u_adv-*.so.*
-%{_libdir}/libwx_gtk2u_animate-*.so.*
+%{_libdir}/libwx_gtk2u_aui-*.so.*
%{_libdir}/libwx_gtk2u_core-*.so.*
%{_libdir}/libwx_gtk2u_gizmos-*.so.*
%{_libdir}/libwx_gtk2u_gizmos_xrc*.so.*
%{_libdir}/libwx_gtk2u_html-*.so.*
-%{_libdir}/libwx_gtk2u_media-*.so.*
%{_libdir}/libwx_gtk2u_ogl-*.so.*
-%{_libdir}/libwx_gtk2u_xrc-*.so.*
-%{_libdir}/libwx_gtk2u_stc-*.so.*
%{_libdir}/libwx_gtk2u_qa-*.so.*
+%{_libdir}/libwx_gtk2u_richtext-*.so.*
+%{_libdir}/libwx_gtk2u_stc-*.so.*
+%{_libdir}/libwx_gtk2u_svg-*.so.*
+%{_libdir}/libwx_gtk2u_xrc-*.so.*
%files devel
%defattr(-,root,root,-)
%{_bindir}/wx-config
%{_bindir}/wxrc*
-%{_includedir}/wx-2.6
+%{_includedir}/wx-2.8
%{_libdir}/libwx_*.so
%dir %{_libdir}/wx
%dir %{_libdir}/wx/include
@@ -194,6 +213,27 @@
%endif
%changelog
+* Thu Dec 14 2006 Matthew Miller <mattdm at mattdm.org> - 2.8.0-2.8.0.1.1
+- patch to 2.8.0.1 wxPython subrelease (following upstream wxPython)
+ from wxWidgets CVS
+
+* Thu Dec 14 2006 Matthew Miller <mattdm at mattdm.org> - 2.8.0-2.8.0.0.1
+- update to 2.8.0 release
+- gtk2 is now the default (and gtk1.2 gone -- about time!)
+- compatibility with wxWidgets 2.2 is now gone; add flag to build 2.4 with
+ compatibility, though (now off by default)
+- added "--enable-no_deps" for faster builds
+- added "--enable-intl", because that seems like a good idea
+- added disable-rpath, enable-geometry, enable-graphics_ctx, enable-sound,
+ enable-mediactrl, and enable-display to better match upstream wxPython
+ package.
+- buildrequires: gstreamer-devel
+- "animate" contributed module no longer exists.
+- enable the svg contributed module
+- build the .mo files explicitly -- not sure why that's not happening
+ automatically.
+- minor -- location of doc files in src tarball has changed
+
* Mon Aug 28 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.3
- bump release for FC6 rebuild
--- wxGTK-2.6.3.2-cvs.patch DELETED ---
--- wxGTK-2.6.3.3-cvs.patch DELETED ---
More information about the fedora-extras-commits
mailing list