[poppler] 4 commits - cmake/modules poppler/Link.cc

[Albert Astals Cid]

 cmake/modules/FindGLIB.cmake |    3 ++-
 cmake/modules/FindGTK.cmake  |    2 +-
 poppler/Link.cc              |    4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit b2d07cbf0c2f94bd25e1422e366ff78031815867
Merge: 80cf78f 3206950
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Mar 18 21:06:59 2013 +0100

    Merge remote-tracking branch 'origin/poppler-0.22'

commit 3206950658521009b52f638cc5e712e0cef42706
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Mar 18 21:06:09 2013 +0100

    Spec says Zoom -> 0 means no zoom change

diff --git a/poppler/Link.cc b/poppler/Link.cc
index b5b2bd3..20184d1 100644
--- a/poppler/Link.cc
+++ b/poppler/Link.cc
@@ -16,7 +16,7 @@
 // Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
 // Copyright (C) 2007, 2010, 2011 Carlos Garcia Campos <carlosgc at gnome.org>
 // Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
-// Copyright (C) 2008-2010, 2012 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008-2010, 2012, 2013 Albert Astals Cid <aacid at kde.org>
 // Copyright (C) 2009 Kovid Goyal <kovid at kovidgoyal.net>
 // Copyright (C) 2009 Ilya Gorenbein <igorenbein at finjan.com>
 // Copyright (C) 2012 Tobias Koening <tobias.koenig at kdab.com>
@@ -220,8 +220,8 @@ LinkDest::LinkDest(Array *a) {
       if (obj2.isNull()) {
 	changeZoom = gFalse;
       } else if (obj2.isNum()) {
-	changeZoom = gTrue;
 	zoom = obj2.getNum();
+	changeZoom = (zoom == 0) ? gFalse : gTrue;
       } else {
 	error(errSyntaxWarning, -1, "Bad annotation destination position");
 	goto err1;
commit 13ee9f8b7d42ed7d7bc0f9dbf190ff66e6ab5a81
Author: Pino Toscano <pino at kde.org>
Date:   Mon Mar 18 18:15:57 2013 +0100

    cmake: drop search of gthread-2.0 and gio-2.0 from GTK
    
    this matches what is done in the autoconf counterpart

diff --git a/cmake/modules/FindGTK.cmake b/cmake/modules/FindGTK.cmake
index 1a32483..cb67220 100644
--- a/cmake/modules/FindGTK.cmake
+++ b/cmake/modules/FindGTK.cmake
@@ -15,7 +15,7 @@ include(FindPackageHandleStandardArgs)
 if (NOT WIN32)
   find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GTK3 "gtk+-3.0>=3.0" "gdk-pixbuf-2.0" "gthread-2.0" "gio-2.0")
+  pkg_check_modules(GTK3 "gtk+-3.0>=3.0" "gdk-pixbuf-2.0")
 
   find_package_handle_standard_args(GTK DEFAULT_MSG GTK3_LIBRARIES GTK3_CFLAGS)
 
commit 47e869e60fb147caca825380eeaa2a0851d502b9
Author: Michael Weiser <michael at weiser.dinsnail.net>
Date:   Mon Mar 18 18:15:14 2013 +0100

    cmake: search also for gio-2.0 as GLIB library

diff --git a/cmake/modules/FindGLIB.cmake b/cmake/modules/FindGLIB.cmake
index 15fb0c7..35a9f9e 100644
--- a/cmake/modules/FindGLIB.cmake
+++ b/cmake/modules/FindGLIB.cmake
@@ -6,6 +6,7 @@
 #  GLIB2_LIBRARIES - Link these to use GLib
 #
 # Copyright 2008-2010 Pino Toscano, <pino at kde.org>
+# Copyright 2013 Michael Weiser, <michael at weiser.dinsnail.net>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
@@ -15,7 +16,7 @@ include(FindPackageHandleStandardArgs)
 if (NOT WIN32)
   find_package(PkgConfig REQUIRED)
 
-  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}")
+  pkg_check_modules(GLIB2 "glib-2.0>=${GLIB_REQUIRED}" "gobject-2.0>=${GLIB_REQUIRED}" "gio-2.0>=${GLIB_REQUIRED}")
 
   find_package_handle_standard_args(GLib DEFAULT_MSG GLIB2_LIBRARIES GLIB2_CFLAGS)