]>
Commit | Line | Data |
---|---|---|
7aad2ba9 JR |
1 | diff -ur xfce4-dict-0.6.0-orig/configure.in xfce4-dict-0.6.0/configure.in |
2 | --- xfce4-dict-0.6.0-orig/configure.in 2009-12-31 01:04:33.000000000 +0100 | |
3 | +++ xfce4-dict-0.6.0/configure.in 2011-03-01 00:45:31.596764895 +0100 | |
4 | @@ -37,7 +37,7 @@ | |
5 | dnl check for required packages | |
6 | XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.6.0]) | |
7 | XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0]) | |
8 | -XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0.0]) | |
9 | +XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0]) | |
10 | XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.4.0.0]) | |
11 | XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0.0]) | |
12 | XDT_CHECK_PACKAGE([X11], [x11]) | |
13 | diff -ur xfce4-dict-0.6.0-orig/lib/Makefile.am xfce4-dict-0.6.0/lib/Makefile.am | |
14 | --- xfce4-dict-0.6.0-orig/lib/Makefile.am 2009-08-13 19:24:47.000000000 +0200 | |
15 | +++ xfce4-dict-0.6.0/lib/Makefile.am 2011-03-01 00:44:43.444764903 +0100 | |
16 | @@ -26,14 +26,14 @@ | |
17 | ||
18 | libdict_la_CFLAGS = \ | |
19 | -I$(top_srcdir) \ | |
20 | - $(LIBXFCEGUI4_CFLAGS) \ | |
21 | + $(LIBXFCE4UI_CFLAGS) \ | |
22 | $(LIBXFCE4PANEL_CFLAGS) \ | |
23 | -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ | |
24 | @GTHREAD_CFLAGS@ | |
25 | ||
26 | libdict_la_LIBADD = \ | |
27 | $(LIBXFCE4PANEL_LIBS) \ | |
28 | - $(LIBXFCEGUI4_LIBS) \ | |
29 | + $(LIBXFCE4UI_LIBS) \ | |
30 | @GTHREAD_LIBS@ | |
31 | ||
32 | ||
33 | diff -ur xfce4-dict-0.6.0-orig/lib/prefs.c xfce4-dict-0.6.0/lib/prefs.c | |
34 | --- xfce4-dict-0.6.0-orig/lib/prefs.c 2009-08-24 23:06:02.000000000 +0200 | |
35 | +++ xfce4-dict-0.6.0/lib/prefs.c 2011-03-01 00:44:21.548764903 +0100 | |
36 | @@ -27,7 +27,7 @@ | |
37 | ||
38 | #include <string.h> | |
39 | #include <gtk/gtk.h> | |
40 | -#include <libxfcegui4/libxfcegui4.h> | |
41 | +#include <libxfce4ui/libxfce4ui.h> | |
42 | ||
43 | #include "common.h" | |
44 | #include "prefs.h" | |
45 | diff -ur xfce4-dict-0.6.0-orig/panel-plugin/Makefile.am xfce4-dict-0.6.0/panel-plugin/Makefile.am | |
46 | --- xfce4-dict-0.6.0-orig/panel-plugin/Makefile.am 2009-11-17 20:42:38.000000000 +0100 | |
47 | +++ xfce4-dict-0.6.0/panel-plugin/Makefile.am 2011-03-01 00:44:54.097764898 +0100 | |
48 | @@ -8,14 +8,14 @@ | |
49 | xfce4_dict_plugin_CFLAGS = \ | |
50 | -I$(top_srcdir) \ | |
51 | -I$(top_srcdir)/lib \ | |
52 | - $(LIBXFCEGUI4_CFLAGS) \ | |
53 | + $(LIBXFCE4UI_CFLAGS) \ | |
54 | $(LIBXFCE4PANEL_CFLAGS) \ | |
55 | -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ | |
56 | @GTHREAD_CFLAGS@ | |
57 | ||
58 | xfce4_dict_plugin_LDADD = \ | |
59 | $(LIBXFCE4PANEL_LIBS) \ | |
60 | - $(LIBXFCEGUI4_LIBS) \ | |
61 | + $(LIBXFCE4UI_LIBS) \ | |
62 | @GTHREAD_LIBS@ \ | |
63 | @X11_LIBS@ \ | |
64 | $(top_builddir)/lib/libdict.la | |
65 | diff -ur xfce4-dict-0.6.0-orig/panel-plugin/xfce4-dict-plugin.c xfce4-dict-0.6.0/panel-plugin/xfce4-dict-plugin.c | |
66 | --- xfce4-dict-0.6.0-orig/panel-plugin/xfce4-dict-plugin.c 2009-08-13 19:24:47.000000000 +0200 | |
67 | +++ xfce4-dict-0.6.0/panel-plugin/xfce4-dict-plugin.c 2011-03-01 00:45:57.673764902 +0100 | |
68 | @@ -24,9 +24,8 @@ | |
69 | #include <stdlib.h> | |
70 | #include <gtk/gtk.h> | |
71 | ||
72 | -#include <libxfcegui4/libxfcegui4.h> | |
73 | -#include <libxfce4panel/xfce-panel-plugin.h> | |
74 | -#include <libxfce4panel/xfce-panel-convenience.h> | |
75 | +#include <libxfce4ui/libxfce4ui.h> | |
76 | +#include <libxfce4panel/libxfce4panel.h> | |
77 | ||
78 | #include <sys/types.h> | |
79 | #include <sys/socket.h> | |
80 | diff -ur xfce4-dict-0.6.0-orig/src/Makefile.am xfce4-dict-0.6.0/src/Makefile.am | |
81 | --- xfce4-dict-0.6.0-orig/src/Makefile.am 2009-11-17 20:42:38.000000000 +0100 | |
82 | +++ xfce4-dict-0.6.0/src/Makefile.am 2011-03-01 00:45:11.803764898 +0100 | |
83 | @@ -11,13 +11,14 @@ | |
84 | -DPACKAGE_LOCALE_DIR=\"$(localedir)\" \ | |
85 | -I$(top_srcdir)/lib \ | |
86 | $(LIBXFCE4UTIL_CFLAGS) \ | |
87 | + $(LIBXFCE4UI_CFLAGS) \ | |
88 | $(GTK_CFLAGS) \ | |
89 | $(PLATFORM_CFLAGS) | |
90 | ||
91 | xfce4_dict_LDADD = \ | |
92 | $(GTK_LIBS) \ | |
93 | $(LIBXFCE4UTIL_LIBS) \ | |
94 | - $(LIBXFCEGUI4_LIBS) \ | |
95 | + $(LIBXFCE4UI_LIBS) \ | |
96 | @GTHREAD_LIBS@ \ | |
97 | @X11_LIBS@ \ | |
98 | $(top_builddir)/lib/libdict.la |