diff --git a/_service b/_service index 327de2d..28cc3b9 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git git://github.com/wxWidgets/wxWidgets master - @PARENT_TAG@.@TAG_OFFSET@ + 3.1.1~@TAG_OFFSET@ v(.*) diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index ba4b5b5..f84156f 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -21,10 +21,10 @@ Name: wxGTK3-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 4 -Version: 3.1.0.2244 +Version: 3.1.1~2244 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.0 +%define wx_micro 3.1.1 # lang packages are exactly equal for all variants. Build it only once: %if "%name" == "%base_name" %define BUILD_LANG 1 @@ -37,7 +37,7 @@ Summary: C++ Library for Cross-Platform Development License: GPL-2.0+ Group: Development/Libraries/C and C++ Url: http://www.wxwidgets.org/ -Source: https://github.com/wxWidgets/wxWidgets/releases/download/v%version/%tarball_name-%version.tar.bz2 +Source: %tarball_name-%version.tar.xz Source2: README.SUSE Source5: rpmlintrc # This script is not used during build, but it makes possible to diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index f44f7b0..fd23740 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -21,10 +21,10 @@ Name: wxQt-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 4 -Version: 3.1.0.2244 +Version: 3.1.1~2244 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.0 +%define wx_micro 3.1.1 # lang packages are exactly equal for all variants. Build it only once: %if "%name" == "%base_name" %define BUILD_LANG 1 @@ -37,7 +37,7 @@ Summary: C++ Library for Cross-Platform Development License: GPL-2.0+ Group: Development/Libraries/C and C++ Url: http://www.wxwidgets.org/ -Source: https://github.com/wxWidgets/wxWidgets/releases/download/v%version/%tarball_name-%version.tar.bz2 +Source: %tarball_name-%version.tar.xz Source2: README.SUSE Source5: rpmlintrc # This script is not used during build, but it makes possible to @@ -246,7 +246,7 @@ read %_docdir/%name/README.SUSE to pick a correct variant. %prep echo "=== RPM build flags: WX_DEBUG=0%{?WX_DEBUG}" %setup -q -n %tarball_name-%version -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 cp %{S:2} . %build diff --git a/wxWidgets-3.1.0.2244.tar.xz b/wxWidgets-3.1.0.2244.tar.xz deleted file mode 100644 index b37add8..0000000 --- a/wxWidgets-3.1.0.2244.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f5683afe475aef049b5700dc052295f03e0173046d93557ee1174a4d4f756f3c -size 21658448 diff --git a/wxWidgets-3.1.1~2244.tar.xz b/wxWidgets-3.1.1~2244.tar.xz new file mode 100644 index 0000000..ec1db58 --- /dev/null +++ b/wxWidgets-3.1.1~2244.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:964c2da4a947af84adb683d4a564ad549d48058ec8048eca6df7a2fb3f7931b3 +size 21657792 diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 2dc3f51..10f2d71 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -21,10 +21,10 @@ Name: wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 4 -Version: 3.1.0.2244 +Version: 3.1.1~2244 Release: 0 %define wx_minor 3.1 -%define wx_micro 3.1.0 +%define wx_micro 3.1.1 # lang packages are exactly equal for all variants. Build it only once: %if "%name" == "%base_name" %define BUILD_LANG 1 diff --git a/wxqt-compile.diff b/wxqt-compile.diff index b3ba880..15802e3 100644 --- a/wxqt-compile.diff +++ b/wxqt-compile.diff @@ -11,447 +11,19 @@ wxAcceleratorTable::ConvertShortcutTable(QWidget*) const': Change code to use full PIMPL so that wx headers do not depend on Qt at all (this is the declared goal of wx). --- - include/wx/qt/accel.h | 3 -- - include/wx/qt/app.h | 2 - - include/wx/qt/colour.h | 30 ++++++++++------------- - include/wx/qt/window.h | 1 - src/qt/accel.cpp | 2 - - src/qt/app.cpp | 1 - src/qt/bitmap.cpp | 2 - - src/qt/brush.cpp | 6 ++-- - src/qt/calctrl.cpp | 14 +++++----- - src/qt/colordlg.cpp | 4 +-- - src/qt/colour.cpp | 59 ++++++++++++++++++++++++++++++++++++++++++++++ - src/qt/dc.cpp | 16 ++++++------ - src/qt/evtloop.cpp | 1 - src/qt/listctrl.cpp | 4 +-- - src/qt/pen.cpp | 6 ++-- - 19 files changed, 109 insertions(+), 48 deletions(-) + src/qt/accel.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: wxWidgets/include/wx/qt/accel.h +Index: wxWidgets-3.1.1~2244/src/qt/accel.cpp =================================================================== ---- wxWidgets.orig/include/wx/qt/accel.h -+++ wxWidgets/include/wx/qt/accel.h -@@ -9,8 +9,7 @@ - #ifndef _WX_QT_ACCEL_H_ - #define _WX_QT_ACCEL_H_ - --#include --#include -+#include - - /* wxQt accelerators implementation: - * -Index: wxWidgets/include/wx/qt/app.h -=================================================================== ---- wxWidgets.orig/include/wx/qt/app.h -+++ wxWidgets/include/wx/qt/app.h -@@ -9,8 +9,6 @@ - #ifndef _WX_QT_APP_H_ - #define _WX_QT_APP_H_ - --#include -- - class WXDLLIMPEXP_CORE wxApp : public wxAppBase - { - public: -Index: wxWidgets/include/wx/qt/colour.h -=================================================================== ---- wxWidgets.orig/include/wx/qt/colour.h -+++ wxWidgets/include/wx/qt/colour.h -@@ -10,37 +10,35 @@ - #ifndef _WX_QT_COLOUR_H_ - #define _WX_QT_COLOUR_H_ - --#include -+class QColor; - - class WXDLLIMPEXP_CORE wxColour : public wxColourBase - { - public: - DEFINE_STD_WXCOLOUR_CONSTRUCTORS -- wxColour(const QColor& color) : m_qtColor(color) {} -+ wxColour(const QColor &); - -- virtual bool IsOk() const { return m_qtColor.isValid(); } -+ void Init(void); -+ virtual bool IsOk(void) const; - -- unsigned char Red() const { return m_qtColor.red(); } -- unsigned char Green() const { return m_qtColor.green(); } -- unsigned char Blue() const { return m_qtColor.blue(); } -- unsigned char Alpha() const { return m_qtColor.alpha(); } -- -- bool operator==(const wxColour& color) const -- { return m_qtColor == color.m_qtColor; } -- bool operator!=(const wxColour& color) const -- { return m_qtColor != color.m_qtColor; } -+ unsigned char Red(void) const; -+ unsigned char Green(void) const; -+ unsigned char Blue(void) const; -+ unsigned char Alpha(void) const; -+ -+ bool operator==(const wxColour &) const; -+ bool operator!=(const wxColour &) const; - - int GetPixel() const; - -- QColor GetHandle() const { return m_qtColor; }; -+ QColor *GetHandle(void) const; - - protected: - virtual void -- InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a) -- { m_qtColor.setRgb(r, g, b, a); } -+ InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a); - - private: -- QColor m_qtColor; -+ QColor *m_qtColor; - - wxDECLARE_DYNAMIC_CLASS(wxColour); - }; -Index: wxWidgets/include/wx/qt/window.h -=================================================================== ---- wxWidgets.orig/include/wx/qt/window.h -+++ wxWidgets/include/wx/qt/window.h -@@ -11,6 +11,7 @@ - - #include - #include -+#include - - class WXDLLIMPEXP_FWD_CORE wxScrollBar; - class WXDLLIMPEXP_FWD_CORE wxQtShortcutHandler; -Index: wxWidgets/src/qt/accel.cpp -=================================================================== ---- wxWidgets.orig/src/qt/accel.cpp -+++ wxWidgets/src/qt/accel.cpp -@@ -85,7 +85,7 @@ QList< QShortcut* > wxAcceleratorTable:: +--- wxWidgets-3.1.1~2244.orig/src/qt/accel.cpp ++++ wxWidgets-3.1.1~2244/src/qt/accel.cpp +@@ -86,7 +86,7 @@ QList< QShortcut* > *wxAcceleratorTable: { - QList< QShortcut* > qtList; + QList< QShortcut* > *qtList = new QList< QShortcut* >; - for ( wxAccelList::Node *node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext() ) -+ for ( wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext() ) ++ for (wxAccelList::compatibility_iterator node = M_ACCELDATA->m_accels.GetFirst(); node; node = node->GetNext()) { - qtList << ConvertAccelerator( node->GetData(), parent ); + qtList->push_back(ConvertAccelerator( node->GetData(), parent )); } -Index: wxWidgets/src/qt/app.cpp -=================================================================== ---- wxWidgets.orig/src/qt/app.cpp -+++ wxWidgets/src/qt/app.cpp -@@ -13,6 +13,7 @@ - #include "wx/qt/private/utils.h" - #include "wx/qt/private/converter.h" - #include -+#include - - wxIMPLEMENT_DYNAMIC_CLASS(wxApp, wxAppBase); - -Index: wxWidgets/src/qt/bitmap.cpp -=================================================================== ---- wxWidgets.orig/src/qt/bitmap.cpp -+++ wxWidgets/src/qt/bitmap.cpp -@@ -514,7 +514,7 @@ bool wxMask::Create(const wxBitmap& bitm - if (m_qtBitmap) - delete m_qtBitmap; - -- m_qtBitmap = new QBitmap(bitmap.GetHandle()->createMaskFromColor(colour.GetHandle())); -+ m_qtBitmap = new QBitmap(bitmap.GetHandle()->createMaskFromColor(*colour.GetHandle())); - return true; - } - -Index: wxWidgets/src/qt/brush.cpp -=================================================================== ---- wxWidgets.orig/src/qt/brush.cpp -+++ wxWidgets/src/qt/brush.cpp -@@ -95,7 +95,7 @@ wxBrush::wxBrush() - wxBrush::wxBrush(const wxColour& col, wxBrushStyle style ) - { - m_refData = new wxBrushRefData(); -- M_BRUSHDATA.setColor(col.GetHandle()); -+ M_BRUSHDATA.setColor(*col.GetHandle()); - M_BRUSHDATA.setStyle(ConvertBrushStyle(style)); - M_STYLEDATA = style; - } -@@ -103,7 +103,7 @@ wxBrush::wxBrush(const wxColour& col, wx - wxBrush::wxBrush(const wxColour& col, int style) - { - m_refData = new wxBrushRefData(); -- M_BRUSHDATA.setColor(col.GetHandle()); -+ M_BRUSHDATA.setColor(*col.GetHandle()); - M_BRUSHDATA.setStyle(ConvertBrushStyle((wxBrushStyle)style)); - M_STYLEDATA = (wxBrushStyle)style; - } -@@ -122,7 +122,7 @@ wxBrush::wxBrush(const wxBitmap& stipple - void wxBrush::SetColour(const wxColour& col) - { - AllocExclusive(); -- M_BRUSHDATA.setColor(col.GetHandle()); -+ M_BRUSHDATA.setColor(*col.GetHandle()); - } - - void wxBrush::SetColour(unsigned char r, unsigned char g, unsigned char b) -Index: wxWidgets/src/qt/calctrl.cpp -=================================================================== ---- wxWidgets.orig/src/qt/calctrl.cpp -+++ wxWidgets/src/qt/calctrl.cpp -@@ -229,7 +229,7 @@ void wxCalendarCtrl::SetHoliday(size_t d - date.setDate(date.year(), date.month(), day); - - QTextCharFormat format = m_qtCalendar->dateTextFormat(date); -- format.setForeground(m_colHolidayFg.GetHandle()); -+ format.setForeground(*m_colHolidayFg.GetHandle()); - m_qtCalendar->setDateTextFormat(date, format); - } - -@@ -249,9 +249,9 @@ void wxCalendarCtrl::RefreshHolidays() - if ( m_windowStyle & wxCAL_SHOW_HOLIDAYS ) - { - if ( m_colHolidayFg.IsOk() ) -- format.setForeground(m_colHolidayFg.GetHandle()); -+ format.setForeground(*m_colHolidayFg.GetHandle()); - if ( m_colHolidayBg.IsOk() ) -- format.setBackground(m_colHolidayBg.GetHandle()); -+ format.setBackground(*m_colHolidayBg.GetHandle()); - } - else - { -@@ -278,9 +278,9 @@ void wxCalendarCtrl::SetHeaderColours(co - - QTextCharFormat format = m_qtCalendar->headerTextFormat(); - if ( m_colHeaderFg.IsOk() ) -- format.setForeground(m_colHeaderFg.GetHandle()); -+ format.setForeground(*m_colHeaderFg.GetHandle()); - if ( m_colHeaderBg.IsOk() ) -- format.setBackground(m_colHeaderBg.GetHandle()); -+ format.setBackground(*m_colHeaderBg.GetHandle()); - m_qtCalendar->setHeaderTextFormat(format); - } - -@@ -303,9 +303,9 @@ void wxCalendarCtrl::SetAttr(size_t day, - - QTextCharFormat format = m_qtCalendar->dateTextFormat(date); - if ( attr->HasTextColour() ) -- format.setForeground(attr->GetTextColour().GetHandle()); -+ format.setForeground(*attr->GetTextColour().GetHandle()); - if ( attr->HasBackgroundColour() ) -- format.setBackground(attr->GetBackgroundColour().GetHandle()); -+ format.setBackground(*attr->GetBackgroundColour().GetHandle()); - - wxMISSING_IMPLEMENTATION( "Setting font" ); - -Index: wxWidgets/src/qt/colordlg.cpp -=================================================================== ---- wxWidgets.orig/src/qt/colordlg.cpp -+++ wxWidgets/src/qt/colordlg.cpp -@@ -29,10 +29,10 @@ bool wxColourDialog::Create(wxWindow *pa - if ( m_data.GetChooseFull() ) - { - for (int i=0; isetCurrentColor(m_data.GetColour().GetHandle()); -+ GetHandle()->setCurrentColor(*m_data.GetColour().GetHandle()); - - return wxTopLevelWindow::Create( parent, wxID_ANY, ""); - } -Index: wxWidgets/src/qt/colour.cpp -=================================================================== ---- wxWidgets.orig/src/qt/colour.cpp -+++ wxWidgets/src/qt/colour.cpp -@@ -29,7 +29,63 @@ - #endif // WX_PRECOMP - - #include "wx/qt/private/utils.h" -+#include "wx/colour.h" - -+wxColour::wxColour(const QColor &color) : -+ m_qtColor(new QColor(color)) -+{ -+} -+ -+void wxColour::Init(void) -+{ -+ m_qtColor = new QColor(); -+} -+ -+bool wxColour::IsOk(void) const -+{ -+ return m_qtColor->isValid(); -+} -+ -+unsigned char wxColour::Red(void) const -+{ -+ return m_qtColor->red(); -+} -+ -+unsigned char wxColour::Green(void) const -+{ -+ return m_qtColor->green(); -+} -+ -+unsigned char wxColour::Blue(void) const -+{ -+ return m_qtColor->blue(); -+} -+ -+unsigned char wxColour::Alpha(void) const -+{ -+ return m_qtColor->alpha(); -+} -+ -+bool wxColour::operator==(const wxColour &color) const -+{ -+ return *m_qtColor == *color.m_qtColor; -+} -+ -+bool wxColour::operator!=(const wxColour &color) const -+{ -+ return *m_qtColor != *color.m_qtColor; -+} -+ -+QColor *wxColour::GetHandle(void) const -+{ -+ return m_qtColor; -+} -+ -+void wxColour::InitRGBA(unsigned char r, unsigned char g, unsigned char b, -+ unsigned char a) -+{ -+ m_qtColor->setRgb(r, g, b, a); -+} - - int wxColour::GetPixel() const - { - wxMISSING_IMPLEMENTATION( "wxColour::GetPixel" ); -Index: wxWidgets/src/qt/dc.cpp -=================================================================== ---- wxWidgets.orig/src/qt/dc.cpp -+++ wxWidgets/src/qt/dc.cpp -@@ -142,7 +142,7 @@ void wxQtDCImpl::SetBrush(const wxBrush& - { - // Use a monochrome mask: use foreground color for the mask - QBrush b(brush.GetHandle()); -- b.setColor(m_textForegroundColour.GetHandle()); -+ b.setColor(*m_textForegroundColour.GetHandle()); - b.setTexture(b.texture().mask()); - m_qtPainter->setBrush(b); - } -@@ -572,7 +572,7 @@ void wxQtDCImpl::DoDrawEllipse(wxCoord x - // Save pen/brush - savedBrush = m_qtPainter->brush(); - // Fill with text background color ("no fill" like in wxGTK): -- m_qtPainter->setBrush(QBrush(m_textBackgroundColour.GetHandle())); -+ m_qtPainter->setBrush(QBrush(*m_textBackgroundColour.GetHandle())); - } - - // Draw -@@ -617,8 +617,8 @@ void wxQtDCImpl::DoDrawBitmap(const wxBi - QPen savedPen = m_qtPainter->pen(); - - //Use text colors -- m_qtPainter->setBackground(QBrush(m_textBackgroundColour.GetHandle())); -- m_qtPainter->setPen(QPen(m_textForegroundColour.GetHandle())); -+ m_qtPainter->setBackground(QBrush(*m_textBackgroundColour.GetHandle())); -+ m_qtPainter->setPen(QPen(*m_textForegroundColour.GetHandle())); - - //Draw - m_qtPainter->drawPixmap(x, y, pix); -@@ -648,7 +648,7 @@ void wxQtDCImpl::DoDrawBitmap(const wxBi - void wxQtDCImpl::DoDrawText(const wxString& text, wxCoord x, wxCoord y) - { - QPen savedPen = m_qtPainter->pen(); -- m_qtPainter->setPen(QPen(m_textForegroundColour.GetHandle())); -+ m_qtPainter->setPen(QPen(*m_textForegroundColour.GetHandle())); - - // Disable logical function - QPainter::CompositionMode savedOp = m_qtPainter->compositionMode(); -@@ -662,7 +662,7 @@ void wxQtDCImpl::DoDrawText(const wxStri - QBrush savedBrush = m_qtPainter->background(); - - //Use text colors -- m_qtPainter->setBackground(QBrush(m_textBackgroundColour.GetHandle())); -+ m_qtPainter->setBackground(QBrush(*m_textBackgroundColour.GetHandle())); - - //Draw - m_qtPainter->drawText(x, y, 1, 1, Qt::TextDontClip, wxQtConvertString(text)); -@@ -691,7 +691,7 @@ void wxQtDCImpl::DoDrawRotatedText(const - m_qtPainter->rotate(-angle); - - QPen savedPen = m_qtPainter->pen(); -- m_qtPainter->setPen(QPen(m_textForegroundColour.GetHandle())); -+ m_qtPainter->setPen(QPen(*m_textForegroundColour.GetHandle())); - - // Disable logical function - QPainter::CompositionMode savedOp = m_qtPainter->compositionMode(); -@@ -705,7 +705,7 @@ void wxQtDCImpl::DoDrawRotatedText(const - QBrush savedBrush = m_qtPainter->background(); - - //Use text colors -- m_qtPainter->setBackground(QBrush(m_textBackgroundColour.GetHandle())); -+ m_qtPainter->setBackground(QBrush(*m_textBackgroundColour.GetHandle())); - - //Draw - m_qtPainter->drawText(x, y, 1, 1, Qt::TextDontClip, wxQtConvertString(text)); -Index: wxWidgets/src/qt/evtloop.cpp -=================================================================== ---- wxWidgets.orig/src/qt/evtloop.cpp -+++ wxWidgets/src/qt/evtloop.cpp -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - wxQtIdleTimer::wxQtIdleTimer( wxQtEventLoopBase *eventLoop ) - { -Index: wxWidgets/src/qt/listctrl.cpp -=================================================================== ---- wxWidgets.orig/src/qt/listctrl.cpp -+++ wxWidgets/src/qt/listctrl.cpp -@@ -336,9 +336,9 @@ bool wxListCtrl::SetItem(wxListItem& inf - if ( info.GetFont().IsOk() ) - qitem->setFont(col, info.GetFont().GetHandle() ); - if ( info.GetTextColour().IsOk() ) -- qitem->setTextColor(col, info.GetTextColour().GetHandle()); -+ qitem->setTextColor(col, *info.GetTextColour().GetHandle()); - if ( info.GetBackgroundColour().IsOk() ) -- qitem->setBackgroundColor(col, info.GetBackgroundColour().GetHandle()); -+ qitem->setBackgroundColor(col, *info.GetBackgroundColour().GetHandle()); - } - return true; - } -Index: wxWidgets/src/qt/pen.cpp -=================================================================== ---- wxWidgets.orig/src/qt/pen.cpp -+++ wxWidgets/src/qt/pen.cpp -@@ -247,7 +247,7 @@ wxPen::wxPen( const wxColour &colour, in - m_refData = new wxPenRefData(); - M_PENDATA.setWidth(width); - M_PENDATA.setStyle(ConvertPenStyle(style)); -- M_PENDATA.setColor(colour.GetHandle()); -+ M_PENDATA.setColor(*colour.GetHandle()); - } - - wxPen::wxPen(const wxColour& col, int width, int style) -@@ -255,7 +255,7 @@ wxPen::wxPen(const wxColour& col, int wi - m_refData = new wxPenRefData(); - M_PENDATA.setWidth(width); - M_PENDATA.setStyle(ConvertPenStyle((wxPenStyle)style)); -- M_PENDATA.setColor(col.GetHandle()); -+ M_PENDATA.setColor(*col.GetHandle()); - } - - -@@ -276,7 +276,7 @@ bool wxPen::operator!=(const wxPen& pen) - void wxPen::SetColour(const wxColour& col) - { - AllocExclusive(); -- M_PENDATA.setColor(col.GetHandle()); -+ M_PENDATA.setColor(*col.GetHandle()); - } - - void wxPen::SetColour(unsigned char r, unsigned char g, unsigned char b)