diff --git a/_service b/_service
index c4ac3ae..56c1295 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
git
git://github.com/wxWidgets/wxWidgets
master
- 3.1.1.g@TAG_OFFSET@
+ 3.1.2.g@TAG_OFFSET@
v(.*)
diff --git a/soversion.diff b/soversion.diff
index 62b5456..7fcbb95 100644
--- a/soversion.diff
+++ b/soversion.diff
@@ -20,7 +20,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in
===================================================================
--- wxWidgets-3.1.0.2244.orig/Makefile.in
+++ wxWidgets-3.1.0.2244/Makefile.in
-@@ -2119,6 +2119,7 @@ LOCALE_MSW_LINGUAS = it
+@@ -2105,6 +2105,7 @@ LOCALE_MSW_LINGUAS = it
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@WXCOMPILER = _gcc
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@WXCOMPILER \
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@ = _gcc$(COMPILER_VERSION)
@@ -28,7 +28,7 @@ Index: wxWidgets-3.1.0.2244/Makefile.in
@COND_OFFICIAL_BUILD_0_PLATFORM_WIN32_1@VENDORTAG = _$(VENDOR)
@COND_OFFICIAL_BUILD_1_PLATFORM_WIN32_1@VENDORTAG =
@COND_BUILD_debug@WXDEBUGFLAG = d
-@@ -2130,7 +2131,7 @@ LOCALE_MSW_LINGUAS = it
+@@ -2116,7 +2117,7 @@ LOCALE_MSW_LINGUAS = it
@COND_PLATFORM_WIN32_0@WXDLLNAMEPREFIXGUI = wx_$(PORTNAME)$(WXUNIVNAME)
@COND_PLATFORM_WIN32_1@WXDLLNAMEPREFIXGUI = \
@COND_PLATFORM_WIN32_1@ wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)
@@ -37,12 +37,12 @@ Index: wxWidgets-3.1.0.2244/Makefile.in
@COND_PLATFORM_WIN32_1@WXDLLVERSIONTAG =
COND_wxUSE_REGEX_builtin___wxregex___depname = \
$(LIBDIRNAME)/$(LIBPREFIX)wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)$(LIBEXT)
-@@ -13524,7 +13525,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
- @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .1.0.0.$(SO_SUFFIX)
- @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -1.$(SO_SUFFIX)
+@@ -13690,7 +13691,7 @@ COND_MONOLITHIC_0_SHARED_1_USE_GUI_1_USE
+ @COND_PLATFORM_MACOSX_1_USE_SOVERSION_1@ = .3.0.0.$(SO_SUFFIX)
+ @COND_USE_SOVERCYGWIN_1_USE_SOVERSION_1@dll___targetsuf3 = -3.$(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).3.1.1
+-@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3
++@COND_USE_SOVERSION_1_USE_SOVERSOLARIS_1@dll___targetsuf3 = .$(SO_SUFFIX).3.1.2
@COND_TOOLKIT_MSW@__RCDEFDIR_p = --include-dir \
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
@COND_wxUSE_LIBTIFF_builtin@__INC_TIFF_BUILD_p_66 \
diff --git a/wxGTK3-3_2.changes b/wxGTK3-3_2.changes
index c9ec7a6..bad21b8 100644
--- a/wxGTK3-3_2.changes
+++ b/wxGTK3-3_2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at
+
+- Update to 3.1.2
+
+-------------------------------------------------------------------
+Tue Apr 17 10:48:16 UTC 2018 - jengelh@inai.de
+
+- Update soversion.diff to use the package version, not some
+ incremental integer.
+
-------------------------------------------------------------------
Mon Feb 19 00:24:12 UTC 2018 - jengelh@inai.de
diff --git a/wxGTK3-3_2.spec b/wxGTK3-3_2.spec
index e55508b..518a391 100644
--- a/wxGTK3-3_2.spec
+++ b/wxGTK3-3_2.spec
@@ -1,7 +1,7 @@
#
# spec file for package wxGTK3-3_2
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,12 +20,12 @@ Name: wxGTK3-3_2
%define base_name wxWidgets-3_2
%define tarball_name wxWidgets
%define variant suse
-%define psonum 3_1_1
-%define sonum 3.1.1
-Version: 3.1.1.g3
+%define psonum 3_1_2
+%define sonum 3.1.2
+Version: 3.1.2.g198
Release: 0
%define wx_minor 3.1
-%define wx_micro 3.1.1
+%define wx_micro 3.1.3
# build non-UI toolkit related packages
%define base_packages 0
Summary: C++ Library for Cross-Platform Development
@@ -39,7 +39,6 @@ Source5: wxWidgets-3_2-rpmlintrc
# identify and backport wxPython fixes to wxWidgets.
Source6: wxpython-mkdiff.sh
Patch1: soversion.diff
-Patch2: wxqt-compile.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SDL-devel
BuildRequires: autoconf
@@ -227,7 +226,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 -P 2 -p1
+%patch -P 1 -p1
cp %{S:2} .
%build
diff --git a/wxQt-3_2.changes b/wxQt-3_2.changes
index c9ec7a6..bad21b8 100644
--- a/wxQt-3_2.changes
+++ b/wxQt-3_2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at
+
+- Update to 3.1.2
+
+-------------------------------------------------------------------
+Tue Apr 17 10:48:16 UTC 2018 - jengelh@inai.de
+
+- Update soversion.diff to use the package version, not some
+ incremental integer.
+
-------------------------------------------------------------------
Mon Feb 19 00:24:12 UTC 2018 - jengelh@inai.de
diff --git a/wxQt-3_2.spec b/wxQt-3_2.spec
index e43f8b4..7893ac6 100644
--- a/wxQt-3_2.spec
+++ b/wxQt-3_2.spec
@@ -1,7 +1,7 @@
#
# spec file for package wxQt-3_2
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,12 +20,12 @@ Name: wxQt-3_2
%define base_name wxWidgets-3_2
%define tarball_name wxWidgets
%define variant suse
-%define psonum 3_1_1
-%define sonum 3.1.1
-Version: 3.1.1.g3
+%define psonum 3_1_2
+%define sonum 3.1.2
+Version: 3.1.2.g198
Release: 0
%define wx_minor 3.1
-%define wx_micro 3.1.1
+%define wx_micro 3.1.3
# build non-UI toolkit related packages
%define base_packages 0
Summary: C++ Library for Cross-Platform Development
@@ -39,7 +39,6 @@ Source5: wxWidgets-3_2-rpmlintrc
# identify and backport wxPython fixes to wxWidgets.
Source6: wxpython-mkdiff.sh
Patch1: soversion.diff
-Patch2: wxqt-compile.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SDL-devel
BuildRequires: autoconf
@@ -228,7 +227,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 -P 2 -p1
+%patch -P 1 -p1
cp %{S:2} .
%build
diff --git a/wxWidgets-3.1.1.g3.tar.xz b/wxWidgets-3.1.1.g3.tar.xz
deleted file mode 100644
index fba0f33..0000000
--- a/wxWidgets-3.1.1.g3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:807d264f7f0ef1d8f5d4cb1fb6fd13e9d31116d4b7fd780e3929c109eccfdeb9
-size 21924192
diff --git a/wxWidgets-3.1.2.g198.tar.xz b/wxWidgets-3.1.2.g198.tar.xz
new file mode 100644
index 0000000..4360919
--- /dev/null
+++ b/wxWidgets-3.1.2.g198.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d96bf0c5150be0b2ce56b1eed1068fadfa13ff24d9d8b03423a8ce5407ae1e4
+size 22350936
diff --git a/wxWidgets-3_2.changes b/wxWidgets-3_2.changes
index abba480..bad21b8 100644
--- a/wxWidgets-3_2.changes
+++ b/wxWidgets-3_2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jan 11 20:13:45 UTC 2019 - martin.koegler@chello.at
+
+- Update to 3.1.2
+
-------------------------------------------------------------------
Tue Apr 17 10:48:16 UTC 2018 - jengelh@inai.de
diff --git a/wxWidgets-3_2.spec b/wxWidgets-3_2.spec
index 1742979..5de5562 100644
--- a/wxWidgets-3_2.spec
+++ b/wxWidgets-3_2.spec
@@ -1,7 +1,7 @@
#
# spec file for package wxWidgets-3_2
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,12 +20,12 @@ Name: wxWidgets-3_2
%define base_name wxWidgets-3_2
%define tarball_name wxWidgets
%define variant suse
-%define psonum 3_1_1
-%define sonum 3.1.1
-Version: 3.1.1.g3
+%define psonum 3_1_2
+%define sonum 3.1.2
+Version: 3.1.2.g198
Release: 0
%define wx_minor 3.1
-%define wx_micro 3.1.1
+%define wx_micro 3.1.3
# build non-UI toolkit related packages
%define base_packages 1
Summary: C++ Library for Cross-Platform Development
@@ -39,7 +39,6 @@ Source5: wxWidgets-3_2-rpmlintrc
# identify and backport wxPython fixes to wxWidgets.
Source6: wxpython-mkdiff.sh
Patch1: soversion.diff
-Patch2: wxqt-compile.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: SDL-devel
BuildRequires: autoconf
@@ -232,7 +231,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 -P 2 -p1
+%patch -P 1 -p1
cp %{S:2} .
%build
diff --git a/wxqt-compile.diff b/wxqt-compile.diff
deleted file mode 100644
index 15802e3..0000000
--- a/wxqt-compile.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Jan Engelhardt
-Date: 2014-12-05 19:29:16.174123839 +0100
-
-build: fix compile errors/warnings
-
-./src/qt/accel.cpp: In member function 'QList
-wxAcceleratorTable::ConvertShortcutTable(QWidget*) const':
-./src/qt/accel.cpp:88:11: error: 'Node' is not a member of
-'wxAccelList'
-
-Change code to use full PIMPL so that wx headers do not depend on Qt at all
-(this is the declared goal of wx).
----
- src/qt/accel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: wxWidgets-3.1.1~2244/src/qt/accel.cpp
-===================================================================
---- 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 = 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())
- {
- qtList->push_back(ConvertAccelerator( node->GetData(), parent ));
- }