summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-xfce/recipes-panel-plugins/datetime/files/0001-port-to-libxfce4ui.patch361
-rw-r--r--meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch32
-rw-r--r--meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb9
-rw-r--r--meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_git.bb21
4 files changed, 9 insertions, 414 deletions
diff --git a/meta-xfce/recipes-panel-plugins/datetime/files/0001-port-to-libxfce4ui.patch b/meta-xfce/recipes-panel-plugins/datetime/files/0001-port-to-libxfce4ui.patch
deleted file mode 100644
index ccff851ab5..0000000000
--- a/meta-xfce/recipes-panel-plugins/datetime/files/0001-port-to-libxfce4ui.patch
+++ /dev/null
@@ -1,361 +0,0 @@
1From 2041c011c62e13c5bc1f0824733bc34ebb8a8bfe Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de>
3Date: Sun, 23 Oct 2011 20:14:42 +0200
4Subject: [PATCH] port to libxfce4ui
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8Upstream-Status: pending
9
10
11Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
12---
13 configure.ac.in | 9 +--
14 panel-plugin/Makefile.am | 8 +-
15 panel-plugin/datetime-dialog.c | 8 +-
16 panel-plugin/datetime.c | 4 +-
17 panel-plugin/xfce46-compat.c | 193 ----------------------------------------
18 panel-plugin/xfce46-compat.h | 20 ----
19 6 files changed, 11 insertions(+), 231 deletions(-)
20 delete mode 100644 panel-plugin/xfce46-compat.c
21 delete mode 100644 panel-plugin/xfce46-compat.h
22
23diff --git a/configure.ac.in b/configure.ac.in
24index 4d58211..5200268 100644
25--- a/configure.ac.in
26+++ b/configure.ac.in
27@@ -31,12 +31,9 @@ XDT_I18N([@LINGUAS@])
28
29 dnl Check for required packages
30 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.6.0])
31-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.3.99.2])
32-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99.2])
33-XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.3.99.2])
34-
35-dnl check for optional packages/versions
36-XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4PANEL_46], [libxfce4panel-1.0], [4.5.92], [libxfce4panel46], [Take advantage of Xfce 4.6 panel changes])
37+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.8.0])
38+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.8.0])
39+XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.8.0])
40
41 #CFLAGS="$CFLAGS -Wall -Werror"
42
43diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
44index 4005f85..18bbc7e 100644
45--- a/panel-plugin/Makefile.am
46+++ b/panel-plugin/Makefile.am
47@@ -7,16 +7,14 @@ libdatetime_la_SOURCES = \
48 datetime.h \
49 datetime.c \
50 datetime-dialog.h \
51- datetime-dialog.c \
52- xfce46-compat.h \
53- xfce46-compat.c
54+ datetime-dialog.c
55
56 libdatetime_la_CFLAGS = \
57 -I$(top_srcdir) \
58 -DLOCALEDIR=\"$(localedir)\" \
59 $(GTK_CFLAGS) \
60 $(LIBXFCE4PANEL_CFLAGS) \
61- $(LIBXFCEGUI4_CFLAGS) \
62+ $(LIBXFCE4UI_CFLAGS) \
63 $(LIBXFCE4UTIL_CFLAGS)
64
65 libdatetime_la_LDFLAGS = \
66@@ -31,7 +29,7 @@ endif
67 libdatetime_la_LIBADD = \
68 $(GTK_LIBS) \
69 $(LIBXFCE4PANEL_LIBS) \
70- $(LIBXFCEGUI4_LIBS) \
71+ $(LIBXFCE4UI_LIBS) \
72 $(LIBXFCE4UTIL_LIBS)
73
74 desktopdir = $(datadir)/xfce4/panel-plugins
75diff --git a/panel-plugin/datetime-dialog.c b/panel-plugin/datetime-dialog.c
76index 193587e..4ef3ab8 100644
77--- a/panel-plugin/datetime-dialog.c
78+++ b/panel-plugin/datetime-dialog.c
79@@ -28,7 +28,7 @@
80 #include <string.h>
81
82 /* xfce includes */
83-#include <libxfcegui4/libxfcegui4.h>
84+#include <libxfce4ui/libxfce4ui.h>
85 #include <libxfce4util/libxfce4util.h>
86 #include <libxfce4panel/xfce-panel-plugin.h>
87
88@@ -388,7 +388,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime)
89 /*
90 * layout frame
91 */
92- frame = xfce_create_framebox(_("Layout"), &bin);
93+ frame = xfce_gtk_frame_box_new(_("Layout"), &bin);
94 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), frame,
95 FALSE, FALSE, 0);
96 gtk_container_set_border_width(GTK_CONTAINER(frame), 6);
97@@ -422,7 +422,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime)
98 /*
99 * Date frame
100 */
101- datetime->date_frame = xfce_create_framebox(_("Date"), &bin);
102+ datetime->date_frame = xfce_gtk_frame_box_new(_("Date"), &bin);
103 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->date_frame,
104 FALSE, FALSE, 0);
105 gtk_container_set_border_width(GTK_CONTAINER(datetime->date_frame), 6);
106@@ -525,7 +525,7 @@ datetime_properties_dialog(XfcePanelPlugin *plugin, t_datetime * datetime)
107 /*
108 * time frame
109 */
110- datetime->time_frame = xfce_create_framebox(_("Time"), &bin);
111+ datetime->time_frame = xfce_gtk_frame_box_new(_("Time"), &bin);
112 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dlg)->vbox), datetime->time_frame,
113 FALSE, FALSE, 0);
114 gtk_container_set_border_width(GTK_CONTAINER(datetime->time_frame), 6);
115diff --git a/panel-plugin/datetime.c b/panel-plugin/datetime.c
116index 30ee04a..0738889 100644
117--- a/panel-plugin/datetime.c
118+++ b/panel-plugin/datetime.c
119@@ -28,13 +28,11 @@
120 #include <string.h>
121
122 /* xfce includes */
123-#include <libxfcegui4/libxfcegui4.h>
124+#include <libxfce4ui/libxfce4ui.h>
125 #include <libxfce4util/libxfce4util.h>
126 #include <libxfce4panel/xfce-panel-plugin.h>
127 #include <libxfce4panel/xfce-panel-convenience.h>
128
129-#include "xfce46-compat.h"
130-
131 #include "datetime.h"
132 #include "datetime-dialog.h"
133
134diff --git a/panel-plugin/xfce46-compat.c b/panel-plugin/xfce46-compat.c
135deleted file mode 100644
136index 97f10b1..0000000
137--- a/panel-plugin/xfce46-compat.c
138+++ /dev/null
139@@ -1,193 +0,0 @@
140-/*
141- * Code was taken from libxfce4panel (LGPL2 or any later version),
142- * distributed here under the GPL.
143- *
144- * Copyright (c) 2005-2007 Jasper Huijsmans <jasper@xfce.org>
145- *
146- * This program is free software; you can redistribute it and/or modify
147- * it under the terms of the GNU General Public License as published by
148- * the Free Software Foundation; either version 2 of the License, or
149- * (at your option) any later version.
150- *
151- * This program is distributed in the hope that it will be useful,
152- * but WITHOUT ANY WARRANTY; without even the implied warranty of
153- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
154- * GNU Library General Public License for more details.
155- *
156- * You should have received a copy of the GNU General Public License
157- * along with this program; if not, write to the Free Software
158- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
159- */
160-
161-#ifdef HAVE_CONFIG_H
162-# include <config.h>
163-#endif
164-
165-#ifndef HAVE_LIBXFCE4PANEL_46
166-
167-#include "xfce46-compat.h"
168-
169-#include <libxfce4panel/xfce-panel-plugin.h>
170-#include <libxfce4panel/xfce-panel-macros.h>
171-
172-/* support macros for debugging */
173-#ifndef NDEBUG
174-#define _panel_assert(expr) g_assert (expr)
175-#define _panel_assert_not_reached() g_assert_not_reached ()
176-#define _panel_return_if_fail(expr) g_return_if_fail (expr)
177-#define _panel_return_val_if_fail(expr, val) g_return_val_if_fail (expr, (val))
178-#else
179-#define _panel_assert(expr) G_STMT_START{ (void)0; }G_STMT_END
180-#define _panel_assert_not_reached() G_STMT_START{ (void)0; }G_STMT_END
181-#define _panel_return_if_fail(expr) G_STMT_START{ (void)0; }G_STMT_END
182-#define _panel_return_val_if_fail(expr, val) G_STMT_START{ (void)0; }G_STMT_END
183-#endif
184-
185-/**
186- * xfce_panel_plugin_arrow_type:
187- * @plugin : an #XfcePanelPlugin
188- *
189- * Determine the #GtkArrowType for a widget that opens a menu and uses
190- * xfce_panel_plugin_position_menu() to position the menu.
191- *
192- * Returns: The #GtkArrowType to use.
193- **/
194-GtkArrowType
195-xfce_panel_plugin_arrow_type (XfcePanelPlugin *plugin)
196-{
197- XfceScreenPosition position;
198- GdkScreen *screen;
199- GdkRectangle geom;
200- gint mon, x, y;
201-
202- if (!GTK_WIDGET_REALIZED (plugin))
203- return GTK_ARROW_UP;
204-
205- position = xfce_panel_plugin_get_screen_position (plugin);
206- switch (position)
207- {
208- /* top */
209- case XFCE_SCREEN_POSITION_NW_H:
210- case XFCE_SCREEN_POSITION_N:
211- case XFCE_SCREEN_POSITION_NE_H:
212- return GTK_ARROW_DOWN;
213-
214- /* left */
215- case XFCE_SCREEN_POSITION_NW_V:
216- case XFCE_SCREEN_POSITION_W:
217- case XFCE_SCREEN_POSITION_SW_V:
218- return GTK_ARROW_RIGHT;
219-
220- /* right */
221- case XFCE_SCREEN_POSITION_NE_V:
222- case XFCE_SCREEN_POSITION_E:
223- case XFCE_SCREEN_POSITION_SE_V:
224- return GTK_ARROW_LEFT;
225-
226- /* bottom */
227- case XFCE_SCREEN_POSITION_SW_H:
228- case XFCE_SCREEN_POSITION_S:
229- case XFCE_SCREEN_POSITION_SE_H:
230- return GTK_ARROW_UP;
231-
232- /* floating */
233- default:
234- /* get the screen information */
235- screen = gtk_widget_get_screen (GTK_WIDGET (plugin));
236- mon = gdk_screen_get_monitor_at_window (screen, GTK_WIDGET (plugin)->window);
237- gdk_screen_get_monitor_geometry (screen, mon, &geom);
238- gdk_window_get_root_origin (GTK_WIDGET (plugin)->window, &x, &y);
239-
240- /* get the position based on the screen position */
241- if (position == XFCE_SCREEN_POSITION_FLOATING_H)
242- return ((y < (geom.y + geom.height / 2)) ? GTK_ARROW_DOWN : GTK_ARROW_UP);
243- else
244- return ((x < (geom.x + geom.width / 2)) ? GTK_ARROW_RIGHT : GTK_ARROW_LEFT);
245- }
246-}
247-
248-
249-
250-/**
251- * xfce_panel_plugin_position_widget:
252- * @plugin : an #XfcePanelPlugin
253- * @menu_widget : a #GtkWidget that will be used as popup menu
254- * @attach_widget : a #GtkWidget relative to which the menu should be positioned
255- * @x : return location for the x coordinate
256- * @y : return location for the y coordinate
257- *
258- * The menu widget is positioned relative to @attach_widget.
259- * If @attach_widget is NULL, the menu widget is instead positioned
260- * relative to @panel_plugin.
261- *
262- * This function is intended for custom menu widgets.
263- * For a regular #GtkMenu you should use xfce_panel_plugin_position_menu()
264- * instead (as callback argument to gtk_menu_popup()).
265- *
266- * See also: xfce_panel_plugin_position_menu().
267- **/
268-void
269-xfce_panel_plugin_position_widget (XfcePanelPlugin *plugin,
270- GtkWidget *menu_widget,
271- GtkWidget *attach_widget,
272- gint *x,
273- gint *y)
274-{
275- GtkRequisition req;
276- GdkScreen *screen;
277- GdkRectangle geom;
278- gint mon;
279-
280- _panel_return_if_fail (XFCE_IS_PANEL_PLUGIN (plugin));
281- _panel_return_if_fail (GTK_IS_WIDGET (menu_widget));
282- _panel_return_if_fail (attach_widget == NULL || GTK_IS_WIDGET (attach_widget));
283-
284- if (attach_widget == NULL)
285- attach_widget = GTK_WIDGET (plugin);
286-
287- if (!GTK_WIDGET_REALIZED (menu_widget))
288- gtk_widget_realize (menu_widget);
289-
290- gtk_widget_size_request (menu_widget, &req);
291- gdk_window_get_origin (attach_widget->window, x, y);
292-
293- switch (xfce_panel_plugin_arrow_type (plugin))
294- {
295- case GTK_ARROW_UP:
296- *y -= req.height;
297- break;
298-
299- case GTK_ARROW_DOWN:
300- *y += attach_widget->allocation.height;
301- break;
302-
303- case GTK_ARROW_LEFT:
304- *x -= req.width;
305- break;
306-
307- default: /* GTK_ARROW_RIGHT and GTK_ARROW_NONE */
308- *x += attach_widget->allocation.width;
309- break;
310- }
311-
312- screen = gtk_widget_get_screen (attach_widget);
313- mon = gdk_screen_get_monitor_at_window (screen, attach_widget->window);
314- gdk_screen_get_monitor_geometry (screen, mon, &geom);
315-
316- /* keep inside the screen */
317- if (*x > geom.x + geom.width - req.width)
318- *x = geom.x + geom.width - req.width;
319- if (*x < geom.x)
320- *x = geom.x;
321- if (*y > geom.y + geom.height - req.height)
322- *y = geom.y + geom.height - req.height;
323- if (*y < geom.y)
324- *y = geom.y;
325-
326- if (G_LIKELY (GTK_IS_MENU (menu_widget)))
327- gtk_menu_set_screen (GTK_MENU (menu_widget), screen);
328- else if (GTK_IS_WINDOW (menu_widget))
329- gtk_window_set_screen (GTK_WINDOW (menu_widget), screen);
330-}
331-
332-#endif
333diff --git a/panel-plugin/xfce46-compat.h b/panel-plugin/xfce46-compat.h
334deleted file mode 100644
335index d385ec4..0000000
336--- a/panel-plugin/xfce46-compat.h
337+++ /dev/null
338@@ -1,20 +0,0 @@
339-#ifndef _XFCE46_COMPAT
340-#define _XFCE46_COMPAT
341-
342-#ifdef HAVE_CONFIG_H
343-# include <config.h>
344-#endif
345-
346-#ifndef HAVE_LIBXFCE4PANEL_46
347-
348-#include <gtk/gtk.h>
349-#include <libxfce4panel/xfce-panel-plugin.h>
350-
351-void xfce_panel_plugin_position_widget (XfcePanelPlugin *plugin,
352- GtkWidget *menu_widget,
353- GtkWidget *attach_widget,
354- gint *x,
355- gint *y);
356-
357-#endif
358-#endif
359--
3601.7.4.4
361
diff --git a/meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch b/meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch
deleted file mode 100644
index fedbc12798..0000000000
--- a/meta-xfce/recipes-panel-plugins/datetime/files/0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From f6e97314f425574289697ddfa0914f7580130a7c Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Sat, 19 May 2012 20:23:06 +0200
4Subject: [PATCH] configure.ac.in: remove breaking BM_DEBUG_SUPPORT
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8Upstream-Status: pending
9
10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12---
13 configure.ac.in | 3 ---
14 1 files changed, 0 insertions(+), 3 deletions(-)
15
16diff --git a/configure.ac.in b/configure.ac.in
17index 5200268..a2550ca 100644
18--- a/configure.ac.in
19+++ b/configure.ac.in
20@@ -37,9 +37,6 @@ XDT_CHECK_PACKAGE([LIBXFCE4PANEL],[libxfce4panel-1.0],[4.8.0])
21
22 #CFLAGS="$CFLAGS -Wall -Werror"
23
24-dnl Check for debugging support
25-BM_DEBUG_SUPPORT()
26-
27 AC_OUTPUT([
28 Makefile
29 po/Makefile.in
30--
311.7.4.4
32
diff --git a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb
new file mode 100644
index 0000000000..544c768fec
--- /dev/null
+++ b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_0.6.2.bb
@@ -0,0 +1,9 @@
1DESCRIPTION = "Panel plugin displaying date and time and a calendar when left-clicked"
2HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5
6inherit xfce-panel-plugin
7
8SRC_URI[md5sum] = "fe604a251eadbc5b0f2b4737b85d92c8"
9SRC_URI[sha256sum] = "9734da671e8d1d7de5fae92093a05d653c9245b838542fb9aff3e10368cc9e2c"
diff --git a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_git.bb b/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_git.bb
deleted file mode 100644
index 9421c1e02b..0000000000
--- a/meta-xfce/recipes-panel-plugins/datetime/xfce4-datetime-plugin_git.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1DESCRIPTION = "Panel plugin displaying date and time and a calendar when left-clicked"
2HOMEPAGE = "http://goodies.xfce.org/projects/panel-plugins/xfce4-datetime-plugin"
3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5
6inherit xfce-panel-plugin
7
8SRCREV = "97ebbac9ba52397ec34edb43935083f6263d1666"
9PV = "0.6.1+gitr${SRCPV}"
10S = "${WORKDIR}/git"
11
12SRC_URI = "git://git.xfce.org/panel-plugins/xfce4-datetime-plugin;protocol=git;branch=master \
13 file://0001-port-to-libxfce4ui.patch \
14 file://0002-configure.ac.in-remove-breaking-BM_DEBUG_SUPPORT.patch \
15 "
16SRC_URI[md5sum] = "e82f51ff0e75a63e5cbd139e43e094f9"
17SRC_URI[sha256sum] = "fb340c1c2170d4f33c7f278772966f3c01caaedcd4a7f58f670bf8e28580bb1b"
18
19do_configure_prepend() {
20 NOCONFIGURE=yes ./autogen.sh
21}
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-02-13 13:31:09 +0000