From 20dbdc103d30301d3f58487cb33ed3fc5b976ea8 Mon Sep 17 00:00:00 2001 From: alexjnewt@hotmail.com Date: Nov 04 2014 12:57:12 +0000 Subject: Forgot to remove patch --- diff --git a/wxGTK3-3.0.2-gtkwarnings.patch b/wxGTK3-3.0.2-gtkwarnings.patch deleted file mode 100644 index b0a9fcf..0000000 --- a/wxGTK3-3.0.2-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.spec b/wxGTK3.spec index eb9af08..d65b380 100644 --- a/wxGTK3.spec +++ b/wxGTK3.spec @@ -19,8 +19,6 @@ URL: http://www.wxwidgets.org/ Source0: http://downloads.sf.net/wxwindows/%{srcname}-%{version}.tar.bz2 Source1: http://downloads.sf.net/wxwindows/%{srcname}-%{version}-docs-html.tar.bz2 Source10: wx-config -#Fixed Upstream, see RH#1147995 for details -Patch0: %{name}-%{version}-gtkwarnings.patch BuildRequires: gtk%{gtkver}-devel #Note webkitgtk (GTK2) does not appear to be supported @@ -123,7 +121,6 @@ This package provides documentation for the %{srcname} library. %prep %setup -q -n %{srcname}-%{version} -a 1 -%patch0 -p1 # patch some installed files to avoid conflicts with 2.8.* #The following line is disabled to avoid bugs: