Attachment #720396 for bug #799374

View | Details | Raw Unified | Return to bug 799374
Collapse All | Expand All

Lines 251-260 Link Here

(-)a/configure.ac (-2 / +18 lines)
251	fi	251	fi
252		252
253	if test "x$have_evince2_3" = "xno"; then	253	if test "x$have_evince2_3" = "xno"; then
254	PKG_CHECK_MODULES(EVINCE_2_32, evince-view-2.32 >= 2.0)	254	PKG_CHECK_MODULES(EVINCE_2_32, evince-view-2.32 >= 2.0, have_evince2_32=yes, have_evince2_32=no)
255	CFLAGS="$CFLAGS $EVINCE_2_32_CFLAGS"	255	CFLAGS="$CFLAGS $EVINCE_2_32_CFLAGS"
256	LIBS="$LIBS $EVINCE_2_32_LIBS"	256	LIBS="$LIBS $EVINCE_2_32_LIBS"
257	fi	257	fi
		258
		259	if test "x$have_evince2_32" = "xno"; then
		260	PKG_CHECK_MODULES(ATRIL, atril-view-1.5.0 >= 1.5 have_atril=yes, have_atril=no)
		261	CFLAGS="$CFLAGS $ATRIL_CFLAGS"
		262	LIBS="$LIBS $ATRIL_LIBS"
		263	fi
258	fi	264	fi
259	fi	265	fi
260		266
Lines 267-281 Link Here
267	LIBS="$LIBS $GTKSOURCEVIEW_LIBS"	273	LIBS="$LIBS $GTKSOURCEVIEW_LIBS"
268		274
269	if test "x$useevince" != "xno"; then	275	if test "x$useevince" != "xno"; then
270	PKG_CHECK_MODULES(EVINCE, evince-view-3.0 >= 3.0)	276	PKG_CHECK_MODULES(EVINCE, evince-view-3.0 >= 3.0, have_envince_3_0=yes, have_envince_3_0=no)
271	CFLAGS="$CFLAGS $EVINCE_CFLAGS"	277	CFLAGS="$CFLAGS $EVINCE_CFLAGS"
272	LIBS="$LIBS $EVINCE_LIBS"	278	LIBS="$LIBS $EVINCE_LIBS"
273	fi	279	fi
		280
		281	if test "x$have_envince_3_0" = "xno"; then
		282	PKG_CHECK_MODULES(ATRIL, atril-view-1.5.0 >= 1.5, have_atril=yes, have_atril=no)
		283	CFLAGS="$CFLAGS $ATRIL_CFLAGS"
		284	LIBS="$LIBS $ATRIL_LIBS"
		285	fi
274	fi	286	fi
275		287
276	if test "x$useevince" = "xyes"; then	288	if test "x$useevince" = "xyes"; then
277	CFLAGS="$CFLAGS -DUSE_EVINCE"	289	CFLAGS="$CFLAGS -DUSE_EVINCE"
278	LIBS="$LIBS -DUSE_EVINCE"	290	LIBS="$LIBS -DUSE_EVINCE"
		291	if test "x$have_atril" = "xyes"; then
		292	CFLAGS="$CFLAGS -DUSE_ATRIL"
		293	LIBS="$LIBS $ATRIL_LIBS"
		294	fi
279	fi	295	fi
280		296
281	AC_ARG_ENABLE(	297	AC_ARG_ENABLE(

Lines 1-4 Link Here

(-)a/src/printview/markupview.c (+4 lines)
		1	#ifdef USE_ATRIL
		2	#include <atril-view.h>
		3	#else
1	#include <evince-view.h>	4	#include <evince-view.h>
		5	#endif
2	#include <errno.h>	6	#include <errno.h>
3	#include <math.h>	7	#include <math.h>
4	#include <glib/gstdio.h>	8	#include <glib/gstdio.h>

Lines 1-4 Link Here

(-)a/src/printview/printview.c (+4 lines)
		1	#ifdef USE_ATRIL
		2	#include <atril-view.h>
		3	#else
1	#include <evince-view.h>	4	#include <evince-view.h>
		5	#endif
2	#include <errno.h>	6	#include <errno.h>
3	#include <math.h>	7	#include <math.h>
4	#include <glib/gstdio.h>	8	#include <glib/gstdio.h>

Lines 21-28 Link Here

(-)a/src/source/proof.c (+5 lines)
21	#include "source/proof.h"	21	#include "source/proof.h"
22	#include "core/view.h"	22	#include "core/view.h"
23	#include "core/utils.h"	23	#include "core/utils.h"
		24	#ifdef USE_ATRIL
		25	#include <atril-view.h>
		26	#include <atril-document.h>
		27	#else
24	#include <evince-view.h>	28	#include <evince-view.h>
25	#include <evince-document.h>	29	#include <evince-document.h>
		30	#endif
26		31
27	static const gchar *nearest_annotation_text = NULL;	32	static const gchar *nearest_annotation_text = NULL;
28	static GList *annotated_pages = NULL;	33	static GList *annotated_pages = NULL;

Lines 20-26 Link Here

(-)a/src/source/source.c (+4 lines)
20	#include "source/source.h"	20	#include "source/source.h"
21	#include "core/view.h"	21	#include "core/view.h"
22	#include "core/utils.h"	22	#include "core/utils.h"
		23	#ifdef USE_ATRIL
		24	#include <atril-view.h>
		25	#else
23	#include <evince-view.h>	26	#include <evince-view.h>
		27	#endif
24		28
25	static gboolean Dragging;	29	static gboolean Dragging;
26	static GdkPoint DragStart, DragEnd;	30	static GdkPoint DragStart, DragEnd;

Lines 22-28 Link Here

(-)a/tools/annotator.c (+4 lines)
22	#include <math.h>	22	#include <math.h>
23	#include <string.h>	23	#include <string.h>
24	#include<gtk/gtk.h>	24	#include<gtk/gtk.h>
		25	#ifdef USE_ATRIL
		26	#include <atril-view.h>
		27	#else
25	#include <evince-view.h>	28	#include <evince-view.h>
		29	#endif
26		30
27	#define SPOT_SIZE (10) //size of spot for picking out an annotation	31	#define SPOT_SIZE (10) //size of spot for picking out an annotation
28	typedef struct Location {	32	typedef struct Location {

Lines 22-28 Link Here

(-)a/tools/pageswitcher.c (+4 lines)
22	#include <math.h>	22	#include <math.h>
23	#include <string.h>	23	#include <string.h>
24	#include<gtk/gtk.h>	24	#include<gtk/gtk.h>
		25	#ifdef USE_ATRIL
		26	#include <atril-view.h>
		27	#else
25	#include <evince-view.h>	28	#include <evince-view.h>
		29	#endif
26		30
27	#define SPOT_SIZE (10) //size of spot for picking out an annotation	31	#define SPOT_SIZE (10) //size of spot for picking out an annotation
28	typedef struct Location {	32	typedef struct Location {

Lines 22-28 Link Here

(-)a/tools/pageturner.c (+4 lines)
22	#include <math.h>	22	#include <math.h>
23	#include <string.h>	23	#include <string.h>
24	#include<gtk/gtk.h>	24	#include<gtk/gtk.h>
		25	#ifdef USE_ATRIL
		26	#include <atril-view.h>
		27	#else
25	#include <evince-view.h>	28	#include <evince-view.h>
		29	#endif
26		30
27	#define SPOT_SIZE (20) //size of spot indicating the position of a repeat to be returned to	31	#define SPOT_SIZE (20) //size of spot indicating the position of a repeat to be returned to
28	typedef struct Location {	32	typedef struct Location {

Lines 22-28 Link Here

(-)a/tools/twopageturner.c (+4 lines)
22	#include <math.h>	22	#include <math.h>
23	#include <string.h>	23	#include <string.h>
24	#include<gtk/gtk.h>	24	#include<gtk/gtk.h>
		25	#ifdef USE_ATRIL
		26	#include <atril-view.h>
		27	#else
25	#include <evince-view.h>	28	#include <evince-view.h>
		29	#endif
26		30
27	#if !((GTK_MAJOR_VERSION==3) && (GTK_MINOR_VERSION>=18))	31	#if !((GTK_MAJOR_VERSION==3) && (GTK_MINOR_VERSION>=18))
28	#define gtk_overlay_reorder_overlay(a,b,c) g_critical("Must be Gtk version 3.18 or greater"), exit(-1)	32	#define gtk_overlay_reorder_overlay(a,b,c) g_critical("Must be Gtk version 3.18 or greater"), exit(-1)

Return to bug 799374