From 9296aec3a5102fcbf7a5fb586a4f71e8eb44fba4 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 7 Feb 2010 17:21:59 +0000 Subject: [PATCH 3/5] Switch from DirectFB to X11: Update libraries in pkg-config calls. --- packages/cdebconf/debian/changelog | 1 + .../cdebconf/src/modules/frontend/gtk/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/cdebconf/debian/changelog b/packages/cdebconf/debian/changelog index f876d99..8759fe0 100644 --- a/packages/cdebconf/debian/changelog +++ b/packages/cdebconf/debian/changelog @@ -7,6 +7,7 @@ cdebconf (0.148) UNRELEASED; urgency=low - Bump the Build-Depends on libcairo2-dev to ensure the new udeb gets a dependency on libcairo2-udeb. - Disable DirectFB includes and dfb_input_device_reload_keymap(). + - Update libraries in pkg-config calls. -- Cyril Brulebois Sun, 07 Feb 2010 17:05:11 +0000 diff --git a/packages/cdebconf/src/modules/frontend/gtk/Makefile b/packages/cdebconf/src/modules/frontend/gtk/Makefile index 350b878..b9ae740 100644 --- a/packages/cdebconf/src/modules/frontend/gtk/Makefile +++ b/packages/cdebconf/src/modules/frontend/gtk/Makefile @@ -14,10 +14,10 @@ OBJS = cdebconf_gtk.opic \ ifneq ($(strip $(filter -DDI_UDEB, $(CFLAGS))),) OBJS += screenshot.opic di.opic -MODCFLAGS = `pkg-config --cflags gtk+-directfb-2.0 \ - gthread-2.0 directfb-internal` -MODLDFLAGS = `pkg-config --libs gtk+-directfb-2.0 \ - gthread-2.0 directfb-internal` -ldebian-installer +MODCFLAGS = `pkg-config --cflags gtk+-x11-2.0 \ + gthread-2.0` +MODLDFLAGS = `pkg-config --libs gtk+-x11-2.0 \ + gthread-2.0` -ldebian-installer else MODCFLAGS = `pkg-config --cflags gtk+-2.0 gthread-2.0` MODLDFLAGS = `pkg-config --libs gtk+-2.0 gthread-2.0` -ldebian-installer -- 1.6.6.1