Hello community, here is the log from the commit of package perl-Wx for openSUSE:Factory checked in at 2017-05-31 12:18:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Wx (Old) and /work/SRC/openSUSE:Factory/.perl-Wx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Wx" Wed May 31 12:18:47 2017 rev:7 rq:498858 version:0.9932 Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Wx/perl-Wx.changes 2017-03-31 15:08:25.241433956 +0200 +++ /work/SRC/openSUSE:Factory/.perl-Wx.new/perl-Wx.changes 2017-05-31 12:19:52.979207906 +0200 @@ -1,0 +2,27 @@ +Thu May 25 09:26:01 UTC 2017 - [email protected] + +- updated to 0.9932 + see /usr/share/doc/packages/perl-Wx/Changes + + 0.9932 Tue Apr 18 2017 + - fix build for Perl 5.25.11 ( . no longer in @INC ) + - RT:121224 - fixes broken 0.9930 commit for keycode constants + - RT:120657 revert changes for this fro 0.9929 + + 0.9931 Mon Apr 17 2017 + - really skip Strawberry 64 bit build test failure + + 0.9930 Mon Apr 17 2017 + - Refactor wxTreeList + - RT:119059 some missing keycode constants + - skip Strawberry 64 bit build test failure + - Fix none latin paths in @INC on Windows + + 0.9929 Sat Apr 8 2017 + - Fix current OSX builds + - RT:115097 remove encoding pragma + - RT:120657 for Wx_Exp.pm exports incomplete + - RT:105467 Unescaped left brace in regex + - RT:120139 support wxScrolledWindow::ShowScrollbars + +------------------------------------------------------------------- Old: ---- Wx-0.9928.tar.gz New: ---- Wx-0.9932.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Wx.spec ++++++ --- /var/tmp/diff_new_pack.45p67v/_old 2017-05-31 12:19:54.478996189 +0200 +++ /var/tmp/diff_new_pack.45p67v/_new 2017-05-31 12:19:54.482995625 +0200 @@ -17,22 +17,22 @@ Name: perl-Wx -Version: 0.9928 +Version: 0.9932 Release: 0 %define cpan_name Wx Summary: Interface to the Wxwidgets Cross-Platform Gui Toolkit License: Artistic-1.0 or GPL-1.0+ Group: Development/Libraries/Perl Url: http://search.cpan.org/dist/Wx/ -Source0: http://www.cpan.org/authors/id/M/MD/MDOOTSON/%{cpan_name}-%{version}.tar.gz +Source0: https://cpan.metacpan.org/authors/id/M/MD/MDOOTSON/%{cpan_name}-%{version}.tar.gz Source1: perl-Wx-rpmlintrc Source2: cpanspec.yml -# Needed for reproducible build -Patch0: 0001-Sort-output-of-dumped-dictionaries-for-reproducible-.patch -Patch1: 0002-Provide-overload-methods-to-XSpp-in-sorted-order.patch -# Fix for incomplete Wx_Exp.pm, https://rt.cpan.org/Public/Bug/Display.html?id=120657 -Patch2: 0001-fix-incomplete-Wx_Exp.pm-due-to-missing-dependecy-in.patch +Patch0: 0001-fix-incomplete-Wx_Exp.pm-due-to-missing-dependecy-in.patch +Patch1: 0001-Sort-output-of-dumped-dictionaries-for-reproducible-.patch +Patch2: 0002-Provide-overload-methods-to-XSpp-in-sorted-order.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: perl +BuildRequires: perl-macros BuildRequires: perl(Alien::wxWidgets) >= 0.25 BuildRequires: perl(ExtUtils::MakeMaker) >= 6.46 BuildRequires: perl(ExtUtils::ParseXS) >= 3.15 @@ -61,6 +61,7 @@ %prep %setup -q -n %{cpan_name}-%{version} +find . -type f ! -name \*.pl -print0 | xargs -0 chmod 644 %patch0 -p1 %patch1 -p1 %patch2 -p1 ++++++ Wx-0.9928.tar.gz -> Wx-0.9932.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/Changes new/Wx-0.9932/Changes --- old/Wx-0.9928/Changes 2015-12-20 18:20:25.000000000 +0100 +++ new/Wx-0.9932/Changes 2017-04-18 03:04:22.000000000 +0200 @@ -1,5 +1,26 @@ Revision history for Perl extension Wx. +0.9932 Tue Apr 18 2017 + - fix build for Perl 5.25.11 ( . no longer in @INC ) + - RT:121224 - fixes broken 0.9930 commit for keycode constants + - RT:120657 revert changes for this fro 0.9929 + +0.9931 Mon Apr 17 2017 + - really skip Strawberry 64 bit build test failure + +0.9930 Mon Apr 17 2017 + - Refactor wxTreeList + - RT:119059 some missing keycode constants + - skip Strawberry 64 bit build test failure + - Fix none latin paths in @INC on Windows + +0.9929 Sat Apr 8 2017 + - Fix current OSX builds + - RT:115097 remove encoding pragma + - RT:120657 for Wx_Exp.pm exports incomplete + - RT:105467 Unescaped left brace in regex + - RT:120139 support wxScrolledWindow::ShowScrollbars + 0.9928 Sun Dec 20 2015 - Fix memory leak in Wx::Timer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/Constant.xs new/Wx-0.9932/Constant.xs --- old/Wx-0.9928/Constant.xs 2014-11-02 20:27:34.000000000 +0100 +++ new/Wx-0.9932/Constant.xs 2017-04-18 00:29:03.000000000 +0200 @@ -4,7 +4,7 @@ // Author: Mattia Barbon // Modified by: // Created: 29/10/2000 -// RCS-ID: $Id: Constant.xs 3527 2014-11-02 19:27:35Z mdootson $ +// RCS-ID: $Id: Constant.xs 3555 2017-04-17 04:32:11Z mdootson $ // Copyright: (c) 2000-2011 Mattia Barbon // Licence: This program is free software; you can redistribute it and/or // modify it under the same terms as Perl itself @@ -1817,6 +1817,46 @@ case 'K': if( strnEQ( name, "WXK_", 4 ) ) { +#if WXPERL_W_VERSION_GE( 2, 9, 2 ) + r( WXK_NONE ); // keycode + r( WXK_CONTROL_A ); // keycode + r( WXK_CONTROL_B ); // keycode + r( WXK_CONTROL_C ); // keycode + r( WXK_CONTROL_D ); // keycode + r( WXK_CONTROL_E ); // keycode + r( WXK_CONTROL_F ); // keycode + r( WXK_CONTROL_G ); // keycode + r( WXK_CONTROL_H ); // keycode + r( WXK_CONTROL_I ); // keycode + r( WXK_CONTROL_J ); // keycode + r( WXK_CONTROL_K ); // keycode + r( WXK_CONTROL_L ); // keycode + r( WXK_CONTROL_M ); // keycode + r( WXK_CONTROL_N ); // keycode + r( WXK_CONTROL_O ); // keycode + r( WXK_CONTROL_P ); // keycode + r( WXK_CONTROL_Q ); // keycode + r( WXK_CONTROL_R ); // keycode + r( WXK_CONTROL_S ); // keycode + r( WXK_CONTROL_U ); // keycode + r( WXK_CONTROL_V ); // keycode + r( WXK_CONTROL_W ); // keycode + r( WXK_CONTROL_X ); // keycode + r( WXK_CONTROL_Y ); // keycode + r( WXK_CONTROL_Z ); // keycode + r( WXK_RAW_CONTROL ); // keycode + r( WXK_WINDOWS_LEFT ); // keycode + r( WXK_WINDOWS_RIGHT ); // keycode + r( WXK_WINDOWS_MENU ); // keycode + r( WXK_COMMAND ); // keycode +#else +#if defined(__WXMSW__) + r( WXK_WINDOWS_LEFT ); // keycode + r( WXK_WINDOWS_RIGHT ); // keycode + r( WXK_WINDOWS_MENU ); // keycode + r( WXK_COMMAND ); // keycode +#endif +#endif r( WXK_BACK ); // keycode r( WXK_TAB ); // keycode r( WXK_RETURN ); // keycode @@ -1918,13 +1958,7 @@ r( WXK_NUMPAD_SEPARATOR ); // keycode r( WXK_NUMPAD_SUBTRACT ); // keycode r( WXK_NUMPAD_DECIMAL ); // keycode - r( WXK_NUMPAD_DIVIDE ); // keycode -#if defined(__WXMSW__) - r( WXK_WINDOWS_LEFT ); // keycode - r( WXK_WINDOWS_RIGHT ); // keycode - r( WXK_WINDOWS_MENU ); // keycode - r( WXK_COMMAND ); // keycode -#endif + r( WXK_NUMPAD_DIVIDE ); // keycode r( WXK_SPECIAL1 ); // keycode r( WXK_SPECIAL2 ); // keycode r( WXK_SPECIAL3 ); // keycode @@ -2500,6 +2534,11 @@ // r( wxSB_SIZEGRIP ); r( wxSB_HORIZONTAL ); // scrollbar r( wxSB_VERTICAL ); // scrollbar +#if WXPERL_W_VERSION_GE( 2, 9, 0 ) + r( wxSHOW_SB_ALWAYS ); // scrolledwindow + r( wxSHOW_SB_NEVER ); // scrolledwindow + r( wxSHOW_SB_DEFAULT ); // scrolledwindow +#endif #if WXPERL_W_VERSION_GE( 2, 5, 3 ) r( wxSB_NORMAL ); // statusbar r( wxSB_FLAT ); // statusbar diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/Controls.xs new/Wx-0.9932/Controls.xs --- old/Wx-0.9928/Controls.xs 2014-03-08 14:01:15.000000000 +0100 +++ new/Wx-0.9932/Controls.xs 2017-04-18 01:13:31.000000000 +0200 @@ -59,62 +59,62 @@ #endif -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ControlWithItems.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ControlWithItems.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/bmpbuttn.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/AnimationCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/bmpbuttn.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/AnimationCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/EditableListBox.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/EditableListBox.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/BookCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/BookCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Listbook.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Listbook.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Choicebook.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Choicebook.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Toolbook.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Toolbook.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Treebook.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Treebook.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/HyperlinkCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/HyperlinkCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/VListBox.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/VListBox.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/SearchCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/SearchCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ComboPopup.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ComboPopup.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ComboCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ComboCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/OwnerDrawnComboBox.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/OwnerDrawnComboBox.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/CollapsiblePane.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/CollapsiblePane.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/BitmapComboBox.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/BitmapComboBox.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/DirCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/DirCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FileCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FileCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/generic/spinctrg.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/generic/spinctrg.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/infobar.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/infobar.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/headerctrl.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/headerctrl.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/headercol.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/headercol.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/button.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/button.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/commandlinkbutton.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/commandlinkbutton.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/treelist.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/treelist.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/richtooltip.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/richtooltip.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/bannerwindow.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/bannerwindow.h -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/rearrangectrl.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/rearrangectrl.h INCLUDE: XS/CheckBox.xs INCLUDE: XS/CheckListBox.xs @@ -137,16 +137,16 @@ INCLUDE: XS/ToggleButton.xs INCLUDE: XS/TreeCtrl.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/TextAttr.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/TextAttr.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/TextCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/TextCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/PickerCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/PickerCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ColourPickerCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ColourPickerCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FilePickerCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FilePickerCtrl.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FontPickerCtrl.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FontPickerCtrl.xsp MODULE=Wx_Ctrl PACKAGE=Wx::Control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/Frames.xs new/Wx-0.9932/Frames.xs --- old/Wx-0.9928/Frames.xs 2014-03-08 14:01:42.000000000 +0100 +++ new/Wx-0.9932/Frames.xs 2017-04-18 01:00:46.000000000 +0200 @@ -24,35 +24,35 @@ INCLUDE: XS/Panel.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Dialog.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Dialog.xsp INCLUDE: XS/Frame.xs INCLUDE: XS/StatusBar.xs INCLUDE: XS/ToolBar.xs INCLUDE: XS/Wizard.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/IconBundle.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/IconBundle.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/TopLevelWindow.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/TopLevelWindow.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/PopupWindow.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/PopupWindow.xsp INCLUDE: XS/ColourDialog.xs INCLUDE: XS/DirDialog.xs INCLUDE: XS/FileDialog.xs INCLUDE: XS/TextEntryDialog.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/MessageDialog.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/MessageDialog.xsp INCLUDE: XS/ProgressDialog.xs INCLUDE: XS/SingleChoiceDialog.xs INCLUDE: XS/MultiChoiceDialog.xs INCLUDE: XS/FontDialog.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FindReplaceDialog.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FindReplaceDialog.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/AboutDialog.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/AboutDialog.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/PropertySheetDialog.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/PropertySheetDialog.xsp MODULE=Wx_Wnd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/GDI.xs new/Wx-0.9932/GDI.xs --- old/Wx-0.9928/GDI.xs 2014-03-08 14:01:15.000000000 +0100 +++ new/Wx-0.9932/GDI.xs 2017-04-18 01:01:15.000000000 +0200 @@ -36,18 +36,18 @@ MODULE=Wx_GDI -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Animation.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Animation.xsp INCLUDE: XS/Colour.xs INCLUDE: XS/ColourDatabase.xs INCLUDE: XS/Font.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ImageList.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ImageList.xsp INCLUDE: XS/Bitmap.xs INCLUDE: XS/Icon.xs INCLUDE: XS/Cursor.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/DC.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/DC.xsp INCLUDE: XS/Overlay.xs INCLUDE: XS/Pen.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Brush.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Brush.xsp INCLUDE: XS/Image.xs INCLUDE: XS/Palette.xs @@ -55,9 +55,9 @@ INCLUDE: XS/GraphicsPath.xs INCLUDE: XS/GraphicsMatrix.xs INCLUDE: XS/GraphicsObject.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/GraphicsRenderer.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/GraphicsRenderer.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/SVGFileDC.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/SVGFileDC.xsp MODULE=Wx PACKAGE=Wx PREFIX=wx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/MANIFEST new/Wx-0.9932/MANIFEST --- old/Wx-0.9928/MANIFEST 2015-12-20 18:20:47.000000000 +0100 +++ new/Wx-0.9932/MANIFEST 2017-04-18 03:06:58.000000000 +0200 @@ -602,5 +602,5 @@ XS/Wave.xs XS/Window.xsp XS/Wizard.xs -META.yml Module YAML meta-data (added by MakeMaker) -META.json Module JSON meta-data (added by MakeMaker) +META.yml Module YAML meta-data (added by MakeMaker) +META.json Module JSON meta-data (added by MakeMaker) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/META.json new/Wx-0.9932/META.json --- old/Wx-0.9928/META.json 2015-12-20 18:20:46.000000000 +0100 +++ new/Wx-0.9932/META.json 2017-04-18 03:06:57.000000000 +0200 @@ -1,67 +1,68 @@ -{ - "abstract" : "interface to the wxWidgets cross-platform GUI toolkit", - "author" : [ - "Mattia Barbon <[email protected]>" - ], - "dynamic_config" : 1, - "generated_by" : "ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.140640", - "license" : [ - "perl_5" - ], - "meta-spec" : { - "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, - "version" : "2" - }, - "name" : "Wx", - "no_index" : { - "directory" : [ - "samples", - "script" - ], - "package" : [ - "MY", - "Parse::Yapp::Driver", - "Wx::DropTarget", - "Wx::Droptarget" - ] - }, - "prereqs" : { - "build" : { - "requires" : { - "Alien::wxWidgets" : "0.25", - "ExtUtils::MakeMaker" : "6.48", - "ExtUtils::ParseXS" : "3.15", - "ExtUtils::XSpp" : "0.1602", - "File::Spec::Functions" : "0.82", - "Test::Harness" : "2.26", - "Test::More" : "0.45", - "if" : "0.03" - } - }, - "configure" : { - "requires" : { - "Alien::wxWidgets" : "0.25" - } - }, - "runtime" : { - "requires" : { - "Alien::wxWidgets" : "0.25" - } - } - }, - "release_status" : "stable", - "resources" : { - "bugtracker" : { - "web" : "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Wx"; - }, - "homepage" : "http://www.wxperl.it/";, - "license" : [ - "http://dev.perl.org/licenses/"; - ], - "repository" : { - "url" : "http://svn.code.sf.net/p/wxperl/code/wxPerl"; - }, - "x_MailingList" : "http://lists.perl.org/list/wxperl-users.html"; - }, - "version" : "0.9928" -} +{ + "abstract" : "interface to the wxWidgets cross-platform GUI toolkit", + "author" : [ + "Mattia Barbon <[email protected]>" + ], + "dynamic_config" : 1, + "generated_by" : "ExtUtils::MakeMaker version 7.1002, CPAN::Meta::Converter version 2.150005", + "license" : [ + "perl_5" + ], + "meta-spec" : { + "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec";, + "version" : "2" + }, + "name" : "Wx", + "no_index" : { + "directory" : [ + "samples", + "script" + ], + "package" : [ + "MY", + "Parse::Yapp::Driver", + "Wx::DropTarget", + "Wx::Droptarget" + ] + }, + "prereqs" : { + "build" : { + "requires" : { + "Alien::wxWidgets" : "0.25", + "ExtUtils::MakeMaker" : "6.48", + "ExtUtils::ParseXS" : "3.15", + "ExtUtils::XSpp" : "0.1602", + "File::Spec::Functions" : "0.82", + "Test::Harness" : "2.26", + "Test::More" : "0.45", + "if" : "0.03" + } + }, + "configure" : { + "requires" : { + "Alien::wxWidgets" : "0.25" + } + }, + "runtime" : { + "requires" : { + "Alien::wxWidgets" : "0.25" + } + } + }, + "release_status" : "stable", + "resources" : { + "bugtracker" : { + "web" : "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Wx"; + }, + "homepage" : "http://www.wxperl.it/";, + "license" : [ + "http://dev.perl.org/licenses/"; + ], + "repository" : { + "url" : "http://svn.code.sf.net/p/wxperl/code/wxPerl"; + }, + "x_MailingList" : "http://lists.perl.org/list/wxperl-users.html"; + }, + "version" : "0.9932", + "x_serialization_backend" : "JSON::PP version 2.27300_01" +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/META.yml new/Wx-0.9932/META.yml --- old/Wx-0.9928/META.yml 2015-12-20 18:20:43.000000000 +0100 +++ new/Wx-0.9932/META.yml 2017-04-18 03:06:49.000000000 +0200 @@ -1,40 +1,41 @@ ---- -abstract: 'interface to the wxWidgets cross-platform GUI toolkit' -author: - - 'Mattia Barbon <[email protected]>' -build_requires: - Alien::wxWidgets: '0.25' - ExtUtils::MakeMaker: '6.48' - ExtUtils::ParseXS: '3.15' - ExtUtils::XSpp: '0.1602' - File::Spec::Functions: '0.82' - Test::Harness: '2.26' - Test::More: '0.45' - if: '0.03' -configure_requires: - Alien::wxWidgets: '0.25' -dynamic_config: 1 -generated_by: 'ExtUtils::MakeMaker version 6.98, CPAN::Meta::Converter version 2.140640' -license: perl -meta-spec: - url: http://module-build.sourceforge.net/META-spec-v1.4.html - version: '1.4' -name: Wx -no_index: - directory: - - samples - - script - package: - - MY - - Parse::Yapp::Driver - - Wx::DropTarget - - Wx::Droptarget -requires: - Alien::wxWidgets: '0.25' -resources: - MailingList: http://lists.perl.org/list/wxperl-users.html - bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Wx - homepage: http://www.wxperl.it/ - license: http://dev.perl.org/licenses/ - repository: http://svn.code.sf.net/p/wxperl/code/wxPerl -version: '0.9928' +--- +abstract: 'interface to the wxWidgets cross-platform GUI toolkit' +author: + - 'Mattia Barbon <[email protected]>' +build_requires: + Alien::wxWidgets: '0.25' + ExtUtils::MakeMaker: '6.48' + ExtUtils::ParseXS: '3.15' + ExtUtils::XSpp: '0.1602' + File::Spec::Functions: '0.82' + Test::Harness: '2.26' + Test::More: '0.45' + if: '0.03' +configure_requires: + Alien::wxWidgets: '0.25' +dynamic_config: 1 +generated_by: 'ExtUtils::MakeMaker version 7.1002, CPAN::Meta::Converter version 2.150005' +license: perl +meta-spec: + url: http://module-build.sourceforge.net/META-spec-v1.4.html + version: '1.4' +name: Wx +no_index: + directory: + - samples + - script + package: + - MY + - Parse::Yapp::Driver + - Wx::DropTarget + - Wx::Droptarget +requires: + Alien::wxWidgets: '0.25' +resources: + MailingList: http://lists.perl.org/list/wxperl-users.html + bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Wx + homepage: http://www.wxperl.it/ + license: http://dev.perl.org/licenses/ + repository: http://svn.code.sf.net/p/wxperl/code/wxPerl +version: '0.9932' +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/Window.xs new/Wx-0.9932/Window.xs --- old/Wx-0.9928/Window.xs 2014-10-28 02:36:33.000000000 +0100 +++ new/Wx-0.9932/Window.xs 2017-04-18 01:02:02.000000000 +0200 @@ -1277,23 +1277,23 @@ #endif -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Window.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Window.xsp INCLUDE: XS/Accelerators.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/PlWindow.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/PlWindow.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/SplitterWindow.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/SplitterWindow.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/VScrolledWindow.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/VScrolledWindow.xsp INCLUDE: XS/ScrolledWindow.xs INCLUDE: XS/Validators.xs INCLUDE: XS/Constraint.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Sizer.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Sizer.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/GridBagSizer.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/GridBagSizer.xsp INCLUDE: XS/SashWindow.xs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/Wx.pm new/Wx-0.9932/Wx.pm --- old/Wx-0.9928/Wx.pm 2015-03-26 19:05:58.000000000 +0100 +++ new/Wx-0.9932/Wx.pm 2017-04-17 06:44:25.000000000 +0200 @@ -4,7 +4,7 @@ ## Author: Mattia Barbon ## Modified by: ## Created: 01/10/2000 -## RCS-ID: $Id: Wx.pm 3543 2015-03-26 18:05:52Z mdootson $ +## RCS-ID: $Id: Wx.pm 3560 2017-04-17 04:44:26Z mdootson $ ## Copyright: (c) 2000-2013 Mattia Barbon ## Licence: This program is free software; you can redistribute it and/or ## modify it under the same terms as Perl itself @@ -21,7 +21,7 @@ $_msw = 1; $_gtk = 2; $_motif = 3; $_mac = 4; $_x11 = 5; @ISA = qw(Exporter); -$VERSION = '0.9928'; +$VERSION = '0.9932'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/Wx.xs new/Wx-0.9932/Wx.xs --- old/Wx-0.9928/Wx.xs 2014-10-31 20:05:19.000000000 +0100 +++ new/Wx-0.9932/Wx.xs 2017-04-18 01:02:35.000000000 +0200 @@ -544,29 +544,29 @@ INCLUDE: XS/FontMapper.xs INCLUDE: XS/Wave.xs -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FontEnumerator.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/FontEnumerator.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ArtProvider.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ArtProvider.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/MimeTypes.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/MimeTypes.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Sound.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Sound.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Power.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Power.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ClassInfo.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/ClassInfo.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Display.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Display.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/StandardPaths.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/StandardPaths.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Variant.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/Variant.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/NotificationMessage.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/NotificationMessage.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/EventFilter.xsp +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp XS/EventFilter.xsp -INCLUDE_COMMAND: $^X -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/uiaction.h +INCLUDE_COMMAND: $^X -I./ -MExtUtils::XSpp::Cmd -e xspp -- -t typemap.xsp interface/wx/uiaction.h ## //FIXME// tricky ##if defined(__WXMSW__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/XS/ScrolledWindow.xs new/Wx-0.9932/XS/ScrolledWindow.xs --- old/Wx-0.9928/XS/ScrolledWindow.xs 2014-03-08 14:01:15.000000000 +0100 +++ new/Wx-0.9932/XS/ScrolledWindow.xs 2017-04-10 04:39:51.000000000 +0200 @@ -4,7 +4,7 @@ ## Author: Mattia Barbon ## Modified by: ## Created: 02/12/2000 -## RCS-ID: $Id: ScrolledWindow.xs 2285 2007-11-11 21:31:54Z mbarbon $ +## RCS-ID: $Id: ScrolledWindow.xs 3550 2017-04-10 02:39:52Z mdootson $ ## Copyright: (c) 2000-2003, 2005-2007 Mattia Barbon ## Licence: This program is free software; you can redistribute it and/or ## modify it under the same terms as Perl itself @@ -86,6 +86,15 @@ wxScrolledWindow::EnableScrolling( xScrolling, yScrolling ) bool xScrolling bool yScrolling + +#if WXPERL_W_VERSION_GE( 2, 9, 0 ) + +void +wxScrolledWindow::ShowScrollbars( horz, vert ) + wxScrollbarVisibility horz + wxScrollbarVisibility vert + +#endif void wxScrolledWindow::GetScrollPixelsPerUnit() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/build/Wx/build/MakeMaker/MacOSX_GCC.pm new/Wx-0.9932/build/Wx/build/MakeMaker/MacOSX_GCC.pm --- old/Wx-0.9928/build/Wx/build/MakeMaker/MacOSX_GCC.pm 2015-03-10 04:19:58.000000000 +0100 +++ new/Wx-0.9932/build/Wx/build/MakeMaker/MacOSX_GCC.pm 2017-04-09 01:35:22.000000000 +0200 @@ -22,7 +22,9 @@ if ($config{CC} =~ /clang\+\+/ || $config{LD} =~ /clang\+\+/) { my $sdkrepl = ''; - for my $sdkversion ( qw( 10.9 10.8 10.7 10.6 ) ) { + # Get ahead with the xcode versions. It'll be wrong, but better than not + # finding at all. + for my $sdkversion ( qw( 10.14 10.13 10.12 10.11 10.10 10.9 10.8 10.7 10.6 ) ) { my $macossdk = qq(/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${sdkversion}.sdk); if( -d $macossdk ) { $sdkrepl = 'clang++ -isysroot ' . $macossdk . ' -stdlib=libc++'; @@ -41,9 +43,6 @@ my $this = shift; my %config = $this->SUPER::configure_core( @_ ); - $config{depend}{'$(INST_STATIC)'} .= ' wxPerl'; - $config{depend}{'$(INST_DYNAMIC)'} .= ' wxPerl'; - $config{clean}{FILES} .= " wxPerl cpp/wxPerl.osx/build cpp/wxPerl.osx/wxPerl.c cpp/wxPerl.osx/wxPerl.r"; $config{dynamic_lib}{OTHERLDFLAGS} .= ' -framework ApplicationServices '; if( $Config{ptrsize} == 8 @@ -68,75 +67,6 @@ return $text; } -sub install_core { - my $this = shift; - my $text = $this->SUPER::install_core( @_ ); - - $text =~ m/^(install\s*:+)/m and - $text .= "\n\n$1 install_wxperl\n\n"; - - return $text; -} - -sub postamble_core { - my $this = shift; - my $text = $this->SUPER::postamble_core( @_ ); - my $wx_config = $ENV{WX_CONFIG} || 'wx-config'; - my $rfile; - - return '' unless $Wx::build::MakeMaker::Core::has_alien; - - if( $Wx::build::MakeMaker::Core::has_alien - && Alien::wxWidgets->version < 2.006 ) { - my $rsrc = join ' ', grep { /wx/ } split ' ', `$wx_config --rezflags`; - $rfile = sprintf <<EOR, $rsrc; - echo '#include <Carbon.r>' > cpp/wxPerl.osx/wxPerl.r - cat %s >> cpp/wxPerl.osx/wxPerl.r -EOR - } else { - $rfile = <<EOE; - echo '#include <Carbon.r>' > cpp/wxPerl.osx/wxPerl.r -EOE - } - - my $arch = $this->{INSTALLSITEARCH}; - $arch =~ s/\$\(SITEPREFIX\)/$this->{PREFIX}/e; - $arch =~ s/\$\(INSTALL_BASE\)/$this->{INSTALL_BASE}/e; - write_string( 'cpp/wxPerl.osx/wxPerl.c', sprintf <<EOT, $arch ); -#include <unistd.h> -#include <stdlib.h> -#include <stdio.h> - -int main( int argc, char **argv ) -{ - argv[0] = "%s/auto/Wx/wxPerl.app/Contents/MacOS/wxPerl"; - execv( argv[0], argv ); - perror( "wxPerl: execv" ); - exit( 1 ); -} -EOT - - my $arch_flags = join ' ', - ( Alien::wxWidgets->c_flags =~ /(^|\s)(-arch\s+\w+)/g ); - - $text .= sprintf <<'EOT', $rfile, $restoolpath, $arch_flags, $arch_flags; - -wxPerl : Makefile -%s cd cpp/wxPerl.osx && make RESTOOLDIR='%s' ARCH_FLAGS='%s' - cp -p $(PERL) `find cpp -name wxPerl.app`/Contents/MacOS/wxPerl - mkdir -p $(INST_ARCHLIB)/auto/Wx - cp -rp `find cpp -name wxPerl.app` $(INST_ARCHLIB)/auto/Wx - $(CC) %s cpp/wxPerl.osx/wxPerl.c -o wxPerl - -install_wxperl : - mkdir -p $(DESTINSTALLBIN) - cp -p wxPerl $(DESTINSTALLBIN) - -EOT - - return $text; -} - 1; # local variables: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/build/Wx/build/Utils.pm new/Wx-0.9932/build/Wx/build/Utils.pm --- old/Wx-0.9928/build/Wx/build/Utils.pm 2014-03-08 14:01:15.000000000 +0100 +++ new/Wx-0.9932/build/Wx/build/Utils.pm 2017-04-08 22:56:39.000000000 +0200 @@ -107,7 +107,7 @@ m/^\s*INCLUDE:\s+(.*)$/ and $file = $1 and $arr = \@xsinclude; m/^\s*INCLUDE_COMMAND:\s+.*\s(\S+\.(?:xsp?|h))\s*/ and $file = $1 and $arr = \@xsinclude; - m/^\s*\%include{([^}]+)}\s*;\s*$/ and $file = $1 and $arr = \@xsinclude; + m/^\s*\%include\{([^}]+)\}\s*;\s*$/ and $file = $1 and $arr = \@xsinclude; if( defined $file ) { $file = catfile( split '/', $file ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/ext/webview/WebView.xs new/Wx-0.9932/ext/webview/WebView.xs --- old/Wx-0.9928/ext/webview/WebView.xs 2014-03-23 22:43:48.000000000 +0100 +++ new/Wx-0.9932/ext/webview/WebView.xs 2017-04-13 03:11:36.000000000 +0200 @@ -13,27 +13,15 @@ #define PERL_NO_GET_CONTEXT #include "cpp/wxapi.h" -#include "cpp/constants.h" -#include "cpp/overload.h" #undef THIS -#if WXPERL_W_VERSION_GE( 2, 9, 3 ) && wxUSE_WEBVIEW - -#include <wx/filesys.h> -#include <wx/webview.h> -#include <wx/webviewarchivehandler.h> -#include "cpp/streams.h" -#include "cpp/helpers.h" - -#endif - MODULE=Wx__WebView BOOT: INIT_PLI_HELPERS( wx_pli_helpers ); -#if WXPERL_W_VERSION_GE( 2, 9, 3 ) && wxUSE_WEBVIEW +#if WXPERL_W_VERSION_GE( 2, 9, 3 ) #if WXPERL_W_VERSION_GE( 3, 0, 0) @@ -45,11 +33,11 @@ #endif -MODULE=Wx__WebView PACKAGE=Wx::WebView +#endif +#include "cpp/overload.h" #include "cpp/ovl_const.cpp" - -#endif +#include "cpp/constants.h" # //FIXME//tricky #if defined(__WXMSW__) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/ext/webview/XS/WebViewV2.xsp new/Wx-0.9932/ext/webview/XS/WebViewV2.xsp --- old/Wx-0.9928/ext/webview/XS/WebViewV2.xsp 2014-03-23 22:41:44.000000000 +0100 +++ new/Wx-0.9932/ext/webview/XS/WebViewV2.xsp 2017-04-13 03:11:36.000000000 +0200 @@ -8,8 +8,17 @@ ##// Licence: wxWindows licence ##///////////////////////////////////////////////////////////////////////////// +#include <wx/setup.h> + #if wxUSE_WEBVIEW +#include <wx/filesys.h> +#include <wx/webview.h> +#include <wx/webviewarchivehandler.h> + +#include "cpp/streams.h" +#include "cpp/helpers.h" + %loadplugin{build::Wx::XSP::Overload}; %loadplugin{build::Wx::XSP::Enum}; %loadplugin{build::Wx::XSP::Event}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/ext/webview/XS/WebViewV3.xsp new/Wx-0.9932/ext/webview/XS/WebViewV3.xsp --- old/Wx-0.9928/ext/webview/XS/WebViewV3.xsp 2014-03-23 22:42:27.000000000 +0100 +++ new/Wx-0.9932/ext/webview/XS/WebViewV3.xsp 2017-04-13 03:11:36.000000000 +0200 @@ -8,8 +8,17 @@ ##// Licence: wxWindows licence ##///////////////////////////////////////////////////////////////////////////// +#include <wx/setup.h> + #if wxUSE_WEBVIEW +#include <wx/filesys.h> +#include <wx/webview.h> +#include <wx/webviewarchivehandler.h> + +#include "cpp/streams.h" +#include "cpp/helpers.h" + %loadplugin{build::Wx::XSP::Overload}; %loadplugin{build::Wx::XSP::Enum}; %loadplugin{build::Wx::XSP::Event}; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/interface/wx/treelist.h new/Wx-0.9932/interface/wx/treelist.h --- old/Wx-0.9928/interface/wx/treelist.h 2014-03-08 14:01:17.000000000 +0100 +++ new/Wx-0.9932/interface/wx/treelist.h 2017-04-13 02:57:40.000000000 +0200 @@ -77,7 +77,7 @@ wxTL_CHECKBOX = 0x0002, // Show checkboxes in the first column. wxTL_3STATE = 0x0004, // Allow 3rd state in checkboxes. wxTL_USER_3STATE = 0x0008, // Allow user to set 3rd state. - + wxTL_NO_HEADER = 0x0010, wxTL_STYLE_MASK = 0x000F, wxTL_DEFAULT_STYLE = wxTL_SINGLE }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/lib/Wx/Mini.pm new/Wx-0.9932/lib/Wx/Mini.pm --- old/Wx-0.9928/lib/Wx/Mini.pm 2015-03-26 19:05:33.000000000 +0100 +++ new/Wx-0.9932/lib/Wx/Mini.pm 2017-04-17 06:43:54.000000000 +0200 @@ -12,7 +12,7 @@ $Wx::dlls = XXXDLLSXXX; } -$VERSION = '0.9928'; # bootstrap will catch wrong versions +$VERSION = '0.9932'; # bootstrap will catch wrong versions $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -72,6 +72,11 @@ last; } } + + if( $wx_path && $^O =~ /mswin/i ) { + require Win32; + $wx_path = Win32::GetShortPathName( $wx_path ); + } } _alien_path(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/script/copy_files.pl new/Wx-0.9932/script/copy_files.pl --- old/Wx-0.9928/script/copy_files.pl 2014-03-08 14:01:42.000000000 +0100 +++ new/Wx-0.9932/script/copy_files.pl 2017-04-18 00:24:33.000000000 +0200 @@ -13,6 +13,7 @@ use strict; use ExtUtils::Install 'pm_to_blib'; +use lib '.'; my $file = shift; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/t/14_eh_die.t new/Wx-0.9932/t/14_eh_die.t --- old/Wx-0.9928/t/14_eh_die.t 2015-03-09 21:28:07.000000000 +0100 +++ new/Wx-0.9932/t/14_eh_die.t 2017-04-17 06:39:03.000000000 +0200 @@ -2,11 +2,12 @@ use strict; use Wx; +use Config; use lib './t'; use Tests_Helper qw(test_app); -use Test::More Wx::wxMAC() ? ( 'skip_all' => 'Hangs on wxMac' ) : +use Test::More ( Wx::wxMAC() || Wx::wxMSW() && ( $Config{ptrsize} == 8 && $Config{cf_by} eq 'strawberry-perl') ) ? ( 'skip_all' => 'Hangs on wxMac and on 64 bit Strawberry Perl' ) : ( 'tests' => 6 ); - + use Wx::Event qw(EVT_TIMER); my $app = test_app( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/t/18_unicode.t new/Wx-0.9932/t/18_unicode.t --- old/Wx-0.9928/t/18_unicode.t 2014-03-08 14:01:41.000000000 +0100 +++ new/Wx-0.9932/t/18_unicode.t 2017-04-08 22:43:53.000000000 +0200 @@ -5,18 +5,14 @@ use lib './t'; use Tests_Helper qw(in_frame); use Test::More 'tests' => 12; -use encoding qw(iso-8859-1); +use utf8; use Encode qw(is_utf8); my $ascii = 'Abcde'; my $ascii2 = 'XXX'; -my $latin1 = '�bcd�'; +my $utf8 = 'Àbcdë'; my $unicode = "\x{1234}"; -# needs to be upgraded to characters because wxPerl converts -# based upon the current locale, which might not be Latin-1 -utf8::upgrade( $latin1 ); # safe beacuse it's latin1 - in_frame( sub { my $self = shift; @@ -50,10 +46,10 @@ skip "wrongly asserts under 2.5.x", 6 if Wx::wxVERSION < 2.006; - $label->SetLabel( $latin1 ); - is( $label->GetLabel, $latin1 ); + $label->SetLabel( $utf8 ); + is( $label->GetLabel, $utf8 ); - ok( is_utf8( $latin1 ) ); + ok( is_utf8( $utf8 ) ); ok( is_utf8( $label->GetLabel ) ); $label->SetLabel( $unicode ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/typemap new/Wx-0.9932/typemap --- old/Wx-0.9928/typemap 2015-12-20 13:29:12.000000000 +0100 +++ new/Wx-0.9932/typemap 2017-04-10 04:39:51.000000000 +0200 @@ -4,7 +4,7 @@ ## Author: Mattia Barbon ## Modified by: ## Created: 29/10/2000 -## RCS-ID: $Id: typemap.tmpl 3521 2014-05-12 10:09:20Z mdootson $ +## RCS-ID: $Id: typemap 3550 2017-04-10 02:39:52Z mdootson $ ## Copyright: (c) 2000-2013 Mattia Barbon ## Licence: This program is free software; you can redistribute it and/or ## modify it under the same terms as Perl itself @@ -64,6 +64,7 @@ wxWindowVariant T_ENUM wxImageResizeQuality T_ENUM wxAlignment T_ENUM +wxScrollbarVisibility T_ENUM wxFindReplaceDialogStyles T_ENUM wxFindReplaceFlags T_ENUM diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Wx-0.9928/typemap.tmpl new/Wx-0.9932/typemap.tmpl --- old/Wx-0.9928/typemap.tmpl 2015-12-20 13:28:50.000000000 +0100 +++ new/Wx-0.9932/typemap.tmpl 2017-04-10 04:39:51.000000000 +0200 @@ -4,7 +4,7 @@ ## Author: Mattia Barbon ## Modified by: ## Created: 29/10/2000 -## RCS-ID: $Id: typemap.tmpl 3521 2014-05-12 10:09:20Z mdootson $ +## RCS-ID: $Id: typemap.tmpl 3550 2017-04-10 02:39:52Z mdootson $ ## Copyright: (c) 2000-2013 Mattia Barbon ## Licence: This program is free software; you can redistribute it and/or ## modify it under the same terms as Perl itself @@ -64,6 +64,7 @@ wxWindowVariant T_ENUM wxImageResizeQuality T_ENUM wxAlignment T_ENUM +wxScrollbarVisibility T_ENUM wxFindReplaceDialogStyles T_ENUM wxFindReplaceFlags T_ENUM
