[gtkdatabox] Fixes FTBFS #715761
Eric Work
ework at fedoraproject.org
Sun Jun 26 07:26:51 UTC 2011
commit b5aea8b32a2d1cb6ddb5f37cf186803794820c95
Author: Eric Work <ework at erwin.work.local>
Date: Sun Jun 26 00:25:31 2011 -0700
Fixes FTBFS #715761
gtkdatabox-0.9.1.1-gdk-deprecated.patch | 104 +++++++++++++++++++++++++++++++
gtkdatabox.spec | 26 +++-----
2 files changed, 113 insertions(+), 17 deletions(-)
---
diff --git a/gtkdatabox-0.9.1.1-gdk-deprecated.patch b/gtkdatabox-0.9.1.1-gdk-deprecated.patch
new file mode 100644
index 0000000..9df23d5
--- /dev/null
+++ b/gtkdatabox-0.9.1.1-gdk-deprecated.patch
@@ -0,0 +1,104 @@
+diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_bars.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_bars.c
+--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_bars.c 2011-06-25 21:24:24.168596670 -0700
++++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_bars.c 2011-06-25 21:33:48.302358825 -0700
+@@ -17,6 +17,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++/* FIXME: need porting to cairo */
++#undef GDK_DISABLE_DEPRECATED
++
+ #include <gtkdatabox_bars.h>
+
+ static void gtk_databox_bars_real_draw (GtkDataboxGraph * bars,
+diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c gtkdatabox-0.9.1.1/gtk/gtkdatabox.c
+--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox.c 2011-06-25 21:24:24.172596770 -0700
++++ gtkdatabox-0.9.1.1/gtk/gtkdatabox.c 2011-06-25 21:33:39.488359126 -0700
+@@ -17,6 +17,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++/* FIXME: need porting to cairo */
++#undef GDK_DISABLE_DEPRECATED
++
+ #include <gtkdatabox.h>
+ #include <gtkdatabox_marshal.h>
+ #include <gtk/gtkhscrollbar.h>
+diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_graph.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_graph.c
+--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_graph.c 2011-06-25 21:24:24.164596569 -0700
++++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_graph.c 2011-06-25 21:34:09.002353964 -0700
+@@ -17,6 +17,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++/* FIXME: need porting to cairo */
++#undef GDK_DISABLE_DEPRECATED
++
+ #include <gtkdatabox_graph.h>
+ #include <gtk/gtkstyle.h>
+ #include <gtk/gtkgc.h>
+diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_grid.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_grid.c
+--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_grid.c 2011-06-25 21:24:24.167596645 -0700
++++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_grid.c 2011-06-25 21:35:26.135286035 -0700
+@@ -17,6 +17,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++/* FIXME: need porting to cairo */
++#undef GDK_DISABLE_DEPRECATED
++
+ #include <gtkdatabox_grid.h>
+
+ static void gtk_databox_grid_real_draw (GtkDataboxGraph * grid,
+diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_lines.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_lines.c
+--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_lines.c 2011-06-25 21:24:24.171596745 -0700
++++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_lines.c 2011-06-25 21:36:28.252177144 -0700
+@@ -17,6 +17,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++/* FIXME: need porting to cairo */
++#undef GDK_DISABLE_DEPRECATED
++
+ #include <gtkdatabox_lines.h>
+
+ static void gtk_databox_lines_real_draw (GtkDataboxGraph * lines,
+diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_markers.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_markers.c
+--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_markers.c 2011-06-25 21:24:24.172596770 -0700
++++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_markers.c 2011-06-25 21:36:35.574161250 -0700
+@@ -17,6 +17,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++/* FIXME: need porting to cairo */
++#undef GDK_DISABLE_DEPRECATED
++
+ #include <gtkdatabox_markers.h>
+ #include <pango/pango.h>
+
+diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_points.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_points.c
+--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_points.c 2011-06-25 21:24:24.170596720 -0700
++++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_points.c 2011-06-25 21:36:41.875147166 -0700
+@@ -17,6 +17,9 @@
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
++/* FIXME: need porting to cairo */
++#undef GDK_DISABLE_DEPRECATED
++
+ #include <gtkdatabox_points.h>
+
+ static void gtk_databox_points_real_draw (GtkDataboxGraph * points,
+diff -urN gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c
+--- gtkdatabox-0.9.1.1.orig/gtk/gtkdatabox_ruler.c 2011-06-25 21:24:24.165596595 -0700
++++ gtkdatabox-0.9.1.1/gtk/gtkdatabox_ruler.c 2011-06-25 21:36:57.220110723 -0700
+@@ -27,6 +27,9 @@
+
+ /* Modified by Roland Bock 2007, see ChangeLog */
+
++/* FIXME: need porting to cairo */
++#undef GDK_DISABLE_DEPRECATED
++
+ #include <gtkdatabox_ruler.h>
+
+ #include <math.h>
diff --git a/gtkdatabox.spec b/gtkdatabox.spec
index 976948b..8705201 100644
--- a/gtkdatabox.spec
+++ b/gtkdatabox.spec
@@ -1,6 +1,6 @@
Name: gtkdatabox
Version: 0.9.1.1
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: GTK+ widget for fast data display
Group: System Environment/Libraries
License: LGPLv2+
@@ -9,9 +9,10 @@ Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.
Patch0: gtkdatabox-0.8.2.0-userpmoptflags.patch
Patch1: gtkdatabox-0.9.1.1-gtk-2.20.patch
Patch2: gtkdatabox-0.9.1.1-gtk-2.22.patch
+Patch3: gtkdatabox-0.9.1.1-gdk-deprecated.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel, pkgconfig
-BuildRequires: libglade2-devel, glade3-libgladeui-devel
+BuildRequires: libglade2-devel
%description
GtkDatabox is a widget for the GTK+ library designed to display
@@ -35,23 +36,15 @@ Requires: %{name} = %{version}-%{release}
%description libglade
The %{name}-libglade package contains support files for libglade.
-%package glade
-Summary: Glade 3 support files for %{name}
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description glade
-The %{name}-glade package contains support files for glade.
-
%prep
%setup -q
%patch0 -p1 -b .optflags
%patch1 -p1 -b .gtk220
%patch2 -p1 -b .gtk222
+%patch3 -p1 -b .gdkdep
%build
-%configure --disable-static --disable-rpath \
- --enable-libglade --enable-glade LIBS="-lm"
+%configure --disable-static --disable-rpath --enable-libglade LIBS="-lm"
# fix rpath libtool issues
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -87,12 +80,11 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_libdir}/libglade/2.0/libdatabox.so
-%files glade
-%defattr(-,root,root,-)
-%{_libdir}/glade3/modules/libgladedatabox.so
-%{_datadir}/glade3/catalogs/gtkdatabox.xml
-
%changelog
+* Sat Jun 25 2011 Eric Work <work.eric at gmail.com> - 0.9.1.1-6
+- Allow deprecated GDK functions
+- Disable glade subpackage requires gtk-3.0
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list