Hello community, here is the log from the commit of package chmsee for openSUSE:Factory checked in at 2012-01-05 19:10:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chmsee (Old) and /work/SRC/openSUSE:Factory/.chmsee.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chmsee", Maintainer is "p...@novell.com" Changes: -------- --- /work/SRC/openSUSE:Factory/chmsee/chmsee.changes 2011-11-16 17:17:35.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chmsee.new/chmsee.changes 2012-01-05 19:10:22.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Dec 25 08:03:30 UTC 2011 - w...@rosenauer.org + +- Update to version 1.99.06 +- Adapted chmsee-newer-firefox.patch for xulrunner 9 + +------------------------------------------------------------------- Old: ---- jungleji-chmsee-v1.99.05-0-g7fb12b8.tar.gz New: ---- jungleji-chmsee-v1.99.06-0-gad31e43.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chmsee.spec ++++++ --- /var/tmp/diff_new_pack.toYw0u/_old 2012-01-05 19:10:23.000000000 +0100 +++ /var/tmp/diff_new_pack.toYw0u/_new 2012-01-05 19:10:23.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package chmsee # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,27 +15,25 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: chmsee Summary: A Gtk+2 CHM document viewer -Version: 1.99.05 -Release: 1 License: GPL-2.0+ Group: Productivity/Graphics/Viewers +Version: 1.99.06 +Release: 0 Url: http://code.google.com/p/chmsee/ -Source0: jungleji-chmsee-v1.99.05-0-g7fb12b8.tar.gz +Source0: jungleji-chmsee-v1.99.06-0-gad31e43.tar.gz Source1: Makefile -# PATCH-FIX-UPSTREAM chmsee-newer-firefox.patch vu...@opensuse.org -- Declare chmsee compatible with Firefox 8 +# PATCH-FIX-UPSTREAM chmsee-newer-firefox.patch vu...@opensuse.org -- Declare chmsee compatible with Firefox 9 Patch0: chmsee-newer-firefox.patch BuildRequires: chmlib-devel BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: python -BuildRequires: xulrunner-devel BuildRequires: shared-mime-info BuildRequires: update-desktop-files +BuildRequires: xulrunner-devel >= 9.0 %define xulrunner_version %(rpm -q --queryformat '%{VERSION}' xulrunner) Requires: xulrunner = %{xulrunner_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,7 +47,7 @@ and several other great people. %prep -%setup -q -n jungleji-chmsee-370f906 +%setup -q -n jungleji-chmsee-dd9130e cp %{SOURCE1} src %patch0 -p1 ++++++ chmsee-newer-firefox.patch ++++++ --- /var/tmp/diff_new_pack.toYw0u/_old 2012-01-05 19:10:23.000000000 +0100 +++ /var/tmp/diff_new_pack.toYw0u/_new 2012-01-05 19:10:23.000000000 +0100 @@ -1,10 +1,35 @@ -Index: jungleji-chmsee-370f906/application.ini -=================================================================== ---- jungleji-chmsee-370f906.orig/application.ini -+++ jungleji-chmsee-370f906/application.ini -@@ -25,4 +25,4 @@ ID={f48601d0-39a1-11e0-a013-00241d8cf371 +diff --git a/application.ini b/application.ini +index 2019445..ca6fa4d 100644 +--- a/application.ini ++++ b/application.ini +@@ -25,4 +25,4 @@ ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] - MinVersion=2.0b9 --MaxVersion=7.0.* -+MaxVersion=8.0.* + MinVersion=6.0 +-MaxVersion=8.0.* ++MaxVersion=9.0.* +diff --git a/src/common.mk b/src/common.mk +index c0af241..07e22a6 100644 +--- a/src/common.mk ++++ b/src/common.mk +@@ -11,7 +11,8 @@ IDL = ${INTERFACE}.idl + XPT = ${COMPONENTSDIR}/xpcomchm.xpt + + SDK_IDL = ${LIBXUL_SDK}/idl +-XPIDL = ${LIBXUL_SDK}/bin/xpidl ++TYPELIB = ${LIBXUL_SDK}/sdk/bin/typelib.py ++HEADER = ${LIBXUL_SDK}/sdk/bin/header.py + XPT_LINK = ${LIBXUL_SDK}/sdk/bin/xpt.py link + + MOZ_DEBUG_DISABLE_DEFS = -DNDEBUG -DTRIMMED +@@ -43,8 +44,8 @@ LDFLAGS += ${DEFINES} \ + all: ${TARGET} + + ${XPT}: ${IDL} +- ${XPIDL} -w -v -m header -I ${SDK_IDL} ${IDL} +- ${XPIDL} -w -v -m typelib -I ${SDK_IDL} ${IDL} ++ ${HEADER} -I ${SDK_IDL} -o ${INTERFACE}.h ${IDL} ++ ${TYPELIB} -I ${SDK_IDL} -o ${INTERFACE}.xpt ${IDL} + ${XPT_LINK} ${XPT} ${INTERFACE}.xpt + + ${TARGET}: ${XPT} ${OBJS} ++++++ jungleji-chmsee-v1.99.05-0-g7fb12b8.tar.gz -> jungleji-chmsee-v1.99.06-0-gad31e43.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-370f906/application.ini new/jungleji-chmsee-dd9130e/application.ini --- old/jungleji-chmsee-370f906/application.ini 2011-08-23 16:58:30.000000000 +0200 +++ new/jungleji-chmsee-dd9130e/application.ini 2011-11-20 11:47:10.000000000 +0100 @@ -19,10 +19,10 @@ [App] Name=ChmSee -Version=1.99.05 +Version=1.99.06 BuildID=2011040511 ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] -MinVersion=2.0b9 -MaxVersion=7.0.* +MinVersion=6.0 +MaxVersion=8.0.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-370f906/chrome/content/book.js new/jungleji-chmsee-dd9130e/chrome/content/book.js --- old/jungleji-chmsee-370f906/chrome/content/book.js 2011-08-23 16:58:30.000000000 +0200 +++ new/jungleji-chmsee-dd9130e/chrome/content/book.js 2011-11-20 11:47:10.000000000 +0100 @@ -115,6 +115,10 @@ book.url = CsScheme + book.homepage; return book; }, + + saveBookInfo: function (book) { + RDF.saveBookinfo(book); + }, }; var EmptyBook = { @@ -124,6 +128,7 @@ lastpage: "", url: "", title: "", + zoom: 1.0, hhc: null, hhcDS: null, hhk: null, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-370f906/chrome/content/main.js new/jungleji-chmsee-dd9130e/chrome/content/main.js --- old/jungleji-chmsee-370f906/chrome/content/main.js 2011-08-23 16:58:30.000000000 +0200 +++ new/jungleji-chmsee-dd9130e/chrome/content/main.js 2011-11-20 11:47:10.000000000 +0100 @@ -140,6 +140,12 @@ Prefs.lastDir = fp.file.parent; var book = Book.getBookFromFile(fp.file); + if (book == null) { + let prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService); + + prompts.alert(window, "ChmSee 2.0", "Open book failed!\nYou may need to rebuild the chmsee XPCOM component."); + return; + } var newTab = createBookTab(book); replaceTab(newTab, getCurrentTab()); @@ -283,16 +289,21 @@ var browser = contentTabbox.selectedPanel.browser; var zoom = browser.markupDocumentViewer.fullZoom; browser.markupDocumentViewer.fullZoom = zoom * 1.2; + var book = contentTabbox.selectedPanel.book; + book.zoom = browser.markupDocumentViewer.fullZoom; }; var zoomOut = function () { var browser = contentTabbox.selectedPanel.browser; var zoom = browser.markupDocumentViewer.fullZoom; browser.markupDocumentViewer.fullZoom = zoom * 0.8; + var book = contentTabbox.selectedPanel.book; + book.zoom = browser.markupDocumentViewer.fullZoom; }; var zoomReset = function () { contentTabbox.selectedPanel.browser.markupDocumentViewer.fullZoom = 1.0; + contentTabbox.selectedPanel.book.zoom = 1.0; }; var togglePanel = function () { @@ -386,6 +397,10 @@ var child = panels.childNodes[i]; d("saveCurrentTabs", "url = " + child.browser.currentURI.spec); urls.push(child.browser.currentURI.spec); + + if (child.book.type == "book") { + Book.saveBookInfo(child.book); + } } LastUrls.save(urls); @@ -602,6 +617,11 @@ if (book.url !== "") { tab.panel.browser.setAttribute("src", book.url); } + + if (book.zoom) { + panel.browser.markupDocumentViewer.fullZoom = book.zoom; + } + }; var rebuildIndexTree = function (tree, data, filterText) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-370f906/chrome/content/rdfUtils.js new/jungleji-chmsee-dd9130e/chrome/content/rdfUtils.js --- old/jungleji-chmsee-370f906/chrome/content/rdfUtils.js 2011-08-23 16:58:30.000000000 +0200 +++ new/jungleji-chmsee-dd9130e/chrome/content/rdfUtils.js 2011-11-20 11:47:10.000000000 +0100 @@ -47,6 +47,12 @@ object = rdfService.GetLiteral(book.charset); infoDS.Assert(res, predicate, object, true); + predicate = rdfService.GetResource("urn:chmsee:rdf#zoom"); + var oldZoom = getTargetValue(infoDS, res, "urn:chmsee:rdf#zoom") || 1.0; + oldObject = rdfService.GetLiteral(oldZoom); + newObject = rdfService.GetLiteral(book.zoom); + infoDS.Change(res, predicate, oldObject, newObject); + if (book.hhc !== null) { predicate = rdfService.GetResource("urn:chmsee:rdf#hhc"); object = rdfService.GetLiteral(book.hhc); @@ -81,6 +87,9 @@ book.charset = getTargetValue(infoDS, res, "urn:chmsee:rdf#charset") || "ISO-8859-1"; d("RDF::loadBookinfo", "bookinfo charset = " + book.charset); + book.zoom = getTargetValue(infoDS, res, "urn:chmsee:rdf#zoom") || 1.0; + d("RDF::loadBookinfo", "bookinfo zoom = " + book.zoom); + book.hhc = getTargetValue(infoDS, res, "urn:chmsee:rdf#hhc") || null; d("RDF::loadBookinfo", "bookinfo hhc = " + book.hhc); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-370f906/src/Makefile.arch new/jungleji-chmsee-dd9130e/src/Makefile.arch --- old/jungleji-chmsee-370f906/src/Makefile.arch 2011-08-23 16:58:30.000000000 +0200 +++ new/jungleji-chmsee-dd9130e/src/Makefile.arch 2011-11-20 11:47:10.000000000 +0100 @@ -1,4 +1,4 @@ -LIBXUL_SDK = /usr/lib/xulrunner-devel-5.0 +LIBXUL_SDK = $(shell pkg-config --variable=sdkdir libxul) NSPR_INCLUDES = -I/usr/include/nspr NSPR_LIBS = -lplds4 -lplc4 -lnspr4 -lpthread -ldl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-370f906/src/Makefile.debian new/jungleji-chmsee-dd9130e/src/Makefile.debian --- old/jungleji-chmsee-370f906/src/Makefile.debian 2011-08-23 16:58:30.000000000 +0200 +++ new/jungleji-chmsee-dd9130e/src/Makefile.debian 2011-11-20 11:47:10.000000000 +0100 @@ -1,4 +1,4 @@ -LIBXUL_SDK = /usr/lib/xulrunner-devel-5.0 +LIBXUL_SDK = $(shell pkg-config --variable=sdkdir libxul) NSPR_INCLUDES = -I/usr/include/nspr NSPR_LIBS = -lplds4 -lplc4 -lnspr4 -lpthread -ldl @@ -7,3 +7,5 @@ CHMLIB_LIBS = -lchm include ./common.mk + +XPT_LINK = python ${LIBXUL_SDK}/sdk/bin/xpt.py link diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-370f906/src/Makefile.sample new/jungleji-chmsee-dd9130e/src/Makefile.sample --- old/jungleji-chmsee-370f906/src/Makefile.sample 2011-08-23 16:58:30.000000000 +0200 +++ new/jungleji-chmsee-dd9130e/src/Makefile.sample 2011-11-20 11:47:10.000000000 +0100 @@ -1,6 +1,6 @@ ## -*- Mode: makefile -*- -## REPLACE WITH YOUR XULRNNER SDK DIRECTORY -LIBXUL_SDK = /usr/lib/xulrunner-devel-2.0 +## REPLACE WITH YOUR XULRUNNER SDK DIRECTORY +LIBXUL_SDK = /usr/lib/xulrunner-devel-7.0 ## REPLACE WITH YOUR NSPR CFLAGS NSPR_INCLUDES = -I/usr/include/nspr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-370f906/src/common.mk new/jungleji-chmsee-dd9130e/src/common.mk --- old/jungleji-chmsee-370f906/src/common.mk 2011-08-23 16:58:30.000000000 +0200 +++ new/jungleji-chmsee-dd9130e/src/common.mk 2011-11-20 11:47:10.000000000 +0100 @@ -18,12 +18,12 @@ INCLUDES = -I/usr/include -I. -I${LIBXUL_SDK}/include ${NSPR_INCLUDES} ${CHMLIB_INCLUDES} DEFINES = -Wall -Wpointer-arith -Wcast-align -Wno-variadic-macros \ - -O2 -fPIC -DPIC -fno-strict-aliasing -Dunix -std=gnu++0x -fshort-wchar -pthread -pipe + -O2 -fPIC -DPIC -fno-strict-aliasing -Dunix -fshort-wchar -pthread -pipe VISIBILITY_FLAGS = -fvisibility=hidden LIBXUL_CXXFLAGS = -DMOZILLA_CLIENT -include mozilla-config.h CFLAGS += ${DEFINES} ${VISIBILITY_FLAGS} ${INCLUDES} -CXXFLAGS += -fno-rtti -fno-exceptions \ +CXXFLAGS += -fno-rtti -fno-exceptions -std=gnu++0x \ -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wno-invalid-offsetof \ ${VISIBILITY_FLAGS} ${DEFINES} ${INCLUDES} ${LIBXUL_CXXFLAGS} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
