Mailinglist Archive: opensuse-commit (1929 mails)

< Previous Next >
commit okular for openSUSE:Factory

Hello community,

here is the log from the commit of package okular for openSUSE:Factory
checked in at Thu Oct 6 16:44:14 CEST 2011.



--------
--- openSUSE:Factory/okular/okular.changes 2011-09-23 02:15:04.000000000
+0200
+++ /mounts/work_src_done/STABLE/okular/okular.changes 2011-10-02
17:23:41.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Oct 2 17:22:46 CEST 2011 - dmueller@xxxxxxx
+
+- update to 4.7.2
+ * see http://kde.org/announcements/changelogs/changelog4_7_1to4_7_2.php for
details
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
okular-4.7.1.tar.bz2

New:
----
okular-4.7.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ okular.spec ++++++
--- /var/tmp/diff_new_pack.c5isaU/_old 2011-10-06 16:44:11.000000000 +0200
+++ /var/tmp/diff_new_pack.c5isaU/_new 2011-10-06 16:44:11.000000000 +0200
@@ -18,7 +18,7 @@


Name: okular
-Version: 4.7.1
+Version: 4.7.2
Release: 1
License: GPLv2+
Summary: Document Viewer

++++++ okular-4.7.1.tar.bz2 -> okular-4.7.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okular-4.7.1/VERSION new/okular-4.7.2/VERSION
--- old/okular-4.7.1/VERSION 2011-09-01 22:48:33.000000000 +0200
+++ new/okular-4.7.2/VERSION 2011-10-02 15:26:57.000000000 +0200
@@ -1 +1 @@
-okular v0.13.1
+okular v0.13.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okular-4.7.1/core/version.h
new/okular-4.7.2/core/version.h
--- old/okular-4.7.1/core/version.h 2011-09-01 22:48:33.000000000 +0200
+++ new/okular-4.7.2/core/version.h 2011-10-02 15:26:57.000000000 +0200
@@ -10,10 +10,10 @@
#ifndef _OKULAR_VERSION_H_
#define _OKULAR_VERSION_H_

-#define OKULAR_VERSION_STRING "0.13.1"
+#define OKULAR_VERSION_STRING "0.13.2"
#define OKULAR_VERSION_MAJOR 0
#define OKULAR_VERSION_MINOR 13
-#define OKULAR_VERSION_RELEASE 1
+#define OKULAR_VERSION_RELEASE 2
#define OKULAR_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))

#define OKULAR_VERSION \
Files old/okular-4.7.1/doc/index.cache.bz2 and
new/okular-4.7.2/doc/index.cache.bz2 differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/okular-4.7.1/generators/comicbook/libokularGenerator_comicbook.desktop
new/okular-4.7.2/generators/comicbook/libokularGenerator_comicbook.desktop
--- old/okular-4.7.1/generators/comicbook/libokularGenerator_comicbook.desktop
2011-06-22 16:15:08.000000000 +0200
+++ new/okular-4.7.2/generators/comicbook/libokularGenerator_comicbook.desktop
2011-10-02 15:26:56.000000000 +0200
@@ -7,7 +7,7 @@
Name[bs]=Strip
Name[ca]=Comic Book
Name[ca@valencia]=Comic Book
-Name[cs]=Kniha komixů
+Name[cs]=Kniha komiksů
Name[da]=Comic Book
Name[de]=Comicbook
Name[el]=Βιβλίο κόμικ
@@ -65,7 +65,7 @@
Comment[bs]=Pozadina stripa za Okular
Comment[ca]=Dorsal de Comic book per a l'Okular
Comment[ca@valencia]=Dorsal de Comic book per a l'Okular
-Comment[cs]=Implementace Knihy komixů pro Okular
+Comment[cs]=Implementace Knihy komiksů pro Okular
Comment[da]=Comic book-motor til Okular
Comment[de]=Anzeigemodul für Comicbook in Okular
Comment[el]=Σύστημα υποστήριξης βιβλίων κόμικ για το Okular
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okular-4.7.1/generators/dvi/fontpool.cpp
new/okular-4.7.2/generators/dvi/fontpool.cpp
--- old/okular-4.7.1/generators/dvi/fontpool.cpp 2011-06-22
16:15:08.000000000 +0200
+++ new/okular-4.7.2/generators/dvi/fontpool.cpp 2011-10-02
15:26:56.000000000 +0200
@@ -352,7 +352,7 @@
matchingFiles = fileNameList.filter(fn);
#endif
if (matchingFiles.isEmpty() == true)
- matchingFiles += fileNameList.filter(fontp->fontname+".");
+ matchingFiles += fileNameList.filter("/"+fontp->fontname+".");

if (matchingFiles.isEmpty() != true) {
#ifdef DEBUG_FONTPOOL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okular-4.7.1/generators/dvi/generator_dvi.cpp
new/okular-4.7.2/generators/dvi/generator_dvi.cpp
--- old/okular-4.7.1/generators/dvi/generator_dvi.cpp 2011-06-22
16:15:08.000000000 +0200
+++ new/okular-4.7.2/generators/dvi/generator_dvi.cpp 2011-10-02
15:26:57.000000000 +0200
@@ -52,7 +52,7 @@
"okular_dvi",
"okular_dvi",
ki18n( "DVI Backend" ),
- "0.3.1",
+ "0.3.2",
ki18n( "A DVI file renderer" ),
KAboutData::License_GPL,
ki18n( "© 2006 Luigi Toscano" )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/okular-4.7.1/generators/poppler/synctex/patches/08-fix_path_comparison.diff
new/okular-4.7.2/generators/poppler/synctex/patches/08-fix_path_comparison.diff
---
old/okular-4.7.1/generators/poppler/synctex/patches/08-fix_path_comparison.diff
1970-01-01 01:00:00.000000000 +0100
+++
new/okular-4.7.2/generators/poppler/synctex/patches/08-fix_path_comparison.diff
2011-10-02 15:26:57.000000000 +0200
@@ -0,0 +1,22 @@
+diff --git a/generators/poppler/synctex/synctex_parser_utils.c
b/generators/poppler/synctex/synctex_parser_utils.c
+index 8a79da0..6a6165f 100644
+--- a/generators/poppler/synctex/synctex_parser_utils.c
++++ b/generators/poppler/synctex/synctex_parser_utils.c
+@@ -184,7 +184,16 @@ next_character:
+ ++rhs;
+ goto next_character;
+ # else
+- return 0 == strcmp(lhs,rhs)?synctex_YES:synctex_NO;
++ if (lhs[0] == '/' && rhs[0] == '/') { /* for absolute paths compare the
real paths */
++ char *lhsreal = realpath(lhs, 0);
++ char *rhsreal = realpath(rhs, 0);
++ synctex_bool_t result = lhsreal && rhsreal && 0 ==
strcmp(lhsreal,rhsreal)?synctex_YES:synctex_NO;
++ free (lhsreal);
++ free (rhsreal);
++ return result;
++ } else {
++ return 0 == strcmp(lhs,rhs)?synctex_YES:synctex_NO;
++ }
+ # endif
+ }
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/okular-4.7.1/generators/poppler/synctex/patches/series
new/okular-4.7.2/generators/poppler/synctex/patches/series
--- old/okular-4.7.1/generators/poppler/synctex/patches/series 2011-06-22
16:15:08.000000000 +0200
+++ new/okular-4.7.2/generators/poppler/synctex/patches/series 2011-10-02
15:26:57.000000000 +0200
@@ -6,3 +6,4 @@
05-fix-error-formats.diff
06-mingw-_synctex_error.diff
07-synctex_scanner_new_with_output_file-reset-mode.diff
+08-fix_path_comparison.diff
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/okular-4.7.1/generators/poppler/synctex/synctex_parser_utils.c
new/okular-4.7.2/generators/poppler/synctex/synctex_parser_utils.c
--- old/okular-4.7.1/generators/poppler/synctex/synctex_parser_utils.c
2011-06-22 16:15:08.000000000 +0200
+++ new/okular-4.7.2/generators/poppler/synctex/synctex_parser_utils.c
2011-10-02 15:26:57.000000000 +0200
@@ -184,7 +184,16 @@
++rhs;
goto next_character;
# else
- return 0 == strcmp(lhs,rhs)?synctex_YES:synctex_NO;
+ if (lhs[0] == '/' && rhs[0] == '/') { /* for absolute paths compare the
real paths */
+ char *lhsreal = realpath(lhs, 0);
+ char *rhsreal = realpath(rhs, 0);
+ synctex_bool_t result = lhsreal && rhsreal && 0 ==
strcmp(lhsreal,rhsreal)?synctex_YES:synctex_NO;
+ free (lhsreal);
+ free (rhsreal);
+ return result;
+ } else {
+ return 0 == strcmp(lhs,rhs)?synctex_YES:synctex_NO;
+ }
# endif
}

diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/okular-4.7.1/part.cpp new/okular-4.7.2/part.cpp
--- old/okular-4.7.1/part.cpp 2011-09-01 22:48:33.000000000 +0200
+++ new/okular-4.7.2/part.cpp 2011-10-02 15:26:57.000000000 +0200
@@ -921,6 +921,13 @@
return false;
}

+static void addFileToWatcher( KDirWatch *watcher, const QString &filePath)
+{
+ if ( !watcher->contains( filePath ) ) watcher->addFile(filePath);
+ const QFileInfo fi(filePath);
+ if ( !watcher->contains( fi.absolutePath() ) )
watcher->addDir(fi.absolutePath());
+ if ( fi.isSymLink() ) watcher->addFile( fi.readLink() );
+}

bool Part::openFile()
{
@@ -1013,10 +1020,7 @@
// set the file to the fileWatcher
if ( url().isLocalFile() )
{
- if ( !m_watcher->contains( localFilePath() ) )
m_watcher->addFile(localFilePath());
- const QFileInfo fi(localFilePath());
- if ( !m_watcher->contains( fi.absolutePath() ) )
m_watcher->addDir(fi.absolutePath());
- if ( fi.isSymLink() ) m_watcher->addFile( fi.readLink() );
+ addFileToWatcher( m_watcher, localFilePath() );
}

// if the 'OpenTOC' flag is set, open the TOC
@@ -1277,8 +1281,8 @@
}
else
{
- // start watching the file again (since we dropped it on close)
- m_watcher->addFile(localFilePath());
+ // start watching the file again (since we dropped it on close)
+ addFileToWatcher( m_watcher, localFilePath() );
m_dirtyHandler->start( 750 );
}
}

continue with "q"...



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread