rpms/codeblocks/FC-6 codeblocks-wx28-centre.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 codeblocks-autorev.patch, 1.3, 1.4 codeblocks-wx28-wizard.patch, 1.1, 1.2 codeblocks-wx28-wxsmith.patch, 1.1, 1.2 codeblocks.spec, 1.14, 1.15 sources, 1.14, 1.15
Dan Horak (sharkcz)
fedora-extras-commits at redhat.com
Sun Apr 8 16:13:14 UTC 2007
- Previous message (by thread): rpms/websec/EL-5 websec.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/codeblocks/FC-5 codeblocks-wx28-centre.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 codeblocks-autorev.patch, 1.3, 1.4 codeblocks-wx28-wizard.patch, 1.1, 1.2 codeblocks-wx28-wxsmith.patch, 1.1, 1.2 codeblocks.spec, 1.14, 1.15 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: sharkcz
Update of /cvs/extras/rpms/codeblocks/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28295
Modified Files:
.cvsignore codeblocks-autorev.patch
codeblocks-wx28-wizard.patch codeblocks-wx28-wxsmith.patch
codeblocks.spec sources
Added Files:
codeblocks-wx28-centre.patch
Log Message:
- update to revision 3816
codeblocks-wx28-centre.patch:
--- NEW FILE codeblocks-wx28-centre.patch ---
Index: src/sdk/globals.cpp
===================================================================
--- src/sdk/globals.cpp (revision 3800)
+++ src/sdk/globals.cpp (working copy)
@@ -872,7 +872,11 @@
if(the_mode == pdlCentre || the_mode == pdlHead)
{
+#if wxCHECK_VERSION(2, 8, 0)
+ w->Centre(wxBOTH | wxCENTRE_ON_SCREEN);
+#else
w->CentreOnScreen();
+#endif
return;
}
else
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 13 Feb 2007 16:01:49 -0000 1.14
+++ .cvsignore 8 Apr 2007 16:12:40 -0000 1.15
@@ -1 +1 @@
-codeblocks-svn3592.tar.bz2
+codeblocks-svn3816.tar.bz2
codeblocks-autorev.patch:
Index: codeblocks-autorev.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-autorev.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- codeblocks-autorev.patch 13 Feb 2007 16:01:49 -0000 1.3
+++ codeblocks-autorev.patch 8 Apr 2007 16:12:40 -0000 1.4
@@ -16,11 +16,11 @@
# Deal with some gentoo-specific issues
WANT_AUTOMAKE='1.9 1.8 1.7' #latest of these is chosen or default if none hits
export WANT_AUTOMAKE
---- src/Makefile.am.orig 2006-10-15 10:11:04.000000000 +0200
-+++ src/Makefile.am 2006-10-15 10:11:09.000000000 +0200
+--- src/Makefile.am.orig 2007-02-13 12:28:07.000000000 +0100
++++ src/Makefile.am 2007-02-27 09:57:47.000000000 +0100
@@ -1,4 +1,4 @@
--SUBDIRS = build_tools sdk src plugins tools setup templates scripts wxsmith
-+SUBDIRS = sdk src plugins tools setup templates scripts wxsmith
+-SUBDIRS = base build_tools include sdk src plugins tools setup templates scripts wxsmith
++SUBDIRS = base include sdk src plugins tools setup templates scripts wxsmith
dist_pkgdata_DATA = tips.txt
codeblocks-wx28-wizard.patch:
Index: codeblocks-wx28-wizard.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-wx28-wizard.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-wx28-wizard.patch 13 Feb 2007 16:01:49 -0000 1.1
+++ codeblocks-wx28-wizard.patch 8 Apr 2007 16:12:40 -0000 1.2
@@ -1,17 +1,19 @@
-Index: src/plugins/scriptedwizard/wiz.cpp
+Index: wiz.cpp
===================================================================
---- src/plugins/scriptedwizard/wiz.cpp (revision 3562)
+--- src/plugins/scriptedwizard/wiz.cpp (revision 3800)
+++ src/plugins/scriptedwizard/wiz.cpp (working copy)
-@@ -1001,8 +1001,12 @@
+@@ -1023,12 +1023,8 @@
wxWizardPageSimple::Chain(m_Pages[i - 1], m_Pages[i]);
// allow the wizard to size itself around the pages
-+#if wxCHECK_VERSION(2, 8, 0)
-+ m_pWizard->GetPageAreaSizer()->Add(m_Pages[0]);
-+#else
- for (size_t i = 1; i < m_Pages.GetCount(); ++i)
- m_pWizard->GetPageAreaSizer()->Add(m_Pages[i]);
-+#endif
+- #if wxCHECK_VERSION(2, 8, 0)
+- m_pWizard->GetPageAreaSizer()->Add(m_Pages[0]);
+- #else
+- for (size_t i = 1; i < m_Pages.GetCount(); ++i)
+- m_pWizard->GetPageAreaSizer()->Add(m_Pages[i]);
+- #endif
++ for (size_t i = 0; i < m_Pages.GetCount(); ++i)
++ m_pWizard->GetPageAreaSizer()->Add(m_Pages[i]);
m_pWizard->Fit();
}
codeblocks-wx28-wxsmith.patch:
Index: codeblocks-wx28-wxsmith.patch
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks-wx28-wxsmith.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- codeblocks-wx28-wxsmith.patch 26 Jan 2007 13:29:37 -0000 1.1
+++ codeblocks-wx28-wxsmith.patch 8 Apr 2007 16:12:40 -0000 1.2
@@ -1,20 +1,3 @@
-Index: src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsguiconfigpanel.cpp
-===================================================================
---- src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsguiconfigpanel.cpp (revision 3526)
-+++ src/plugins/contrib/wxSmith/wxwidgets/wxwidgetsguiconfigpanel.cpp (working copy)
-@@ -128,7 +128,11 @@
- _("XRC files (*.xrc)|*.xrc|"
- "Zipped files (*.zip)|*.zip|"
- "All files (*)|*"),
-- wxOPEN|wxFILE_MUST_EXIST|wxHIDE_READONLY);
-+ wxOPEN|wxFILE_MUST_EXIST
-+#if (WXWIN_COMPATIBILITY_2_4)
-+ |wxHIDE_READONLY
-+#endif
-+ );
-
- if ( !FileName.empty() )
- {
Index: src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsnotebook.cpp
===================================================================
--- src/plugins/contrib/wxSmith/wxwidgets/defitems/wxsnotebook.cpp (revision 3526)
@@ -58,69 +41,3 @@
#include "../wxscodinglang.h"
#include <wx/dynarray.h>
-Index: src/plugins/contrib/wxSmith/wxwidgets/properties/wxsfontproperty.cpp
-===================================================================
---- src/plugins/contrib/wxSmith/wxwidgets/properties/wxsfontproperty.cpp (revision 3526)
-+++ src/plugins/contrib/wxSmith/wxwidgets/properties/wxsfontproperty.cpp (working copy)
-@@ -39,10 +39,15 @@
- wxString Face;
- wxFontEnumerator Enumer;
- Enumer.EnumerateFacenames();
-+#if wxCHECK_VERSION(2, 8, 0)
-+ wxArrayString faceNames = Enumer.GetFacenames();
-+#else
-+ wxArrayString& faceNames = *Enumer.GetFacenames();
-+#endif
- size_t Count = Faces.Count();
- for ( size_t i = 0; i<Count; i++ )
- {
-- if ( Enumer.GetFacenames()->Index(Faces[i]) != wxNOT_FOUND )
-+ if ( faceNames.Index(Faces[i]) != wxNOT_FOUND )
- {
- Face = Faces[i];
- break;
-Index: src/plugins/contrib/wxSmith/wxwidgets/properties/wxsarraystringcheckproperty.h
-===================================================================
---- src/plugins/contrib/wxSmith/wxwidgets/properties/wxsarraystringcheckproperty.h (revision 3526)
-+++ src/plugins/contrib/wxSmith/wxwidgets/properties/wxsarraystringcheckproperty.h (working copy)
-@@ -3,7 +3,11 @@
-
- #include "../../properties/wxsproperties.h"
-
--WX_DEFINE_ARRAY(bool,wxArrayBool);
-+#if wxCHECK_VERSION(2, 8, 0)
-+ WX_DEFINE_ARRAY_INT(bool,wxArrayBool);
-+#else
-+ WX_DEFINE_ARRAY(bool,wxArrayBool);
-+#endif
-
- /** \brief Property for editing arrays of strings with checked option
- *
-Index: src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.cpp
-===================================================================
---- src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.cpp (revision 3526)
-+++ src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.cpp (working copy)
-@@ -88,3 +88,9 @@
-
- EndModal(wxID_OK);
- }
-+#if wxCHECK_VERSION(2, 8, 0)
-+void wxsArrayStringEditorDlg::OnCancel(wxCommandEvent& event)
-+{
-+ EndModal(wxID_CANCEL);
-+}
-+#endif
-Index: src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.h
-===================================================================
---- src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.h (revision 3526)
-+++ src/plugins/contrib/wxSmith/properties/wxsarraystringeditordlg.h (working copy)
-@@ -27,6 +27,9 @@
-
- //(*Handlers(wxsArrayStringEditorDlg)
- void OnOK(wxCommandEvent& event);
-+#if wxCHECK_VERSION(2, 8, 0)
-+ void OnCancel(wxCommandEvent& event);
-+#endif
- //*)
-
- //(*Declarations(wxsArrayStringEditorDlg)
Index: codeblocks.spec
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/codeblocks.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- codeblocks.spec 13 Feb 2007 16:01:49 -0000 1.14
+++ codeblocks.spec 8 Apr 2007 16:12:40 -0000 1.15
@@ -1,9 +1,9 @@
-%define rev 3592
-%define date 20070211
+%define rev 3816
+%define date 20070406
Name: codeblocks
Version: 1.0
-Release: 0.23.%{date}svn%{rev}%{?dist}
+Release: 0.24.%{date}svn%{rev}%{?dist}
Summary: An open source, cross platform, free C++ IDE
Group: Development/Tools
License: GPL
@@ -21,8 +21,9 @@
Patch2: codeblocks-desktop.patch
Patch3: codeblocks-autorev.patch
Patch100: codeblocks-wx28-listbook.patch
-Patch101: codeblocks-wx28-wxsmith.patch
+Patch101: codeblocks-wx28-centre.patch
Patch102: codeblocks-wx28-wizard.patch
+Patch103: codeblocks-wx28-wxsmith.patch
Source100: codeblocks-getsvn
%description
@@ -70,6 +71,7 @@
%patch100
%patch101
%patch102
+%patch103
%build
find . -type f -and -not -name "*.cpp" -and -not -name "*.h" -and -not -name "*.png" -and -not -name "*.bmp" -and -not -name "*.c" -and -not -name "*.cxx" -and -not -name "*.ico" | sed "s/.*/\"\\0\"/" | xargs dos2unix &> /dev/null
@@ -173,12 +175,10 @@
%{plugindir}/libscriptedwizard.so
%{plugindir}/libtodo.so
-%{_datadir}/application-registry/%{name}.applications
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/gnome/48x48/mimetypes/*.png
-%{_datadir}/mime-info/*
-%{_datadir}/mime/packages/codeblocks.xml
-%{_datadir}/pixmaps/codeblocks.png
+%{_datadir}/mime/packages/%{name}.xml
+%{_datadir}/pixmaps/%{name}.png
%dir %{pkgdatadir}
%{pkgdatadir}/icons
@@ -250,6 +250,9 @@
%changelog
+* Sat Apr 7 2007 Dan Horak <dan[at]danny.cz> 1.0-0.24.20070406svn3816
+- update to revision 3816
+
* Tue Feb 13 2007 Dan Horak <dan[at]danny.cz> 1.0-0.23.20070211svn3592
- update the autorev.patch
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/codeblocks/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 13 Feb 2007 16:01:49 -0000 1.14
+++ sources 8 Apr 2007 16:12:40 -0000 1.15
@@ -1 +1 @@
-7c3e8b377cb4df9817b55a609e853a0c codeblocks-svn3592.tar.bz2
+2c9f245d2c91034028c9e52930e00be9 codeblocks-svn3816.tar.bz2
- Previous message (by thread): rpms/websec/EL-5 websec.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/codeblocks/FC-5 codeblocks-wx28-centre.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 codeblocks-autorev.patch, 1.3, 1.4 codeblocks-wx28-wizard.patch, 1.1, 1.2 codeblocks-wx28-wxsmith.patch, 1.1, 1.2 codeblocks.spec, 1.14, 1.15 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list