From 91e4bf2d67c2ee5f63c2da49430b0146f5a493d8 Mon Sep 17 00:00:00 2001 From: Mike Massonnet Date: Sun, 11 Apr 2010 12:39:07 +0200 Subject: [PATCH] 4.5.7.22: Compile fine with libxfce4panel 4.7 --- configure.in.in | 2 +- globaltime/timezone_selection.c | 1 - panel-plugin/Makefile.am | 7 ++++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.in.in b/configure.in.in index dc3c882..067cd2a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto dnl dnl Version information -m4_define([orage_version], [4.7.5.21-git]) +m4_define([orage_version], [4.7.5.22-git]) m4_define([gtk_minimum_version], [2.10.0]) m4_define([xfce_minimum_version], [4.6.0]) diff --git a/globaltime/timezone_selection.c b/globaltime/timezone_selection.c index 59a4dbe..86b998a 100644 --- a/globaltime/timezone_selection.c +++ b/globaltime/timezone_selection.c @@ -53,7 +53,6 @@ #include #include -#include #include "tz_zoneinfo_read.h" #include "timezone_selection.h" diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 7201c50..e429edb 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -5,10 +5,12 @@ plugin_PROGRAMS = xfce4-orageclock-plugin xfce4_orageclock_plugin_CFLAGS = \ -DPACKAGE_DATA_DIR=\"$(datadir)\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ - @LIBXFCE4PANEL_CFLAGS@ + @LIBXFCE4PANEL_CFLAGS@ \ + @LIBXFCEGUI4_CFLAGS@ xfce4_orageclock_plugin_LDFLAGS = \ @LIBXFCE4PANEL_LIBS@ \ + @LIBXFCEGUI4_LIBS@ \ -lX11 xfce4_orageclock_plugin_SOURCES = \ @@ -22,8 +24,7 @@ xfce4_orageclock_plugin_SOURCES = \ if HAVE_CYGWIN xfce4_orageclock_plugin_LDFLAGS += \ - -no-undefined \ - @LIBXFCEGUI4_LIBS@ + -no-undefined endif # .desktop file -- 1.7.0.3