3 files changed, 37 insertions, 29 deletions

diff --git a/x11-toolkits/wxgtk26/files/patch-Makefile.in b/x11-toolkits/wxgtk26/files/patch-Makefile.in
index d63613ccefb5..c4a0015bafa5 100644
--- a/x11-toolkits/wxgtk26/files/patch-Makefile.in
+++ b/x11-toolkits/wxgtk26/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Sep 20 22:03:25 2005
-+++ Makefile.in	Wed Oct 12 23:21:27 2005
-@@ -23,6 +23,7 @@
+--- Makefile.in.orig	Tue Mar 21 11:39:27 2006
++++ Makefile.in	Tue Mar 21 11:54:48 2006
+@@ -24,6 +24,7 @@
  SONAME_FLAG = @SONAME_FLAG@
  STRIP = @STRIP@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -8,7 +8,7 @@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_DIR = @INSTALL_DIR@
  srcdir = @srcdir@
-@@ -9153,13 +9154,15 @@
+@@ -9387,18 +9388,15 @@
  
  all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
  
@@ -23,11 +23,16 @@
  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
  	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
 -	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
--	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx)
+-	for f in setup.h $(RCDEFS_H); do \
+-	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+-	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f`; \
+-	fi; \
+-	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
+-	done
  	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
  	for f in $(ALL_HEADERS); do \
  	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
-@@ -9692,9 +9695,7 @@
+@@ -9931,9 +9929,7 @@
  
  install-wxconfig: 
  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp b/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
deleted file mode 100644
index 12488d2b710e..000000000000
--- a/x11-toolkits/wxgtk26/files/patch-src-common-intl.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-===================================================================
-RCS file: /pack/cvsroots/wxwidgets/wxWidgets/src/common/intl.cpp,v
-retrieving revision 1.166
-retrieving revision 1.166.2.1
-diff -u -r1.166 -r1.166.2.1
---- src/common/intl.cpp	2005/09/18 23:38:06	1.166
-+++ src/common/intl.cpp	2005/09/28 09:48:03	1.166.2.1
-@@ -1260,9 +1260,14 @@
-             inputConv =
-             csConv = new wxCSConv(m_charset);
-     }
--    else // no conversion needed
-+    else // no need to convert the encoding
-     {
-+        // we still need the conversion for Unicode build
-+#if wxUSE_UNICODE
-+        inputConv = wxConvCurrent;
-+#else // !wxUSE_UNICODE
-         inputConv = NULL;
-+#endif
-     }
- 
-     // conversion to apply to msgid strings before looking them up: we only
diff --git a/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp b/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp
new file mode 100644
index 000000000000..1568c514b291
--- /dev/null
+++ b/x11-toolkits/wxgtk26/files/patch-src-gtk-clipbrd.cpp
@@ -0,0 +1,26 @@
+--- src/gtk/clipbrd.cpp.orig	Wed Mar 22 05:42:16 2006
++++ src/gtk/clipbrd.cpp	Sun Apr  2 17:51:17 2006
+@@ -494,16 +494,21 @@
+ 
+     delete[] array;
+ 
++#ifdef __WXGTK20__
+     gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
+                         "selection_get",
+                         GTK_SIGNAL_FUNC(selection_handler),
+                         GUINT_TO_POINTER(
+-#ifdef __WXGTK20__
+                                 gtk_get_current_event_time()
++                                        ) );
+ #else
++    gtk_signal_connect( GTK_OBJECT(m_clipboardWidget),
++                        "selection_get",
++                        GTK_SIGNAL_FUNC(selection_handler),
++                        GUINT_TO_POINTER(
+                                 gdk_event_get_time(gtk_get_current_event())
+-#endif
+                                         ) );
++#endif
+ 
+ #if wxUSE_THREADS
+     /* disable GUI threads */