Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Andraž Levstik (e71768c16d3b7895ada5c20c3ae7359a70e30d10)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Andraž Levstik <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Andraž Levstik (e71768c16d3b7895ada5c20c3ae7359a70e30d10)
  • Date: Sun, 7 Oct 2007 14:48:22 -0500

GIT changes to master grimoire by Andraž Levstik <ruskie AT mages.ath.cx>:

x11-toolkits/wxgtk-no-unicode/DEPENDS | 4
x11-toolkits/wxgtk-no-unicode/DETAILS | 3
x11-toolkits/wxgtk-no-unicode/HISTORY | 12
x11-toolkits/wxgtk-no-unicode/PRE_BUILD | 12
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.1-contrib.patch | 13
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-cleanup.patch | 446
++++++++++
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-contrib_animate.patch | 10
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch | 11
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-menu.cpp.patch | 45 +
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-noftinternals.patch | 44
x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-pango_fix.patch | 14
11 files changed, 598 insertions(+), 16 deletions(-)

New commits:
commit 17b7aeeee259a3db00c4da9388343bb255a26a52
Author: Andraž Levstik <ruskie AT mages.ath.cx>
Commit: Andraž Levstik <ruskie AT mages.ath.cx>

wxgtk-no-unicode: various patches from gentoo that just make it work a
lot better, if anyone wants to see if any are optional/not needed feel
free to do so

diff --git a/x11-toolkits/wxgtk-no-unicode/DEPENDS
b/x11-toolkits/wxgtk-no-unicode/DEPENDS
index 9785cde..492fb75 100755
--- a/x11-toolkits/wxgtk-no-unicode/DEPENDS
+++ b/x11-toolkits/wxgtk-no-unicode/DEPENDS
@@ -1,6 +1,4 @@
-depends gcc34 &&
-
- depends gtk+ &&
+depends gtk+2 '--enable-gtk2' &&

depends X11-LIBS '--with-x --with-libxpm' &&

diff --git a/x11-toolkits/wxgtk-no-unicode/DETAILS
b/x11-toolkits/wxgtk-no-unicode/DETAILS
index 90f0416..20e91ff 100755
--- a/x11-toolkits/wxgtk-no-unicode/DETAILS
+++ b/x11-toolkits/wxgtk-no-unicode/DETAILS
@@ -1,7 +1,7 @@
SPELL=wxgtk-no-unicode
SPELLX=wxAll
VERSION=2.4.2
-
SOURCE_HASH=sha512:19cc25c933411fb71369e35584f6b7daa454b79d6d91a38f81501cd5a318fffd423f010d9ec3db856222badee6b58c0d3b6d023326b2d19a48c1b4b846774894
+
SOURCE_HASH=sha512:19cc25c933411fb71369e35584f6b7daa454b79d6d91a38f81501cd5a318fffd423f010d9ec3db856222badee6b58c0d3b6d023326b2d19a48c1b4b846774894
SOURCE=$SPELLX-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/wxWindows-${VERSION}
SOURCE_URL[0]=$SOURCEFORGE_URL/wxwindows/$SOURCE
@@ -9,7 +9,6 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/wxWindows-${VERSION}
WEB_SITE=http://www.wxwidgets.org/
ENTERED=20011217
TMPFS=off
- GCC_VERSION=3.4
KEYWORDS="x11 libs"
SHORT='GTK+ verion of wxWidgets API'
cat << EOF
diff --git a/x11-toolkits/wxgtk-no-unicode/HISTORY
b/x11-toolkits/wxgtk-no-unicode/HISTORY
index 20497eb..e2b4394 100644
--- a/x11-toolkits/wxgtk-no-unicode/HISTORY
+++ b/x11-toolkits/wxgtk-no-unicode/HISTORY
@@ -1,3 +1,15 @@
+2007-10-07 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: no more use of gcc 3.4
+ * DEPENDS: use gtk+2, no more gcc 3.4
+ * PRE_BUILD: added to apply patches
+ * wxGTK-2.4.1-contrib.patch: various cleanups
+ * wxGTK-2.4.2-cleanup.patch: various cleanups
+ * wxGTK-2.4.2-contrib_animate.patch: various cleanups
+ * wxGTK-2.4.2-gcc4.patch: fixes to build against gcc 4
+ * wxGTK-2.4.2-menu.cpp.patch: various cleanups
+ * wxGTK-2.4.2-noftinternals.patch: fixes for freetype update
+ * wxGTK-2.4.2-pango_fix.patch: fixes for pango
+
2007-03-12 Juuso Alasuutari <iuso AT sourcemage.org>
* DETAILS: Added GCC_VERSION=3.4, audacity 1.2.6 won't build
with patched wxgtk-no-unicode.
diff --git a/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
b/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
new file mode 100755
index 0000000..b73fec0
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/PRE_BUILD
@@ -0,0 +1,12 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-menu.cpp.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.4.1-contrib.patch &&
+pushd contrib/src &&
+patch -p0 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-contrib_animate.patch &&
+popd
+patch -p0 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-pango_fix.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-cleanup.patch &&
+patch -p0 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-gcc4.patch &&
+patch -p1 < ${SPELL_DIRECTORY}/wxGTK-2.4.2-noftinternals.patch
+
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.1-contrib.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.1-contrib.patch
new file mode 100644
index 0000000..6332e0e
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.1-contrib.patch
@@ -0,0 +1,13 @@
+--- wxGTK-2.4.1/contrib/src/xrc/Makefile.in 2003-09-09 16:46:13.468009816
+0100
++++ wxGTK-2.4.1/contrib/src/xrc/Makefile.in 2003-09-09 16:46:50.065446160
+0100
+@@ -17,7 +17,9 @@
+ HEADER_SUBDIR=xrc
+
+ EXPAT_DEFS=-I$(expat_dir)/xmlparse -I$(expat_dir)/xmltok
+-EXPAT_OBJECTS=xmltok.o xmlrole.o xmlparse.o
++EXPAT_OBJECTS=$(expat_dir)/xmltok/xmltok.o \
++ $(expat_dir)/xmltok/xmlrole.o \
++ $(expat_dir)/xmlparse/xmlparse.o
+
+ HEADERS=xh_all.h xh_bttn.h xh_chckb.h xh_chckl.h xh_choic.h xh_combo.h \
+ xh_dlg.h xh_gauge.h xh_html.h xh_menu.h xh_notbk.h xh_panel.h \
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-cleanup.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-cleanup.patch
new file mode 100644
index 0000000..b75b5e6
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-cleanup.patch
@@ -0,0 +1,446 @@
+diff -ur wxGTK-2.4.2/contrib/include/wx/fl/controlbar.h
wxGTK-2.4.2-fixed/contrib/include/wx/fl/controlbar.h
+--- wxGTK-2.4.2/contrib/include/wx/fl/controlbar.h 2003-09-21
07:32:10.000000000 -0400
++++ wxGTK-2.4.2-fixed/contrib/include/wx/fl/controlbar.h 2003-11-10
16:54:25.840115752 -0500
+@@ -825,7 +825,8 @@
+ };
+
+ // FIXME: this array definition compiles but probably doesn't do what was
intended (GD)
+-WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat);
++//WXFL_DEFINE_ARRAY_LONG(float, cbArrayFloat);
++WXFL_DEFINE_ARRAY_LONG(long, cbArrayFloat);
+
+ /*
+ Helper class used internally by the wxFrameLayout class.
+diff -ur wxGTK-2.4.2/contrib/src/canvas/canvas.cpp
wxGTK-2.4.2-fixed/contrib/src/canvas/canvas.cpp
+--- wxGTK-2.4.2/contrib/src/canvas/canvas.cpp 2003-09-21 07:32:40.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/canvas/canvas.cpp 2003-11-10
16:43:15.910960464 -0500
+@@ -325,7 +325,7 @@
+
+ if ( rightu - leftu < 2*recold.width && bottomu - topu <
2*recold.height)
+ {
+- dc.Blit(leftu,topu,rightu - leftu,bottomu -
topu,&dcm,leftu,topu,wxCOPY,FALSE);
++ dc.Blit((int)leftu,(int)topu,(int)(rightu -
leftu),(int)(bottomu - topu),&dcm,(int)leftu,(int)topu,wxCOPY,FALSE);
+ }
+ else
+ {
+@@ -1280,7 +1280,7 @@
+ int pw=m_pen.GetWidth();
+ m_pen.SetWidth(m_admin->LogicalToDeviceXRel(pw));
+ dc->SetPen( m_pen );
+- dc->DrawLine( x1, y1, x2, y2 );
++ dc->DrawLine( (int)x1, (int)y1, (int)x2, (int)y2 );
+
+ dc->DestroyClippingRegion();
+ m_pen.SetWidth(pw);
+@@ -1467,7 +1467,7 @@
+ else
+ {
+ dc->SetClippingRegion( clip_x, clip_y, clip_width, clip_height );
+- dc->DrawBitmap( bmp, x, y, TRUE );
++ dc->DrawBitmap( bmp, (int)x, (int)y, TRUE );
+ dc->DestroyClippingRegion();
+ }
+ }
+@@ -2548,14 +2548,14 @@
+ double dmvx = m_virtm_maxX - m_virtm_minX;
+ double dmvy = m_virtm_maxY - m_virtm_minY;
+
+- SetScrollbar(wxHORIZONTAL,(m_virt_minX-m_virtm_minX)/dmvx
*1000,dvx/dmvx *1000,1000,FALSE);
++ SetScrollbar(wxHORIZONTAL,(int)((m_virt_minX-m_virtm_minX)/dmvx
*1000),(int)(dvx/dmvx *1000),1000,FALSE);
+ if (m_yaxis)
+ {
+- SetScrollbar(wxVERTICAL,(m_virtm_maxY-m_virt_maxY)/dmvy
*1000,dvy/dmvy *1000,1000,FALSE);
++ SetScrollbar(wxVERTICAL,(int)((m_virtm_maxY-m_virt_maxY)/dmvy
*1000),(int)(dvy/dmvy *1000),1000,FALSE);
+ }
+ else
+ {
+- SetScrollbar(wxVERTICAL,(m_virt_minY-m_virtm_minY)/dmvy
*1000,dvy/dmvy *1000,1000,FALSE);
++ SetScrollbar(wxVERTICAL,(int)((m_virt_minY-m_virtm_minY)/dmvy
*1000),(int)(dvy/dmvy *1000),1000,FALSE);
+ }
+
+ m_scrolled=TRUE;
+@@ -2628,13 +2628,13 @@
+ {
+ double
x=m_virtm_minX+event.GetPosition()/1000.0*(m_virtm_maxX-m_virtm_minX);
+ x=LogicalToDeviceXRel(x-m_virt_minX);
+- ScrollWindow(-x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)-x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ double
y=m_virtm_minY+event.GetPosition()/1000.0*(m_virtm_maxY-m_virtm_minY);
+ y=LogicalToDeviceYRel(y-m_virt_minY);
+- ScrollWindow(0, -y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)-y, (const wxRect *) NULL);
+ }
+ }
+ else if (event.GetEventType()==wxEVT_SCROLLWIN_PAGEUP)
+@@ -2642,12 +2642,12 @@
+ if (event.GetOrientation()==wxHORIZONTAL)
+ {
+ double x=GetBufferWidth();
+- ScrollWindow(x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ double y=GetBufferHeight();
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ }
+ else if (event.GetEventType()==wxEVT_SCROLLWIN_PAGEDOWN)
+@@ -2655,12 +2655,12 @@
+ if (event.GetOrientation()==wxHORIZONTAL)
+ {
+ double x=-GetBufferWidth();
+- ScrollWindow(x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ double y=-GetBufferHeight();
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ }
+ else if (event.GetEventType()==wxEVT_SCROLLWIN_LINEUP)
+@@ -2668,12 +2668,12 @@
+ if (event.GetOrientation()==wxHORIZONTAL)
+ {
+ int x=GetBufferWidth()/10;
+- ScrollWindow(x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ int y=GetBufferHeight()/10;
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ }
+ else if (event.GetEventType()==wxEVT_SCROLLWIN_LINEDOWN)
+@@ -2681,12 +2681,12 @@
+ if (event.GetOrientation()==wxHORIZONTAL)
+ {
+ int x=-GetBufferWidth()/10;
+- ScrollWindow(x, 0, (const wxRect *) NULL);
++ ScrollWindow((int)x, 0, (const wxRect *) NULL);
+ }
+ else
+ {
+ int y=-GetBufferHeight()/10;
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ }
+
+@@ -2700,28 +2700,28 @@
+ case WXK_PRIOR:
+ {
+ double y=GetBufferHeight();
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ break;
+ case WXK_PAGEDOWN:
+ case WXK_NEXT:
+ {
+ double y=-GetBufferHeight();
+- ScrollWindow(0, y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)y, (const wxRect *) NULL);
+ }
+ break;
+ case WXK_HOME:
+ {
+ double y=m_virtm_minY;
+ y=LogicalToDeviceYRel(y-m_virt_minY);
+- ScrollWindow(0, -y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)-y, (const wxRect *) NULL);
+ }
+ break;
+ case WXK_END:
+ {
+ double y=m_virtm_minY+(m_virtm_maxY-m_virtm_minY);
+ y=LogicalToDeviceYRel(y-m_virt_minY);
+- ScrollWindow(0, -y, (const wxRect *) NULL);
++ ScrollWindow(0, (int)-y, (const wxRect *) NULL);
+ }
+ break;
+ case WXK_UP:
+diff -ur wxGTK-2.4.2/contrib/src/fl/controlbar.cpp
wxGTK-2.4.2-fixed/contrib/src/fl/controlbar.cpp
+--- wxGTK-2.4.2/contrib/src/fl/controlbar.cpp 2003-09-21 07:32:40.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/fl/controlbar.cpp 2003-11-10
20:24:24.019901312 -0500
+@@ -2675,8 +2679,8 @@
+ {
+ if ( !pCur->IsFixed() )
+ {
+- ratios.Add( 0.0 );
+- ratios[ ratios.GetCount() - 1 ] = pCur->mLenRatio;
++ ratios.Add( (long)0.0 );
++ ratios[ ratios.GetCount() - 1 ] = (long)pCur->mLenRatio;
+ }
+
+ pCur = pCur->mpNext;
+diff -ur wxGTK-2.4.2/contrib/src/mmedia/sndcpcm.cpp
wxGTK-2.4.2-fixed/contrib/src/mmedia/sndcpcm.cpp
+--- wxGTK-2.4.2/contrib/src/mmedia/sndcpcm.cpp 2003-09-21 07:32:44.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/mmedia/sndcpcm.cpp 2003-11-10
21:25:18.066401808 -0500
+@@ -51,7 +51,7 @@
+ // -----------------------------------------------------------------------
+
+ #define DEFINE_CONV(name, input_type, output_type, convert) \
+-static void Convert_##name##(const void *buf_in, void *buf_out, wxUint32
len) \
++static void Convert_##name(const void *buf_in, void *buf_out, wxUint32 len)
\
+ {\
+ register input_type src; \
+ register const input_type *t_buf_in = (input_type *)buf_in; \
+diff -ur wxGTK-2.4.2/contrib/src/mmedia/vidxanm.cpp
wxGTK-2.4.2-fixed/contrib/src/mmedia/vidxanm.cpp
+--- wxGTK-2.4.2/contrib/src/mmedia/vidxanm.cpp 2003-09-21 07:32:46.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/mmedia/vidxanm.cpp 2003-11-10
22:21:10.604738512 -0500
+@@ -465,11 +465,13 @@
+ // Get current display
+ #ifdef __WXGTK__
+ m_internal->xanim_dpy = gdk_display;
+- GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow );
+- GdkWindow *window = pizza->bin_window;
++ // GtkPizza *pizza = GTK_PIZZA( m_video_output->m_wxwindow ); // unused
++ // GdkWindow *window = pizza->bin_window; // unused
+
+- m_internal->xanim_window =
+- ((GdkWindowPrivate *)window)->xwindow;
++ /* I think this is what you want. Not to sure. */
++ /* m_internal->xanim_window =
++ ((GdkWindowPrivate *)window)->xwindow; */
++ m_internal->xanim_window = gdk_x11_get_default_root_xwindow();
+ #endif
+ // Get the XANIM atom
+ m_internal->xanim_atom = XInternAtom(m_internal->xanim_dpy,
+@@ -477,7 +479,7 @@
+
+ // Build the command
+ xanim_command.Printf(wxT("xanim -Zr +Ze +Sr +f +W%d +f +q "
+- "+Av70 %s %s"), m_internal->xanim_window,
++ "+Av70 %s %s"), (int)m_internal->xanim_window,
+ (xanim_chg_size) ? _T("") : _T(""),
+ WXSTRINGCAST m_filename);
+
+diff -ur wxGTK-2.4.2/contrib/src/ogl/composit.cpp
wxGTK-2.4.2-fixed/contrib/src/ogl/composit.cpp
+--- wxGTK-2.4.2/contrib/src/ogl/composit.cpp 2003-09-21 07:32:46.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/ogl/composit.cpp 2003-11-10
14:17:19.286169776 -0500
+@@ -1182,8 +1182,8 @@
+ double maxX, maxY;
+
+ GetBoundingBoxMax(&maxX, &maxY);
+- double x, y;
+- int direction;
++ double x = 0.0, y = 0.0;
++ int direction = 0;
+ /*
+ if (m_leftSide)
+ {
+diff -ur wxGTK-2.4.2/contrib/src/ogl/drawn.cpp
wxGTK-2.4.2-fixed/contrib/src/ogl/drawn.cpp
+--- wxGTK-2.4.2/contrib/src/ogl/drawn.cpp 2003-09-21 07:32:47.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/ogl/drawn.cpp 2003-11-10
20:55:51.544953888 -0500
+@@ -430,7 +431,7 @@
+ {
+ // Check for overriding this operation for outline
+ // colour
+- if (m_image->m_outlineColours.Member((wxObject *)m_gdiIndex))
++ if (m_image->m_outlineColours.Member((wxObject *)(long)m_gdiIndex))
+ {
+ if (m_image->m_outlinePen)
+ dc.SetPen(* m_image->m_outlinePen);
+@@ -451,7 +452,7 @@
+ {
+ // Check for overriding this operation for outline or fill
+ // colour
+- if (m_image->m_outlineColours.Member((wxObject *)m_gdiIndex))
++ if (m_image->m_outlineColours.Member((wxObject *)(long)m_gdiIndex))
+ {
+ // Need to construct a brush to match the outline pen's colour
+ if (m_image->m_outlinePen)
+@@ -461,7 +462,7 @@
+ dc.SetBrush(* br);
+ }
+ }
+- else if (m_image->m_fillColours.Member((wxObject *)m_gdiIndex))
++ else if (m_image->m_fillColours.Member((wxObject *)(long)m_gdiIndex))
+ {
+ if (m_image->m_fillBrush)
+ {
+@@ -1828,7 +1833,9 @@
+ bool wxPseudoMetaFile::LoadFromMetaFile(const wxString& filename, double
*rwidth, double *rheight)
+ {
+ if (!wxFileExists(filename))
+- return NULL;
++ // Are you kidding me!?!? bool function returns NULL!?!?
++ // return NULL;
++ return FALSE;
+
+ wxXMetaFile *metaFile = new wxXMetaFile;
+
+@@ -2441,7 +2449,7 @@
+
+ if (isOutline)
+ {
+- m_outlineColours.Append((wxObject*) (n - 1));
++ m_outlineColours.Append((wxObject*) (long)(n - 1));
+ }
+ }
+
+@@ -2456,7 +2464,7 @@
+
+ if (isFill)
+ {
+- m_fillColours.Append((wxObject*) (n - 1));
++ m_fillColours.Append((wxObject*) (long)(n - 1));
+ }
+ }
+
+diff -ur wxGTK-2.4.2/contrib/src/ogl/lines.cpp
wxGTK-2.4.2-fixed/contrib/src/ogl/lines.cpp
+--- wxGTK-2.4.2/contrib/src/ogl/lines.cpp 2003-09-21 07:32:47.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/ogl/lines.cpp 2003-11-10
14:21:33.562513896 -0500
+@@ -601,7 +601,7 @@
+ double positionOnLineX, positionOnLineY;
+
+ // Position of start point of line, at the end of which we draw the arrow.
+- double startPositionX, startPositionY;
++ double startPositionX = 0.0, startPositionY = 0.0;
+
+ switch (arrow->GetPosition())
+ {
+diff -ur wxGTK-2.4.2/contrib/src/stc/scintilla/src/Editor.cxx
wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/Editor.cxx
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/Editor.cxx 2003-09-21
07:32:48.000000000 -0400
++++ wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/Editor.cxx 2003-11-10
15:14:25.429316848 -0500
+@@ -1695,10 +1695,10 @@
+ (ll->styles[numCharsInLine]
== static_cast<char>(styleByte & styleMask));
+ allSame = allSame &&
+
(ll->indicators[numCharsInLine] == static_cast<char>(styleByte & ~styleMask));
+- if
(vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
++ if
(vstyle.styles[(int)ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
+ allSame = allSame &&
+
(ll->chars[numCharsInLine] == static_cast<char>(toupper(chDoc)));
+- else if
(vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseLower)
++ else if
(vstyle.styles[(int)ll->styles[numCharsInLine]].caseForce == Style::caseLower)
+ allSame = allSame &&
+
(ll->chars[numCharsInLine] == static_cast<char>(tolower(chDoc)));
+ else
+@@ -1739,9 +1739,9 @@
+ ll->chars[numCharsInLine] = chDoc;
+ ll->styles[numCharsInLine] =
static_cast<char>(styleByte & styleMask);
+ ll->indicators[numCharsInLine] =
static_cast<char>(styleByte & ~styleMask);
+- if
(vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
++ if
(vstyle.styles[(int)ll->styles[numCharsInLine]].caseForce == Style::caseUpper)
+ ll->chars[numCharsInLine] =
static_cast<char>(toupper(chDoc));
+- else if
(vstyle.styles[ll->styles[numCharsInLine]].caseForce == Style::caseLower)
++ else if
(vstyle.styles[(int)ll->styles[numCharsInLine]].caseForce == Style::caseLower)
+ ll->chars[numCharsInLine] =
static_cast<char>(tolower(chDoc));
+ numCharsInLine++;
+ }
+@@ -1768,7 +1768,7 @@
+ if ((ll->styles[charInLine] != ll->styles[charInLine
+ 1]) ||
+ isControl || isControlNext) {
+ ll->positions[startseg] = 0;
+- if
(vstyle.styles[ll->styles[charInLine]].visible) {
++ if
(vstyle.styles[(int)ll->styles[charInLine]].visible) {
+ if (isControl) {
+ if (ll->chars[charInLine] ==
'\t') {
+
ll->positions[charInLine + 1] = ((((startsegx + 2) /
+@@ -1788,10 +1788,10 @@
+ if ((lenSeg == 1) && (' ' ==
ll->chars[startseg])) {
+ lastSegItalics =
false;
+ // Over half the
segments are single characters and of these about half are space characters.
+-
ll->positions[charInLine + 1] =
vstyle.styles[ll->styles[charInLine]].spaceWidth;
++
ll->positions[charInLine + 1] =
vstyle.styles[(int)ll->styles[charInLine]].spaceWidth;
+ } else {
+- lastSegItalics =
vstyle.styles[ll->styles[charInLine]].italic;
+-
surface->MeasureWidths(vstyle.styles[ll->styles[charInLine]].font, ll->chars
+ startseg,
++ lastSegItalics =
vstyle.styles[(int)ll->styles[charInLine]].italic;
++
surface->MeasureWidths(vstyle.styles[(int)ll->styles[charInLine]].font,
ll->chars + startseg,
+
lenSeg, ll->positions + startseg + 1);
+ }
+ }
+@@ -4537,7 +4537,7 @@
+ }
+
+ bool Editor::PositionIsHotspot(int position) {
+- return vs.styles[pdoc->StyleAt(position)].hotspot;
++ return vs.styles[(int)pdoc->StyleAt(position)].hotspot;
+ }
+
+ bool Editor::PointIsHotspot(Point pt) {
+diff -ur wxGTK-2.4.2/contrib/src/stc/scintilla/src/PropSet.cxx
wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/PropSet.cxx
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/PropSet.cxx 2003-09-21
07:32:49.000000000 -0400
++++ wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/PropSet.cxx
2003-11-10 15:18:08.784361720 -0500
+@@ -422,11 +422,11 @@
+ for (int i=0;i<256; i++) {
+ wordSeparator[i] = false;
+ }
+- wordSeparator['\r'] = true;
+- wordSeparator['\n'] = true;
++ wordSeparator[(int)'\r'] = true;
++ wordSeparator[(int)'\n'] = true;
+ if (!onlyLineEnds) {
+- wordSeparator[' '] = true;
+- wordSeparator['\t'] = true;
++ wordSeparator[(int)' '] = true;
++ wordSeparator[(int)'\t'] = true;
+ }
+ for (int j = 0; wordlist[j]; j++) {
+ int curr = static_cast<unsigned char>(wordlist[j]);
+@@ -539,7 +539,7 @@
+ j++;
+ }
+ }
+- j = starts['^'];
++ j = starts[(int)'^'];
+ if (j >= 0) {
+ while (words[j][0] == '^') {
+ const char *a = words[j] + 1;
+diff -ur wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.cxx
wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/RESearch.cxx
+--- wxGTK-2.4.2/contrib/src/stc/scintilla/src/RESearch.cxx 2003-09-21
07:32:49.000000000 -0400
++++ wxGTK-2.4.2-fixed/contrib/src/stc/scintilla/src/RESearch.cxx
2003-11-10 15:18:44.884873608 -0500
+@@ -764,10 +764,10 @@
+ return NOTFOUND;
+ break;
+ case BOT:
+- bopat[*ap++] = lp;
++ bopat[(int)*ap++] = lp;
+ break;
+ case EOT:
+- eopat[*ap++] = lp;
++ eopat[(int)*ap++] = lp;
+ break;
+ case BOW:
+ if (lp!=bol && iswordc(ci.CharAt(lp-1)) ||
!iswordc(ci.CharAt(lp)))
+diff -ur wxGTK-2.4.2/contrib/src/svg/dcsvg.cpp
wxGTK-2.4.2-fixed/contrib/src/svg/dcsvg.cpp
+--- wxGTK-2.4.2/contrib/src/svg/dcsvg.cpp 2003-09-21 07:32:54.000000000
-0400
++++ wxGTK-2.4.2-fixed/contrib/src/svg/dcsvg.cpp 2003-11-10
14:11:29.309374336 -0500
+@@ -233,13 +233,13 @@
+
+ // wxT("upper left") and wxT("upper right")
+ CalcBoundingBox(x, y);
+- CalcBoundingBox(x + w*cos(rad), y - h*sin(rad));
++ CalcBoundingBox(x + w*(int)cos(rad), y - h*(int)sin(rad));
+
+ // wxT("bottom left") and wxT("bottom right")
+ x += (wxCoord)(h*sin(rad));
+ y += (wxCoord)(h*cos(rad));
+ CalcBoundingBox(x, y);
+- CalcBoundingBox(x + h*sin(rad), y + h*cos(rad));
++ CalcBoundingBox(x + h*(int)sin(rad), y + h*(int)cos(rad));
+
+ if (m_backgroundMode == wxSOLID)
+ {
+diff -ur wxGTK-2.4.2/src/gtk/dnd.cpp wxGTK-2.4.2-fixed/src/gtk/dnd.cpp
+--- wxGTK-2.4.2/src/gtk/dnd.cpp 2003-09-21 07:31:57.000000000 -0400
++++ wxGTK-2.4.2-fixed/src/gtk/dnd.cpp 2003-11-10 12:11:14.265227768 -0500
+@@ -449,7 +449,7 @@
+ GList *child = m_dragContext->targets;
+ while (child)
+ {
+- GdkAtom formatAtom = (GdkAtom) GPOINTER_TO_INT(child->data);
++ GdkAtom formatAtom = (GdkAtom) child->data;
+ wxDataFormat format( formatAtom );
+
+ #ifdef __WXDEBUG__
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-contrib_animate.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-contrib_animate.patch
new file mode 100644
index 0000000..5813628
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-contrib_animate.patch
@@ -0,0 +1,10 @@
+--- Makefile.in 2003-09-21 12:32:39.000000000 +0100
++++ Makefile.in.new 2003-09-28 13:51:51.006341440 +0100
+@@ -1,6 +1,6 @@
+ # $Id: wxGTK-2.4.2-contrib_animate.patch,v 1.2 2007/07/24 22:52:52
dirtyepic dead $
+
+-CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc animate
#applet
++CONTRIB_SUBDIRS=canvas fl gizmos mmedia net ogl plot stc svg xrc #animate
#applet
+
+ all:
+ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
deleted file mode 100644
index 0dfe7a7..0000000
--- a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-gcc4_v2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/common/sckfile.cpp.orig 2005-04-16 16:50:11.000000000 -0700
-+++ 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".
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-menu.cpp.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-menu.cpp.patch
new file mode 100644
index 0000000..8219a15
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-menu.cpp.patch
@@ -0,0 +1,45 @@
+diff -Nur wxGTK-2.4.2/src/gtk/menu.cpp wxGTK-2.4.2-patched/src/gtk/menu.cpp
+--- wxGTK-2.4.2/src/gtk/menu.cpp 2003-09-21 05:31:57.000000000 -0600
++++ wxGTK-2.4.2-patched/src/gtk/menu.cpp 2004-03-31 22:37:42.422032816
-0700
+@@ -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
+diff -Nur wxGTK-2.4.2/src/gtk/settings.cpp
wxGTK-2.4.2-patched/src/gtk/settings.cpp
+--- wxGTK-2.4.2/src/gtk/settings.cpp 2003-09-21 05:31:57.000000000 -0600
++++ wxGTK-2.4.2-patched/src/gtk/settings.cpp 2004-03-31
23:03:41.888957808 -0700
+@@ -340,9 +340,17 @@
+ }
+ 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
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-noftinternals.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-noftinternals.patch
new file mode 100644
index 0000000..da21124
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-noftinternals.patch
@@ -0,0 +1,44 @@
+--- wxGTK-2.4.2/src/generic/dcpsg.cpp 2006-10-07 15:05:34.000000000 +0200
++++ wxGTK-2.4.2/src/generic/dcpsg.cpp 2006-10-07 15:08:21.000000000 +0200
+@@ -1146,7 +1146,7 @@
+ FILE *file;
+ };
+
+-static int paps_move_to( FT_Vector* to,
++static int paps_move_to( const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1156,7 +1156,7 @@
+ return 0;
+ }
+
+-static int paps_line_to( FT_Vector* to,
++static int paps_line_to( const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1166,8 +1166,8 @@
+ return 0;
+ }
+
+-static int paps_conic_to( FT_Vector* control,
+- FT_Vector* to,
++static int paps_conic_to( const FT_Vector* control,
++ const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
+@@ -1179,9 +1179,9 @@
+ return 0;
+ }
+
+-static int paps_cubic_to( FT_Vector* control1,
+- FT_Vector* control2,
+- FT_Vector* to,
++static int paps_cubic_to( const FT_Vector* control1,
++ const FT_Vector* control2,
++ const FT_Vector* to,
+ void *user_data)
+ {
+ OutlineInfo *outline_info = (OutlineInfo*)user_data;
diff --git a/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-pango_fix.patch
b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-pango_fix.patch
new file mode 100644
index 0000000..2cec83f
--- /dev/null
+++ b/x11-toolkits/wxgtk-no-unicode/wxGTK-2.4.2-pango_fix.patch
@@ -0,0 +1,14 @@
+--- wx-config.in.orig 2003-09-21 18:31:27.000000000 +0700
++++ wx-config.in 2005-11-24 04:56:18.313149073 +0600
+@@ -145,9 +145,9 @@
+ fi
+
+ if test $static_flag = yes ; then
+- echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@
@libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
++ echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@
@libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@ -lpangox-1.0 "
+ else
+- echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@
@DMALLOC_LIBS@
++ echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@
@DMALLOC_LIBS@ -lpangox-1.0 "
+ fi
+
+ ;;



  • [SM-Commit] GIT changes to master grimoire by Andraž Levstik (e71768c16d3b7895ada5c20c3ae7359a70e30d10), Andraž Levstik, 10/07/2007

Archive powered by MHonArc 2.6.24.

Top of Page