From 9de67c4a92b2bc326b961985c43ef37284bb3de9ad707cfcaad96bc92553d637 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 19 Feb 2018 00:15:35 +0000 Subject: [PATCH 1/4] Accepting request 577601 from home:e9925248:branches:X11:wxWidgets - Update to 3.1.1-rc (3.1.1~2807) OBS-URL: https://build.opensuse.org/request/show/577601 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=40 --- wxGTK3-3_2.changes | 5 +++++ wxGTK3-3_2.spec | 2 +- wxQt-3_2.changes | 5 +++++ wxQt-3_2.spec | 2 +- wxWidgets-3.1.1~2640.tar.xz | 3 --- wxWidgets-3.1.1~2807.tar.xz | 3 +++ wxWidgets-3_2.changes | 5 +++++ wxWidgets-3_2.spec | 2 +- 8 files changed, 21 insertions(+), 6 deletions(-) delete mode 100644 wxWidgets-3.1.1~2640.tar.xz create mode 100644 wxWidgets-3.1.1~2807.tar.xz diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes index 095938c..b6288df 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 17 10:31:37 UTC 2018 - martin.koegler@chello.at + +- Update to 3.1.1-rc (3.1.1~2807) + ------------------------------------------------------------------- Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index 948ada1..1534db1 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -21,7 +21,7 @@ Name: wxGTK3-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 5 -Version: 3.1.1~2640 +Version: 3.1.1~2807 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes index 095938c..b6288df 100644 --- a/wxQt-3_2.changes +++ b/wxQt-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 17 10:31:37 UTC 2018 - martin.koegler@chello.at + +- Update to 3.1.1-rc (3.1.1~2807) + ------------------------------------------------------------------- Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index f3fe607..02c7bf1 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -21,7 +21,7 @@ Name: wxQt-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 5 -Version: 3.1.1~2640 +Version: 3.1.1~2807 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 diff --git a/wxWidgets-3.1.1~2640.tar.xz b/wxWidgets-3.1.1~2640.tar.xz deleted file mode 100644 index 6ce752b..0000000 --- a/wxWidgets-3.1.1~2640.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcf65d6ef76ebd590b64088274b802711e23bb8889a116874b21a29df34b7afd -size 21917832 diff --git a/wxWidgets-3.1.1~2807.tar.xz b/wxWidgets-3.1.1~2807.tar.xz new file mode 100644 index 0000000..5b0d286 --- /dev/null +++ b/wxWidgets-3.1.1~2807.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85ebdf1e08c1ceb25e7428d0b37de3187b9bd40a37991397b41ee337078a1481 +size 12787400 diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index 095938c..b6288df 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 17 10:31:37 UTC 2018 - martin.koegler@chello.at + +- Update to 3.1.1-rc (3.1.1~2807) + ------------------------------------------------------------------- Wed Jan 24 09:07:47 UTC 2018 - jengelh@inai.de diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 026111a..aa2485a 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -21,7 +21,7 @@ Name: wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 5 -Version: 3.1.1~2640 +Version: 3.1.1~2807 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 From 9d7ffea1b9e5df54ebb78275e5264ac7ee71c0cfbd3c0c0796023e6226b41430 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 19 Feb 2018 00:32:36 +0000 Subject: [PATCH 2/4] - Update to new upstream release 3.1.1 OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=41 --- _service | 2 +- wxGTK3-3_2.changes | 17 +++++++++++++++++ wxGTK3-3_2.spec | 2 +- wxQt-3_2.changes | 17 +++++++++++++++++ wxQt-3_2.spec | 2 +- wxWidgets-3.1.1.g3.tar.xz | 3 +++ wxWidgets-3.1.1~2807.tar.xz | 3 --- wxWidgets-3_2.changes | 17 +++++++++++++++++ wxWidgets-3_2.spec | 2 +- 9 files changed, 58 insertions(+), 7 deletions(-) create mode 100644 wxWidgets-3.1.1.g3.tar.xz delete mode 100644 wxWidgets-3.1.1~2807.tar.xz diff --git a/_service b/_service index 28cc3b9..c4ac3ae 100644 --- a/_service +++ b/_service @@ -3,7 +3,7 @@ git git://github.com/wxWidgets/wxWidgets master - 3.1.1~@TAG_OFFSET@ + 3.1.1.g@TAG_OFFSET@ v(.*) diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes index b6288df..c9ec7a6 100644 --- a/wxGTK3-3_2.changes +++ b/wxGTK3-3_2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Feb 19 00:24:12 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 3.1.1 + * wxRibbonButtonBar::DeleteButton() now deletes and not just + removes the button. + * Using invalid flags with wxBoxSizer or wxGridSizer items now + triggers asserts + * wxWS_EX_VALIDATE_RECURSIVELY is now the default behaviour. + * wxListCtrl::HasCheckboxes() and EnableCheckboxes(), which + were added in 3.1.0, have been renamed to HasCheckBoxes and + EnableCheckBoxes respectively for consistency with wxCheckBox + naming. + * wxZipOutputStream will now automatically convert filenames to + UTF-8, if the wxMBConv used when calling the constructor + supports UTF-8 encoding. + ------------------------------------------------------------------- Sat Feb 17 10:31:37 UTC 2018 - martin.koegler@chello.at diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index 1534db1..46895c5 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -21,7 +21,7 @@ Name: wxGTK3-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 5 -Version: 3.1.1~2807 +Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes index b6288df..c9ec7a6 100644 --- a/wxQt-3_2.changes +++ b/wxQt-3_2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Feb 19 00:24:12 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 3.1.1 + * wxRibbonButtonBar::DeleteButton() now deletes and not just + removes the button. + * Using invalid flags with wxBoxSizer or wxGridSizer items now + triggers asserts + * wxWS_EX_VALIDATE_RECURSIVELY is now the default behaviour. + * wxListCtrl::HasCheckboxes() and EnableCheckboxes(), which + were added in 3.1.0, have been renamed to HasCheckBoxes and + EnableCheckBoxes respectively for consistency with wxCheckBox + naming. + * wxZipOutputStream will now automatically convert filenames to + UTF-8, if the wxMBConv used when calling the constructor + supports UTF-8 encoding. + ------------------------------------------------------------------- Sat Feb 17 10:31:37 UTC 2018 - martin.koegler@chello.at diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index 02c7bf1..1afd0ee 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -21,7 +21,7 @@ Name: wxQt-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 5 -Version: 3.1.1~2807 +Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 diff --git a/wxWidgets-3.1.1.g3.tar.xz b/wxWidgets-3.1.1.g3.tar.xz new file mode 100644 index 0000000..fba0f33 --- /dev/null +++ b/wxWidgets-3.1.1.g3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:807d264f7f0ef1d8f5d4cb1fb6fd13e9d31116d4b7fd780e3929c109eccfdeb9 +size 21924192 diff --git a/wxWidgets-3.1.1~2807.tar.xz b/wxWidgets-3.1.1~2807.tar.xz deleted file mode 100644 index 5b0d286..0000000 --- a/wxWidgets-3.1.1~2807.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85ebdf1e08c1ceb25e7428d0b37de3187b9bd40a37991397b41ee337078a1481 -size 12787400 diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes index b6288df..c9ec7a6 100644 --- a/wxWidgets-3_2.changes +++ b/wxWidgets-3_2.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Feb 19 00:24:12 UTC 2018 - jengelh@inai.de + +- Update to new upstream release 3.1.1 + * wxRibbonButtonBar::DeleteButton() now deletes and not just + removes the button. + * Using invalid flags with wxBoxSizer or wxGridSizer items now + triggers asserts + * wxWS_EX_VALIDATE_RECURSIVELY is now the default behaviour. + * wxListCtrl::HasCheckboxes() and EnableCheckboxes(), which + were added in 3.1.0, have been renamed to HasCheckBoxes and + EnableCheckBoxes respectively for consistency with wxCheckBox + naming. + * wxZipOutputStream will now automatically convert filenames to + UTF-8, if the wxMBConv used when calling the constructor + supports UTF-8 encoding. + ------------------------------------------------------------------- Sat Feb 17 10:31:37 UTC 2018 - martin.koegler@chello.at diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index aa2485a..0deef38 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -21,7 +21,7 @@ Name: wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse %define sonum 5 -Version: 3.1.1~2807 +Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1 %define wx_micro 3.1.1 From 40e380662dd78dd5da9d2cc6f0e96abb3312081e9a7436d61f05abb8a336a543 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 19 Feb 2018 00:34:12 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=42 --- soversion.diff | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/soversion.diff b/soversion.diff index cc1c96e..8b0f273 100644 --- a/soversion.diff +++ b/soversion.diff @@ -15,7 +15,8 @@ Record of names used in openSUSE: wxWidgets 3.0.2: libwx_*-suse.so.1 wxWidgets 3.1.0~g61143(dp only): libwx_*-suse.so.2 wxWidgets 3.1.0.g2244(dp only): libwx_*-suse.so.4 - wxWidgets 3.1.1~2640(dp only): libwx_*-suse.so.5 + wxWidgets 3.1.1~2640: libwx_*-suse.so.5 + wxWidgets 3.1.1.g3: libwx_*-suse.so.6 Since SOVERLINUX does not support TWOSYMLINKS=0, patch and use a bit on SOVERSOLARIS instead. @@ -50,7 +51,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX) @COND_USE_SOVERSION_0@dll___targetsuf3 = .$(SO_SUFFIX) -@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).1 -+@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).5 ++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).6 @COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \ @COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME) @COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \ From c2adcb96f627968b23f321e93ade8f2a9f04d3313bfbae4f92b83049e1f55b5e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 19 Feb 2018 00:58:02 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/X11:wxWidgets/wxWidgets-3_2?expand=0&rev=43 --- wxGTK3-3_2.spec | 2 +- wxQt-3_2.spec | 2 +- wxWidgets-3_2.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec index 46895c5..63bd66b 100644 --- a/wxGTK3-3_2.spec +++ b/wxGTK3-3_2.spec @@ -20,7 +20,7 @@ Name: wxGTK3-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define sonum 5 +%define sonum 6 Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1 diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec index 1afd0ee..847f059 100644 --- a/wxQt-3_2.spec +++ b/wxQt-3_2.spec @@ -20,7 +20,7 @@ Name: wxQt-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define sonum 5 +%define sonum 6 Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1 diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec index 0deef38..7560413 100644 --- a/wxWidgets-3_2.spec +++ b/wxWidgets-3_2.spec @@ -20,7 +20,7 @@ Name: wxWidgets-3_2 %define base_name wxWidgets-3_2 %define tarball_name wxWidgets %define variant suse -%define sonum 5 +%define sonum 6 Version: 3.1.1.g3 Release: 0 %define wx_minor 3.1