summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Robby Workman <rworkman@slackbuilds.org>2021-09-01 01:27:26 -0500
committer Robby Workman <rworkman@slackbuilds.org>2021-09-06 01:25:15 -0500
commit538644a006683a274edd948fd622a0b81b9bf9f0 (patch)
tree86e258d1d609b4bd46a6aed21969f8bbf5fb7a63
parent1600a0383bc36aabb7686fe63b74e843fa2d531b (diff)
downloadslackbuilds-evince-needs-review.tar.gz
slackbuilds-evince-needs-review.tar.xz
office/evince: Updated for version 40.4.evince-needs-review
This commit could *definitely* use some review before it goes into master. At a minimum, I don't like that this still builds libhandy...
-rw-r--r--office/evince/0001-shell-Fix-libhandy-includes.patch56
-rw-r--r--office/evince/0002-build-Allow-building-without-libhandy-1-available.patch39
-rw-r--r--office/evince/evince.SlackBuild83
-rw-r--r--office/evince/evince.info6
4 files changed, 128 insertions, 56 deletions
diff --git a/office/evince/0001-shell-Fix-libhandy-includes.patch b/office/evince/0001-shell-Fix-libhandy-includes.patch
new file mode 100644
index 0000000000..f0b6658549
--- /dev/null
+++ b/office/evince/0001-shell-Fix-libhandy-includes.patch
@@ -0,0 +1,56 @@
+From 960372e7fa4b0bab7244661f0a7fb926c6b1441d Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 21 Feb 2021 17:15:15 +0100
+Subject: [PATCH 1/2] shell: Fix libhandy includes
+
+The libhandy-1 pkgconfig file already includes the "libhandy-1/"
+directory, so no need to add it to our includes.
+Cflags: -I${includedir}/libhandy-1
+---
+ shell/ev-application.c | 2 +-
+ shell/ev-window.c | 2 +-
+ shell/ev-window.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/shell/ev-application.c b/shell/ev-application.c
+index c6f51c10..e704bda2 100644
+--- a/shell/ev-application.c
++++ b/shell/ev-application.c
+@@ -30,7 +30,7 @@
+ #include <glib/gi18n.h>
+ #include <glib/gstdio.h>
+ #include <gtk/gtk.h>
+-#include <libhandy-1/handy.h>
++#include <handy.h>
+ #ifdef GDK_WINDOWING_X11
+ #include <gdk/gdkx.h>
+ #endif
+diff --git a/shell/ev-window.c b/shell/ev-window.c
+index 6c0a2283..6a4f7f7b 100644
+--- a/shell/ev-window.c
++++ b/shell/ev-window.c
+@@ -40,7 +40,7 @@
+ #include <glib/gi18n.h>
+ #include <gio/gio.h>
+ #include <gtk/gtk.h>
+-#include <libhandy-1/handy.h>
++#include <handy.h>
+
+ #include "dzl-file-manager.h"
+ #include "ev-find-sidebar.h"
+diff --git a/shell/ev-window.h b/shell/ev-window.h
+index 746f3f85..65fe322b 100644
+--- a/shell/ev-window.h
++++ b/shell/ev-window.h
+@@ -26,7 +26,7 @@
+
+ #include <glib.h>
+ #include <gtk/gtk.h>
+-#include <libhandy-1/handy.h>
++#include <handy.h>
+
+ #include "ev-link.h"
+ #include "ev-history.h"
+--
+2.33.0
+
diff --git a/office/evince/0002-build-Allow-building-without-libhandy-1-available.patch b/office/evince/0002-build-Allow-building-without-libhandy-1-available.patch
new file mode 100644
index 0000000000..d0eb04e361
--- /dev/null
+++ b/office/evince/0002-build-Allow-building-without-libhandy-1-available.patch
@@ -0,0 +1,39 @@
+From 2408fd4a4d97aae5cb47bd5032bafa34f1e3b56f Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Sun, 21 Feb 2021 17:17:15 +0100
+Subject: [PATCH 2/2] build: Allow building without libhandy-1 available
+
+---
+ meson.build | 3 ++-
+ subprojects/libhandy.wrap | 5 +++++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+ create mode 100644 subprojects/libhandy.wrap
+
+diff --git a/meson.build b/meson.build
+index ed628182..64b780c5 100644
+--- a/meson.build
++++ b/meson.build
+@@ -163,7 +163,8 @@ gmodule_dep = dependency('gmodule-2.0')
+ gmodule_no_export_dep = dependency('gmodule-no-export-2.0', version: glib_req_version)
+ gtk_dep = dependency('gtk+-3.0', version: gtk_req_version)
+ gthread_dep = dependency('gthread-2.0', version: glib_req_version)
+-hdy_dep = dependency('libhandy-1', version: hdy_req_version)
++# Keep the version here synchronised with subprojects/libhandy.wrap
++hdy_dep = dependency('libhandy-1', version: hdy_req_version, fallback: ['libhandy', 'libhandy_dep'])
+
+ m_dep = cc.find_library('m')
+
+diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
+new file mode 100644
+index 00000000..24c18155
+--- /dev/null
++++ b/subprojects/libhandy.wrap
+@@ -0,0 +1,5 @@
++[wrap-git]
++directory=libhandy
++url=https://gitlab.gnome.org/GNOME/libhandy.git
++# See comment in meson.build
++revision=e455f608e7a4ac4ab51e0bb70296f40862054f2b
+--
+2.33.0
+
diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild
index db10141d89..3b1998d686 100644
--- a/office/evince/evince.SlackBuild
+++ b/office/evince/evince.SlackBuild
@@ -26,16 +26,10 @@
# Now maintained by B. Watson <yalhcru@gmail.com>
-# 20191231 bkw:
-# - take over maintenance
-# - update for v3.28.5.3, which is the last version that will build with
-# Slack 14.2's rather outdated gtk+3 libraries. Actually it requires
-# some fugly hackery to work, see shim.h for gory details and polemic.
-
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=evince
-VERSION=${VERSION:-3.34.2}
+VERSION=${VERSION:-40.4}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -86,54 +80,37 @@ chown -R root:root .
find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
\! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
-# If we have any patches apply them here:
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/evince/files/
-
-# 20191231 bkw: I'll leave this here, but I have NOT tested it.
-# It was never documented in README, caveat hactor.
-NLS=${NLS:-YES}
-if [ "$NLS" != "YES" ]; then
- # disable NLS - we're going for a small package here.
- rm po/*.po
- sed -i -e 's/USE_NLS=yes/USE_NLS=no/g' \
- -e 's/ENABLE_NLS 1/ENABLE_NLS 0/g' configure
-fi
+patch -p1 < $CWD/0001-shell-Fix-libhandy-includes.patch
+patch -p1 < $CWD/0002-build-Allow-building-without-libhandy-1-available.patch
+
+mkdir build
+cd build
+ CFLAGS="$SLKCFLAGS" \
+ CXXFLAGS="$SLKCFLAGS" \
+ meson .. \
+ --buildtype=release \
+ --prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --mandir=/usr/man \
+ --infodir=/usr/info \
+ -D strip=true \
+ -D nautilus=false \
+ -D systemduserunitdir=no
+
+ "${NINJA:=ninja}"
+ DESTDIR=$PKG $NINJA install
+cd ..
+
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
+gzip -9 $PKG/usr/man/man1/*.1
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
- --prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --mandir=/usr/man \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --mandir=/usr/man \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --enable-dbus \
- --enable-pdf \
- --enable-tiff \
- --enable-djvu \
- --enable-t1lib \
- --enable-comics \
- --enable-dvi \
- --enable-ps \
- --enable-xps \
- --enable-introspection \
- --disable-static \
- --disable-nautilus \
- --disable-maintainer-mode \
- --without-gspell \
- --with-systemduserunitdir=no \
- --build=$ARCH-slackware-linux
-
-make V=1
-make install-strip DESTDIR=$PKG
-
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
-
-rm -rf $PKG/{usr/share/gtk-doc,etc}
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING NEWS README.md MAINTAINERS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS CONTRIBUTING.md COPYING MAINTAINERS NEWS* NOTES README* TODO \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/office/evince/evince.info b/office/evince/evince.info
index a5814eea74..534f0f3ea4 100644
--- a/office/evince/evince.info
+++ b/office/evince/evince.info
@@ -1,8 +1,8 @@
PRGNAM="evince"
-VERSION="3.34.2"
+VERSION="40.4"
HOMEPAGE="http://projects.gnome.org/evince/"
-DOWNLOAD="https://download.gnome.org/sources/evince/3.34/evince-3.34.2.tar.xz"
-MD5SUM="9e9e82fa8f6045ad7817157d9335d185"
+DOWNLOAD="https://download.gnome.org/sources/evince/40/evince-40.4.tar.xz"
+MD5SUM="bf78a8e8c384bbd2780b7be0ac917e79"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""