diff --git a/x11-wm/nscde/Makefile b/x11-wm/nscde/Makefile index 614c8aad22e3..98870538fe76 100644 --- a/x11-wm/nscde/Makefile +++ b/x11-wm/nscde/Makefile @@ -1,5 +1,5 @@ PORTNAME= nscde -DISTVERSION= 1.2 +DISTVERSION= 1.3 CATEGORIES= x11-wm MAINTAINER= freebsd@ny-central.org @@ -19,12 +19,10 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}psutil>=5.7.0:sysutils/py-psutil@${PY_FLAVOR fvwm2:x11-wm/fvwm2 \ gsed:textproc/gsed \ ksh93:shells/ast-ksh \ - magick:graphics/ImageMagick7 \ pyuic5:devel/py-qt5@${PY_FLAVOR} \ qt5-style-plugins>=5.0.0:x11-themes/qt5-style-plugins \ roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \ stalonetray:x11/stalonetray \ - sudo:security/sudo \ xdotool:x11/xdotool \ xdpyinfo:x11/xdpyinfo \ xrdb:x11/xrdb \ @@ -53,18 +51,34 @@ SHEBANG_FILES= Installer.ksh NsCDE/bin/confget.py NsCDE/bin/confset.py \ DOCSDIR= ${PREFIX}/share/doc/nscde OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_DEFAULT= DOCS EXAMPLES +OPTIONS_DEFAULT= DOCS EXAMPLES SUDO IMGV6 +OPTIONS_SINGLE= ROOTAUTH IMGMAG +OPTIONS_SINGLE_IMGMAG= IMGV6 IMGV7 +OPTIONS_SINGLE_ROOTAUTH= SUDO DOAS +DOAS_DESC= Use doas to elevate privileges +IMGMAG_DESC= ImageMagick release +IMGV6_DESC= ImageMagick version 6 +IMGV7_DESC= ImageMagick version 7 +ROOTAUTH_DESC= Root authorization +SUDO_DESC= Use sudo to elevate privileges + +DOAS_RUN_DEPENDS= doas:security/doas +IMGV6_RUN_DEPENDS= convert:graphics/ImageMagick6 +IMGV7_RUN_DEPENDS= magick:graphics/ImageMagick7 +SUDO_RUN_DEPENDS= sudo:security/sudo _NSCDE_HELPERS= Notifier.sh Splash.sh appfinder backdropmgr colorconv.py \ colormgr fontmgr fp_manage_subpanel fpexec fpseticon \ generate_app_menus generate_subpanels geticon.py getla1.py \ keymenu nscde-acpi nscde_get_logical_screens \ nscde_palette_colorgen.py nscde_setup strip_icon_path \ - style_managers.shlib subpanel_menuitem_props themegen.py + style_managers.shlib subpanel_menuitem_props themegen.py \ + xrandr_backer GWM.sh _PREFIX_FILES= NsCDE/bin/fpclock NsCDE/bin/get_fvwm_infostore \ NsCDE/bin/getfont NsCDE/bin/mkpagemenu NsCDE/bin/nscde \ NsCDE/bin/nscde_colorpicker NsCDE/bin/xdowrapper \ + NsCDE/config/NsCDE-Functions.conf.sample \ NsCDE/config/NsCDE-Main.conf.sample NsCDE/libexec/Splash.sh \ NsCDE/libexec/fp_manage_subpanel \ NsCDE/libexec/fvwm-modules/FvwmScript NsCDE/libexec/nscde_setup \ @@ -76,7 +90,6 @@ _PREFIX_FILES= NsCDE/bin/fpclock NsCDE/bin/get_fvwm_infostore \ docbook/NsCDE.xml docbook/NsCDE.xsl _SHAREDOC= NsCDE/config/FrontPanel.actions \ - NsCDE/config/NsCDE-Functions.conf \ NsCDE/config/NsCDE-Keybindings.conf \ NsCDE/config/NsCDE-Menus.conf NsCDE/config/NsCDE-Subpanels.conf \ NsCDE/config/Subpanels.actions NsCDE/lib/scripts/BackdropMgr \ @@ -94,9 +107,8 @@ _SHAREDOC= NsCDE/config/FrontPanel.actions \ NsCDE/lib/scripts/WSM NsCDE/lib/scripts/WSM-2 \ NsCDE/lib/scripts/WSM-4 NsCDE/lib/scripts/WSM-6 \ NsCDE/lib/scripts/WSM-8 NsCDE/lib/scripts/WindowMgr \ - NsCDE/lib/scripts/WsPgMgr - -_SHAREICONS= NsCDE/config/NsCDE-Functions.conf + NsCDE/lib/scripts/WsPgMgr \ + NsCDE/libexec/GWM.sh _CURLYICONS= NsCDE/config/NsCDE-Functions.conf NsCDE/libexec/colormgr \ NsCDE/libexec/subpanel_menuitem_props @@ -124,6 +136,7 @@ _BSHARESLASH= NsCDE/config/NsCDE-Functions.conf NsCDE/lib/scripts/BackdropMgr \ NsCDE/libexec/appfinder NsCDE/libexec/fontmgr \ NsCDE/libexec/strip_icon_path \ NsCDE/libexec/subpanel_menuitem_props \ + NsCDE/libexec/GWM.sh \ NsCDE/share/config_templates/colormgr.local \ NsCDE/share/doc/NsCDE.txt README.localization @@ -182,6 +195,7 @@ _BBINS= NsCDE/config/FrontPanel.actions \ NsCDE/libexec/colormgr NsCDE/libexec/fontmgr \ NsCDE/libexec/fp_manage_subpanel NsCDE/libexec/strip_icon_path \ NsCDE/libexec/subpanel_menuitem_props \ + NsCDE/libexec/GWM.sh \ NsCDE/share/applications/NsCDE-Exec.desktop \ NsCDE/share/applications/NsCDE-FvwmConsole.desktop \ NsCDE/share/applications/NsCDE-NProcMgr.desktop \ @@ -202,9 +216,7 @@ _CONFREF= NsCDE/config/NsCDE-Main.conf _CCONFIGS= NsCDE/libexec/colormgr _CONFIGS= NsCDE/lib/scripts/SubpanelMgr \ - NsCDE/lib/scripts/SubpanelSettings NsCDE/lib/scripts/WSM \ - NsCDE/lib/scripts/WSM-2 NsCDE/lib/scripts/WSM-4 \ - NsCDE/lib/scripts/WSM-6 NsCDE/lib/scripts/WSM-8 \ + NsCDE/lib/scripts/SubpanelSettings \ NsCDE/lib/scripts/WindowMgr NsCDE/lib/scripts/WsPgMgr \ NsCDE/libexec/fp_manage_subpanel NsCDE/libexec/fpexec \ NsCDE/libexec/fpseticon NsCDE/libexec/generate_app_menus \ @@ -217,6 +229,7 @@ _KSHFIX= NsCDE/bin/fpclock NsCDE/bin/get_fvwm_infostore NsCDE/bin/getdpi \ NsCDE/bin/nscde NsCDE/bin/nscde_colorpicker \ NsCDE/bin/nscde_fvwmclnt NsCDE/bin/nscde_var_append \ NsCDE/bin/xdowrapper NsCDE/libexec/Notifier.sh \ + NsCDE/libexec/GWM.sh \ NsCDE/libexec/Splash.sh NsCDE/libexec/appfinder \ NsCDE/libexec/backdropmgr NsCDE/libexec/colormgr \ NsCDE/libexec/fontmgr NsCDE/libexec/fp_manage_subpanel \ @@ -238,7 +251,7 @@ post-patch: ${CP} ${WRKSRC}/NsCDE/libexec/generate_subpanels ${WRKSRC}/generate_subpanels ${REINPLACE_CMD} -e 's@config/@etc/nscde/@g' ${WRKSRC}/generate_subpanels ( for SDOC in ${_SHAREDOC}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share/doc/@'${PREFIX}'/share/doc/nscde/@g' ${WRKSRC}/$${SDOC}; done ) - ( for IDOC in ${_SHAREICONS}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share/icons/@'${PREFIX}'/share/icons/@g' ${WRKSRC}/$${IDOC}; done ) + ${REINPLACE_CMD} -e 's@\\/@/@g' ${WRKSRC}/NsCDE/libexec/GWM.sh ( for SDOC in ${_SHARESLASH}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share/@'${DATADIR}'/@g' ${WRKSRC}/$${SDOC}; done ) ( for SDOC in ${_SHARENSLASH}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/share@'${DATADIR}'@g' ${WRKSRC}/$${SDOC}; done ) ( for SCR in ${_LIBEXEC_SCRIPTS}; do ${REINPLACE_CMD} -e 's@$$\[NSCDE_ROOT\]/libexec/@'${PREFIX}'/libexec/nscde/@g' ${WRKSRC}/$${SCR}; done ) @@ -249,6 +262,7 @@ post-patch: ( for SDOC in ${_CSHARESLASH}; do ${REINPLACE_CMD} -e 's@$${NSCDE_ROOT}/share/@'${DATADIR}'/@g' ${WRKSRC}/$${SDOC}; done ) ( for SDOC in ${_BSHARESLASH}; do ${REINPLACE_CMD} -e 's@$$NSCDE_ROOT/share/@'${DATADIR}'/@g' ${WRKSRC}/$${SDOC}; done ) ${FIND} ${WRKSRC}/NsCDE/config -type f -name '*.conf' -exec ${MV} {} {}.sample \; + ${FIND} ${WRKSRC}/NsCDE/config -type f -name '*.menu' -exec ${MV} {} {}.sample \; ( for BBIN in ${_BBINS}; do ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/bin@'${PREFIX}'/sbin@g' ${WRKSRC}/$${BBIN}; done ) ( for CFG in ${_CONFIGS}; do ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/config@'${ETCDIR}'@g' ${WRKSRC}/$${CFG}; done ) ( for SCR in ${_BLIBEXEC_SCRIPTS}; do ${REINPLACE_CMD} -e 's@$$NSCDE\_ROOT\/libexec@'${PREFIX}'/libexec/nscde@g' ${WRKSRC}/$${SCR}; done ) @@ -261,6 +275,12 @@ post-patch: ( for HLP in ${_PREFIX_FILES}; do ${REINPLACE_CMD} -e 's@$${PREFIX}@'${PREFIX}'@g' ${WRKSRC}/$${HLP}; done ) ${FIND} ${WRKSRC}/NsCDE -type f -name '*.bak' -delete +post-patch-DOAS-on: + ${REINPLACE_CMD} -e 's@sudo@doas@g' ${WRKSRC}/NsCDE/lib/scripts/SysActionDialog + ${REINPLACE_CMD} -e 's@sudo@doas@g' ${WRKSRC}/NsCDE/config/NsCDE-Functions.conf.sample + ${REINPLACE_CMD} -e 's@$${PREFIX}@'${PREFIX}'@g' ${WRKSRC}/NsCDE/share/doc/examples/doas.conf + ${FIND} ${WRKSRC}/NsCDE -type f -name '*.bak' -delete + do-build: ${RM} ${WRKSRC}/NsCDE/share/doc/html/* (cd ${WRKSRC}/docbook && ${PREFIX}/bin/xsltproc -o ${WRKSRC}/NsCDE/share/doc/html/NsCDE.html NsCDE.xsl NsCDE.xml) @@ -301,6 +321,7 @@ do-install-DOCS-on: ${MKDIR} ${STAGEDIR}/${PREFIX}/share/examples/nscde (cd ${WRKSRC}/NsCDE/share/doc/examples && ${COPYTREE_SHARE} . ${STAGEDIR}/${PREFIX}/share/examples/nscde) (cd ${WRKSRC}/NsCDE/share/doc && ${COPYTREE_SHARE} html ${STAGEDIR}/${PREFIX}/share/doc/nscde) + (cd ${WRKSRC}/NsCDE/share/doc && ${COPYTREE_SHARE} help ${STAGEDIR}/${PREFIX}/share/doc/nscde) ${INSTALL_DATA} ${WRKSRC}/NsCDE/share/doc/NsCDE.* ${STAGEDIR}/${PREFIX}/share/doc/nscde .include diff --git a/x11-wm/nscde/distinfo b/x11-wm/nscde/distinfo index 55e940fe655f..cb165fce0361 100644 --- a/x11-wm/nscde/distinfo +++ b/x11-wm/nscde/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1619881563 -SHA256 (nscde-nscde-1.2_GH0.tar.gz) = 86b3e9ca84814ded9aed3d4044716b46229b69e47e55b76d2526aa6185fc20ce -SIZE (nscde-nscde-1.2_GH0.tar.gz) = 31421032 +TIMESTAMP = 1634580730 +SHA256 (nscde-nscde-1.3_GH0.tar.gz) = 9867f3511dca6f89c03ac253643de6d942975ddc7892921e6e5b3137fad22a6b +SIZE (nscde-nscde-1.3_GH0.tar.gz) = 31935416 diff --git a/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf b/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf new file mode 100644 index 000000000000..427d5a87eb65 --- /dev/null +++ b/x11-wm/nscde/files/patch-NsCDE_config_NsCDE-Functions.conf @@ -0,0 +1,11 @@ +--- NsCDE/config/NsCDE-Functions.conf.orig 2021-10-18 18:47:50 UTC ++++ NsCDE/config/NsCDE-Functions.conf +@@ -963,7 +963,7 @@ AddToFunc f_ShowGlobalPager + + I All (GWM, CirculateHit) Break 1 + + I All (CurrentPage, LocalPager, CirculateHit, !Iconic) Iconify True + + I All (WspLocPager, CirculateHit) KillModule FvwmPager WspLocPager +-+ I PipeRead "/opt/NsCDE/libexec/GWM.sh -w 1920 -h 1200 -f 16 -d 4 -c -" +++ I PipeRead "${PREFIX}/libexec/nscde/GWM.sh -w 1920 -h 1200 -f 16 -d 4 -c -" + + I Wait GWMPager + + I All ("GWMPager", CirculateHit, !Transient) $[0-] + + I All ("GWMPager", CirculateHit, !Transient) f_OverScreen GWMPager PlaceAgain diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels b/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels new file mode 100644 index 000000000000..b9105df4a8ff --- /dev/null +++ b/x11-wm/nscde/files/patch-NsCDE_libexec_generate__subpanels @@ -0,0 +1,13 @@ +--- NsCDE/libexec/generate_subpanels.orig 2021-10-16 22:57:06 UTC ++++ NsCDE/libexec/generate_subpanels +@@ -6,9 +6,7 @@ + # Licence: GPLv3 + # + +-if [ -z $HAS_WINDOWNAME ]; then +- HAS_WINDOWNAME=0 +-fi ++HAS_WINDOWNAME=0 + + if [ -z $FVWM_USERDIR ]; then + if [[ -z $SYSMODE ]]; then diff --git a/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup b/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup index 22d640fbc737..ceb3d5ecc611 100644 --- a/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup +++ b/x11-wm/nscde/files/patch-NsCDE_libexec_nscde__setup @@ -1,11 +1,5 @@ ---- NsCDE/libexec/nscde_setup.orig 2021-04-24 03:10:51 UTC +--- NsCDE/libexec/nscde_setup.orig 2021-10-08 08:21:08 UTC +++ NsCDE/libexec/nscde_setup -@@ -1,4 +1,4 @@ --#!/usr/bin/env ksh93 -+#!${PREFIX}/bin/ksh93 - - # - # This file is a part of the NsCDE - Not so Common Desktop Environment @@ -7,7 +7,7 @@ # @@ -142,15 +136,14 @@ locale_setting_default_cursor_theme=$(gettext -s "Setting default cursor theme") echo "${HOME}/.icons/default/index.theme ${already_exists}. ${locale_setting_default_cursor_theme}." - $NSCDE_ROOT/bin/confset.py -t ini -c "$HOME/.icons/default/index.theme" -s "Icon Theme" -k Inherits -v dmz-aa -+ ${PREFIX}/sbin/confset.py -t ini -c "$HOME/.icons/default/index.theme" -s "Icon Theme" -k Inherits -v dmz-aa ++ $PEFIX/sbin/confset.py -t ini -c "$HOME/.icons/default/index.theme" -s "Icon Theme" -k Inherits -v dmz-aa fi fi -@@ -260,14 +250,14 @@ function setup_nscde +@@ -244,13 +234,13 @@ function setup_nscde if (($VERBOSE == 1)); then echo -ne "${HOME}/.gtkrc-2.0 ${already_exists}. " gettext -s "Setting NsCDE theme options." -- $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-key-theme-name -v '"Emacs"' - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-theme-name -v '"NsCDE"' - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-font-name -v '"DejaVu Serif Book 10"' - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-application-prefer-dark-theme -v 1 @@ -158,7 +151,6 @@ - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-button-images -v 0 - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-menu-images -v 0 - $NSCDE_ROOT/bin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-cursor-blink -v 0 -+ ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-key-theme-name -v '"Emacs"' + ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-theme-name -v '"NsCDE"' + ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-font-name -v '"DejaVu Serif Book 10"' + ${PREFIX}/sbin/confset.py -t properties -c "$HOME/.gtkrc-2.0" -k gtk-application-prefer-dark-theme -v 1 @@ -169,7 +161,7 @@ fi fi -@@ -284,14 +274,14 @@ function setup_nscde +@@ -267,14 +257,14 @@ function setup_nscde if (($VERBOSE == 1)); then echo -ne "${HOME}/.config/gtk-3.0/settings.ini already exists. " gettext -s "Setting NsCDE theme options." @@ -192,7 +184,7 @@ fi fi -@@ -302,7 +292,7 @@ function setup_nscde +@@ -285,7 +275,7 @@ function setup_nscde echo "$locale_generating_default_theme_for_gtk2_gtk3_in $HOME/.themes/NsCDE ..." fi mkdir -p "$HOME/.themes" @@ -201,7 +193,7 @@ else if (($VERBOSE == 1)); then echo "${HOME}/.themes/NsCDE ${already_exists}." -@@ -320,7 +310,7 @@ function setup_nscde +@@ -303,7 +293,7 @@ function setup_nscde if (($VERBOSE == 1)); then echo -ne "${HOME}/.config/Trolltech.conf ${already_exists}. " gettext -s "Setting NsCDE style." @@ -210,7 +202,7 @@ fi fi -@@ -334,9 +324,9 @@ function setup_nscde +@@ -317,9 +307,9 @@ function setup_nscde if (($VERBOSE == 1)); then echo "${HOME}/.config/qt5ct/qt5ct.conf ${already_exists}." gettext -s "Setting NsCDE style." @@ -223,7 +215,7 @@ fi fi -@@ -347,7 +337,7 @@ function setup_nscde +@@ -330,7 +320,7 @@ function setup_nscde echo "$setting_default ${FVWM_USERDIR}/libexec/colormgr.local ..." fi mkdir -p "${FVWM_USERDIR}/libexec" @@ -232,7 +224,7 @@ chmod +x "${FVWM_USERDIR}/libexec/colormgr.local" else if (($VERBOSE == 1)); then -@@ -368,7 +358,7 @@ function setup_nscde +@@ -351,7 +341,7 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "${locale_enabling}: pageshowrootpager --> 1" @@ -241,7 +233,7 @@ elif [ "x$ans" == "xn" ]; then echo "${locale_not_enabling} pageshowrootpager --> 0" else -@@ -390,7 +380,7 @@ function setup_nscde +@@ -380,7 +370,7 @@ function setup_nscde echo "$locale_enabled_by_default nscde_use_xscreensaver --> 1" elif [ "x$ans" == "xn" ]; then echo "$locale_disabling nscde_use_xscreensaver --> 0" @@ -250,7 +242,7 @@ else gettext -s "Answer not understood." echo "$locale_enabled_by_default nscde_use_xscreensaver --> 1" -@@ -401,7 +391,7 @@ function setup_nscde +@@ -391,7 +381,7 @@ function setup_nscde if (($VERBOSE == 1)); then echo "$setting_default ${FVWM_USERDIR}/Stalonetray.conf ..." fi @@ -259,7 +251,7 @@ else if (($VERBOSE == 1)); then locale_already_in_place=$(gettext -s "already in place") -@@ -419,7 +409,7 @@ function setup_nscde +@@ -409,7 +399,7 @@ function setup_nscde echo "$locale_enabled_by_default nscde_use_stalonetray --> 1" elif [ "x$ans" == "xn" ]; then echo "$locale_disabling nscde_use_stalonetray --> 0" @@ -268,7 +260,7 @@ else gettext -s "Answer not understood." echo "$locale_enabled_by_default nscde_use_stalonetray --> 1" -@@ -435,7 +425,7 @@ function setup_nscde +@@ -425,7 +415,7 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "$locale_enabling nscde_use_xsettingsd --> 1" @@ -277,7 +269,7 @@ elif [ "x$ans" == "xn" ]; then echo "$locale_not_enabling nscde_use_xsettingsd --> 0" else -@@ -454,8 +444,8 @@ function setup_nscde +@@ -444,8 +434,8 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "$locale_enabling nscde_use_dunst --> 1" @@ -288,7 +280,7 @@ elif [ "x$ans" == "xn" ]; then echo "$locale_not_enabling nscde_use_dunst --> 0" else -@@ -474,7 +464,7 @@ function setup_nscde +@@ -464,7 +454,7 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "$locale_enabling nscde_use_rofi --> 1" @@ -297,7 +289,7 @@ elif [ "x$ans" == "xn" ]; then echo "$locale_not_enabling nscde_use_rofi --> 0" else -@@ -491,14 +481,14 @@ function setup_nscde +@@ -481,14 +471,14 @@ function setup_nscde fi if [ "x$ans" == "xy" ]; then echo "$locale_enabling desklastpage --> 1" @@ -314,36 +306,53 @@ + ${PREFIX}/sbin/ised -c 's/InfoStoreAdd desklastpage 1/InfoStoreAdd desklastpage 0/g' -f "$FVWM_USERDIR/NsCDE.conf" fi - for filemgr in pcmanfm-qt pcmanfm krusader caja nemo thunar dolphin nautilus -@@ -518,10 +508,10 @@ function setup_nscde + if [ "x$FVWM_IS_FVWM3" == "x1" ]; then +@@ -500,7 +490,7 @@ function setup_nscde + fi + if [ "x$ans" == "xy" ]; then + echo "${locale_enabling}: fvwm3_default_logging --> 1" +- $NSCDE_ROOT/bin/ised -c 's/# InfoStoreAdd fvwm3_default_logging 1/InfoStoreAdd fvwm3_default_logging 1/g' -f "$FVWM_USERDIR/NsCDE.conf" ++ ${PREFIX}/sbin/ised -c 's/# InfoStoreAdd fvwm3_default_logging 1/InfoStoreAdd fvwm3_default_logging 1/g' -f "$FVWM_USERDIR/NsCDE.conf" + elif [ "x$ans" == "xn" ]; then + echo "${locale_not_enabling} fvwm3_default_logging --> 0" + else +@@ -526,7 +516,7 @@ function setup_nscde read ans if [ "x$ans" != "x" ]; then echo "$locale_setting_filemgr filemgr --> ${ans}" - $NSCDE_ROOT/bin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd filemgr ${ans}/g" -f "$FVWM_USERDIR/NsCDE.conf" + ${PREFIX}/sbin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd filemgr ${ans}/g" -f "$FVWM_USERDIR/NsCDE.conf" + + # Insanely retarded xdg utils. No exit status, no error, no listings of desktop files. + whence -q xdg-mime +@@ -544,7 +534,7 @@ function setup_nscde + elif [ "x${fmsugestion}" != "x" ]; then echo "$locale_setting_proposed_filemgr filemgr --> ${fmsugestion}" - $NSCDE_ROOT/bin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd filemgr ${fmsugestion}/g" -f "$FVWM_USERDIR/NsCDE.conf" + ${PREFIX}/sbin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd filemgr ${fmsugestion}/g" -f "$FVWM_USERDIR/NsCDE.conf" - else - echo "$locale_skipping_fm_set_later $FVWM_USERDIR/NsCDE.conf." - fi -@@ -544,12 +534,12 @@ function setup_nscde + + # Insanely retarded xdg utils. No exit status, no error, no listings of desktop files. + whence -q xdg-mime +@@ -582,7 +572,7 @@ function setup_nscde if [ "x$ans" != "x" ]; then echo "$locale_setting_editor xeditor --> ${ans}" if [ "x$ans" != "gvim" ]; then - $NSCDE_ROOT/bin/ised -c "s/InfoStoreAdd xeditor gvim/InfoStoreAdd xeditor ${ans}/g" -f "$FVWM_USERDIR/NsCDE.conf" + ${PREFIX}/sbin/ised -c "s/InfoStoreAdd xeditor gvim/InfoStoreAdd xeditor ${ans}/g" -f "$FVWM_USERDIR/NsCDE.conf" - fi + + # Insanely retarded xdg utils. No exit status, no error, no listings of desktop files. + txtmimes="application/x-shellscript text/english text/plain text/x-c text/x-c++ text/x-c++hdr text/x-c++src text/x-chdr text/x-csrc text/x-java text/x-makefile text/x-readme text/x-tcl" +@@ -620,7 +610,7 @@ function setup_nscde elif [ "x${xedit_suggest}" != "x" ]; then echo "$locale_setting_proposed_editor xeditor --> ${xedit_suggest}" if [ "x$ans" != "gvim" ]; then - $NSCDE_ROOT/bin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd xeditor ${xedit_suggest}/g" -f "$FVWM_USERDIR/NsCDE.conf" + ${PREFIX}/sbin/ised -c "s/InfoStoreAdd filemgr true/InfoStoreAdd xeditor ${xedit_suggest}/g" -f "$FVWM_USERDIR/NsCDE.conf" - fi - else - echo "$locale_setting_proposed_editor $FVWM_USERDIR/NsCDE.conf." -@@ -568,13 +558,13 @@ function setup_nscde + + # Insanely retarded xdg utils. No exit status, no error, no listings of desktop files. + txtmimes="application/x-shellscript text/english text/plain text/x-c text/x-c++ text/x-c++hdr text/x-c++src text/x-chdr text/x-csrc text/x-java text/x-makefile text/x-readme text/x-tcl" +@@ -672,13 +662,13 @@ function setup_nscde gettext -s "that you want to apply and confirm with OK in Color Style Manager" sleep 2 echo "" @@ -359,7 +368,7 @@ gettext -s "other integration options you may want to apply." sleep 1 echo "" -@@ -583,8 +573,8 @@ function setup_nscde +@@ -687,8 +677,8 @@ function setup_nscde if (($INTERACTIVE == 1)); then gettext -s "Press RETURN to finish setup and start Color Style Manager." read RET diff --git a/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local b/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local index ba7792476fc3..aa675b985a2a 100644 --- a/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local +++ b/x11-wm/nscde/files/patch-NsCDE_share_config__templates_NsCDE-Functions.local @@ -1,6 +1,6 @@ ---- NsCDE/share/config_templates/NsCDE-Functions.local.orig 2021-05-01 22:22:02 UTC +--- NsCDE/share/config_templates/NsCDE-Functions.local.orig 2021-10-08 08:21:08 UTC +++ NsCDE/share/config_templates/NsCDE-Functions.local -@@ -66,14 +66,14 @@ +@@ -69,14 +69,14 @@ # Hook of the f_SysConfigureWindowEvent called from # FvwmEvent on configure_window event. See # FvwmEvent(1) and f_SysConfigureWindowEvent in diff --git a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_doas.conf b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_doas.conf new file mode 100644 index 000000000000..164fd891c231 --- /dev/null +++ b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_doas.conf @@ -0,0 +1,8 @@ +--- NsCDE/share/doc/examples/doas.conf.orig 2021-10-17 10:41:55 UTC ++++ NsCDE/share/doc/examples/doas.conf +@@ -0,0 +1,5 @@ ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args suspend ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args hibernate ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args hybrid-suspend ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args poweroff ++permit nopass :wheel as root cmd ${PREFIX}/libexec/nscde/nscde-acpi args reboot diff --git a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager index 91923f0e699e..1e9f4c00d48c 100644 --- a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager +++ b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_006__PowerManager @@ -1,4 +1,4 @@ ---- NsCDE/share/doc/examples/sudo/006_PowerManager.orig 2021-05-01 21:44:54 UTC +--- NsCDE/share/doc/examples/sudo/006_PowerManager.orig 2021-10-08 08:21:08 UTC +++ NsCDE/share/doc/examples/sudo/006_PowerManager @@ -8,11 +8,11 @@ @@ -9,11 +9,11 @@ - /opt/NsCDE/libexec/nscde-acpi hybrid-suspend, \ - /opt/NsCDE/libexec/nscde-acpi poweroff, \ - /opt/NsCDE/libexec/nscde-acpi reboot -+Cmnd_Alias NSCDE_ACPI = ${PREFIX}/libexec/nscde-acpi suspend, \ -+ ${PREFIX}/libexec/nscde-acpi hibernate, \ -+ ${PREFIX}/libexec/nscde-acpi hybrid-suspend, \ -+ ${PREFIX}/libexec/nscde-acpi poweroff, \ -+ ${PREFIX}/libexec/nscde-acpi reboot ++Cmnd_Alias NSCDE_ACPI = ${PREFIX}/libexec/nscde/nscde-acpi suspend, \ ++ ${PREFIX}/libexec/nscde/nscde-acpi hibernate, \ ++ ${PREFIX}/libexec/nscde/nscde-acpi hybrid-suspend, \ ++ ${PREFIX}/libexec/nscde/nscde-acpi poweroff, \ ++ ${PREFIX}/libexec/nscde/nscde-acpi reboot user1 ALL = (TOOR) NOPASSWD: NSCDE_ACPI user2 ALL = (TOOR) NOPASSWD: NSCDE_ACPI diff --git a/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_README b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_README new file mode 100644 index 000000000000..15e520701ff2 --- /dev/null +++ b/x11-wm/nscde/files/patch-NsCDE_share_doc_examples_sudo_README @@ -0,0 +1,6 @@ +--- NsCDE/share/doc/examples/sudo/README.orig 2021-10-16 23:05:58 UTC ++++ NsCDE/share/doc/examples/sudo/README +@@ -1,2 +1,2 @@ + For SysActionDialog to work for certain actions, this sudoers configuration +-has to be put in /etc/sudoers or as a file in /etc/sudoers.d ++has to be put in /usr/local/etc/sudoers or as a file in /usr/local/etc/sudoers.d diff --git a/x11-wm/nscde/files/patch-docbook_NsCDE.xml b/x11-wm/nscde/files/patch-docbook_NsCDE.xml index 8b9d912be191..d3f0371fff5e 100644 --- a/x11-wm/nscde/files/patch-docbook_NsCDE.xml +++ b/x11-wm/nscde/files/patch-docbook_NsCDE.xml @@ -1,32 +1,24 @@ ---- docbook/NsCDE.xml.orig 2021-04-24 03:10:51 UTC +--- docbook/NsCDE.xml.orig 2021-10-08 08:21:08 UTC +++ docbook/NsCDE.xml -@@ -144,25 +144,26 @@ decade from the mainstream desktop players. +@@ -144,15 +144,13 @@ decade from the mainstream desktop players. -NsCDE is by default rooted in /opt/NsCDE ($NSCDE_ROOT), -but it can be relocated with only one variable changed in main -wrapper bin/nscde and NsCDE-Main.conf. -+NsCDE is by default rooted in ${PREFIX}/libexec/nscde, -+with several binaries in ${PREFIX}/sbin and -+${PREFIX}/bin. ++NsCDE is by default rooted in ${PREFIX}/libexec/nscde. It is not using your existing $HOME/.fvwm --but sets $FVWM_USERDIR to $HOME/.NsCDE, + but sets $FVWM_USERDIR to $HOME/.NsCDE, -and uses /opt/NsCDE/config as a sources of configuration. -+but sets $FVWM_USERDIR to $HOME/.NsCDE; -+unless any configuration data is put in this user-specific directory, data is instead read from -+${PREFIX}/etc/nscde. ++and uses ${PREFIX}/etc/nscde as a sources of configuration. --Configuration model is a bit complex, but very flexible: configuration options --are grouped in logical order. Configuration files are names -+The configuration model is a bit complex, but very flexible: configuration options -+are grouped in logical order. Configuration files are named - NsCDE-<group>.conf. For example, NsCDE-Functions.conf +@@ -162,7 +160,7 @@ are grouped in logical order. Configuration files are for FVWM functions. Each configuration file can have two exclusive sources, and one additional. For example, if user doesn't have $FVWM_USERDIR/NsCDE-Functions.conf, then @@ -35,7 +27,7 @@ $FVWM_USERDIR/NsCDE-Functions.local exists, it will be read in addition to conf file, from wherever it was read. This is intended as a primary mechanism for customization: If user doesn't need to override and change a lot of -@@ -174,12 +175,12 @@ configuration can be overridden or destroyed and recre +@@ -174,12 +172,12 @@ configuration can be overridden or destroyed and recre One notable addon to this system of configuration is the way FVWM Styles are read. In addition to reading $FVWM_USERDIR/NsCDE-Style.local "early" configuration in $FVWM_USERDIR/NsCDE-Style.override will be read from @@ -50,7 +42,7 @@ can nullify overrides for that particular applications, this is why this mechanism is provided. This file is not created in $FVWM_USERDIR by setup procedure or Style Managers, but it will be read if created manually. -@@ -298,7 +299,7 @@ differences are: +@@ -301,7 +299,7 @@ differences are: instead of static icons, because this cannot be done with gui menu actions. See FrontPanel.actions for examples. The other way (full control) is by copying FrontPanel.actions @@ -59,7 +51,7 @@ to $FVWM_USERDIR. -@@ -323,7 +324,7 @@ differences are: +@@ -326,7 +324,7 @@ differences are: main application as if icon has been clicked with the 1st mouse button, b) "reset this button" which will remove user's customizations for that launcher button from the $FVWM_USERDIR/FrontPanel.actions and load default from @@ -68,7 +60,7 @@ will reset upper subpanel to it's default value (remove definition of the numbered subpanel from the $FVWM_USERDIR/Subpanels.actions), d) "Delete Subpanel" will disable subpanel for above this icon (without resetting -@@ -605,13 +606,13 @@ necessary, and to enable or disable that particular Su +@@ -605,13 +603,13 @@ necessary, and to enable or disable that particular Su On the first change with Install Icon or Subpanel Settings, non-FVWM configuration file Subpanels.actions will be created in the $FVWM_USERDIR, from where all subpanels changed from default will be read @@ -85,16 +77,16 @@ Syntax of the Subpanels.actions is explained in the Configuration files explained section. -@@ -687,7 +688,7 @@ same function. +@@ -687,7 +685,7 @@ same function. then in 2 or 4 desks/buttons - mode a small current page indicator is show on the right side of the button. + mode a small current page indicator is shown on the right side of the button. In addition to Page Manager Icon southwest of the WSM. Disabled (0) by default. - WSM.conf (system wide: $NSCDE_ROOT/config/WSM.conf) is -+ WSM.conf (system wide: ${PREFIX}/etc/nscde/WSM.conf) is ++ WSM.conf (system wide: ${PREFIX}/nscde/WSM.conf) is a separate configuration file read by WSM, WsPgMgr and such. Not a FVWM configuration file. -@@ -773,16 +774,12 @@ It supports XPM skins and displays hours, minutes and +@@ -773,16 +771,13 @@ It supports XPM skins and displays hours, minutes and suited for window manager docks like FvwmButtons(1). In NsCDE it is applied with a skin similar to original one, but slightly bigger and with more clear edges and colors. Default can be used from @@ -107,24 +99,22 @@ -Pclock C source is provided for user's convenience if it -needs to be recompiled on another system or architecture. Source is in -$NSCDE_ROOT/src/pclock-0.13.1. --With NsCDE binary for Linux is provided by + With NsCDE binary for Linux is provided by -default in $NSCDE_ROOT/bin. -+pclock is found in ${PREFIX}/bin. ++default in ${PREFIX}/bin. -@@ -833,8 +830,8 @@ what is going on if FpLite is all red. - +@@ -834,7 +829,7 @@ what is going on if FpLite is all red. If clicked, it will call a function f_FpLiteClickAction which is by default set to safe defaults ([default terminal app] -e top). --FpLite FvwmScript app uses little portable python script getla1.py from the + FpLite FvwmScript app uses little portable python script getla1.py from the -$NSCDE_ROOT/libexec to obtain 1-minute load data. -+FpLite FvwmScript app uses a little portable python script getla1.py from +${PREFIX}/libexec/nscde to obtain 1-minute load data. Key F1 will bring this help text in browser. -@@ -937,7 +934,7 @@ Key Bindings: +@@ -942,7 +937,7 @@ Key Bindings: Part of the Style Managers which can be called from the main Style Manager (7th button on the Front Panel). This is the clone of the same-named CDE tool. It loads backdrops from the @@ -133,7 +123,7 @@ $FVWM_USERDIR/backdrops (if any). From XPM backdrop templates with symbol names (with .pm extension) it will generate previews in user's $FVWM_USERDIR/tmp and if -@@ -978,7 +975,7 @@ more than CDE original: +@@ -990,7 +985,7 @@ more than CDE original: Instead of backdrops, user can opt for a background image. If option "Use photo or picture" is selected, list of backdrops will dissapear and image backgrounds (so called "wallpapers") of PNG and XPM type will be loaded from @@ -142,7 +132,7 @@ $FVWM_USERDIR/photos (if any). Option to use one photo for all workspaces exists too. In this mode, backdrop-specific options will be hidden until Use photo or picture is not deselected. -@@ -1047,7 +1044,7 @@ Key Bindings: +@@ -1059,7 +1054,7 @@ Key Bindings: With Backdrop Style Manager, this is probably the most important theme tool in (Ns)CDE. This tool applies colors to the widgets, menus, applications and backdrops. As in CDE, it reads color information from the palette files in @@ -151,7 +141,7 @@ $FVWM_USERDIR/palettes. Palettes are the 16bpp color definitions (8 of them). This colors and border bg/fg/sel colors calculated from them are the base of the look of pretty much all of the things -@@ -1078,7 +1075,7 @@ will present editor with controls for Red, Green and B +@@ -1090,7 +1085,7 @@ will present editor with controls for Red, Green and B and Value. On the top left corner are preview squares with names "Old" and "New". When changing color with RGB and/or HSV controls, this "New" square button will change it's colorset. Color can also be picked with Grab Color button if a small binary "colorpicker" is @@ -160,7 +150,7 @@ If action is not Cancel but OK, selected color will be modified and new palette with generic name "Custom" created immediately. When finishing theme selection in Color Style Manager with modified colors, Color Style Manager will ask for a name -@@ -1302,10 +1299,10 @@ Monospaced Bold Large +@@ -1319,10 +1314,10 @@ Monospaced Bold Large This fonts are defined as FVWM infostore variables in the file @@ -173,7 +163,7 @@ $FVWM_USERDIR/fontsets/SomeName.fontset. Further, they are defined as CPP macros in $FVWM_USERDIR/Xdefaults.fontdefs which is included in -@@ -1319,7 +1316,7 @@ if some of this widget integrations is not desirable b +@@ -1336,7 +1331,7 @@ if some of this widget integrations is not desirable b The Font Style Manager itself consists of fontsets and fonts. Fontsets are named complete sets of five groups of three members of fonts defined above. @@ -182,7 +172,7 @@ $FVWM_USERDIR/fontsets. If font set is selected in Font Style Manager, 15 fonts from the set are loaded into preview lists of the application and can be immediately applied or further customized by leaving Use Predefined Font Set mode -@@ -1367,7 +1364,7 @@ to manual font selection for customizations into the n +@@ -1384,7 +1379,7 @@ to manual font selection for customizations into the n Button Default loads default @@ -191,7 +181,7 @@ then be saved as a choice or further customized into the new fontset. Bottom half of the Font Style Manager contains preview for all fonts from the one of the three selected size sets. -@@ -1562,8 +1559,8 @@ to save size and position of the non-transient window. +@@ -1754,8 +1749,8 @@ to save size and position of the non-transient window. the same application window on FVWM page where it is not already present that window will cause window to be resized to that exact width, height, X position and Y position X11 coordinates as stored in the $FVWM_USERDIR/GeoDB.ini. This ini-style file is managed by this application, as @@ -202,7 +192,7 @@ Resource names on contextual call, as well as geometry parameters. Before applying this settings, user has a chance to fine tune this parameters in text fields and confirm (or cancel) the action on the end. Using Clear all geometry values, as well as those which may be -@@ -1784,7 +1781,7 @@ button does this and also quits Subpanel Manager. +@@ -1976,7 +1971,7 @@ button does this and also quits Subpanel Manager. Subpanels configuration file Subpanels.actions, can be edited by hand in $FVWM_USERDIR if something needs to be changed on existing @@ -211,7 +201,7 @@ must be used to generate FVWM configuration output which must be redirected into $FVWM_USERDIR/NsCDE-Subpanels.conf. -@@ -1854,11 +1851,11 @@ and hibernation of the system. Of course, reb +@@ -2046,10 +2041,10 @@ and hibernation of the system. Of course, reb sudo(8) entries are configured properly. While System Action Dialog is active, root cursor changes to line-crossed cursor which is dismissed after the action is performed or dialog action dismissed. Not all of this actions are possible on all systems, but with the @@ -220,13 +210,11 @@ pm-utils but with systemd(1) and FreeBSD with acpiconf(8) are supported in this moment. -In $NSCDE_ROOT/share/doc/examples/sudo, one can find example --which can be put in /etc/sudoers.d with little changes. +In ${PREFIX}/share/examples/nscde/sudo, one can find example -+which can be put in ${PREFIX}/etc/sudoers.d with little changes. + which can be put in /etc/sudoers.d with little changes. Confirm button applies, Dismiss cancels and closes the dialog. - -@@ -2463,7 +2460,7 @@ same line is set. +@@ -2678,7 +2673,7 @@ same line is set. Default backdrops are set from the @@ -235,42 +223,42 @@ user does not redefine/set his own with Backdrop Style Manager. Default palette is Broica in 8 colors variant. -@@ -2478,9 +2475,9 @@ This file is read by FvwmBacker(1) FVWM module. It is +@@ -2693,9 +2688,9 @@ This file is read by FvwmBacker(1) FVWM module. It is first change with Backdrop Style Manager. -Until then, file $NSCDE_ROOT/config/NsCDE-Backdrops.conf is read, which -+Until then, file ${PREFIX}/etc/NsCDE-Backdrops.conf is read, which ++Until then, file ${PREFIX}/etc/nscde/NsCDE-Backdrops.conf is read, which itself reads pre-generated and pre-defined backdrops from the -$NSCDE_ROOT/share/defaults/backer directory. +${PREFIX}/share/nscde/defaults/backer directory. We can conclude that backdrops are source form or template file, and when processed -@@ -2506,7 +2503,7 @@ and safe defaults, and reads the rest of the configura +@@ -2732,7 +2727,7 @@ and safe defaults, and reads the rest of the configura which are included there. It defines StartFunction which starts all additional modules and calls important things during start or restart of the Window Manager. System Wide configuration files -are located in $NSCDE_ROOT/config, while user local hooks or -+are located in ${PREFIX}/etc/nscde, while user local hooks or ++are located in ${PREFIX}/etc/nscde, while user local hooks or user complete overrides are in $FVWM_USERDIR. -@@ -2595,11 +2592,11 @@ slightly different options: +@@ -2821,11 +2816,11 @@ slightly different options: @@ -279,16 +267,16 @@ extended by creating and writing $FVWM_USERDIR/AppMenus.conf file. -@@ -3192,7 +3189,7 @@ mouse focus to free space on the screen. +@@ -3426,7 +3421,7 @@ after losing mouse focus to free up space on the scree - XF86AudioLowerVolume and XF86AudioRaiseVolume on Sun type 6 or 7 keyboards will lower and raise sound volume by 1 percent, or by 10 percent if combined with Ctrl modifier. This works by default on systems on which pactl(1) PulseAudio tool is installed. On other systems, f_Mixer function has to be redefined. See $NSCDE_ROOT/config/NsCDE-Keybindings.conf for f_Mixer options and interaction. -+ XF86AudioLowerVolume and XF86AudioRaiseVolume on Sun type 6 or 7 keyboards will lower and raise sound volume by 1 percent, or by 10 percent if combined with Ctrl modifier. This works by default on systems on which pactl(1) PulseAudio tool is installed. On other systems, f_Mixer function has to be redefined. See ${PREFIX}/etc/nscde/NsCDE-Keybindings.conf for f_Mixer options and interaction. ++ XF86AudioLowerVolume and XF86AudioRaiseVolume on Sun type 6 or 7 keyboards will lower and raise sound volume by 1 percent, or by 10 percent if combined with Ctrl modifier. This works by default on systems on which pactl(1) PulseAudio tool is installed. On other systems, f_Mixer function has to be redefined. See ${PREFIX}/nscde/NsCDE-Keybindings.conf for f_Mixer options and interaction. -@@ -3210,7 +3207,7 @@ Pressend second time just once, it will dismiss Local +@@ -3444,7 +3439,7 @@ Pressend second time just once, it will dismiss Local Occupy Workspace dialog for window moving between the desks. @@ -297,7 +285,7 @@ for automatic description on menus. -@@ -3220,7 +3217,7 @@ Pressend second time just once, it will dismiss Local +@@ -3454,7 +3449,7 @@ Pressend second time just once, it will dismiss Local Occupy Page dialog for window moving between the desks. @@ -306,7 +294,16 @@ for automatic description on menus. -@@ -3228,7 +3225,7 @@ Pressend second time just once, it will dismiss Local +@@ -3465,7 +3460,7 @@ Pressend second time just once, it will dismiss Local + only when multiple monitors are detected by NsCDE and FVWM. + + +- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions ++ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions + for automatic description on menus. + + +@@ -3473,7 +3468,7 @@ Pressend second time just once, it will dismiss Local Alt+F1 regenerates and refreshes the window @@ -315,7 +312,7 @@ for automatic description on menus. -@@ -3236,7 +3233,7 @@ Pressend second time just once, it will dismiss Local +@@ -3481,7 +3476,7 @@ Pressend second time just once, it will dismiss Local Meta+F1 Calls xrefresh(1) command to refresh the X11 display @@ -324,7 +321,7 @@ for automatic description on menus. -@@ -3244,7 +3241,7 @@ Pressend second time just once, it will dismiss Local +@@ -3489,7 +3484,7 @@ Pressend second time just once, it will dismiss Local Alt+F2 iconifies (deiconifies if in icon context) @@ -333,7 +330,7 @@ for automatic description on menus. -@@ -3252,7 +3249,7 @@ Pressend second time just once, it will dismiss Local +@@ -3497,7 +3492,7 @@ Pressend second time just once, it will dismiss Local Meta+F2 "shades" or rolls up the window to titlebar only view @@ -342,7 +339,7 @@ for automatic description on menus. -@@ -3263,7 +3260,7 @@ Pressend second time just once, it will dismiss Local +@@ -3508,7 +3503,7 @@ Pressend second time just once, it will dismiss Local window with FVWM PlaceAgain command @@ -351,7 +348,7 @@ for automatic description on menus. -@@ -3272,7 +3269,7 @@ Pressend second time just once, it will dismiss Local +@@ -3517,7 +3512,7 @@ Pressend second time just once, it will dismiss Local mouse pointer currently resides, together with frame @@ -360,7 +357,7 @@ for automatic description on menus. -@@ -3281,7 +3278,7 @@ Pressend second time just once, it will dismiss Local +@@ -3526,7 +3521,7 @@ Pressend second time just once, it will dismiss Local and enter @@ -369,7 +366,7 @@ for automatic description on menus. -@@ -3290,7 +3287,7 @@ Pressend second time just once, it will dismiss Local +@@ -3535,7 +3530,7 @@ Pressend second time just once, it will dismiss Local directions and place it again on page @@ -378,7 +375,7 @@ for automatic description on menus. -@@ -3299,7 +3296,7 @@ directions and place it again on page +@@ -3544,7 +3539,7 @@ directions and place it again on page directions and place it again on page @@ -387,7 +384,7 @@ for automatic description on menus. -@@ -3308,7 +3305,7 @@ directions and place it again on page +@@ -3553,7 +3548,7 @@ directions and place it again on page and enter @@ -396,7 +393,7 @@ for automatic description on menus. -@@ -3319,7 +3316,7 @@ directions and place it again on page +@@ -3564,7 +3559,7 @@ directions and place it again on page Meta+Shift+F5 combinations will put window back from sticky state @@ -405,7 +402,7 @@ for automatic description on menus. -@@ -3329,7 +3326,7 @@ directions and place it again on page +@@ -3574,7 +3569,7 @@ directions and place it again on page Pressing again the same combination toggles this state back @@ -414,7 +411,7 @@ for automatic description on menus. -@@ -3339,7 +3336,7 @@ directions and place it again on page +@@ -3584,7 +3579,7 @@ directions and place it again on page Pressing again the same combination toggles this state back @@ -423,7 +420,7 @@ for automatic description on menus. -@@ -3347,7 +3344,7 @@ directions and place it again on page +@@ -3592,7 +3587,7 @@ directions and place it again on page Alt+F6 raises or lowers the window @@ -432,7 +429,7 @@ for automatic description on menus. -@@ -3359,7 +3356,7 @@ directions and place it again on page +@@ -3604,7 +3599,7 @@ directions and place it again on page grow and maximized states. This is a cyclic keybinding in a "shrink" direction. @@ -441,7 +438,7 @@ for automatic description on menus. -@@ -3377,7 +3374,7 @@ directions and place it again on page +@@ -3622,7 +3617,7 @@ directions and place it again on page stretched and maximized state. This is a cyclic keybinding in a "grow" direction. @@ -450,7 +447,7 @@ for automatic description on menus. -@@ -3392,7 +3389,7 @@ directions and place it again on page +@@ -3637,7 +3632,7 @@ directions and place it again on page Alt+F9 is empty @@ -459,7 +456,7 @@ for automatic description on menus. -@@ -3406,7 +3403,7 @@ directions and place it again on page +@@ -3651,7 +3646,7 @@ directions and place it again on page Alt+F10 deletes a window (see fvwm(1)) @@ -468,7 +465,7 @@ for automatic description on menus. -@@ -3414,7 +3411,7 @@ directions and place it again on page +@@ -3659,7 +3654,7 @@ directions and place it again on page Meta+F10 closes a window @@ -477,7 +474,7 @@ for automatic description on menus. -@@ -3422,7 +3419,7 @@ directions and place it again on page +@@ -3667,7 +3662,7 @@ directions and place it again on page Meta+Alt+F10 forcefully destroys a window @@ -486,7 +483,7 @@ for automatic description on menus. -@@ -3430,7 +3427,7 @@ directions and place it again on page +@@ -3675,7 +3670,7 @@ directions and place it again on page Alt+F11 is empty @@ -495,7 +492,7 @@ for automatic description on menus. -@@ -3438,7 +3435,7 @@ directions and place it again on page +@@ -3683,7 +3678,7 @@ directions and place it again on page Meta+F11 is empty @@ -504,7 +501,7 @@ for automatic description on menus. -@@ -3447,7 +3444,7 @@ directions and place it again on page +@@ -3692,7 +3687,7 @@ directions and place it again on page variable in the $FVWM_USERDIR/NsCDE.conf @@ -513,7 +510,7 @@ for automatic description on menus. -@@ -3455,7 +3452,7 @@ directions and place it again on page +@@ -3700,7 +3695,7 @@ directions and place it again on page Meta+F12 invokes default terminal app ($[infostore.terminal]) @@ -522,7 +519,7 @@ for automatic description on menus. -@@ -3464,7 +3461,7 @@ directions and place it again on page +@@ -3709,7 +3704,7 @@ directions and place it again on page information for a current window in the GeoDB.ini @@ -531,7 +528,7 @@ for automatic description on menus. -@@ -3484,7 +3481,7 @@ directions and place it again on page +@@ -3729,7 +3724,7 @@ directions and place it again on page $HOME if XDG_PICTURES_DIR is not defined. @@ -540,7 +537,7 @@ for automatic description on menus. -@@ -3494,7 +3491,7 @@ directions and place it again on page +@@ -3739,7 +3734,7 @@ directions and place it again on page $HOME if XDG_PICTURES_DIR is not defined. @@ -549,7 +546,25 @@ for automatic description on menus. -@@ -3505,7 +3502,7 @@ directions and place it again on page +@@ -3748,7 +3743,7 @@ directions and place it again on page + Screenshots in PNG format are saved into clipboard for pasting into compatible X11 applications. + + +- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions ++ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions + for automatic description on menus. + + +@@ -3757,7 +3752,7 @@ directions and place it again on page + Screenshots in PNG format are saved into clipboard for pasting into compatible X11 applications. + + +- Dynamic: defined in $NSCDE_ROOT/config/Keymenu.actions ++ Dynamic: defined in ${PREFIX}/etc/nscde/Keymenu.actions + for automatic description on menus. + + +@@ -3768,7 +3763,7 @@ directions and place it again on page button on the borders of the frame has the same effect @@ -558,7 +573,7 @@ for automatic description on menus. -@@ -3517,7 +3514,7 @@ directions and place it again on page +@@ -3780,7 +3775,7 @@ directions and place it again on page itself. @@ -567,7 +582,7 @@ for automatic description on menus. -@@ -3550,7 +3547,7 @@ Front Panel or Subpanels documentation. +@@ -3813,7 +3808,7 @@ Front Panel or Subpanels documentation. This file is not FVWM configuration file. It is written Subpanel Settings, or @@ -576,7 +591,7 @@ command which will generate infostore variables with descriptive keyboard shortcut names which are used in NsCDE menus from NsCDE-Menus.conf and NsCDE-Functions.conf, and additionaly, use the whole line after the keyword -@@ -3573,7 +3570,7 @@ on menus. For example, "F3 A M" configuration for FVWM +@@ -3836,7 +3831,7 @@ on menus. For example, "F3 A M" configuration for FVWM description right of the (De)Shade item on titlebar left button popdown menu. @@ -585,17 +600,7 @@ This script generates FVWM infostore variables used in menus, and executes FVWM "Key" commands producing dynamic keybindings which are described in menus. -@@ -3595,7 +3592,8 @@ notices in section about ~/.fvwm if user has a plain (normal) - FVWM setup, defines and redefines FVWM internal variables and sets -- NSCDE_ROOT, configures some core FVWM options (like ), -+ NSCDE_ROOT (though this variable is obsolete on FreeBSD), -+ configures some core FVWM options (like ), - defines main FVWM Read command wrapper f_ReadCfg, - sets desktop names, reads NsCDE.conf depending if user has it, or system-wide one, - defines StartFunction, , and -@@ -3972,7 +3970,7 @@ differ from NsCDE, since FVWM has much more options an +@@ -4225,7 +4220,7 @@ differ from NsCDE, since FVWM has much more options an huge number of tastes. '*' options are partially overridden or extended in NsCDE.conf which can be generated with Window Style Manager @@ -604,7 +609,7 @@ to $FVWM_USERDIR and edited to suit. -@@ -4000,7 +3998,7 @@ This styles can be extended and/or overridden by the u +@@ -4253,7 +4248,7 @@ This styles can be extended and/or overridden by the u $FVWM_USERDIR/NsCDE-Style.local, and core style for all windows (*) can be overriden by creating $FVWM_USERDIR/NsCDE-Style.override which extends or @@ -613,7 +618,7 @@ prior to applying particular application styles and prior to reading $FVWM_USERDIR/NsCDE-Style.local. -@@ -4020,7 +4018,7 @@ with a huge set of commands. +@@ -4273,7 +4268,7 @@ with a huge set of commands. This file is not FVWM configuration file. It is written by the Subpanels Manager, Subpanel Settings, or @@ -622,7 +627,7 @@ command which will generate NsCDE-Subpanels.conf file in user's $FVWM_USERDIR. -@@ -4066,14 +4064,14 @@ the field values. This values are: +@@ -4319,14 +4314,14 @@ the field values. This values are: NsCDE-Subpanels.conf @@ -639,7 +644,7 @@ read user's or system Subpanels.actions for every subpanel and if it is defined in user's one, take this one while generating NsCDE-Subpanels.conf. In system default, subpanels 2, 5 and 6 are disabled by default, but can be activated with a very quick -@@ -4099,29 +4097,19 @@ or $FVWM_USERDIR. +@@ -4352,25 +4347,20 @@ or $FVWM_USERDIR. System Tree Layout @@ -652,39 +657,43 @@ -user's $PATH. +FreeBSD's port of NsCDE places all application files into appropriate directories +within -+${PREFIX}. ++${PREFIX}. -This are subdirectories of /opt/NsCDE with short --description what is what, and what is where: -+Relevant directories are listed below: ++This are subdirectories of NsCDE with short + description what is what, and what is where: -/opt/NsCDE -- ++${PREFIX}/usr/lib/nscde + -main top directory of NsCDE installation all further -descriptions will be written as relative to this directory -- -- ++main top directory of NsCDE installation + + --bin -+${PREFIX}/bin, -+${PREFIX}/sbin +@@ -4378,14 +4368,14 @@ descriptions will be written as relative to this direc nscde start wrapper called from .xsession or integrated as .desktop -@@ -4132,7 +4120,7 @@ descriptions will be written as relative to this direc +- file in /usr/share/xsession is located here, ++ file in ${PREFIX}/share/xsession is located here, + as well as some helper + scripts of the NsCDE which are suitable for general use. Front Panel + pclock is also here. Pclock is the only binary part of the NsCDE - config -+ ${PREFIX}/etc/nscde ++ ${PREFIX}/etc/nscde Configuration directory. All .conf files described in documentation -@@ -4141,7 +4129,7 @@ descriptions will be written as relative to this direc +@@ -4394,7 +4384,7 @@ descriptions will be written as relative to this direc @@ -693,7 +702,7 @@ Template X pixmap files used by Color Style Manager for producing -@@ -4153,7 +4141,7 @@ descriptions will be written as relative to this direc +@@ -4406,7 +4396,7 @@ descriptions will be written as relative to this direc @@ -702,7 +711,7 @@ Python libraries used by themegen.py: part of the integration suite -@@ -4161,7 +4149,7 @@ descriptions will be written as relative to this direc +@@ -4414,7 +4404,7 @@ descriptions will be written as relative to this direc @@ -711,7 +720,7 @@ The rest of the scripts (korn shell and python) are located here. In -@@ -4171,7 +4159,7 @@ descriptions will be written as relative to this direc +@@ -4424,7 +4414,7 @@ descriptions will be written as relative to this direc @@ -720,7 +729,7 @@ Backdrop files. CDE and new, additional. Source for generation of active -@@ -4183,7 +4171,7 @@ descriptions will be written as relative to this direc +@@ -4436,7 +4426,7 @@ descriptions will be written as relative to this direc @@ -729,7 +738,7 @@ Custom cursors which are missing on plain X server installations but -@@ -4191,7 +4179,7 @@ descriptions will be written as relative to this direc +@@ -4444,7 +4434,7 @@ descriptions will be written as relative to this direc @@ -738,7 +747,7 @@ Default generated backdrops for first start (Broica, 8 colors) -@@ -4199,21 +4187,21 @@ descriptions will be written as relative to this direc +@@ -4452,21 +4442,21 @@ descriptions will be written as relative to this direc @@ -763,7 +772,7 @@ Examples for X display manager and DE integrations, sudo for shutdown -@@ -4222,21 +4210,21 @@ Examples for X display manager and DE integrations, @@ -788,7 +797,7 @@ Custom NsCDE icons of which many are part of FvwmScript programs and -@@ -4244,7 +4232,7 @@ Examples for X display manager and DE integrations, @@ -797,7 +806,7 @@ CDE palettes plus a bunch of new custom palettes. Used by Color -@@ -4255,7 +4243,7 @@ Examples for X display manager and DE integrations, @@ -806,7 +815,7 @@ A couple of nice free photos collected and resized for various -@@ -4266,7 +4254,7 @@ Examples for X display manager and DE integrations, @@ -815,7 +824,7 @@ X resources for a particular X applications (like XTerm) which -@@ -4276,10 +4264,10 @@ Examples for X display manager and DE integrations, @@ -823,12 +832,8 @@ + ${PREFIX}/share/nscde/config_templates/integration/gtk2_gtk3_qt -- Part of the CDE theme which are used by libexec/themegen.py and -+ Part of the CDE theme which are used by ${PREFIX}/libexec/nscde/themegen.py and - the rest of lib/python/*.py to generate - $HOME/.themes/NsCDE with - a selected palette and color depth. -@@ -4296,24 +4284,6 @@ Examples for X display manager and DE integrations, libexec/themegen.py and +@@ -4549,24 +4539,6 @@ Examples for X display manager and DE integrations, $FVWM_USERDIR. @@ -853,7 +858,7 @@ -@@ -4373,7 +4343,7 @@ it will not be touched and can co-exist with NsCDE in +@@ -4637,7 +4609,7 @@ it will not be touched and can co-exist with NsCDE in NsCDE custom icons. Put here by Color Style Manager and the rest of the tools. Since icons from here are referenced with a relative path, whatever is missing here, will be loaded from system's @@ -862,7 +867,7 @@ -@@ -4406,7 +4376,7 @@ it will not be touched and can co-exist with NsCDE in +@@ -4670,7 +4642,7 @@ it will not be touched and can co-exist with NsCDE in NsCDE-XYZ.conf files: @@ -871,7 +876,7 @@ If in existence, they will be read instead of system defaults. XYZ is here placeholder/example for Style, Functions, Keybindings, Init, Menus etc ... -@@ -4414,7 +4384,7 @@ it will not be touched and can co-exist with NsCDE in +@@ -4678,7 +4650,7 @@ it will not be touched and can co-exist with NsCDE in NsCDE-XYZ.local files: @@ -880,7 +885,7 @@ If in existence, they will be read in right after their .conf main configurations from system (or local) directory. This is preferred way to extend functionality or override something not big enough -@@ -4425,14 +4395,14 @@ it will not be touched and can co-exist with NsCDE in +@@ -4689,14 +4661,14 @@ it will not be touched and can co-exist with NsCDE in NsCDE-Style.override file: @@ -897,7 +902,7 @@ for that particular applications, this is why this mechanism is provided. This file is not created in $FVWM_USERDIR by setup procedure or Style Managers, but if created (manually) it will be read and processed. -@@ -4452,7 +4422,7 @@ it will not be touched and can co-exist with NsCDE in +@@ -4716,7 +4688,7 @@ it will not be touched and can co-exist with NsCDE in WSM.conf: read/written by Workspace and Page Manager, WSM and user's favorite editor. Not an FVWM config file. System default @@ -906,105 +911,32 @@ -@@ -4651,111 +4621,37 @@ any part of the NsCDE. (optional) - - Installation - --There is a script Installer.ksh in NsCDE top level directory when unpacked. When run without --any arguments, installer script will print usage with explanations and examples. Installing NsCDE --is relatively simple: if some mandatory dependency is missing (for example FVWM or ksh), installer --will print that error, as well for some Python3 modules. For optional dependencies, that is, --programs and components which are not essential it will just print a warning. -- -- --The main moduses of installation are: -- -- --.tar.gz -- # tar xpzf NsCDE-.tar.gz -- # cd NsCDE- -- # ./Installer -w -n -i --]]> -- -+On FreeBSD, use -+pkg install nscde -+or - -- --For FVWM3 or FVWM2 patched with NsCDE patches from NsCDE-<version>/src --one can use "-f" mode of installation instead "-w". - -- - - .tar.gz -- # tar xpzf NsCDE-.tar.gz -- # cd NsCDE- -- # ./Installer -f -n -i -+ $ cd /usr/ports/x11-wm/nscde -+ # make config -+ # make install clean - ]]> +@@ -4954,23 +4926,10 @@ one can use "-f" mode of installation instead "-w". -- + -Both of the examples above will install NsCDE into /opt/NsCDE. However, it is -possible to install to some other place. For example, this will install NsCDE -in /data/programs/nscde: -- -- ++Both of the examples above will install NsCDE into ${PREFIX}. + + - - - - -- + -For interactive mode of installation "-n" must be ommited. An asking wizard type -of installation will appear. - - - --For a latest master tree from development page on Github, NsCDE can be fetched with --git(1) and upgraded with fetching changes in the master or some other branch. An example --of this would be: -- -- -- -- -- -- -- --Upgrades, either from tarball or from git, once new version is downloaded can be made --by replacing "-i" option with "-u" option for the installer. Example of upgrade: -- -- -- -- -- -- -- --Similarly, option "-d" is for uninstallation etc ... run --Installer.ksh without arguments for a full set of options. -- -- - - + For a latest master tree from development page on Github, NsCDE can be fetched with + git(1) and upgraded with fetching changes in the master or some other branch. An example + of this would be: +@@ -5007,19 +4966,19 @@ Installer.ksh without arguments for a full set of opti NsCDE Startup Session can be started from the $HOME/.xsession in last command line @@ -1018,37 +950,36 @@ -file /opt/NsCDE/share/doc/examples/xsession-integration/nscde.desktop +file ${PREFIX}/share/examples/nscde/xsession-integration/nscde.desktop will be put by Installer.ksh during the installation into --/usr/share/xsessions -+${PREFIX}/share/xsessions + /usr/share/xsessions (or in whatever place your system and your X Display Manager reads this files) and afterwards NsCDE can be selected from the display manager's menu or similar session selector. See the rest of the X Session Manager integration examples in the -directory /opt/NsCDE/share/doc/examples/ -+directory ${PREFIX}/share/examples/nscde ++directory ${PREFIX}/share/examples/nscde/ for MATE, KDE, LXDE and similar DE integrations and play with this if you like. -@@ -4764,15 +4660,15 @@ for MATE, KDE, LXDE and similar DE integrations and pl +@@ -5028,15 +4987,15 @@ for MATE, KDE, LXDE and similar DE integrations and pl NsCDE Localization NsCDE implements localization capabilities provided by FVWM and system C library. -Directive LocalePath in $NSCDE_ROOT/config/NsCDE-Main.conf -is set to look at $[NSCDE_ROOT]/share/locale;NsCDE:$[NSCDE_ROOT]/share/locale;NsCDE-Subpanels:+. +Directive LocalePath in ${PREFIX}/etc/nscde/NsCDE-Main.conf -+is set to look at ${PREFIX}/share/nscde/locale;NsCDE:NsCDE-Subpanels:+. ++is set to look at ${PREFIX}/share/locale;NsCDE:${PREFIX}/share/locale;NsCDE-Subpanels:+. In other words, whole NsCDE reads it's localization from "mo" files from -$[NSCDE_ROOT]/share/locale/$LANG/LC_MESSAGES/NsCDE.mo except subpanels -+${PREFIX}/share/nscde/locale/$LANG/LC_MESSAGES/NsCDE.mo except subpanels ++${PREFIX}/share/locale/$LANG/LC_MESSAGES/NsCDE.mo except subpanels which have their localization in separate mo files in the same directory. All FvwmScript based applications are reading their own "mo" file from -$[NSCDE_ROOT]/share/locale/$LANG/LC_MESSAGES/NsCDE.mo -+${PREFIX}/share/nscde/locale/$LANG/LC_MESSAGES/NsCDE.mo ++${PREFIX}/share/locale/$LANG/LC_MESSAGES/NsCDE.mo which is defined in every program's header with UseGettext directive. -@@ -4813,7 +4709,7 @@ on the system and found, they will be run too. Stalone +@@ -5077,7 +5036,7 @@ on the system and found, they will be run too. Stalone Style Manager and Font Style Manager when theme or font is changed. @@ -1057,7 +988,7 @@ the terminal which will run automatically and will set up the following: -@@ -4943,7 +4839,7 @@ When both windows are on the screen, this menu entries +@@ -5208,7 +5167,7 @@ When both windows are on the screen, this menu entries NsCDE is using it's own copies of Xdefaults and includes files for X resources integration in $FVWM_USERDIR. X resources are filled with @@ -1066,7 +997,7 @@ part of session assembling. Variable XAPPLRESDIR is also adjusted to $FVWM_USERDIR/app-defaults. There can be problems while using certain X session managers or DE which are -@@ -4961,7 +4857,7 @@ even better, $FVWM_USERDIR +@@ -5226,7 +5185,7 @@ even better, $FVWM_USERDIR and reworked for Color Style Manager integration, because if find in that directory, and with .tmpl extension, it will be processed in the same way @@ -1075,7 +1006,7 @@ and put in $FVWM_USERDIR/app-defaults. -@@ -4975,12 +4871,12 @@ X resources integration is turned on by default in +@@ -5240,12 +5199,12 @@ X resources integration is turned on by default in Gtk2, Gtk3, Qt4 and Qt5 @@ -1083,7 +1014,7 @@ -$NSCDE_ROOT/lib/python and with -$NSCDE_ROOT/share/config_templates/integration/gtk2_gtk3_qt +${PREFIX}/libexec/nscde/themegen.py with -+${PREFIX}/lib/nscde/python and with ++${PREFIX}/libexec/nscde/lib/python and with +${PREFIX}/share/nscde/config_templates/integration/gtk2_gtk3_qt are parts of the optional Gtk2, Gtk3, Qt4 and Qt5 integration suite. When run from the Color Style Manager or manually with the @@ -1092,7 +1023,61 @@ with proper options, this will produce $HOME/.themes/NsCDE directory with either or both Gtk2 and Gtk3 themes. $HOME/.gtkrc-2.0 and $HOME/.config/gtk-3.0/settings.ini will be edited to point to this -@@ -5014,13 +4910,13 @@ of this resources. Also "skins" for programs like + For this to work, + appropriate code or the whole colormgr.local from +-$NSCDE_ROOT/share/config_templates/colormgr.local must be adapted into ++${PREFIX}/share/nscde/config_templates/colormgr.local must be adapted into + $FVWM_USERDIR/libexec/colormgr.local. Shell variable + FIREFOX_CHROMEDIR should contain path to the + ~/.mozilla/firefox/__PROFILE__/chrome., +@@ -5286,8 +5245,8 @@ point to chrome directory of user's thunderbird profil + directory does not exist, it will be created by the colormgr.local. This will make + appropriate entiries in userChrome.css and userContent.css to + import nscdeChrome.css, nscdeIcons.css and +-nscdeContent.css from the $NSCDE_ROOT/share/config_templates/integration/firefox +-and/or from $NSCDE_ROOT/share/config_templates/integration/thunderbird. ++nscdeContent.css from the ${PREFIX}/share/nscde/config_templates/integration/firefox ++and/or from ${PREFIX}/share/nscde/config_templates/integration/thunderbird. + File nscdeColordefs.css will be generated in the chrome dir with color mappings to the + current NsCDE theme. This wile is also imported in userChrome.css and userContent.css. + +@@ -5317,12 +5276,12 @@ makes a changes: + + $ cat /home/user/.thunderbird/Profile_1/chrome/userContent.css + @import url("nscdeColordefs.css"); +-@import url("/opt/NsCDE/share/config_templates/integration/thunderbird/nscdeContent.css"); ++@import url("${PREFIX}/share/nscde/config_templates/integration/thunderbird/nscdeContent.css"); + + $ cat /home/user/.thunderbird/Profile_1/chrome/userChrome.css + @import url("nscdeColordefs.css"); +-@import url("/opt/NsCDE/share/config_templates/integration/thunderbird/nscdeChrome.css"); +-@import url("/opt/NsCDE/share/config_templates/integration/thunderbird/nscdeIcons.css"); ++@import url("${PREFIX}/share/nscde/config_templates/integration/thunderbird/nscdeChrome.css"); ++@import url("${PREFIX}/share/nscde/config_templates/integration/thunderbird/nscdeIcons.css"); + + + +@@ -5333,14 +5292,14 @@ This is how Firefox chromedir should look: + /opt/NsCDE/share/config_templates/integration/firefox/ff9x_nscdeContent.css ++|- nscdeContent.css -> ${PREFIX}/share/nscde/config_templates/integration/firefox/ff9x_nscdeContent.css + |- userChrome.css + |- userContent.css + + $ cat /home/user/.mozilla/firefox/testtest.default-release/chrome/userChrome.css + @import url("nscdeColordefs.css"); +-@import url("/opt/NsCDE/share/config_templates/integration/firefox/ff9x_nscdeChrome.css"); +-@import url("/opt/NsCDE/share/config_templates/integration/firefox/nscdeIcons.css"); ++@import url("${PREFIX}/share/nscde/config_templates/integration/firefox/ff9x_nscdeChrome.css"); ++@import url("${PREFIX}/share/nscde/config_templates/integration/firefox/nscdeIcons.css"); + + $ cat /home/user/.mozilla/firefox/testtest.default-release/chrome/userContent.css + @import url("nscdeColordefs.css"); +@@ -5370,13 +5329,13 @@ of this resources. Also "skins" for programs like Gkrellm can be processed from custom colormgr.local. @@ -1109,7 +1094,7 @@ -@@ -5086,7 +4982,7 @@ set to look almost as Dtterm, but with richer menu and +@@ -5442,7 +5401,7 @@ set to look almost as Dtterm, but with richer menu and handling, the bad thing is that configuration if not done via GUI or configuration file but is stored in binary DCONF registry, and registry editor like dconf-editor or or dconf gsettings must be used for non-interactive or CLI editing. @@ -1118,7 +1103,7 @@ on how to integrate mate-terminal with a Color Style Manager. Second (if not first) best choice is Urxvt, but since it does not have a menu nor a -@@ -5117,7 +5013,7 @@ NsCDE has a ready drop-in theme called (of course) NsC +@@ -5473,7 +5432,7 @@ NsCDE has a ready drop-in theme called (of course) NsC share/config_templates and it can be put in user's ~/.gkrellm2/themes and integrated with Color Style Manager @@ -1127,7 +1112,7 @@ installed as $FVWM_USERDIR/libexec/colormgr.local. -@@ -5136,7 +5032,7 @@ powerful GPU, CPU and RAM I have. I turn it on occasio +@@ -5492,7 +5451,7 @@ powerful GPU, CPU and RAM I have. I turn it on occasio amusement of xsnow, xsanta or xeyes type, but when I have serious work to do, I simply turn it off in some moment. Maybe it can be better if it is configured more conservative than example. See @@ -1136,27 +1121,21 @@ a starting point. Syntax of this file is largely compatible for all three above mentioned X compositors. -@@ -5382,11 +5278,11 @@ with complete explanations: +@@ -5744,6 +5703,8 @@ with complete explanations: Patches for FVWM --Optional but recommended patches for FVWM 2.6.7 and 2.6.8 are in --/opt/NsCDE/src directory. -+Optional but recommended patches for FVWM 2.6.7 and 2.6.8 are -+available on GitHub but are not integrated in FreeBSD's port. ++(This FreeBSD port does not include these patches in fvwm and therefore are not ++applicable) + Optional but recommended patches for FVWM 2.6.7 and 2.6.8 are in + /opt/NsCDE/src directory. - --This patches will add: -+These patches will add: - - - -@@ -5472,7 +5368,7 @@ in layout to old Xinerama support in FVWM2, while seco - and different parts of different workspaces can be shown on different - monitors. For NsCDE to work with this, currently there is one workaround in - the for of external background setter. For more information and instructions, refer --to the $NSCDE_ROOT/share/doc/examples/fvwm3-per-monitor/README. -+to the ${PREFIX}/share/examples/nscde/fvwm3-per-monitor/README. - As in the future more desktop layouts are planned by FVWM3 developers, this - setting will most probably get it's GUI control usable on FVWM3 in the - Workspaces and Pages Manager. Currently, NsCDE +@@ -5834,7 +5795,7 @@ in layout to old Xinerama support in FVWM2, while seco + workspaces, so different parts of different workspaces can be shown on different + monitors. NsCDE implements dynamic finding and displaying, as well as creation of + joint backdrops combinations for multiple monitors layout out of the box, so old +-hack described in $NSCDE_ROOT/share/doc/examples/fvwm3-per-monitor/README ++hack described in ${PREFIX}/share/examples/nscde/fvwm3-per-monitor/README + is not needed anymore. As in the future more desktop layouts are planned by FVWM3 developers, this + setting has it's GUI control usable on FVWM3 in the + Workspaces and Pages Style Manager. NsCDE diff --git a/x11-wm/nscde/files/patch-src_XOverrideFontCursor_Makefile b/x11-wm/nscde/files/patch-src_XOverrideFontCursor_Makefile index 20ff8a8cabe3..2c5fa432c8dc 100644 --- a/x11-wm/nscde/files/patch-src_XOverrideFontCursor_Makefile +++ b/x11-wm/nscde/files/patch-src_XOverrideFontCursor_Makefile @@ -1,9 +1,8 @@ ---- src/XOverrideFontCursor/Makefile.orig 2021-05-19 20:50:51 UTC +--- src/XOverrideFontCursor/Makefile.orig 2021-10-16 21:57:28 UTC +++ src/XOverrideFontCursor/Makefile -@@ -1,5 +1,5 @@ - XOverrideFontCursor.so: -- gcc -I/usr/include/X11 -I/usr/local/include/X11 -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R7/include -I/usr/X11R6/include/X11 -I/usr/X11R7/include/X11 -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/local/lib -lX11 -fPIC -shared XOverrideFontCursor.c -o XOverrideFontCursor.so -+ /usr/bin/clang -I/usr/include/X11 -I/usr/local/include/X11 -I/usr/local/include -I/usr/X11R6/include -I/usr/X11R7/include -I/usr/X11R6/include/X11 -I/usr/X11R7/include/X11 -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/local/lib -lX11 -fPIC -shared XOverrideFontCursor.c -o XOverrideFontCursor.so +@@ -1,4 +1,4 @@ +-CC ?= gcc ++CC ?= clang + CFLAGS ?= + LDFLAGS ?= - clean: - rm XOverrideFontCursor.so diff --git a/x11-wm/nscde/files/patch-src_colorpicker_Makefile b/x11-wm/nscde/files/patch-src_colorpicker_Makefile index 34fff7ebaad9..22c5bea15c7c 100644 --- a/x11-wm/nscde/files/patch-src_colorpicker_Makefile +++ b/x11-wm/nscde/files/patch-src_colorpicker_Makefile @@ -1,8 +1,10 @@ ---- src/colorpicker/Makefile.orig 2021-05-19 20:49:25 UTC +--- src/colorpicker/Makefile.orig 2021-10-08 08:21:08 UTC +++ src/colorpicker/Makefile -@@ -1,4 +1,4 @@ --CC=gcc +@@ -1,6 +1,6 @@ + CC ?= gcc + CFLAGS ?= +-LDFLAGS ?= +CC=/usr/bin/clang colorpicker: main.c - $(CC) -o colorpicker main.c `pkg-config --libs --cflags x11` + $(CC) -o colorpicker $(CFLAGS) main.c `pkg-config --libs --cflags x11` $(LDFLAGS) diff --git a/x11-wm/nscde/files/patch-src_pclock-0.13.1_src_Makefile b/x11-wm/nscde/files/patch-src_pclock-0.13.1_src_Makefile index 94791d3e1a9a..d8a89928d34f 100644 --- a/x11-wm/nscde/files/patch-src_pclock-0.13.1_src_Makefile +++ b/x11-wm/nscde/files/patch-src_pclock-0.13.1_src_Makefile @@ -1,11 +1,11 @@ ---- src/pclock-0.13.1/src/Makefile.orig 2021-05-19 20:50:00 UTC +--- src/pclock-0.13.1/src/Makefile.orig 2021-10-16 21:57:41 UTC +++ src/pclock-0.13.1/src/Makefile @@ -7,7 +7,7 @@ DEFAULT_XPM = Fpclock.xpm INCDIR = -I/usr/X11R6/include -I/usr/X11R7/include -I/usr/include -I/usr/local/include -I. LIBDIR = -L/usr/X11R6/lib -L/usr/X11R7/lib -L/usr/lib64 -L/usr/local/lib --CC = gcc -+CC = /usr/bin/clang - CFLAGS = -O2 -g -Wall +-CC ?= gcc ++CC ?= clang + CFLAGS ?= -O2 -g -Wall + LDFLAGS ?= LIBS = -lXpm -lXext -lX11 -lm - diff --git a/x11-wm/nscde/pkg-message b/x11-wm/nscde/pkg-message index 66e8542db43f..ee493f65b50c 100644 --- a/x11-wm/nscde/pkg-message +++ b/x11-wm/nscde/pkg-message @@ -14,3 +14,4 @@ While NsCDE will generally run fine without those ports, there will be keyboard shortcuts and links in your initial setup, which will not work without them or without further configuration work on your end. + diff --git a/x11-wm/nscde/pkg-plist b/x11-wm/nscde/pkg-plist index ad360ca5870c..0b5f2ee5496c 100644 --- a/x11-wm/nscde/pkg-plist +++ b/x11-wm/nscde/pkg-plist @@ -25,7 +25,6 @@ bin/pclock @sample %%ETCDIR%%/NsCDE-Menus.conf.sample @sample %%ETCDIR%%/NsCDE-Monitors.conf.sample @sample %%ETCDIR%%/NsCDE-Mousebindings.conf.sample -@sample %%ETCDIR%%/NsCDE-Pager-GlobalPager.conf.sample @sample %%ETCDIR%%/NsCDE-Pager-LocalPager.conf.sample @sample %%ETCDIR%%/NsCDE-Pager-WspLocPager.conf.sample @sample %%ETCDIR%%/NsCDE-Script.conf.sample @@ -34,7 +33,7 @@ bin/pclock @sample %%ETCDIR%%/NsCDE.conf.sample @sample %%ETCDIR%%/Subpanels.actions.sample @sample %%ETCDIR%%/WSM.conf.sample -%%ETCDIR%%/xdg/menus/nscde-applications.menu +@sample %%ETCDIR%%/xdg/menus/nscde-applications.menu.sample lib/nscde/XOverrideFontCursor.so lib/nscde/progbits/FullPalette.xpm lib/nscde/progbits/SplashBG1.xpm @@ -311,6 +310,7 @@ lib/nscde/scripts/ExecDialog lib/nscde/scripts/FilePicker lib/nscde/scripts/FontMgr lib/nscde/scripts/FpLite +lib/nscde/scripts/GWMOptions lib/nscde/scripts/GeometryMgr lib/nscde/scripts/InputForm lib/nscde/scripts/KeyboardMgr @@ -335,6 +335,7 @@ lib/nscde/scripts/WSM-8 lib/nscde/scripts/WaitNotice lib/nscde/scripts/WindowMgr lib/nscde/scripts/WsPgMgr +libexec/nscde/GWM.sh libexec/nscde/Notifier.sh libexec/nscde/Splash.sh libexec/nscde/appfinder @@ -359,6 +360,7 @@ libexec/nscde/strip_icon_path libexec/nscde/style_managers.shlib libexec/nscde/subpanel_menuitem_props libexec/nscde/themegen.py +libexec/nscde/xrandr_backer sbin/confget.py sbin/confset.py sbin/fpclock @@ -379,15 +381,21 @@ share/applications/NsCDE-Editor.desktop share/applications/NsCDE-Exec.desktop share/applications/NsCDE-FileMgr.desktop share/applications/NsCDE-FvwmConsole.desktop +share/applications/NsCDE-GWM.desktop +share/applications/NsCDE-MailReader.desktop share/applications/NsCDE-NProcMgr.desktop share/applications/NsCDE-StyleMgr.desktop share/applications/NsCDE-Sysinfo.desktop +share/applications/NsCDE-TaskMgr.desktop share/applications/NsCDE-Terminal.desktop share/applications/NsCDE-Volumectrl.desktop +share/applications/NsCDE-WebBrowser.desktop share/applications/NsCDE-WsPgMgr.desktop share/applications/WatchErrors.desktop %%PORTDOCS%%%%DOCSDIR%%/NsCDE.pdf %%PORTDOCS%%%%DOCSDIR%%/NsCDE.txt +%%PORTDOCS%%%%DOCSDIR%%/help/GWM_Keybindings.help +%%PORTDOCS%%%%DOCSDIR%%/help/StyleMgr_Keybindings.help %%PORTDOCS%%%%DOCSDIR%%/html/AppMenus_conf.html %%PORTDOCS%%%%DOCSDIR%%/html/Keymenu_actions.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Additional-Software.html @@ -414,6 +422,7 @@ share/applications/WatchErrors.desktop %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-FrontPanel_conf.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Functions_conf.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-GUI-Tools.html +%%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-GWM.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-GeometryMgr.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Helper-Dialogs.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-IconMan_conf.html @@ -425,6 +434,7 @@ share/applications/WatchErrors.desktop %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Installation.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Integration-Custom.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Integration-Gtk-Qt.html +%%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Integration-Mozilla.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Integrations.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Keybindings_conf.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-KeyboardMgr.html @@ -439,7 +449,6 @@ share/applications/WatchErrors.desktop %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-NProcMgr.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Occupy.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-PGM.html -%%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Pager-GlobalPager_conf.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Pager-LocalPager_conf.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-Pager-WspLocPager_conf.html %%PORTDOCS%%%%DOCSDIR%%/html/NsCDE-PaletteDialog.html @@ -477,6 +486,7 @@ share/applications/WatchErrors.desktop %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.colormgr.local %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.nocsd %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README.session-integrations +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/doas.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compton-integration/README %%PORTEXAMPLES%%%%EXAMPLESDIR%%/compton-integration/compton.conf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fvwm3-per-monitor/NsCDE-Backer.conf @@ -1268,6 +1278,8 @@ share/icons/CDE/Dtjpegi.m_m.bm share/icons/CDE/Dtjpegi.t.bm share/icons/CDE/Dtjpegi.t.pm share/icons/CDE/Dtjpegi.t_m.bm +share/icons/CDE/Dtkey.l.bm +share/icons/CDE/Dtkey.l.pm share/icons/CDE/Dtkey.m.bm share/icons/CDE/Dtkey.m.pm share/icons/CDE/Dtkey.m_m.bm @@ -2005,6 +2017,7 @@ share/icons/NsCDE/SelectedXL.xpm share/icons/NsCDE/StyleMgr-Backdrop.xpm share/icons/NsCDE/StyleMgr-Beep.xpm share/icons/NsCDE/StyleMgr-Color.xpm +share/icons/NsCDE/StyleMgr-Desks.xpm share/icons/NsCDE/StyleMgr-Font.xpm share/icons/NsCDE/StyleMgr-Keybd.xpm share/icons/NsCDE/StyleMgr-Mouse.xpm @@ -2519,6 +2532,7 @@ share/icons/freedesktop/theme/NsCDE/16x16/actions/zoom-original.png share/icons/freedesktop/theme/NsCDE/16x16/actions/zoom-out.png share/icons/freedesktop/theme/NsCDE/16x16/animations/gnome-spinner.png share/icons/freedesktop/theme/NsCDE/16x16/animations/process-working.png +share/icons/freedesktop/theme/NsCDE/16x16/apps/Mail.png share/icons/freedesktop/theme/NsCDE/16x16/apps/access.png share/icons/freedesktop/theme/NsCDE/16x16/apps/accessibility-directory.png share/icons/freedesktop/theme/NsCDE/16x16/apps/accessories-calculator.png @@ -2550,6 +2564,7 @@ share/icons/freedesktop/theme/NsCDE/16x16/apps/gnome-settings-theme.png share/icons/freedesktop/theme/NsCDE/16x16/apps/gnome-terminal.png share/icons/freedesktop/theme/NsCDE/16x16/apps/gnome-window-manager.png share/icons/freedesktop/theme/NsCDE/16x16/apps/gucharmap.png +share/icons/freedesktop/theme/NsCDE/16x16/apps/gwm.png share/icons/freedesktop/theme/NsCDE/16x16/apps/help-browser.png share/icons/freedesktop/theme/NsCDE/16x16/apps/kcalc.png share/icons/freedesktop/theme/NsCDE/16x16/apps/kcharselect.png @@ -2865,6 +2880,9 @@ share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-octet-stream.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-ogg.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-pdf.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-pgp-encrypted.png +share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-pgp-keys.png +share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-pkcs12.png +share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-pkix-cerl.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-pkix-cert.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-postscript.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-rss+xml.png @@ -2937,6 +2955,7 @@ share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-kword.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-lha.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-lzma-compressed.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-lzop.png +share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-m4.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-mono-develop-xib.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-ms-dos-executable.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-mswrite.png @@ -2945,6 +2964,8 @@ share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-package-list.p share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-pak.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-perl.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-php.png +share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-pkcs12.png +share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-pkcs7-certificates.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-planner.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-python-bytecode.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-rar.png @@ -2963,6 +2984,8 @@ share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-trash.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-troff-man.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-tzo.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-vnc.png +share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-x509-ca-cert.png +share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-x509-user-cert.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-xpinstall.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-xz-compressed-tar.png share/icons/freedesktop/theme/NsCDE/16x16/mimetypes/application-x-xz-compressed.png @@ -3843,6 +3866,7 @@ share/icons/freedesktop/theme/NsCDE/22x22/actions/zoom-original.png share/icons/freedesktop/theme/NsCDE/22x22/actions/zoom-out.png share/icons/freedesktop/theme/NsCDE/22x22/animations/gnome-spinner.png share/icons/freedesktop/theme/NsCDE/22x22/animations/process-working.png +share/icons/freedesktop/theme/NsCDE/22x22/apps/Mail.png share/icons/freedesktop/theme/NsCDE/22x22/apps/access.png share/icons/freedesktop/theme/NsCDE/22x22/apps/accessibility-directory.png share/icons/freedesktop/theme/NsCDE/22x22/apps/accessories-calculator.png @@ -3874,6 +3898,7 @@ share/icons/freedesktop/theme/NsCDE/22x22/apps/gnome-settings-theme.png share/icons/freedesktop/theme/NsCDE/22x22/apps/gnome-terminal.png share/icons/freedesktop/theme/NsCDE/22x22/apps/gnome-window-manager.png share/icons/freedesktop/theme/NsCDE/22x22/apps/gucharmap.png +share/icons/freedesktop/theme/NsCDE/22x22/apps/gwm.png share/icons/freedesktop/theme/NsCDE/22x22/apps/help-browser.png share/icons/freedesktop/theme/NsCDE/22x22/apps/kcalc.png share/icons/freedesktop/theme/NsCDE/22x22/apps/kcharselect.png @@ -4189,6 +4214,9 @@ share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-octet-stream.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-ogg.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-pdf.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-pgp-encrypted.png +share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-pgp-keys.png +share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-pkcs12.png +share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-pkix-cerl.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-pkix-cert.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-postscript.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-rss+xml.png @@ -4262,6 +4290,7 @@ share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-kword.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-lha.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-lzma-compressed.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-lzop.png +share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-m4.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-mono-develop-xib.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-ms-dos-executable.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-mswrite.png @@ -4270,6 +4299,8 @@ share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-package-list.p share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-pak.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-perl.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-php.png +share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-pkcs12.png +share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-pkcs7-certificates.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-planner.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-python-bytecode.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-rar.png @@ -4288,6 +4319,8 @@ share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-trash.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-troff-man.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-tzo.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-vnc.png +share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-x509-ca-cert.png +share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-x509-user-cert.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-xpinstall.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-xz-compressed-tar.png share/icons/freedesktop/theme/NsCDE/22x22/mimetypes/application-x-xz-compressed.png @@ -5165,6 +5198,7 @@ share/icons/freedesktop/theme/NsCDE/24x24/actions/zoom-fit-best.png share/icons/freedesktop/theme/NsCDE/24x24/actions/zoom-in.png share/icons/freedesktop/theme/NsCDE/24x24/actions/zoom-original.png share/icons/freedesktop/theme/NsCDE/24x24/actions/zoom-out.png +share/icons/freedesktop/theme/NsCDE/24x24/apps/Mail.png share/icons/freedesktop/theme/NsCDE/24x24/apps/access.png share/icons/freedesktop/theme/NsCDE/24x24/apps/accessibility-directory.png share/icons/freedesktop/theme/NsCDE/24x24/apps/accessories-calculator.png @@ -5196,6 +5230,7 @@ share/icons/freedesktop/theme/NsCDE/24x24/apps/gnome-settings-theme.png share/icons/freedesktop/theme/NsCDE/24x24/apps/gnome-terminal.png share/icons/freedesktop/theme/NsCDE/24x24/apps/gnome-window-manager.png share/icons/freedesktop/theme/NsCDE/24x24/apps/gucharmap.png +share/icons/freedesktop/theme/NsCDE/24x24/apps/gwm.png share/icons/freedesktop/theme/NsCDE/24x24/apps/help-browser.png share/icons/freedesktop/theme/NsCDE/24x24/apps/kcalc.png share/icons/freedesktop/theme/NsCDE/24x24/apps/kcharselect.png @@ -5508,6 +5543,9 @@ share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-octet-stream.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-ogg.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-pdf.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-pgp-encrypted.png +share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-pgp-keys.png +share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-pkcs12.png +share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-pkix-cerl.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-pkix-cert.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-postscript.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-rss+xml.png @@ -5581,6 +5619,7 @@ share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-kword.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-lha.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-lzma-compressed.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-lzop.png +share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-m4.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-mono-develop-xib.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-ms-dos-executable.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-mswrite.png @@ -5589,6 +5628,8 @@ share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-package-list.p share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-pak.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-perl.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-php.png +share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-pkcs12.png +share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-pkcs7-certificates.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-planner.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-python-bytecode.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-rar.png @@ -5607,6 +5648,8 @@ share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-trash.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-troff-man.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-tzo.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-vnc.png +share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-x509-ca-cert.png +share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-x509-user-cert.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-xpinstall.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-xz-compressed-tar.png share/icons/freedesktop/theme/NsCDE/24x24/mimetypes/application-x-xz-compressed.png @@ -7185,6 +7228,7 @@ share/icons/freedesktop/theme/NsCDE/32x32/actions/zoom-original.png share/icons/freedesktop/theme/NsCDE/32x32/actions/zoom-out.png share/icons/freedesktop/theme/NsCDE/32x32/animations/gnome-spinner.png share/icons/freedesktop/theme/NsCDE/32x32/animations/process-working.png +share/icons/freedesktop/theme/NsCDE/32x32/apps/Mail.png share/icons/freedesktop/theme/NsCDE/32x32/apps/access.png share/icons/freedesktop/theme/NsCDE/32x32/apps/accessibility-directory.png share/icons/freedesktop/theme/NsCDE/32x32/apps/accessories-calculator.png @@ -7216,6 +7260,7 @@ share/icons/freedesktop/theme/NsCDE/32x32/apps/gnome-settings-theme.png share/icons/freedesktop/theme/NsCDE/32x32/apps/gnome-terminal.png share/icons/freedesktop/theme/NsCDE/32x32/apps/gnome-window-manager.png share/icons/freedesktop/theme/NsCDE/32x32/apps/gucharmap.png +share/icons/freedesktop/theme/NsCDE/32x32/apps/gwm.png share/icons/freedesktop/theme/NsCDE/32x32/apps/help-browser.png share/icons/freedesktop/theme/NsCDE/32x32/apps/kcalc.png share/icons/freedesktop/theme/NsCDE/32x32/apps/kcharselect.png @@ -7531,6 +7576,9 @@ share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-octet-stream.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-ogg.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-pdf.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-pgp-encrypted.png +share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-pgp-keys.png +share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-pkcs12.png +share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-pkix-cerl.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-pkix-cert.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-postscript.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-rss+xml.png @@ -7604,6 +7652,7 @@ share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-kword.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-lha.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-lzma-compressed.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-lzop.png +share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-m4.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-mono-develop-xib.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-ms-dos-executable.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-mswrite.png @@ -7612,6 +7661,8 @@ share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-package-list.p share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-pak.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-perl.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-php.png +share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-pkcs12.png +share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-pkcs7-certificates.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-planner.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-python-bytecode.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-rar.png @@ -7630,6 +7681,8 @@ share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-trash.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-troff-man.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-tzo.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-vnc.png +share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-x509-ca-cert.png +share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-x509-user-cert.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-xpinstall.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-xz-compressed-tar.png share/icons/freedesktop/theme/NsCDE/32x32/mimetypes/application-x-xz-compressed.png @@ -8503,6 +8556,7 @@ share/icons/freedesktop/theme/NsCDE/48x48/actions/zoom-original.png share/icons/freedesktop/theme/NsCDE/48x48/actions/zoom-out.png share/icons/freedesktop/theme/NsCDE/48x48/animations/gnome-spinner.png share/icons/freedesktop/theme/NsCDE/48x48/animations/process-working.png +share/icons/freedesktop/theme/NsCDE/48x48/apps/Mail.png share/icons/freedesktop/theme/NsCDE/48x48/apps/access.png share/icons/freedesktop/theme/NsCDE/48x48/apps/accessibility-directory.png share/icons/freedesktop/theme/NsCDE/48x48/apps/accessories-calculator.png @@ -8534,6 +8588,7 @@ share/icons/freedesktop/theme/NsCDE/48x48/apps/gnome-settings-theme.png share/icons/freedesktop/theme/NsCDE/48x48/apps/gnome-terminal.png share/icons/freedesktop/theme/NsCDE/48x48/apps/gnome-window-manager.png share/icons/freedesktop/theme/NsCDE/48x48/apps/gucharmap.png +share/icons/freedesktop/theme/NsCDE/48x48/apps/gwm.png share/icons/freedesktop/theme/NsCDE/48x48/apps/help-browser.png share/icons/freedesktop/theme/NsCDE/48x48/apps/kcalc.png share/icons/freedesktop/theme/NsCDE/48x48/apps/kcharselect.png @@ -8850,6 +8905,9 @@ share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-octet-stream.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-ogg.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-pdf.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-pgp-encrypted.png +share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-pgp-keys.png +share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-pkcs12.png +share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-pkix-cerl.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-pkix-cert.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-postscript.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-rss+xml.png @@ -8924,6 +8982,7 @@ share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-kword.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-lha.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-lzma-compressed.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-lzop.png +share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-m4.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-mono-develop-xib.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-ms-dos-executable.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-mswrite.png @@ -8932,6 +8991,8 @@ share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-package-list.p share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-pak.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-perl.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-php.png +share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-pkcs12.png +share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-pkcs7-certificates.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-planner.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-python-bytecode.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-rar.png @@ -8951,6 +9012,8 @@ share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-trash.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-troff-man.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-tzo.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-vnc.png +share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-x509-ca-cert.png +share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-x509-user-cert.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-xpinstall.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-xz-compressed-tar.png share/icons/freedesktop/theme/NsCDE/48x48/mimetypes/application-x-xz-compressed.png @@ -9472,6 +9535,7 @@ share/icons/freedesktop/theme/NsCDE/index.theme %%DATADIR%%/backdrops/BrickWall.pm %%DATADIR%%/backdrops/BrokenIce.pm %%DATADIR%%/backdrops/Bubbles.pm +%%DATADIR%%/backdrops/Buckles.pm %%DATADIR%%/backdrops/Burl.pm %%DATADIR%%/backdrops/Canvas.pm %%DATADIR%%/backdrops/Carpet.pm @@ -9674,6 +9738,31 @@ share/icons/freedesktop/theme/NsCDE/index.theme %%DATADIR%%/config_templates/app-defaults/xfig.tmpl %%DATADIR%%/config_templates/colormgr.local %%DATADIR%%/config_templates/fontmgr.local +%%DATADIR%%/config_templates/integration/firefox/ff7x_nscdeChrome.css +%%DATADIR%%/config_templates/integration/firefox/ff7x_nscdeContent.css +%%DATADIR%%/config_templates/integration/firefox/ff9x_nscdeChrome.css +%%DATADIR%%/config_templates/integration/firefox/ff9x_nscdeContent.css +%%DATADIR%%/config_templates/integration/firefox/nscdeColordefs.tmpl +%%DATADIR%%/config_templates/integration/firefox/nscdeIcons.css +%%DATADIR%%/config_templates/integration/firefox/nsicons/Bookmarks.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/Filepicker.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/Find.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/History.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/Library.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/Panic.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/Reload.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/ReloadActive.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/ReloadDisabled.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/Sidebar.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/Throbber.gif +%%DATADIR%%/config_templates/integration/firefox/nsicons/advanced.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/application.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/bookmark-hollow.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/bookmark.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/compose-toolbar.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/folder.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/histfile.png +%%DATADIR%%/config_templates/integration/firefox/nsicons/mail-toolbar.png %%DATADIR%%/config_templates/integration/gtk2_gtk3_qt/gtk-2.0/cdecolors.rc %%DATADIR%%/config_templates/integration/gtk2_gtk3_qt/gtk-2.0/gtkrc %%DATADIR%%/config_templates/integration/gtk2_gtk3_qt/gtk-2.0/img/SpritesGtk2.py @@ -10179,6 +10268,75 @@ share/icons/freedesktop/theme/NsCDE/index.theme %%DATADIR%%/config_templates/integration/gtk2_gtk3_qt/img2/resource.indexed.png %%DATADIR%%/config_templates/integration/gtk2_gtk3_qt/img2/resource.indexed.xcf %%DATADIR%%/config_templates/integration/gtk2_gtk3_qt/index.theme +%%DATADIR%%/config_templates/integration/thunderbird/.nscdeChrome.css.swp +%%DATADIR%%/config_templates/integration/thunderbird/nscdeChrome.css +%%DATADIR%%/config_templates/integration/thunderbird/nscdeColordefs.tmpl +%%DATADIR%%/config_templates/integration/thunderbird/nscdeContent.css +%%DATADIR%%/config_templates/integration/thunderbird/nscdeIcons.css +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Account.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Cal.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/CalDelete.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/CalEdit.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/CalSync.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/ExtractCal.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/ExtractTsk.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Filepicker.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Message.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/NewTask.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Offline-Online.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Prefs.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Throbber-large.gif +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Throbber-large.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Throbber.gif +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Throbber.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/Tsk.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/abcard.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/ablist.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/addrbook.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/addressbook-toolbar-small.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/addressbook-toolbar.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/advanced.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/attachments.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/close.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/compose-toolbar-small.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/compose-toolbar.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/composition.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/display.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/flag.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/folder.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/format-buttons.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/general.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/junk.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/mail-toolbar-small.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/mail-toolbar.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/message.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/news.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/phishing.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/privacy.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/remote-addrbook.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/remote-blocked.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/rss-feed.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/secure-remote-addrbook.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/server-rss.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/server.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-cool.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-cry.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-embarassed.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-foot-in-mouth.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-frown.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-innocent.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-kiss.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-laughing.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-money-mouth.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-sealed.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-smile.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-surprised.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-tongue-out.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-undecided.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-wink.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/smileys/smiley-yell.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/tree/twisty-clsd.png +%%DATADIR%%/config_templates/integration/thunderbird/nsicons/tree/twisty-open.png %%DATADIR%%/defaults/backer/Desk1-Ankh.pm %%DATADIR%%/defaults/backer/Desk2-BrickWall.pm %%DATADIR%%/defaults/backer/Desk3-Convex.pm @@ -10221,6 +10379,8 @@ share/icons/freedesktop/theme/NsCDE/index.theme %%DATADIR%%/desktop-directories/nscde-utility-accessibility.directory %%DATADIR%%/fallback/app-catalog/calculator %%DATADIR%%/fallback/app-catalog/filemgr +%%DATADIR%%/fallback/app-catalog/mailreader +%%DATADIR%%/fallback/app-catalog/taskmgr %%DATADIR%%/fallback/app-catalog/terminal %%DATADIR%%/fallback/app-catalog/text-editor %%DATADIR%%/fallback/app-catalog/volumectrl @@ -10481,6 +10641,8 @@ share/icons/freedesktop/theme/NsCDE/index.theme %%DATADIR%%/locale/hr/LC_MESSAGES/NsCDE-FilePicker.po %%DATADIR%%/locale/hr/LC_MESSAGES/NsCDE-FontMgr.mo %%DATADIR%%/locale/hr/LC_MESSAGES/NsCDE-FontMgr.po +%%DATADIR%%/locale/hr/LC_MESSAGES/NsCDE-GWM.mo +%%DATADIR%%/locale/hr/LC_MESSAGES/NsCDE-GWM.po %%DATADIR%%/locale/hr/LC_MESSAGES/NsCDE-GeometryMgr.mo %%DATADIR%%/locale/hr/LC_MESSAGES/NsCDE-GeometryMgr.po %%DATADIR%%/locale/hr/LC_MESSAGES/NsCDE-KeyboardMgr.mo