From 2a19c5c701b1218b07ec15d1f84670f646a56476 Mon Sep 17 00:00:00 2001 From: landry Date: Fri, 26 Jun 2015 08:44:28 +0000 Subject: [PATCH] Update to xfce4-notes 1.8.1. --- x11/xfce4/xfce4-notes/Makefile | 16 +++++------ x11/xfce4/xfce4-notes/distinfo | 4 +-- .../xfce4-notes/patches/patch-src_Makefile_in | 13 --------- x11/xfce4/xfce4-notes/pkg/PLIST | 28 ++++++++++++++++--- 4 files changed, 33 insertions(+), 28 deletions(-) delete mode 100644 x11/xfce4/xfce4-notes/patches/patch-src_Makefile_in diff --git a/x11/xfce4/xfce4-notes/Makefile b/x11/xfce4/xfce4-notes/Makefile index c222bc9b162..2062249f24a 100644 --- a/x11/xfce4/xfce4-notes/Makefile +++ b/x11/xfce4/xfce4-notes/Makefile @@ -1,22 +1,21 @@ -# $OpenBSD: Makefile,v 1.45 2015/05/05 17:00:21 sthen Exp $ +# $OpenBSD: Makefile,v 1.46 2015/06/26 08:44:28 landry Exp $ COMMENT= Xfce4 sticky notes panel plugin -XFCE_VERSION= 1.7.7 +XFCE_VERSION= 1.8.1 XFCE_PLUGIN= notes -REVISION= 10 # GPLv2 PERMIT_PACKAGE_CDROM= Yes -WANTLIB += GL ICE SM X11 X11-xcb Xau Xcomposite Xcursor Xdamage Xdmcp -WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm atk-1.0 c -WANTLIB += cairo dbus-1 dbus-glib-1 drm expat ffi fontconfig freetype +WANTLIB += ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage +WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c +WANTLIB += cairo dbus-1 dbus-glib-1 expat ffi fontconfig freetype WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 WANTLIB += gobject-2.0 graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz m WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png -WANTLIB += pthread pthread-stubs startup-notification-1 stdc++ -WANTLIB += unique-1.0 xcb xcb-render xcb-shm xcb-util xfce4util xfcegui4 +WANTLIB += pthread pthread-stubs startup-notification-1 xfce4ui-1 +WANTLIB += unique-1.0 xcb xcb-render xcb-shm xcb-util xfce4util WANTLIB += xfconf-0 z MODULES= x11/xfce4 @@ -24,7 +23,6 @@ MODXFCE_DESKTOP_FILE = Yes MODXFCE_ICON_CACHE= Yes LIB_DEPENDS += devel/libunique -LIB_DEPENDS += x11/xfce4/libxfcegui4 FAKE_FLAGS = autostartdir=${PREFIX}/share/examples/xfce4-notes diff --git a/x11/xfce4/xfce4-notes/distinfo b/x11/xfce4/xfce4-notes/distinfo index ff5f9654b8f..3668adbc148 100644 --- a/x11/xfce4/xfce4-notes/distinfo +++ b/x11/xfce4/xfce4-notes/distinfo @@ -1,2 +1,2 @@ -SHA256 (xfce4/xfce4-notes-plugin-1.7.7.tar.bz2) = p7qhBbN60F3qTWtV2Y/TIUx3rVx6DpFHHUkGyB5fUhc= -SIZE (xfce4/xfce4-notes-plugin-1.7.7.tar.bz2) = 472082 +SHA256 (xfce4/xfce4-notes-plugin-1.8.1.tar.bz2) = B6TD5xQxwk+X0uJwRS3Q+lH/C9tiGaE6INC/qNneVLI= +SIZE (xfce4/xfce4-notes-plugin-1.8.1.tar.bz2) = 479652 diff --git a/x11/xfce4/xfce4-notes/patches/patch-src_Makefile_in b/x11/xfce4/xfce4-notes/patches/patch-src_Makefile_in deleted file mode 100644 index 8346bfe8778..00000000000 --- a/x11/xfce4/xfce4-notes/patches/patch-src_Makefile_in +++ /dev/null @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_Makefile_in,v 1.1 2011/01/18 20:59:31 landry Exp $ -we want a regular .so for panel ---- src/Makefile.in.orig Sun Nov 7 12:27:13 2010 -+++ src/Makefile.in Sun Jan 16 13:58:22 2011 -@@ -86,7 +86,7 @@ am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) - am__v_lt_0 = --silent - libnotes_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libnotes_la_CFLAGS) \ -- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -avoid-version -module -o $@ - @HAVE_LIBXFCE4PANEL47_TRUE@am_libnotes_la_rpath = -rpath $(plugindir) - PROGRAMS = $(bin_PROGRAMS) $(plugin_PROGRAMS) - am_xfce4_notes_OBJECTS = xfce4_notes-xfce-autostart.$(OBJEXT) \ diff --git a/x11/xfce4/xfce4-notes/pkg/PLIST b/x11/xfce4/xfce4-notes/pkg/PLIST index 8858f190fc6..7701f60e3b1 100644 --- a/x11/xfce4/xfce4-notes/pkg/PLIST +++ b/x11/xfce4/xfce4-notes/pkg/PLIST @@ -1,9 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.19 2013/01/02 17:12:22 landry Exp $ +@comment $OpenBSD: PLIST,v 1.20 2015/06/26 08:44:28 landry Exp $ @bin bin/xfce4-notes @bin bin/xfce4-notes-settings @bin bin/xfce4-popup-notes -lib/xfce4/panel-plugins/ -lib/xfce4/panel-plugins/libnotes.so +lib/xfce4/panel/plugins/libnotes.so share/applications/xfce4-notes.desktop share/examples/xfce4-notes/ @sample ${SYSCONFDIR}/xdg/ @@ -18,33 +17,44 @@ share/icons/hicolor/32x32/apps/xfce4-notes-plugin.png share/icons/hicolor/scalable/apps/xfce4-notes-plugin.svg share/locale/ar/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/ast/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/bg/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/ca/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/cs/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/da/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/de/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/el/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/en_AU/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/en_GB/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/es/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/eu/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/fi/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/fr/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/gl/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/hr/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/hu/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/id/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/is/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/it/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/ja/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/kk/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ko/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/lt/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/lv/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/ms/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/nb/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/nl/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/oc/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/pl/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/pt/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/pt_BR/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/ro/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/ru/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/sk/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/sl/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/sq/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/sr/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/sv/LC_MESSAGES/xfce4-notes-plugin.mo +share/locale/th/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/tr/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/ug/LC_MESSAGES/xfce4-notes-plugin.mo share/locale/uk/LC_MESSAGES/xfce4-notes-plugin.mo @@ -72,11 +82,21 @@ share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-up-active.png share/xfce4-notes-plugin/gtk-2.0/scrollbars/stepper-up.png share/xfce4-notes-plugin/gtk-2.0/scrollbars/trough-scrollbar-horiz.png share/xfce4-notes-plugin/gtk-2.0/scrollbars/trough-scrollbar-vert.png +share/xfce4-notes-plugin/gtk-2.0/tabs/ +share/xfce4-notes-plugin/gtk-2.0/tabs/notebook.png +share/xfce4-notes-plugin/gtk-2.0/tabs/tab-bottom-active.png +share/xfce4-notes-plugin/gtk-2.0/tabs/tab-bottom.png +share/xfce4-notes-plugin/gtk-2.0/tabs/tab-left-active.png +share/xfce4-notes-plugin/gtk-2.0/tabs/tab-left.png +share/xfce4-notes-plugin/gtk-2.0/tabs/tab-right-active.png +share/xfce4-notes-plugin/gtk-2.0/tabs/tab-right.png +share/xfce4-notes-plugin/gtk-2.0/tabs/tab-top-active.png +share/xfce4-notes-plugin/gtk-2.0/tabs/tab-top.png share/xfce4-notes-plugin/pixmaps/ share/xfce4-notes-plugin/pixmaps/notes-menu-active.png share/xfce4-notes-plugin/pixmaps/notes-menu.png share/xfce4/panel-plugins/ -share/xfce4/panel-plugins/xfce4-notes-plugin-47.desktop +share/xfce4/panel-plugins/xfce4-notes-plugin.desktop @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor @exec %D/bin/update-desktop-database