rpms/compat-wxGTK/devel compat-wxGTK.spec, NONE, 1.1 wxGTK-2.4.2-aclocal18.patch, NONE, 1.1 wxGTK-2.4.2-gcc4.patch, NONE, 1.1 wxGTK-2.4.2-privates.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Tom Callaway (spot)
fedora-extras-commits at redhat.com
Fri Jan 6 16:14:53 UTC 2006
Author: spot
Update of /cvs/extras/rpms/compat-wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13873/devel
Modified Files:
.cvsignore sources
Added Files:
compat-wxGTK.spec wxGTK-2.4.2-aclocal18.patch
wxGTK-2.4.2-gcc4.patch wxGTK-2.4.2-privates.patch
Log Message:
auto-import compat-wxGTK-2.4.2-15 on branch devel from compat-wxGTK-2.4.2-15.src.rpm
--- NEW FILE compat-wxGTK.spec ---
%define x11libdir %{_prefix}/X11R6/%{_lib}
Name: compat-wxGTK
Version: 2.4.2
Release: 15%{?dist}
Summary: Compatibility version of the wxWidgets GTK GUI library
License: BSD
Group: System Environment/Libraries
URL: http://www.wxwidgets.org/
Source0: http://dl.sf.net/wxwindows/wxGTK-%{version}.tar.bz2
Patch0: wxGTK-2.4.2-privates.patch
Patch1: wxGTK-2.4.2-aclocal18.patch
Patch2: wxGTK-2.4.2-gcc4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel gtk2-devel zlib-devel >= 1.1.4
BuildRequires: libpng-devel libjpeg-devel libtiff-devel
BuildRequires: libGL libGLU
Requires: %{name}-common = %{version}-%{release}
Obsoletes: wxGTK <= 2.4.2-12
Provides: wxGTK = %{version}-%{release}
%description
wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets
GUI library, offering classes for all common GUI controls as well as a
comprehensive set of helper classes for most common application tasks,
ranging from networking to HTML display and image manipulation.
%package devel
Group: Development/Libraries
Summary: Development files for the wxGTK library
Requires: %{name} = %{version}-%{release}
Requires: %{name}-common-devel = %{version}-%{release}
Requires: %{name}-gl = %{version}-%{release}
Requires: %{name}-stc = %{version}-%{release}
Requires: %{name}-xrc = %{version}-%{release}
Requires: gtk+-devel
Conflicts: %{name}2-devel
Obsoletes: wxGTK-devel <= 2.4.2-12
Provides: wxGTK-devel = %{version}-%{release}
%description devel
This package includes files needed to link with the wxGTK library.
%package -n %{name}2
Group: System Environment/Libraries
Summary: Compatibility version of the wxWidgets GTK2 GUI library
Requires: %{name}-common = %{version}-%{release}
Obsoletes: wxGTK2 <= 2.4.2-12
Provides: wxGTK2 = %{version}-%{release}
%description -n %{name}2
wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
GUI library, offering classes for all common GUI controls as well as a
comprehensive set of helper classes for most common application tasks,
ranging from networking to HTML display and image manipulation.
%package -n %{name}2-devel
Group: Development/Libraries
Summary: Development files for the wxGTK2 library
Requires: %{name}2 = %{version}-%{release}
Requires: %{name}-common-devel = %{version}-%{release}
Requires: %{name}2-gl = %{version}-%{release}
Requires: %{name}2-stc = %{version}-%{release}
Requires: %{name}2-xrc = %{version}-%{release}
Requires: gtk2-devel
Conflicts: %{name}-devel
Obsoletes: wxGTK2-devel <= 2.4.2-12
Provides: wxGTK2-devel = %{version}-%{release}
%description -n %{name}2-devel
This package include files needed to link with the wxGTK2 library.
%package common
Group: System Environment/Libraries
Summary: wxGTK* common files
Obsoletes: wxGTK-common <= 2.4.2-12
Provides: wxGTK-common = %{version}-%{release}
%description common
Common files for wxWidgets/GTK1 and GTK2.
%package common-devel
Group: Development/Libraries
Summary: wxGTK* common development files
Obsoletes: wxGTK-common-devel <= 2.4.2-12
Provides: wxGTK-common-devel = %{version}-%{release}
%description common-devel
Common development files for wxWidgets/GTK1 and GTK2.
%package gl
Summary: OpenGL add-on for the wxWidgets library
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: wxGTK-gl <= 2.4.2-12
Provides: wxGTK-gl = %{version}-%{release}
%description gl
%{summary}.
%package -n %{name}2-gl
Summary: OpenGL add-on for the wxWidgets library
Group: System Environment/Libraries
Requires: %{name}2 = %{version}-%{release}
Obsoletes: wxGTK2-gl <= 2.4.2-12
Provides: wxGTK2-gl = %{version}-%{release}
%description -n %{name}2-gl
%{summary}.
%package stc
Summary: Styled text control add-on for the wxWidgets library
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: wxGTK-stc <= 2.4.2-12
Provides: wxGTK-stc = %{version}-%{release}
%description stc
Styled text control add-on for wxGTK. Based on the Scintillia project.
%package -n %{name}2-stc
Summary: Styled text control add-on for the wxWidgets library
Group: System Environment/Libraries
Requires: %{name}2 = %{version}-%{release}
Obsoletes: wxGTK2-stc <= 2.4.2-12
Provides: wxGTK2-stc = %{version}-%{release}
%description -n %{name}2-stc
Styled text control add-on for wxGTK2. Based on the Scintillia project.
%package xrc
Summary: The XML-based resource system for the wxWidgets library
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
Obsoletes: wxGTK-xrc <= 2.4.2-12
Provides: wxGTK-xrc = %{version}-%{release}
%description xrc
The XML-based resource system, known as XRC, allows user interface
elements such as dialogs, menu bars and toolbars, to be stored in
text files and loaded into the application at run-time.
This package is for the GTK 1.2 backend
%package -n %{name}2-xrc
Summary: The XML-based resource system for the wxWidgets library
Group: System Environment/Libraries
Requires: %{name}2 = %{version}-%{release}
Obsoletes: wxGTK2-xrc <= 2.4.2-12
Provides: wxGTK2-xrc = %{version}-%{release}
%description -n %{name}2-xrc
The XML-based resource system, known as XRC, allows user interface
elements such as dialogs, menu bars and toolbars, to be stored in
text files and loaded into the application at run-time.
This package is for the GTK2 backend.
%prep
%setup -q -n wxGTK-%{version}
%patch0 -p1 -b .privates
%patch1 -p0 -b .aclocal18
%patch2 -p1 -b .gcc4
sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
%build
mkdir _gtk1 _gtk2
export CC="%{__cc}"
export CXX="%{__cxx}"
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
# --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
# (see OPTIMISE in configure).
cd _gtk1
../configure \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--x-libraries=%{x11libdir} \
--with-opengl \
--enable-shared \
--enable-soname \
--disable-optimise
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/xrc
cd ..
cd _gtk2
../configure \
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--x-libraries=%{x11libdir} \
--with-opengl \
--enable-shared \
--enable-soname \
--disable-optimise \
--enable-gtk2
make %{?_smp_mflags}
make %{?_smp_mflags} -C contrib/src/stc
make %{?_smp_mflags} -C contrib/src/xrc
cd ..
%install
rm -rf $RPM_BUILD_ROOT
# Since we're not using %%configure, we would really like to use
# "make install DESTDIR=..." instead of %%makeinstall here to keep things in
# sync. Unfortunately that does not work.
cd _gtk1
%makeinstall
%makeinstall -C contrib/src/stc
%makeinstall -C contrib/src/xrc
cd ..
cd _gtk2
%makeinstall
%makeinstall -C contrib/src/stc
%makeinstall -C contrib/src/xrc
cd ..
# Deal with conflicting files
rm -f $RPM_BUILD_ROOT%{_bindir}/wx-config
touch $RPM_BUILD_ROOT%{_bindir}/wx-2.4-config
chmod 755 $RPM_BUILD_ROOT%{_bindir}/wx-2.4-config
mv $RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin.m4 \
$RPM_BUILD_ROOT%{_datadir}/aclocal/wxwin-2.4.m4
%find_lang wxstd
%clean
rm -rf $RPM_BUILD_ROOT
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post devel
ln -sf $(basename %{_bindir}/wxgtk-*-config) %{_bindir}/wx-2.4-config
%post gl -p /sbin/ldconfig
%postun gl -p /sbin/ldconfig
%post stc -p /sbin/ldconfig
%postun stc -p /sbin/ldconfig
%post xrc -p /sbin/ldconfig
%postun xrc -p /sbin/ldconfig
%post -n %{name}2 -p /sbin/ldconfig
%postun -n %{name}2 -p /sbin/ldconfig
%post -n %{name}2-devel
ln -sf $(basename %{_bindir}/wxgtk2-*-config) %{_bindir}/wx-2.4-config
%post -n %{name}2-gl -p /sbin/ldconfig
%postun -n %{name}2-gl -p /sbin/ldconfig
%post -n %{name}2-stc -p /sbin/ldconfig
%postun -n %{name}2-stc -p /sbin/ldconfig
%post -n %{name}2-xrc -p /sbin/ldconfig
%postun -n %{name}2-xrc -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk-*.so.*
%files devel
%defattr(-,root,root,-)
%ghost %{_bindir}/wx-2.4-config
%{_bindir}/wxgtk-*-config
%{_libdir}/libwx_gtk[-_]*.so
%{_libdir}/wx/include/gtk-*
%files -n %{name}2
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2-*.so.*
%files -n %{name}2-devel
%defattr(-,root,root,-)
%ghost %{_bindir}/wx-2.4-config
%{_bindir}/wxgtk2-*-config
%{_libdir}/libwx_gtk2[-_]*.so
%{_libdir}/wx/include/gtk-2*
%files common -f wxstd.lang
%defattr(-,root,root,-)
%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
%{_datadir}/wx/
%files common-devel
%defattr(-,root,root,-)
%{_datadir}/aclocal/*
%{_includedir}/wx/
%dir %{_libdir}/wx/
%dir %{_libdir}/wx/include/
%files gl
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk_gl-*.so.*
%files -n %{name}2-gl
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2_gl-*.so.*
%files stc
%defattr(-,root,root,-)
%doc contrib/src/stc/README.txt
%{_libdir}/libwx_gtk_stc-*.so.*
%files -n %{name}2-stc
%defattr(-,root,root,-)
%doc contrib/src/stc/README.txt
%{_libdir}/libwx_gtk2_stc-*.so.*
%files xrc
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk_xrc-*.so.*
%files -n %{name}2-xrc
%defattr(-,root,root,-)
%{_libdir}/libwx_gtk2_xrc-*.so.*
%changelog
* Fri Jan 6 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-15
- spec file cleanups
* Mon Aug 15 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-14
- Make all packages Provide their old name = r-v
* Sat Aug 13 2005 Tom "spot" Callaway <tcallawa at redhat.com> - 2.4.2-13
- take ownership
- rename to "compat-wxGTK"
- add dist tag
* Sun May 8 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.4.2-12
- sed -i -e 's|/usr/lib\b|%%{_libdir}|' in configure also to fix
x86_64
* Sat May 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.2-11
- Add BR libGL and libGLU to fix FC4 build failure
(alternatively use xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU).
* Fri Apr 22 2005 Dams <anvil[AT]livna.org> - 2.4.2-10
- Added patch from Ignacio and Denis to fix build with gcc4
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
- rebuilt
* Sun Jan 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4.2-8
- Fix wx-config for x86_64 (#145508).
- Honor $RPM_OPT_FLAGS better, as well as %%{__cc} and %%{__cxx}.
* Mon Dec 6 2004 Ville Skyttä <ville.skytta at iki.fi> - 2.4.2-7
- Patch to avoid aclocal >= 1.8 warnings from wxwin.m4.
- Move unversioned *.so links for -gl, -stc and -xrc to -devel, make -devel
require them.
* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 2.4.2-6
- Bump release to provide Extras upgrade path.
- Fix spaces/tabs in spec.
- Remove unneeded zero epochs.
- Add full source URL.
* Tue Jun 22 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4.2-0.fdr.2
- s/wxWindows/wxWidgets/
- Fix release tag.
* Sat May 22 2004 Noa Resare <noa at resare.com> - 0:2.4.2-0.fdr.1.3
- Merged fix from wxGTK cvs head, now works with recent gtk2
* Sat Oct 11 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4.2-0.fdr.1
- Update to 2.4.2.
* Mon Aug 4 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4.1-0.fdr.4
- Borrow Matthias Saou's -gl and -stc subpackages.
* Mon Jun 16 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.3
- Removed libwx_gtk2_xrc*so* from wxGTK2/wxGTK2-devel packages
* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.2
- Removed *-devel postun scriptlets (from Ville Skyttä)
* Sat Jun 14 2003 Dams <anvil[AT]livna.org> 0:2.4.1-0.fdr.1
- Updated to 2.4.1
* Wed May 28 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.7
- Added xrc contrib in separate packages
* Wed May 21 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.6
- Corrected typo in postun devel
* Wed May 21 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4.0-0.fdr.5
- Make -devel packages require the corresponding GTK devel package.
- Save .spec in UTF-8.
- Fixes from Dams:
- Don't build --with-unicode, it breaks stuff (as was already noted by Dams).
- Don't remove wx-config symlinks on upgrades.
- Remove duplicates from docs.
* Tue May 20 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4.0-0.fdr.4
- Split into subpackages, spec file rewrite.
- Use bzipped upstream tarball.
- Clean up BuildRequirement versions.
* Fri May 9 2003 Dams <anvil[AT]livna.org> 0:2.4.0-0.fdr.3
- Now build/include both gtk/gtk2 libs
- buildroot -> RPM_BUILD_ROOT
* Mon Mar 3 2003 Dams <anvil at livna.org>
- Initial build.
- Disable unicode as it breaks lmule
- use the %find_lang macro for locale
wxGTK-2.4.2-aclocal18.patch:
--- NEW FILE wxGTK-2.4.2-aclocal18.patch ---
--- wxwin.m4~ 2003-09-21 14:31:27.000000000 +0300
+++ wxwin.m4 2004-12-06 11:33:44.097041699 +0200
@@ -33,7 +33,7 @@
dnl command line options
dnl ---------------------------------------------------------------------------
-AC_DEFUN(AM_OPTIONS_WXCONFIG,
+AC_DEFUN([AM_OPTIONS_WXCONFIG],
[
AC_ARG_WITH(wx-prefix, [ --with-wx-prefix=PREFIX Prefix where wxWindows is installed (optional)],
wx_config_prefix="$withval", wx_config_prefix="")
@@ -56,7 +56,7 @@
dnl
dnl Get the cflags and libraries from the wx-config script
dnl
-AC_DEFUN(AM_PATH_WXCONFIG,
+AC_DEFUN([AM_PATH_WXCONFIG],
[
dnl do we have wx-config name: it can be wx-config or wxd-config or ...
if test x${WX_CONFIG_NAME+set} != xset ; then
wxGTK-2.4.2-gcc4.patch:
--- NEW FILE wxGTK-2.4.2-gcc4.patch ---
--- wxGTK-2.4.2/contrib/src/xrc/xml.cpp.gcc4 2003-09-21 07:32:56.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/xrc/xml.cpp 2005-04-15 06:59:47.000000000 -0400
@@ -354,8 +354,8 @@
#else
if ( conv )
{
- size_t nLen = (len != wxSTRING_MAXLEN) ? len :
- nLen = wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0);
+ size_t nLen = ((len != wxSTRING_MAXLEN) ? len :
+ wxConvUTF8.MB2WC((wchar_t*) NULL, s, 0));
wchar_t *buf = new wchar_t[nLen+1];
wxConvUTF8.MB2WC(buf, s, nLen);
--- wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c.gcc4 2003-09-21 07:32:54.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/xrc/expat/xmlparse/xmlparse.c 2005-04-15 06:59:47.000000000 -0400
@@ -203,8 +203,10 @@
static enum XML_Error
doProlog(XML_Parser parser, const ENCODING *enc, const char *s,
const char *end, int tok, const char *next, const char **nextPtr);
+#ifdef XML_DTD
static enum XML_Error
processInternalParamEntity(XML_Parser parser, ENTITY *entity);
+#endif /* XML_DTD */
static enum XML_Error
doContent(XML_Parser parser, int startTagLevel, const ENCODING *enc,
const char *start, const char *end, const char **endPtr);
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx.gcc4 2003-09-21 07:32:47.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/Document.cxx 2005-04-15 06:59:47.000000000 -0400
@@ -850,6 +850,7 @@
DocumentIndexer(Document *pdoc_, int end_) :
pdoc(pdoc_), end(end_) {
}
+ virtual ~DocumentIndexer() {};
virtual char CharAt(int index) {
if (index < 0 || index >= end)
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h.gcc4 2003-09-21 07:32:50.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/ExternalLexer.h 2005-04-15 06:59:47.000000000 -0400
@@ -38,6 +38,7 @@
strncpy(name, languageName_, sizeof(name));
languageName = name;
};
+ virtual ~ExternalLexerModule() {};
virtual void Lex(unsigned int startPos, int lengthDoc, int initStyle,
WordList *keywordlists[], Accessor &styler) const;
virtual void Fold(unsigned int startPos, int lengthDoc, int initStyle,
--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h.gcc4 2003-09-21 07:32:50.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.h 2005-04-15 06:59:47.000000000 -0400
@@ -20,6 +20,7 @@
class CharacterIndexer {
public:
virtual char CharAt(int index)=0;
+ virtual ~CharacterIndexer() {};
};
class RESearch {
--- wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h.gcc4 2003-09-21 07:32:47.000000000 -0400
+++ wxGTK-2.4.2/contrib/src/stc/scintilla/include/KeyWords.h 2005-04-15 06:59:47.000000000 -0400
@@ -29,6 +29,7 @@
LexerModule(int language_, LexerFunction fnLexer_,
const char *languageName_=0, LexerFunction fnFolder_=0,
const char * const wordListDescriptions_[] = NULL);
+ virtual ~LexerModule() {};
int GetLanguage() const { return language; }
// -1 is returned if no WordList information is available
--- wxGTK-2.4.2/src/common/dircmn.cpp.gcc4 2003-09-21 07:31:39.000000000 -0400
+++ wxGTK-2.4.2/src/common/dircmn.cpp 2005-04-15 06:59:47.000000000 -0400
@@ -147,6 +147,7 @@
{
public:
wxDirTraverserSimple(wxArrayString& files) : m_files(files) { }
+ virtual ~wxDirTraverserSimple() {};
virtual wxDirTraverseResult OnFile(const wxString& filename)
{
--- wxGTK-2.4.2/src/common/xpmdecod.cpp.gcc4 2003-09-21 07:31:39.000000000 -0400
+++ wxGTK-2.4.2/src/common/xpmdecod.cpp 2005-04-15 14:06:53.000000000 -0400
@@ -669,7 +669,7 @@
wxChar key[64];
const char *clr_def;
bool hasMask;
- wxXPMColourMapData clr_data;
+ wxXPMColourMapData clr_data = {0, 0, 0};
wxXPMColourMap clr_tbl;
/*
@@ -712,7 +712,7 @@
}
else
{
- bool isNone;
+ bool isNone = false;
if ( !GetRGBFromName(clr_def, &isNone,
&clr_data.R, &clr_data.G, &clr_data.B) )
{
--- wxGTK-2.4.2/src/unix/mimetype.cpp.gcc4 2003-09-21 07:31:40.000000000 -0400
+++ wxGTK-2.4.2/src/unix/mimetype.cpp 2005-04-15 06:59:47.000000000 -0400
@@ -1580,7 +1580,7 @@
{
// now got a file we can write to ....
wxMimeTypeCommands * entries = m_aEntries[index];
- size_t iOpen;
+ size_t iOpen = 0;
wxString sCmd = entries->GetCommandForVerb(_T("open"), &iOpen);
wxString sTmp;
--- wxGTK-2.4.2/include/wx/statline.h.gcc4 2003-09-21 07:31:35.000000000 -0400
+++ wxGTK-2.4.2/include/wx/statline.h 2005-04-15 06:59:47.000000000 -0400
@@ -39,6 +39,7 @@
public:
// constructor
wxStaticLineBase() { }
+ virtual ~wxStaticLineBase() {};
// is the line vertical?
bool IsVertical() const { return (GetWindowStyle() & wxLI_VERTICAL) != 0; }
--- wxGTK-2.4.2/include/wx/datetime.h.gcc4 2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/datetime.h 2005-04-15 06:59:47.000000000 -0400
@@ -1300,6 +1300,7 @@
{
friend class wxDateTimeHolidaysModule;
public:
+ virtual ~wxDateTimeHolidayAuthority() {};
// returns TRUE if the given date is a holiday
static bool IsHoliday(const wxDateTime& dt);
@@ -1340,6 +1341,8 @@
// the holidays for this class are all Saturdays and Sundays
class WXDLLEXPORT wxDateTimeWorkDays : public wxDateTimeHolidayAuthority
{
+public:
+ virtual ~wxDateTimeWorkDays() {};
protected:
virtual bool DoIsHoliday(const wxDateTime& dt) const;
virtual size_t DoGetHolidaysInRange(const wxDateTime& dtStart,
--- wxGTK-2.4.2/include/wx/notebook.h.gcc4 2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/notebook.h 2005-04-15 06:59:47.000000000 -0400
@@ -193,6 +193,7 @@
m_nSel = nSel;
m_nOldSel = nOldSel;
}
+ virtual ~wxNotebookEvent() {};
// accessors
// the currently selected page (-1 if none)
--- wxGTK-2.4.2/include/wx/event.h.gcc4 2003-09-21 07:31:33.000000000 -0400
+++ wxGTK-2.4.2/include/wx/event.h 2005-04-15 06:59:47.000000000 -0400
@@ -1952,6 +1952,7 @@
: wxEventTableEntryBase(id, idLast, fn, data),
m_eventType(evType)
{ }
+ virtual ~wxEventTableEntry() {};
// the reference to event type: this allows us to not care about the
// (undefined) order in which the event table entries and the event types
--- wxGTK-2.4.2/include/wx/geometry.h.gcc4 2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/geometry.h 2005-04-15 06:59:47.000000000 -0400
@@ -785,6 +785,7 @@
class wxTransform2D
{
public :
+ virtual ~wxTransform2D() {};
virtual void Transform( wxPoint2DInt* pt )const = 0;
virtual void Transform( wxRect2DInt* r ) const;
virtual wxPoint2DInt Transform( const wxPoint2DInt &pt ) const;
--- wxGTK-2.4.2/include/wx/list.h.gcc4 2003-09-21 07:31:34.000000000 -0400
+++ wxGTK-2.4.2/include/wx/list.h 2005-04-15 14:05:22.000000000 -0400
@@ -384,6 +384,7 @@
T *data = (T *)NULL, \
const wxListKey& key = wxDefaultListKey) \
: wxNodeBase(list, previous, next, data, key) { } \
+ virtual ~nodetype() {}; \
\
nodetype *GetNext() const \
{ return (nodetype *)wxNodeBase::GetNext(); } \
@@ -410,6 +411,7 @@
\
name& operator=(const name& list) \
{ (void) wxListBase::operator=(list); return *this; } \
+ virtual ~name() {}; \
\
nodetype *GetFirst() const \
{ return (nodetype *)wxListBase::GetFirst(); } \
--- wxGTK-2.4.2/include/wx/radiobox.h.gcc4 2003-09-21 07:31:35.000000000 -0400
+++ wxGTK-2.4.2/include/wx/radiobox.h 2005-04-15 06:59:47.000000000 -0400
@@ -35,6 +35,7 @@
class WXDLLEXPORT wxRadioBoxBase
{
public:
+ virtual ~wxRadioBoxBase() {};
// selection
virtual void SetSelection(int n) = 0;
virtual int GetSelection() const = 0;
--- wxGTK-2.4.2/include/wx/caret.h.gcc4 2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/caret.h 2005-04-15 06:59:47.000000000 -0400
@@ -60,6 +60,7 @@
(void)Create(window, size);
}
+ virtual ~wxCaretBase() {};
// Create() functions - same as ctor but returns the success code
// --------------------------------------------------------------
--- wxGTK-2.4.2/include/wx/dir.h.gcc4 2003-09-21 07:31:32.000000000 -0400
+++ wxGTK-2.4.2/include/wx/dir.h 2005-04-15 06:59:47.000000000 -0400
@@ -52,6 +52,7 @@
class WXDLLEXPORT wxDirTraverser
{
public:
+ virtual ~wxDirTraverser() {};
// called for each file found by wxDir::Traverse()
//
// return wxDIR_STOP or wxDIR_CONTINUE from here
--- wxGTK-2.4.2/include/wx/clipbrd.h.gcc4 2003-09-21 07:31:30.000000000 -0400
+++ wxGTK-2.4.2/include/wx/clipbrd.h 2005-04-15 06:59:47.000000000 -0400
@@ -39,6 +39,7 @@
{
public:
wxClipboardBase();
+ virtual ~wxClipboardBase() {};
// open the clipboard before Add/SetData() and GetData()
virtual bool Open() = 0;
--- wxGTK-2.4.2/src/common/sckfile.cpp.orig 2005-04-16 16:50:11.000000000 -0700
+++ wxGTK-2.4.2/src/common/sckfile.cpp 2005-04-16 16:50:14.000000000 -0700
@@ -9,7 +9,7 @@
// Licence: wxWindows license
/////////////////////////////////////////////////////////////////////////////
#ifdef __GNUG__
-#pragma implementation "sckfile.h"
+#pragma implementation "file.h"
#endif
// For compilers that support precompilation, includes "wx.h".
wxGTK-2.4.2-privates.patch:
--- NEW FILE wxGTK-2.4.2-privates.patch ---
diff -ur wxGTK-2.4.2.vanilla/src/gtk/menu.cpp wxGTK-2.4.2/src/gtk/menu.cpp
--- wxGTK-2.4.2.vanilla/src/gtk/menu.cpp 2003-09-21 13:31:57.000000000 +0200
+++ wxGTK-2.4.2/src/gtk/menu.cpp 2004-05-22 20:57:58.753013328 +0200
@@ -30,13 +30,13 @@
#ifdef __WXGTK20__
#include <glib-object.h>
- #define gtk_accel_group_attach(g, o) _gtk_accel_group_attach((g), (o))
- #define gtk_accel_group_detach(g, o) _gtk_accel_group_detach((g), (o))
+ #define gtk_accel_group_attach(g, o) gtk_window_add_accel_group((o), (g))
+ #define gtk_accel_group_detach(g, o) gtk_window_remove_accel_group((o), (g))
#define gtk_menu_ensure_uline_accel_group(m) gtk_menu_get_accel_group(m)
- #define ACCEL_OBJECT GObject
+ #define ACCEL_OBJECT GtkWindow
#define ACCEL_OBJECTS(a) (a)->acceleratables
- #define ACCEL_OBJ_CAST(obj) G_OBJECT(obj)
+ #define ACCEL_OBJ_CAST(obj) ((GtkWindow*) obj)
#else // GTK+ 1.x
#define ACCEL_OBJECT GtkObject
#define ACCEL_OBJECTS(a) (a)->attach_objects
Endast i wxGTK-2.4.2/src/gtk: menu.cppprivates
diff -ur wxGTK-2.4.2.vanilla/src/gtk/settings.cpp wxGTK-2.4.2/src/gtk/settings.cpp
--- wxGTK-2.4.2.vanilla/src/gtk/settings.cpp 2003-09-21 13:31:57.000000000 +0200
+++ wxGTK-2.4.2/src/gtk/settings.cpp 2004-05-22 20:57:15.330585304 +0200
@@ -340,9 +340,20 @@
}
else
{
- const gchar *font_name =
- _gtk_rc_context_get_default_font_name(gtk_settings_get_default());
- g_systemFont = new wxFont(wxString::FromAscii(font_name));
+ GtkSettings *settings = gtk_settings_get_default();
+ gchar *font_name = NULL;
+ g_object_get ( settings,
+ "gtk-font-name",
+ &font_name,
+ NULL);
+
+ if (!font_name)
+ g_systemFont = new wxFont( 12, wxSWISS, wxNORMAL, wxNORMAL );
+
+ else
+ g_systemFont = new wxFont(wxString::FromAscii(font_name));
+ g_free (font_name);
+
}
gtk_widget_destroy( widget );
#else
Endast i wxGTK-2.4.2/src/gtk: settings.cppprivates
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 6 Jan 2006 16:11:20 -0000 1.1
+++ .cvsignore 6 Jan 2006 16:14:52 -0000 1.2
@@ -0,0 +1 @@
+wxGTK-2.4.2.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 6 Jan 2006 16:11:20 -0000 1.1
+++ sources 6 Jan 2006 16:14:52 -0000 1.2
@@ -0,0 +1 @@
+cdadfe82fc93f8a65a2ae18a95b0b0e3 wxGTK-2.4.2.tar.bz2
More information about the fedora-extras-commits
mailing list