mirror of
https://gitlab.com/mateslackbuilds/msb.git
synced 2025-01-13 08:01:08 +01:00
atril: Upgraded to 1.9.1.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
This commit is contained in:
Willy Sudiarto Raharjo
parent
70b6ebc614
commit
06dd57fce8
3 changed files with 43 additions and 85 deletions
|
|
@ -24,8 +24,8 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=atril
|
||||
VERSION=${VERSION:-1.9.0}
|
||||
BUILD=${BUILD:-2}
|
||||
VERSION=${VERSION:-1.9.1}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_msb}
|
||||
|
||||
if [ -z "$ARCH" ]; then
|
||||
|
|
@ -83,7 +83,7 @@ find -L . \
|
|||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
# Reminder: Remove this on next release of atril
|
||||
patch -p1 < $CWD/disable-epub.patch
|
||||
patch -p1 < $CWD/gsetting.patch
|
||||
autoreconf -fi
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
commit 00b1d84fc528fe903175c82145770960dfdc715e
|
||||
Author: infirit <infirit@gmail.com>
|
||||
Date: Mon Oct 27 22:03:36 2014 +0100
|
||||
|
||||
Autotools: Make epub really optional
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 3f0e59e..034f18d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -138,13 +138,13 @@ MATEDESKTOP_REQUIRED=1.9.0
|
||||
|
||||
case "$with_gtk" in
|
||||
2.0) GTK_API_VERSION=2.0
|
||||
- WEBKIT_API_VERSION=1.0
|
||||
+ WEBKIT_API_VERSION=1.0
|
||||
GAIL_API_VERSION=
|
||||
GTK_REQUIRED=2.24.0
|
||||
WEBKIT_REQUIRED=2.4.3
|
||||
;;
|
||||
3.0) GTK_API_VERSION=3.0
|
||||
- WEBKIT_API_VERSION=3.0
|
||||
+ WEBKIT_API_VERSION=3.0
|
||||
GAIL_API_VERSION=-3.0
|
||||
GTK_REQUIRED=3.0.0
|
||||
WEBKIT_REQUIRED=2.4.3
|
||||
@@ -171,14 +171,6 @@ AC_SEARCH_LIBS([hypot],[m])
|
||||
|
||||
PKG_CHECK_MODULES(LIBDOCUMENT, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gio-2.0 >= $GLIB_REQUIRED)
|
||||
PKG_CHECK_MODULES(LIBVIEW, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gail$GAIL_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
|
||||
-case "$with_gtk" in
|
||||
- 2.0)
|
||||
- PKG_CHECK_MODULES(WEBKIT, webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED)
|
||||
- ;;
|
||||
- 3.0)
|
||||
- PKG_CHECK_MODULES(WEBKIT, webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED)
|
||||
- ;;
|
||||
-esac
|
||||
PKG_CHECK_MODULES(BACKEND, cairo >= $CAIRO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
|
||||
PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gthread-2.0 gio-2.0 >= $GLIB_REQUIRED)
|
||||
PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= $GLIB_REQUIRED)
|
||||
@@ -710,7 +702,17 @@ AC_ARG_ENABLE(epub,
|
||||
[enable_epub=yes])
|
||||
|
||||
if test "x$enable_epub" = "xyes"; then
|
||||
- PKG_CHECK_MODULES(EPUB, libxml-2.0 >= $LIBXML_REQUIRED zlib,enable_epub=yes,enable_epub=no)
|
||||
+ case "$with_gtk" in
|
||||
+ 2.0)
|
||||
+ PKG_CHECK_MODULES(EPUB, webkit-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
|
||||
+ libxml-2.0 >= $LIBXML_REQUIRED zlib,enable_epub=yes,enable_epub=no)
|
||||
+ ;;
|
||||
+ 3.0)
|
||||
+ PKG_CHECK_MODULES(EPUB, webkit2gtk-$WEBKIT_API_VERSION >= $WEBKIT_REQUIRED \
|
||||
+ libxml-2.0 >= $LIBXML_REQUIRED zlib,enable_epub=yes,enable_epub=no)
|
||||
+ ;;
|
||||
+esac
|
||||
+
|
||||
|
||||
if test "x$enable_epub" = "xyes"; then
|
||||
AC_DEFINE([ENABLE_EPUB], [1], [Enable support for ePub documents.])
|
||||
diff --git a/libview/Makefile.am b/libview/Makefile.am
|
||||
index 96e80ea..f05dabc 100644
|
||||
--- a/libview/Makefile.am
|
||||
+++ b/libview/Makefile.am
|
||||
@@ -65,7 +65,7 @@ libatrilview_la_CFLAGS = \
|
||||
$(LIBVIEW_CFLAGS) \
|
||||
$(WARN_CFLAGS) \
|
||||
$(DISABLE_DEPRECATED) \
|
||||
- $(WEBKIT_CFLAGS) \
|
||||
+ $(EPUB_CFLAGS) \
|
||||
$(AM_CFLAGS)
|
||||
|
||||
libatrilview_la_LDFLAGS = \
|
||||
@@ -77,7 +77,7 @@ libatrilview_la_LDFLAGS = \
|
||||
libatrilview_la_LIBADD = \
|
||||
$(top_builddir)/libdocument/libatrildocument.la \
|
||||
$(LIBVIEW_LIBS) \
|
||||
- $(WEBKIT_LIBS)
|
||||
+ $(EPUB_LIBS)
|
||||
|
||||
BUILT_SOURCES = \
|
||||
ev-view-marshal.h \
|
||||
40
extra/atril/gsetting.patch
Normal file
40
extra/atril/gsetting.patch
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
commit 921a0c368f10d7e850364a3a39b82bfff6f738cd
|
||||
Author: infirit <infirit@gmail.com>
|
||||
Date: Wed Dec 10 18:13:22 2014 +0100
|
||||
|
||||
Add gsettings gettext type
|
||||
|
||||
diff --git a/po/POTFILES.in b/po/POTFILES.in
|
||||
index dc4f018..2f109ed 100644
|
||||
--- a/po/POTFILES.in
|
||||
+++ b/po/POTFILES.in
|
||||
@@ -24,7 +24,7 @@ cut-n-paste/toolbar-editor/egg-toolbar-editor.c
|
||||
cut-n-paste/zoom-control/ephy-zoom.h
|
||||
data/atril.appdata.xml.in
|
||||
data/atril.desktop.in.in
|
||||
-data/org.mate.Atril.gschema.xml.in
|
||||
+[type: gettext/gsettings]data/org.mate.Atril.gschema.xml.in
|
||||
previewer/ev-previewer.c
|
||||
previewer/ev-previewer-window.c
|
||||
properties/ev-properties-main.c
|
||||
commit 1ec64aab9b6eb86e002b9e5bc8883e08c6159035
|
||||
Author: infirit <infirit@gmail.com>
|
||||
Date: Wed Dec 10 18:14:05 2014 +0100
|
||||
|
||||
Use the NOMERGE rule for now
|
||||
|
||||
It causes problems in the gsettings schema.
|
||||
|
||||
diff --git a/data/Makefile.am b/data/Makefile.am
|
||||
index 5e5473a..fedca7d 100644
|
||||
--- a/data/Makefile.am
|
||||
+++ b/data/Makefile.am
|
||||
@@ -50,7 +50,7 @@ endif
|
||||
#
|
||||
# App data file
|
||||
#
|
||||
-@INTLTOOL_XML_RULE@
|
||||
+@INTLTOOL_XML_NOMERGE_RULE@
|
||||
appdatadir = $(datadir)/appdata
|
||||
appdata_in_files = atril.appdata.xml.in
|
||||
appdata_DATA = $(appdata_in_files:.xml.in=.xml)
|
||||
Loading…
Reference in a new issue