desktop/birdtray: Fix .desktop file.

Signed-off-by: B. Watson <yalhcru@gmail.com>

3 files changed, 13 insertions, 9 deletions

diff --git a/desktop/birdtray/birdtray.SlackBuild b/desktop/birdtray/birdtray.SlackBuild
index 349359640950..d9abc3675185 100644
--- a/desktop/birdtray/birdtray.SlackBuild
+++ b/desktop/birdtray/birdtray.SlackBuild
@@ -22,11 +22,15 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220404 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - remove +x permission from .desktop file.
+# - fix deprecation warning in .desktop file.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=birdtray
 VERSION=${VERSION:-1.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +42,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -75,9 +76,9 @@ cd $PRGNAM-RELEASE_$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
 cd src
 mkdir -p build
@@ -92,7 +93,7 @@ install -d "$PKG"/usr/lib${LIBDIRSUFFIX}/birdtray
 install -d "$PKG"/usr/include/birdtray
 install -d "$PKG"/usr/share/applications
 
-install $CWD/birdtray.desktop "$PKG"/usr/share/applications/birdtray.desktop
+cat $CWD/birdtray.desktop > "$PKG"/usr/share/applications/birdtray.desktop
 install build/birdtray   "$PKG"/usr/bin/birdtray
 install -m644 build/*.o  "$PKG"/usr/lib${LIBDIRSUFFIX}/birdtray/
 install -m644 build/*.h  "$PKG"/usr/include/birdtray/
@@ -109,6 +110,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/desktop/birdtray/birdtray.desktop b/desktop/birdtray/birdtray.desktop
index 3f486a806aee..195a3b0a59a7 100644
--- a/desktop/birdtray/birdtray.desktop
+++ b/desktop/birdtray/birdtray.desktop
@@ -1,5 +1,4 @@
 [Desktop Entry]
-Encoding=UTF-8
 Name=Birdtray
 Keywords=Email;E-mail;Newsgroup;Feed;RSS
 Keywords[ast]=Corréu;Corréu-e;Noticies;Discusiones;Mensaxes;Canales;RSS
@@ -28,5 +27,5 @@ Terminal=false
 X-MultipleArgs=false
 Type=Application
 Icon=thunderbird
-Categories=Application;Network;Email;
+Categories=Network;Email;
 StartupNotify=true
diff --git a/desktop/birdtray/doinst.sh b/desktop/birdtray/doinst.sh
new file mode 100644
index 000000000000..5fb28930db0b
--- /dev/null
+++ b/desktop/birdtray/doinst.sh
@@ -0,0 +1,3 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi