development/gedit: Updated for version 42.0. New maintainer.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 77 insertions, 54 deletions

diff --git a/development/gedit/README b/development/gedit/README
index d3d0133d5d..e18c5582be 100644
--- a/development/gedit/README
+++ b/development/gedit/README
@@ -1,3 +1,15 @@
 gedit is the official text editor of the GNOME desktop
 environment. While aiming at simplicity and ease of use, gedit is a
 powerful general purpose text editor.
+
+gspell is an optional (autodetected) dependency. If it's already
+installed, but you don't want to build gedit with spell-checking
+support, set the environment variable WITH_GSPELL to "no", e.g.
+  WITH_GSPELL="no" ./gedit.SlackBuild
+
+user documentation is installed by default (accessible through yelp).
+If you don't need it, set the environment variable WITH_USER_DOCS
+to "no", e.g.
+  WITH_USER_DOCS="no" ./gedit.SlackBuild
+
+
diff --git a/development/gedit/doinst.sh b/development/gedit/doinst.sh
index f6bc99f8b3..2d36e69d79 100644
--- a/development/gedit/doinst.sh
+++ b/development/gedit/doinst.sh
@@ -2,19 +2,15 @@ if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
 
+if [ -e usr/share/glib-2.0/schemas ]; then
+  if [ -x /usr/bin/glib-compile-schemas ]; then
+    /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1
+  fi
+fi
+
 if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
   if [ -x /usr/bin/gtk-update-icon-cache ]; then
     /usr/bin/gtk-update-icon-cache -f usr/share/icons/hicolor >/dev/null 2>&1
   fi
 fi
 
-schema_install() {
-  SCHEMA="$1"
-  GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \
-  chroot . gconftool-2 --makefile-install-rule \
-    /etc/gconf/schemas/$SCHEMA \
-    1>/dev/null
-}
-
-schema_install gedit.schemas
-schema_install gedit-file-browser.schemas
diff --git a/development/gedit/gedit.SlackBuild b/development/gedit/gedit.SlackBuild
index cf3b5fda88..2b7624fbfa 100644
--- a/development/gedit/gedit.SlackBuild
+++ b/development/gedit/gedit.SlackBuild
@@ -4,6 +4,8 @@
 
 # Copyright 2010,2011  Robby Workman, Northport, Alabama, USA
 # Copyright 2011 byteframe
+# Maintained 2020, 2021, 2022 by Donald Cooley <chytraeu@sdf.org>
+# Copyright 2022 Juan M. Lasca <juanmlasca@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -12,22 +14,24 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Special thanks to Brandon Pribula, who kindly handed over maintenance to me.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=gedit
-VERSION=${VERSION:-2.30.4}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-42.0}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -71,40 +75,51 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$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 \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-export LDFLAGS="-lgmodule-2.0 -lICE"
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --disable-scrollkeeper \
-  --disable-spell \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -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 {} \;
+
+# gspell is an optional (autodetected) dependency. Give the user the possibility of
+# disabling it if preinstalled.
+spell='disabled'
+if [ -f /usr/lib${LIBDIRSUFFIX}/libgspell-1.so ] && [ "${WITH_GSPELL:-yes}" != "no" ]; then
+  spell='enabled'
+fi;
+
+# Allow the user to disable user documentation inclusion
+[ "${WITH_USER_DOCS:-yes}" != "no" ] && WITH_USER_DOCS="true" || WITH_USER_DOCS="false"
+
+mkdir build
+cd build
+  CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  meson .. \
+    --buildtype=release \
+    --infodir=/usr/info \
+    --libdir=/usr/lib${LIBDIRSUFFIX} \
+    --localstatedir=/var \
+    --mandir=/usr/man \
+    --prefix=/usr \
+    --sysconfdir=/etc \
+    -Dspell=$spell \
+    -Duser_documentation=${WITH_USER_DOCS} \
+    -Dstrip=true
+  "${NINJA:=ninja}"
+  DESTDIR=$PKG $NINJA install
+cd ..
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CONTRIBUTING.md README.md COPYING NEWS \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/gedit/gedit.info b/development/gedit/gedit.info
index fe8320a785..fb80bd61e6 100644
--- a/development/gedit/gedit.info
+++ b/development/gedit/gedit.info
@@ -1,10 +1,10 @@
 PRGNAM="gedit"
-VERSION="2.30.4"
+VERSION="42.0"
 HOMEPAGE="http://projects.gnome.org/gedit/"
-DOWNLOAD="https://download.gnome.org/sources/gedit/2.30/gedit-2.30.4.tar.bz2"
-MD5SUM="e1eecb0a92a1a363b3d375ec5ac0fb3b"
+DOWNLOAD="https://download.gnome.org/sources/gedit/42/gedit-42.0.tar.xz"
+MD5SUM="5c2eacd31f3feb2b7b2b69cafac17c87"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="pygtksourceview"
-MAINTAINER="Donald Cooley"
-EMAIL="chytraeu@sdf.org"
+REQUIRES="gtksourceview4 libpeas"
+MAINTAINER="Juan M. Lasca"
+EMAIL="juanmlasca@gmail.com"