From 14e891c362efb52698ca8c9ecabf5ffd0a75e8d01ad8f4115c714cf6e8338edf Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 11 Oct 2011 08:24:54 +0000 Subject: [PATCH] - fixed build with new gtk (2.22 and above) OBS-URL: https://build.opensuse.org/package/show/M17N/gbdfed?expand=0&rev=2 --- gbdfed-1.6-new-gtk.patch | 16 ++++++++++++++++ gbdfed.changes | 5 +++++ gbdfed.spec | 2 ++ 3 files changed, 23 insertions(+) create mode 100644 gbdfed-1.6-new-gtk.patch diff --git a/gbdfed-1.6-new-gtk.patch b/gbdfed-1.6-new-gtk.patch new file mode 100644 index 0000000..16d427d --- /dev/null +++ b/gbdfed-1.6-new-gtk.patch @@ -0,0 +1,16 @@ +http://sofia.nmsu.edu/~mleisher/Software/gbdfed/ see COMPILATION ALERT +Index: gbdfed-1.6/Makefile.in +=================================================================== +--- gbdfed-1.6.orig/Makefile.in ++++ gbdfed-1.6/Makefile.in +@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs + CC = @CC@ + CFLAGS = @XX_CFLAGS@ @CFLAGS@ + +-DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \ +- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ +- -DGTK_DISABLE_DEPRECATED ++DEFINES = @DEFINES@ + + SRCS = bdf.c \ + bdfcons.c \ diff --git a/gbdfed.changes b/gbdfed.changes index 7695167..72486c7 100644 --- a/gbdfed.changes +++ b/gbdfed.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 11 08:24:12 UTC 2011 - pgajdos@suse.com + +- fixed build with new gtk (2.22 and above) + ------------------------------------------------------------------- Tue Apr 20 16:14:58 CEST 2010 - pgajdos@suse.cz diff --git a/gbdfed.spec b/gbdfed.spec index 81d2d59..28fe13d 100644 --- a/gbdfed.spec +++ b/gbdfed.spec @@ -17,6 +17,7 @@ Source4: gbdfed32x32.png Source5: gbdfed48x48.png Patch0: %{name}-%{version}_array-index.patch Patch1: %{name}-%{version}_64bit.patch +Patch2: %{name}-%{version}-new-gtk.patch BuildRequires: freetype2-devel BuildRequires: update-desktop-files BuildRequires: pkgconfig(gtk+-2.0) @@ -37,6 +38,7 @@ fonts. install -m 644 %{SOURCE2} . %patch0 %patch1 +%patch2 -p1 %build %configure