diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index 7bae17419f22..cb984063302c 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.72 2023/11/14 14:03:22 wiz Exp $ +# $NetBSD: Makefile,v 1.73 2024/03/03 17:58:54 gutteridge Exp $ -PKGREVISION= 3 .include "../../meta-pkgs/xfce4/Makefile.common" -VERSION= 1.6.5 +VERSION= 1.6.6 DISTNAME= xfce4-clipman-plugin-${VERSION} CATEGORIES= x11 MASTER_SITES= https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${VERSION:R}/ @@ -11,6 +10,10 @@ MASTER_SITES= https://archive.xfce.org/src/panel-plugins/xfce4-clipman-plugin/${ HOMEPAGE= https://goodies.xfce.org/projects/panel-plugins/xfce4-clipman-plugin COMMENT= Xfce clipboard plugin +# Will otherwise potentially pick up Wayland libraries in the environment. +# Not ready for use with current state of Xfce in pkgsrc. +CONFIGURE_ARGS+= --disable-wayland + PKG_SYSCONFSUBDIR= xdg CONF_FILES= ${XFCE4_EGBASE}/autostart/xfce4-clipman-plugin-autostart.desktop \ ${PKG_SYSCONFDIR}/autostart/xfce4-clipman-plugin-autostart.desktop \ diff --git a/x11/xfce4-clipman-plugin/distinfo b/x11/xfce4-clipman-plugin/distinfo index 249b1259b1a0..6af9b979155f 100644 --- a/x11/xfce4-clipman-plugin/distinfo +++ b/x11/xfce4-clipman-plugin/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.19 2023/10/03 23:09:57 gutteridge Exp $ +$NetBSD: distinfo,v 1.20 2024/03/03 17:58:54 gutteridge Exp $ -BLAKE2s (xfce4-clipman-plugin-1.6.5.tar.bz2) = 44ad26c6b98a64b89eeb63d108862cbffdd790cc321958c263d1db044f013f37 -SHA512 (xfce4-clipman-plugin-1.6.5.tar.bz2) = b0ae4a3928590346dd0f9786959c138f7e9cc03afa974eee558890fcd2b96c019bd4be67f7c231cac802fb6356c64b1e0394ef327aae6256fc433ced245fdff9 -Size (xfce4-clipman-plugin-1.6.5.tar.bz2) = 483621 bytes -SHA1 (patch-panel-plugin_Makefile.in) = 0e6af6760e17878292ea16bd75969bbb734dd7d9 +BLAKE2s (xfce4-clipman-plugin-1.6.6.tar.bz2) = 555551d5f183acc8505e65ba52638dbe6c1764f52472c928cc69840a79fddda5 +SHA512 (xfce4-clipman-plugin-1.6.6.tar.bz2) = 4f6bb8f56111903af576d06ce5883e8ada2cb3ea377e09a79d2c5fb6f37743dac621649465a573a8a29a1fb884e7608a53dd6486eada23c7f8ee6401237988af +Size (xfce4-clipman-plugin-1.6.6.tar.bz2) = 487832 bytes +SHA1 (patch-panel-plugin_Makefile.in) = c4a7148f4c489359b21eeeca1d9fb4299a184da8 diff --git a/x11/xfce4-clipman-plugin/patches/patch-panel-plugin_Makefile.in b/x11/xfce4-clipman-plugin/patches/patch-panel-plugin_Makefile.in index 38128dd372e5..3c0807e4b636 100644 --- a/x11/xfce4-clipman-plugin/patches/patch-panel-plugin_Makefile.in +++ b/x11/xfce4-clipman-plugin/patches/patch-panel-plugin_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-panel-plugin_Makefile.in,v 1.3 2023/10/03 23:09:57 gutteridge Exp $ +$NetBSD: patch-panel-plugin_Makefile.in,v 1.4 2024/03/03 17:58:54 gutteridge Exp $ Adjust config path ---- panel-plugin/Makefile.in.orig 2023-09-29 11:07:44.000000000 +0000 +--- panel-plugin/Makefile.in.orig 2024-02-29 14:45:40.000000000 +0000 +++ panel-plugin/Makefile.in -@@ -714,7 +714,7 @@ libclipman_la_LIBADD = \ +@@ -710,7 +710,7 @@ libclipman_la_LIBADD = \ # # XML Actions File # @@ -13,12 +13,12 @@ Adjust config path actions_in_files = xfce4-clipman-actions.xml.in actions_DATA = $(actions_in_files:.xml.in=.xml) -@@ -731,7 +731,7 @@ apps_DATA = $(apps_in_files:.desktop.in= +@@ -727,7 +727,7 @@ apps_DATA = $(apps_in_files:.desktop.in= # # Autostart File # --@HAVE_LIBX11_TRUE@autostartdir = $(sysconfdir)/xdg/autostart -+@HAVE_LIBX11_TRUE@autostartdir = $(datadir)/examples/xfce4/autostart - @HAVE_LIBX11_TRUE@autostart_in_files = xfce4-clipman-plugin-autostart.desktop.in - @HAVE_LIBX11_TRUE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop) +-@ENABLE_X11_TRUE@autostartdir = $(sysconfdir)/xdg/autostart ++@ENABLE_X11_TRUE@autostartdir = $(datadir)/examples/xfce4/autostart + @ENABLE_X11_TRUE@autostart_in_files = xfce4-clipman-plugin-autostart.desktop.in + @ENABLE_X11_TRUE@autostart_DATA = $(autostart_in_files:.desktop.in=.desktop)