diff --git a/x11/xfce4/xfce4-panel/Makefile b/x11/xfce4/xfce4-panel/Makefile index b9e5f2a0938..c4bffb95ad4 100644 --- a/x11/xfce4/xfce4-panel/Makefile +++ b/x11/xfce4/xfce4-panel/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.47 2011/12/03 22:39:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.48 2012/04/30 12:52:37 landry Exp $ COMMENT= Xfce4 desktop panel XFCE_PROJECT= xfce4-panel -XFCE_VERSION= 4.8.6 -SHARED_LIBS= xfce4panel-1.0 0.0 # 3.0 -REVISION= 1 +SHARED_LIBS= xfce4panel-1.0 1.0 # 4.0 # GPLv2 PERMIT_DISTFILES_CDROM= Yes @@ -18,9 +16,9 @@ MODXFCE_DESKTOP_FILE= Yes MODXFCE_ICON_CACHE= Yes CONFIGURE_ARGS=--disable-linker-opts -LIB_DEPENDS= x11/xfce4/exo>=0.6.0 \ - x11/xfce4/libxfce4ui>=4.8.0 \ - x11/xfce4/xfconf>=4.8.0 \ +LIB_DEPENDS= x11/xfce4/exo>=0.7.2 \ + x11/xfce4/libxfce4ui>=4.9.0 \ + x11/xfce4/xfconf>=4.9.0 \ x11/xfce4/garcon>=0.1.5 \ devel/libwnck @@ -32,7 +30,7 @@ WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 png pthread pthread-stubs startup-notification-1 WANTLIB += wnck-1 xcb xcb-aux xcb-render xcb-shm xfce4ui-1 xfce4util -WANTLIB += xfconf-0 z +WANTLIB += xfconf-0 z stdc++ FAKE_FLAGS= confdir=${PREFIX}/share/examples/xfce4-panel diff --git a/x11/xfce4/xfce4-panel/distinfo b/x11/xfce4/xfce4-panel/distinfo index f29d5470674..c56061e3933 100644 --- a/x11/xfce4/xfce4-panel/distinfo +++ b/x11/xfce4/xfce4-panel/distinfo @@ -1,5 +1,5 @@ -MD5 (xfce4/xfce4-panel-4.8.6.tar.bz2) = nXvwUD1YZ8QETO8Eu1hFsQ== -RMD160 (xfce4/xfce4-panel-4.8.6.tar.bz2) = ne8KO3OENbcyL8HsAI1wKfiBb6c= -SHA1 (xfce4/xfce4-panel-4.8.6.tar.bz2) = My/JaDMuYnHhu2XW3o3iUksEQOw= -SHA256 (xfce4/xfce4-panel-4.8.6.tar.bz2) = ZvEmahJC7l7K2plaSlhN2YAqokRWdZtAsMKSJ8Ob7QM= -SIZE (xfce4/xfce4-panel-4.8.6.tar.bz2) = 1290803 +MD5 (xfce4/xfce4-panel-4.10.0.tar.bz2) = z3NRpLlS2+P8X/UJxo3vMw== +RMD160 (xfce4/xfce4-panel-4.10.0.tar.bz2) = ZKWjV6NP1r6SJq9j4KJntJZdyRM= +SHA1 (xfce4/xfce4-panel-4.10.0.tar.bz2) = 2x07HaFF2Fjm7ivwJjE9GmCNnzw= +SHA256 (xfce4/xfce4-panel-4.10.0.tar.bz2) = MyH5mK8rvRS6aGVKiIF3T26i7E8aNURZjn9H0+0ACbk= +SIZE (xfce4/xfce4-panel-4.10.0.tar.bz2) = 1036257 diff --git a/x11/xfce4/xfce4-panel/patches/patch-plugins_tasklist_tasklist-widget_c b/x11/xfce4/xfce4-panel/patches/patch-plugins_tasklist_tasklist-widget_c deleted file mode 100644 index c3646702600..00000000000 --- a/x11/xfce4/xfce4-panel/patches/patch-plugins_tasklist_tasklist-widget_c +++ /dev/null @@ -1,28 +0,0 @@ -$OpenBSD: patch-plugins_tasklist_tasklist-widget_c,v 1.1 2011/03/24 17:58:30 stsp Exp $ - -Fixes http://bugzilla.xfce.org/show_bug.cgi?id=7425 - "Can't focus grouped windows from the panel" - ---- plugins/tasklist/tasklist-widget.c.orig Fri Feb 25 21:58:41 2011 -+++ plugins/tasklist/tasklist-widget.c Thu Mar 24 13:06:11 2011 -@@ -3023,6 +3023,11 @@ xfce_tasklist_group_button_menu_close_all (XfceTasklis - } - - -+static void -+xfce_tasklist_group_button_menu_activate(WnckWindow *window) -+{ -+ wnck_window_unminimize (window, gtk_get_current_event_time ()); -+} - - static GtkWidget * - xfce_tasklist_group_button_menu (XfceTasklistChild *group_child, -@@ -3052,6 +3057,8 @@ xfce_tasklist_group_button_menu (XfceTasklistChild *gr - if (action_menu_entries) - gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), - wnck_action_menu_new (child->window)); -+ else -+ gtk_signal_connect_object(GTK_OBJECT(mi), "activate", G_CALLBACK (xfce_tasklist_group_button_menu_activate), child->window); - } - } - diff --git a/x11/xfce4/xfce4-panel/pkg/PFRAG.shared b/x11/xfce4/xfce4-panel/pkg/PFRAG.shared deleted file mode 100644 index 8ae4081306d..00000000000 --- a/x11/xfce4/xfce4-panel/pkg/PFRAG.shared +++ /dev/null @@ -1,13 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2011/01/18 20:32:11 landry Exp $ -@lib lib/libxfce4panel-1.0.so.${LIBxfce4panel-1.0_VERSION} -lib/xfce4/panel/plugins/libactions.so -lib/xfce4/panel/plugins/libapplicationsmenu.so -lib/xfce4/panel/plugins/libclock.so -lib/xfce4/panel/plugins/libdirectorymenu.so -lib/xfce4/panel/plugins/liblauncher.so -lib/xfce4/panel/plugins/libpager.so -lib/xfce4/panel/plugins/libseparator.so -lib/xfce4/panel/plugins/libshowdesktop.so -lib/xfce4/panel/plugins/libsystray.so -lib/xfce4/panel/plugins/libtasklist.so -lib/xfce4/panel/plugins/libwindowmenu.so diff --git a/x11/xfce4/xfce4-panel/pkg/PLIST b/x11/xfce4/xfce4-panel/pkg/PLIST index 09da0f191b8..ec9036f3c47 100644 --- a/x11/xfce4/xfce4-panel/pkg/PLIST +++ b/x11/xfce4/xfce4-panel/pkg/PLIST @@ -1,16 +1,14 @@ -@comment $OpenBSD: PLIST,v 1.21 2011/12/03 22:32:22 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.22 2012/04/30 12:52:37 landry Exp $ @conflict xfce4-datetime-* @conflict xfce4-iconbox-* @conflict xfce4-showdesktop-* @conflict xfce4-systray-* @conflict xfce4-taskbar-* @conflict xfce4-trigger-launcher-* -%%SHARED%% @bin bin/xfce4-panel bin/xfce4-popup-applicationsmenu bin/xfce4-popup-directorymenu bin/xfce4-popup-windowmenu -include/xfce4/ include/xfce4/libxfce4panel-1.0/ include/xfce4/libxfce4panel-1.0/libxfce4panel/ include/xfce4/libxfce4panel-1.0/libxfce4panel/libxfce4panel-config.h @@ -27,80 +25,53 @@ include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin-provider.h include/xfce4/libxfce4panel-1.0/libxfce4panel/xfce-panel-plugin.h lib/libxfce4panel-1.0.a lib/libxfce4panel-1.0.la -lib/pkgconfig/ +@lib lib/libxfce4panel-1.0.so.${LIBxfce4panel-1.0_VERSION} lib/pkgconfig/libxfce4panel-1.0.pc -lib/xfce4/ lib/xfce4/panel/ @bin lib/xfce4/panel/migrate lib/xfce4/panel/plugins/ @comment lib/xfce4/panel/plugins/libactions.a @comment lib/xfce4/panel/plugins/libactions.la +lib/xfce4/panel/plugins/libactions.so @comment lib/xfce4/panel/plugins/libapplicationsmenu.a @comment lib/xfce4/panel/plugins/libapplicationsmenu.la +lib/xfce4/panel/plugins/libapplicationsmenu.so @comment lib/xfce4/panel/plugins/libclock.a @comment lib/xfce4/panel/plugins/libclock.la +lib/xfce4/panel/plugins/libclock.so @comment lib/xfce4/panel/plugins/libdirectorymenu.a @comment lib/xfce4/panel/plugins/libdirectorymenu.la +lib/xfce4/panel/plugins/libdirectorymenu.so @comment lib/xfce4/panel/plugins/liblauncher.a @comment lib/xfce4/panel/plugins/liblauncher.la +lib/xfce4/panel/plugins/liblauncher.so @comment lib/xfce4/panel/plugins/libpager.a @comment lib/xfce4/panel/plugins/libpager.la +lib/xfce4/panel/plugins/libpager.so @comment lib/xfce4/panel/plugins/libseparator.a @comment lib/xfce4/panel/plugins/libseparator.la +lib/xfce4/panel/plugins/libseparator.so @comment lib/xfce4/panel/plugins/libshowdesktop.a @comment lib/xfce4/panel/plugins/libshowdesktop.la +lib/xfce4/panel/plugins/libshowdesktop.so @comment lib/xfce4/panel/plugins/libsystray.a @comment lib/xfce4/panel/plugins/libsystray.la +lib/xfce4/panel/plugins/libsystray.so @comment lib/xfce4/panel/plugins/libtasklist.a @comment lib/xfce4/panel/plugins/libtasklist.la +lib/xfce4/panel/plugins/libtasklist.so @comment lib/xfce4/panel/plugins/libwindowmenu.a @comment lib/xfce4/panel/plugins/libwindowmenu.la +lib/xfce4/panel/plugins/libwindowmenu.so @bin lib/xfce4/panel/wrapper share/applications/panel-desktop-handler.desktop share/applications/panel-preferences.desktop -share/doc/xfce4-panel/ -share/doc/xfce4-panel/README.gtkrc-2.0 -share/doc/xfce4-panel/html/ -share/doc/xfce4-panel/html/C/ -share/doc/xfce4-panel/html/C/actions.html -share/doc/xfce4-panel/html/C/add-new-items.html -share/doc/xfce4-panel/html/C/applicationsmenu.html -share/doc/xfce4-panel/html/C/clock.html -share/doc/xfce4-panel/html/C/directorymenu.html -share/doc/xfce4-panel/html/C/figures/ -share/doc/xfce4-panel/html/C/figures/actions.png -share/doc/xfce4-panel/html/C/figures/add-new-items.png -share/doc/xfce4-panel/html/C/figures/applicationsmenu.png -share/doc/xfce4-panel/html/C/figures/clock.png -share/doc/xfce4-panel/html/C/figures/directorymenu.png -share/doc/xfce4-panel/html/C/figures/launcher.png -share/doc/xfce4-panel/html/C/figures/pager.png -share/doc/xfce4-panel/html/C/figures/preferences.png -share/doc/xfce4-panel/html/C/figures/separator.png -share/doc/xfce4-panel/html/C/figures/systray.png -share/doc/xfce4-panel/html/C/figures/tasklist.png -share/doc/xfce4-panel/html/C/figures/windowmenu.png -share/doc/xfce4-panel/html/C/getting-started.html -share/doc/xfce4-panel/html/C/index.html -share/doc/xfce4-panel/html/C/launcher.html -share/doc/xfce4-panel/html/C/license.html -share/doc/xfce4-panel/html/C/pager.html -share/doc/xfce4-panel/html/C/preferences.html -share/doc/xfce4-panel/html/C/separator.html -share/doc/xfce4-panel/html/C/showdesktop.html -share/doc/xfce4-panel/html/C/systray.html -share/doc/xfce4-panel/html/C/tasklist.html -share/doc/xfce4-panel/html/C/theming.html -share/doc/xfce4-panel/html/C/windowmenu.html -share/doc/xfce4-panel/html/xfce4-panel.css share/examples/xfce4-panel/ @sample ${SYSCONFDIR}/xdg/ @sample ${SYSCONFDIR}/xdg/xfce4/ @sample ${SYSCONFDIR}/xdg/xfce4/panel/ share/examples/xfce4-panel/default.xml @sample ${SYSCONFDIR}/xdg/xfce4/panel/default.xml -share/gtk-doc/ -share/gtk-doc/html/ share/gtk-doc/html/libxfce4panel-1.0/ share/gtk-doc/html/libxfce4panel-1.0/XfceArrowButton.html share/gtk-doc/html/libxfce4panel-1.0/XfceHVBox.html @@ -114,7 +85,6 @@ share/gtk-doc/html/libxfce4panel-1.0/home.png share/gtk-doc/html/libxfce4panel-1.0/index.html share/gtk-doc/html/libxfce4panel-1.0/index.sgml share/gtk-doc/html/libxfce4panel-1.0/left.png -share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-1.0.devhelp2 share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Commonly-used-plugin-macros.html share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-Convenience-Functions.html @@ -130,61 +100,31 @@ share/gtk-doc/html/libxfce4panel-1.0/libxfce4panel-widgets.html share/gtk-doc/html/libxfce4panel-1.0/right.png share/gtk-doc/html/libxfce4panel-1.0/style.css share/gtk-doc/html/libxfce4panel-1.0/up.png -share/icons/ -share/icons/hicolor/ -share/icons/hicolor/16x16/ -share/icons/hicolor/16x16/apps/ share/icons/hicolor/16x16/apps/xfce4-panel-menu.png share/icons/hicolor/16x16/apps/xfce4-panel.png -share/icons/hicolor/22x22/ -share/icons/hicolor/22x22/apps/ share/icons/hicolor/22x22/apps/xfce4-panel-menu.png share/icons/hicolor/22x22/apps/xfce4-panel.png -share/icons/hicolor/24x24/ -share/icons/hicolor/24x24/apps/ share/icons/hicolor/24x24/apps/xfce4-panel-menu.png share/icons/hicolor/24x24/apps/xfce4-panel.png -share/icons/hicolor/32x32/ -share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/xfce4-panel-menu.png share/icons/hicolor/32x32/apps/xfce4-panel.png -share/icons/hicolor/48x48/ -share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/xfce4-panel-menu.png share/icons/hicolor/48x48/apps/xfce4-panel.png -share/icons/hicolor/scalable/ -share/icons/hicolor/scalable/apps/ share/icons/hicolor/scalable/apps/xfce4-panel.svg -share/locale/am/ -share/locale/am/LC_MESSAGES/ share/locale/am/LC_MESSAGES/xfce4-panel.mo -share/locale/ar/ -share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/xfce4-panel.mo -share/locale/ast/ -share/locale/ast/LC_MESSAGES/ share/locale/ast/LC_MESSAGES/xfce4-panel.mo -share/locale/az/ -share/locale/az/LC_MESSAGES/ share/locale/az/LC_MESSAGES/xfce4-panel.mo share/locale/be/LC_MESSAGES/xfce4-panel.mo share/locale/bg/LC_MESSAGES/xfce4-panel.mo -share/locale/bn/ -share/locale/bn/LC_MESSAGES/ share/locale/bn/LC_MESSAGES/xfce4-panel.mo -share/locale/bn_IN/ -share/locale/bn_IN/LC_MESSAGES/ share/locale/bn_IN/LC_MESSAGES/xfce4-panel.mo share/locale/ca/LC_MESSAGES/xfce4-panel.mo share/locale/cs/LC_MESSAGES/xfce4-panel.mo share/locale/da/LC_MESSAGES/xfce4-panel.mo share/locale/de/LC_MESSAGES/xfce4-panel.mo -share/locale/dz/ -share/locale/dz/LC_MESSAGES/ share/locale/dz/LC_MESSAGES/xfce4-panel.mo share/locale/el/LC_MESSAGES/xfce4-panel.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/xfce4-panel.mo share/locale/eo/LC_MESSAGES/xfce4-panel.mo share/locale/es/LC_MESSAGES/xfce4-panel.mo @@ -193,92 +133,52 @@ share/locale/es_MX/LC_MESSAGES/ share/locale/es_MX/LC_MESSAGES/xfce4-panel.mo share/locale/et/LC_MESSAGES/xfce4-panel.mo share/locale/eu/LC_MESSAGES/xfce4-panel.mo -share/locale/fa/ -share/locale/fa/LC_MESSAGES/ share/locale/fa/LC_MESSAGES/xfce4-panel.mo share/locale/fi/LC_MESSAGES/xfce4-panel.mo share/locale/fr/LC_MESSAGES/xfce4-panel.mo share/locale/gl/LC_MESSAGES/xfce4-panel.mo -share/locale/gu/ -share/locale/gu/LC_MESSAGES/ share/locale/gu/LC_MESSAGES/xfce4-panel.mo share/locale/he/LC_MESSAGES/xfce4-panel.mo -share/locale/hi/ -share/locale/hi/LC_MESSAGES/ share/locale/hi/LC_MESSAGES/xfce4-panel.mo share/locale/hr/LC_MESSAGES/xfce4-panel.mo share/locale/hu/LC_MESSAGES/xfce4-panel.mo -share/locale/hy/ -share/locale/hy/LC_MESSAGES/ share/locale/hy/LC_MESSAGES/xfce4-panel.mo share/locale/id/LC_MESSAGES/xfce4-panel.mo -share/locale/is/ -share/locale/is/LC_MESSAGES/ share/locale/is/LC_MESSAGES/xfce4-panel.mo share/locale/it/LC_MESSAGES/xfce4-panel.mo share/locale/ja/LC_MESSAGES/xfce4-panel.mo -share/locale/ka/ -share/locale/ka/LC_MESSAGES/ share/locale/ka/LC_MESSAGES/xfce4-panel.mo -share/locale/kk/ -share/locale/kk/LC_MESSAGES/ share/locale/kk/LC_MESSAGES/xfce4-panel.mo share/locale/ko/LC_MESSAGES/xfce4-panel.mo -share/locale/ku/ -share/locale/ku/LC_MESSAGES/ share/locale/ku/LC_MESSAGES/xfce4-panel.mo -share/locale/lt/ -share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/xfce4-panel.mo share/locale/lv/LC_MESSAGES/xfce4-panel.mo -share/locale/mk/ -share/locale/mk/LC_MESSAGES/ share/locale/mk/LC_MESSAGES/xfce4-panel.mo -share/locale/mr/ -share/locale/mr/LC_MESSAGES/ share/locale/mr/LC_MESSAGES/xfce4-panel.mo -share/locale/ms/ -share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/xfce4-panel.mo share/locale/nb/LC_MESSAGES/xfce4-panel.mo share/locale/nl/LC_MESSAGES/xfce4-panel.mo -share/locale/pa/ -share/locale/pa/LC_MESSAGES/ +share/locale/nn/LC_MESSAGES/xfce4-panel.mo share/locale/pa/LC_MESSAGES/xfce4-panel.mo share/locale/pl/LC_MESSAGES/xfce4-panel.mo share/locale/pt/LC_MESSAGES/xfce4-panel.mo share/locale/pt_BR/LC_MESSAGES/xfce4-panel.mo share/locale/ro/LC_MESSAGES/xfce4-panel.mo share/locale/ru/LC_MESSAGES/xfce4-panel.mo -share/locale/si/ -share/locale/si/LC_MESSAGES/ share/locale/si/LC_MESSAGES/xfce4-panel.mo share/locale/sk/LC_MESSAGES/xfce4-panel.mo -share/locale/sq/ -share/locale/sq/LC_MESSAGES/ share/locale/sq/LC_MESSAGES/xfce4-panel.mo share/locale/sv/LC_MESSAGES/xfce4-panel.mo -share/locale/ta/ -share/locale/ta/LC_MESSAGES/ share/locale/ta/LC_MESSAGES/xfce4-panel.mo -share/locale/te/ -share/locale/te/LC_MESSAGES/ share/locale/te/LC_MESSAGES/xfce4-panel.mo share/locale/tr/LC_MESSAGES/xfce4-panel.mo -share/locale/ug/ -share/locale/ug/LC_MESSAGES/ share/locale/ug/LC_MESSAGES/xfce4-panel.mo share/locale/uk/LC_MESSAGES/xfce4-panel.mo -share/locale/ur/ -share/locale/ur/LC_MESSAGES/ share/locale/ur/LC_MESSAGES/xfce4-panel.mo -share/locale/ur_PK/ -share/locale/ur_PK/LC_MESSAGES/ share/locale/ur_PK/LC_MESSAGES/xfce4-panel.mo share/locale/vi/LC_MESSAGES/xfce4-panel.mo share/locale/zh_CN/LC_MESSAGES/xfce4-panel.mo share/locale/zh_TW/LC_MESSAGES/xfce4-panel.mo -share/xfce4/ share/xfce4/panel/ share/xfce4/panel/plugins/ share/xfce4/panel/plugins/actions.desktop