Kezdőlap Felfedezés Súgó
Bejelentkezés
erkanisik
/
main
tükrözi: https://github.com/pisilinux/main.git
Figyelés 1
Kedvenc 0
Másolás 0
Fájlok Problémák 0 Wiki
Fa: 44b22d2211
Branch-ok Tag-ek
main
/
desktop
/
toolkit
/
wxGTK2.8
/
files
/
wxGTK-collision.patch

wxGTK-collision.patch 6.4 KB
Előzmények Nyers

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182 
  1. diff -Naur wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl wxPython-src-2.8.12.1/build/bakefiles/wx.bkl
    2. 

  2. --- wxPython-src-2.8.12.1.orig/build/bakefiles/wx.bkl	2014-01-04 22:28:16.491774907 -0500
    3. 

  3. +++ wxPython-src-2.8.12.1/build/bakefiles/wx.bkl	2014-01-04 22:37:39.610020870 -0500
    4. 

  4. @@ -128,7 +128,7 @@
    5. 

  5.          <using module="gettext"/>
    6. 

  6.          <gettext-catalogs id="locale">
    7. 

  7.              <srcdir>$(SRCDIR)/locale</srcdir>
    8. 

  8. -            <catalog-name>wxstd</catalog-name>
    9. 

  9. +            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
    10. 

  10.              <linguas>
    11. 

  11.                  ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
    12. 

  12.                  zh zh_CN zh_TW
    13. 

  13. diff -Naur wxPython-src-2.8.12.1.orig/Makefile.in wxPython-src-2.8.12.1/Makefile.in
    14. 

  14. --- wxPython-src-2.8.12.1.orig/Makefile.in	2014-01-04 22:28:16.545107766 -0500
    15. 

  15. +++ wxPython-src-2.8.12.1/Makefile.in	2014-01-04 22:40:27.191813403 -0500
    16. 

  16. @@ -11695,10 +11695,11 @@
    17. 

  17.  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) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
    18. 

  18.  
    19. 

  19.  install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
    20. 

  20. -	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
    21. 

  21. -	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
    22. 

  22. +
    23. 

  23.  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
    24. 

  24. -	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
    25. 

  25. +	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
    26. 

  26. +	for i in wx.bkl wx_unix.bkl wx_win32.bkl ; do \
    27. 

  27. +	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
    28. 

  28.  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
    29. 

  29.  	for f in setup.h $(RCDEFS_H); do \
    30. 

  30.  	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
    31. 

  31. @@ -12455,7 +12456,8 @@
    32. 

  32.  	$(INSTALL_DIR) $(DESTDIR)$(bindir)
    33. 

  33.  	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
    34. 

  34.  	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
    35. 

  35. -	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
    36. 

  36. +	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
    37. 

  37. +	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
    38. 

  38.  
    39. 

  39.  locale_install: 
    40. 

  40.  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
    41. 

  41. @@ -12463,7 +12465,8 @@
    42. 

  42.  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
    43. 

  43.  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
    44. 

  44.  	if test -f $(srcdir)/locale/$$l.mo ; then \
    45. 

  45. -	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
    46. 

  46. +	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
    47. 

  47. +	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
    48. 

  48.  	fi ; \
    49. 

  49.  	done
    50. 

  50.  
    51. 

  51. @@ -12480,7 +12483,7 @@
    52. 

  52.  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
    53. 

  53.  	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
    54. 

  54.  	if test -f $(srcdir)/locale/msw/$$l.mo ; then \
    55. 

  55. -	$(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw.mo ; \
    56. 

  56. +	$(INSTALL_DATA) $(srcdir)/locale/msw/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxmsw$(WX_RELEASE_NODOT).mo ; \
    57. 

  57.  	fi ; \
    58. 

  58.  	done
    59. 

  59.  
    60. 

  60. diff -Naur wxPython-src-2.8.12.1.orig/src/common/intl.cpp wxPython-src-2.8.12.1/src/common/intl.cpp
    61. 

  61. --- wxPython-src-2.8.12.1.orig/src/common/intl.cpp	2014-01-04 22:28:16.675106608 -0500
    62. 

  62. +++ wxPython-src-2.8.12.1/src/common/intl.cpp	2014-01-04 22:47:49.523526232 -0500
    63. 

  63. @@ -1597,7 +1597,7 @@
    64. 

  64.    bool bOk = true;
    65. 

  65.    if ( bLoadDefault )
    66. 

  66.    {
    67. 

  67. -    bOk = AddCatalog(wxT("wxstd"));
    68. 

  68. +    bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION)));
    69. 

  69.  
    70. 

  70.      // there may be a catalog with toolkit specific overrides, it is not
    71. 

  71.      // an error if this does not exist
    72. 

  72. diff -Naur wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in wxPython-src-2.8.12.1/utils/wxrc/Makefile.in
    73. 

  73. --- wxPython-src-2.8.12.1.orig/utils/wxrc/Makefile.in	2014-01-04 22:28:16.335109635 -0500
    74. 

  74. +++ wxPython-src-2.8.12.1/utils/wxrc/Makefile.in	2014-01-04 22:37:34.410068493 -0500
    75. 

  75. @@ -120,7 +120,6 @@
    76. 

  76.  @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
    77. 

  77.  @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
    78. 

  78.  @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
    79. 

  79. -@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
    80. 

  80.  
    81. 

  81.  @COND_USE_XRC_1@uninstall_wxrc: 
    82. 

  82.  @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
    83.