Bug#967452: gplanarity: depends on deprecated GTK 2

[Alexandre Detiste]

Thanks Tim !

Please apply this patch in you repository

Greetings

Alexandre

---

Description: Fix cross build
Do not hardcode LD & PKG_CONFIG
Author: Helmut Grohne <helmut at subdivi.de>
Bug-Debian: http://bugs.debian.org/901691

--- gplanarity-17906.orig/Makefile
+++ gplanarity-17906/Makefile
@@ -4,7 +4,8 @@

TARGET  = gPlanarity
CC      = gcc
-LD      = gcc
+LD      = $(CC)
+PKG_CONFIG ?= pkg-config
export INSTALL = install
PREFIX  = $(DESTDIR)/usr
BINDIR  = $(PREFIX)/games
@@ -50,24 +51,24 @@
       gameboard_logic_fade.o graph_generate_mesh2.o graph_region.o
CAIROVER =  >= 1.0.0
GTKVER   =  >= 2.7.2
-GCF  = `pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2"`
-LDF  = `pkg-config --libs "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2"`
+GCF  = `$(PKG_CONFIG) --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)
freetype2"`
+LDF  = `$(PKG_CONFIG) --libs "gtk+-2.0 $(GTKVER) cairo $(CAIROVER) freetype2"`

all: all-local all-recursive

all-local:
-       pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)
freetype2" 1>/dev/null
+       $(PKG_CONFIG) --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)
freetype2" 1>/dev/null
       $(MAKE) target CFLAGS='$(CFLAGS) -ffast-math $(GCF) $(ADD_DEF)'

all-recursive:
       for D in $(SUBDIRS); do make -C $$D || exit 1; done

debug:
-       pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)
freetype2" 1>/dev/null
+       $(PKG_CONFIG) --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)
freetype2" 1>/dev/null
       $(MAKE) target CFLAGS='-g -Wall -W -Wno-unused-parameter
-D__NO_MATH_INLINES $(GCF) $(ADD_DEF)'

profile:
-       pkg-config --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)
freetype2" 1>/dev/null
+       $(PKG_CONFIG) --cflags "gtk+-2.0 $(GTKVER) cairo $(CAIROVER)
freetype2" 1>/dev/null
       $(MAKE) target CFLAGS='-pg -g -O2 -ffast-math $(GCF)
$(ADD_DEF)" LIBS="$(LIBS) -lgprof-helper'

clean: clean-local clean-recursive
@@ -89,7 +90,8 @@
include $(SRC:.c=.d)
endif

-target:  $(OBJ)
+target: $(TARGET)
+$(TARGET): $(OBJ)
       ./touch-version
       $(LD) $(OBJ) $(LDFLAGS) -o $(TARGET) $(LIBS) $(LDF) -lm