Author: lisu Date: Wed Jul 6 09:15:47 2011 GMT Module: packages Tag: HEAD ---- Log message: - fix build with libxfce4ui
---- Files affected: packages/xfce4-timer-plugin: xfce4-timer-plugin.spec (1.11 -> 1.12) , xfce4-timer-plugin-libxfce4ui.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/xfce4-timer-plugin/xfce4-timer-plugin.spec diff -u packages/xfce4-timer-plugin/xfce4-timer-plugin.spec:1.11 packages/xfce4-timer-plugin/xfce4-timer-plugin.spec:1.12 --- packages/xfce4-timer-plugin/xfce4-timer-plugin.spec:1.11 Wed Jul 6 09:51:42 2011 +++ packages/xfce4-timer-plugin/xfce4-timer-plugin.spec Wed Jul 6 11:15:42 2011 @@ -8,12 +8,13 @@ Group: X11/Applications Source0: http://goodies.xfce.org/releases/xfce4-timer-plugin/%{name}-%{version}.tar.bz2 # Source0-md5: ba5ae0e25f69517338f74a27fbaf4ca2 +Patch0: %{name}-libxfce4ui.patch URL: http://goodies.xfce.org/projects/panel-plugins/xfce4-timer-plugin BuildRequires: autoconf >= 2.50 BuildRequires: automake BuildRequires: intltool BuildRequires: libtool -BuildRequires: libxfcegui4-devel >= 4.2.0 +BuildRequires: libxfce4ui-devel BuildRequires: pkgconfig BuildRequires: xfce4-dev-tools >= 4.4.0 BuildRequires: xfce4-panel-devel >= 4.4.0 @@ -30,6 +31,7 @@ %prep %setup -q +%patch0 -p1 %build %{__intltoolize} @@ -67,6 +69,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2011/07/06 09:15:42 lisu +- fix build with libxfce4ui + Revision 1.11 2011/07/06 07:51:42 lisu - add only BR: libxfcegui4-devel >= 4.2.0 ================================================================ Index: packages/xfce4-timer-plugin/xfce4-timer-plugin-libxfce4ui.patch diff -u /dev/null packages/xfce4-timer-plugin/xfce4-timer-plugin-libxfce4ui.patch:1.1 --- /dev/null Wed Jul 6 11:15:47 2011 +++ packages/xfce4-timer-plugin/xfce4-timer-plugin-libxfce4ui.patch Wed Jul 6 11:15:42 2011 @@ -0,0 +1,41 @@ +--- xfce4-timer-plugin-0.6.1/configure.in~ 2008-11-20 21:45:22.000000000 +0100 ++++ xfce4-timer-plugin-0.6.1/configure.in 2011-07-06 10:49:47.560501986 +0200 +@@ -32,7 +32,7 @@ + dnl required + XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0]) + XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.4.0]) +-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.2.0]) ++XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.2.0]) + XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.20]) + XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.0]) + +--- xfce4-timer-plugin-0.6.1/src/xfcetimer.c~ 2008-11-20 21:45:21.000000000 +0100 ++++ xfce4-timer-plugin-0.6.1/src/xfcetimer.c 2011-07-06 11:08:57.264517246 +0200 +@@ -36,9 +36,8 @@ + #include <gtk/gtk.h> + + #include <libxfce4util/libxfce4util.h> +-#include <libxfcegui4/xfce_iconbutton.h> +-#include <libxfce4panel/xfce-panel-plugin.h> +-#include <libxfcegui4/dialogs.h> ++#include <libxfce4ui/libxfce4ui.h> ++#include <libxfce4panel/libxfce4panel.h> + + #include "xfcetimer.h" + +--- xfce4-timer-plugin-0.6.1/src/Makefile.am~ 2008-11-20 21:45:21.000000000 +0100 ++++ xfce4-timer-plugin-0.6.1/src/Makefile.am 2011-07-06 11:13:21.227027425 +0200 +@@ -18,11 +18,11 @@ + xfce4_timer_LDFLAGS = \ + @LIBXFCE4PANEL_LIBS@ \ + @LIBXFCE4UTIL_LIBS@ \ +- @LIBXFCEGUI4_LIBS@ ++ @LIBXFCE4UI_LIBS@ + + xfce4_timer_CFLAGS = \ + -I$(top_srcdir) \ +- @LIBXFCEGUI4_CFLAGS@ \ ++ @LIBXFCE4UI_CFLAGS@ \ + @LIBXFCE4UTIL_CFLAGS@ \ + @LIBXFCE4PANEL_CFLAGS@ \ + -DPACKAGE_LOCALE_DIR=\"$(localedir)\" ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xfce4-timer-plugin/xfce4-timer-plugin.spec?r1=1.11&r2=1.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
