diff --git a/.gitignore b/.gitignore index 135635a..0a4525b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /wxWidgets-3.0.0.tar.bz2 /wxWidgets-3.0.1-docs-html.tar.bz2 /wxWidgets-3.0.1.tar.bz2 +/wxWidgets-3.0.2-docs-html.tar.bz2 +/wxWidgets-3.0.2.tar.bz2 diff --git a/sources b/sources index bae4198..80e6fd1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -47dbdd5adf5a7a2c9d3dd58b3d78c9c7 wxWidgets-3.0.1-docs-html.tar.bz2 -dad1f1cd9d4c370cbc22700dc492da31 wxWidgets-3.0.1.tar.bz2 +67844da5ed54c1a09d8d4ebe32a5e00a wxWidgets-3.0.2-docs-html.tar.bz2 +ba4cd1f3853d0cd49134c5ae028ad080 wxWidgets-3.0.2.tar.bz2 diff --git a/wxGTK3-3.0.1-gtkwarnings.patch b/wxGTK3-3.0.1-gtkwarnings.patch deleted file mode 100644 index b0a9fcf..0000000 --- a/wxGTK3-3.0.1-gtkwarnings.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rupN wxWidgets-3.0.1/src/gtk/notebook.cpp wxWidgets-3.0.1-patched/src/gtk/notebook.cpp ---- wxWidgets-3.0.1/src/gtk/notebook.cpp 2014-06-14 17:48:48.000000000 -0400 -+++ wxWidgets-3.0.1-patched/src/gtk/notebook.cpp 2014-09-30 10:44:26.589330444 -0400 -@@ -429,8 +429,9 @@ bool wxNotebook::InsertPage( size_t posi - pageData->m_imageIndex = imageId; - - pageData->m_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1); -+#ifndef __WXGTK3__ - gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2); -- -+#endif - pageData->m_image = NULL; - if (imageId != -1) - { diff --git a/wxGTK3-3.0.2-gtkwarnings.patch b/wxGTK3-3.0.2-gtkwarnings.patch new file mode 100644 index 0000000..b0a9fcf --- /dev/null +++ b/wxGTK3-3.0.2-gtkwarnings.patch @@ -0,0 +1,14 @@ +diff -rupN wxWidgets-3.0.1/src/gtk/notebook.cpp wxWidgets-3.0.1-patched/src/gtk/notebook.cpp +--- wxWidgets-3.0.1/src/gtk/notebook.cpp 2014-06-14 17:48:48.000000000 -0400 ++++ wxWidgets-3.0.1-patched/src/gtk/notebook.cpp 2014-09-30 10:44:26.589330444 -0400 +@@ -429,8 +429,9 @@ bool wxNotebook::InsertPage( size_t posi + pageData->m_imageIndex = imageId; + + pageData->m_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 1); ++#ifndef __WXGTK3__ + gtk_container_set_border_width(GTK_CONTAINER(pageData->m_box), 2); +- ++#endif + pageData->m_image = NULL; + if (imageId != -1) + { diff --git a/wxGTK3.spec b/wxGTK3.spec index 324a101..eb9af08 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -10,8 +10,8 @@ %endif Name: %{wxgtkname} -Version: 3.0.1 -Release: 5%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: GTK port of the wxWidgets GUI library License: wxWidgets Group: System Environment/Libraries @@ -247,6 +247,9 @@ popd %doc html %changelog +* Tue Nov 04 2014 Jeremy Newton - 3.0.2-1 +- Update to 3.0.2 + * Mon Nov 03 2014 Marcin Juszkiewicz - 3.0.1-5 - Add aarch64 and ppc64le to list of 64-bit architectures