Hello community, here is the log from the commit of package chmsee for openSUSE:Factory checked in at 2012-02-14 11:23:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-01-05 19:10:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chmsee.new/chmsee.changes 2012-02-14 11:23:33.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 6 13:37:39 UTC 2012 - w...@rosenauer.org + +- Update to version 1.99.07 +- Update chmsee-newer-firefox.patch to build against Gecko 10. +- Change versioned Requires for xulrunner from = to >=, to allow + xulrunner to be updated even if it breaks chmsee (bnc#745303). + +------------------------------------------------------------------- Old: ---- jungleji-chmsee-v1.99.06-0-gad31e43.tar.gz New: ---- jungleji-chmsee-v1.99.07-0-gc2a00db.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chmsee.spec ++++++ --- /var/tmp/diff_new_pack.DXqPvk/_old 2012-02-14 11:23:46.000000000 +0100 +++ /var/tmp/diff_new_pack.DXqPvk/_new 2012-02-14 11:23:46.000000000 +0100 @@ -20,10 +20,10 @@ Summary: A Gtk+2 CHM document viewer License: GPL-2.0+ Group: Productivity/Graphics/Viewers -Version: 1.99.06 +Version: 1.99.07 Release: 0 Url: http://code.google.com/p/chmsee/ -Source0: jungleji-chmsee-v1.99.06-0-gad31e43.tar.gz +Source0: jungleji-chmsee-v1.99.07-0-gc2a00db.tar.gz Source1: Makefile # PATCH-FIX-UPSTREAM chmsee-newer-firefox.patch vu...@opensuse.org -- Declare chmsee compatible with Firefox 9 Patch0: chmsee-newer-firefox.patch @@ -35,7 +35,7 @@ BuildRequires: update-desktop-files BuildRequires: xulrunner-devel >= 9.0 %define xulrunner_version %(rpm -q --queryformat '%{VERSION}' xulrunner) -Requires: xulrunner = %{xulrunner_version} +Requires: xulrunner >= %{xulrunner_version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -47,7 +47,7 @@ and several other great people. %prep -%setup -q -n jungleji-chmsee-dd9130e +%setup -q -n jungleji-chmsee-ccdf6d2 cp %{SOURCE1} src %patch0 -p1 ++++++ chmsee-newer-firefox.patch ++++++ --- /var/tmp/diff_new_pack.DXqPvk/_old 2012-02-14 11:23:46.000000000 +0100 +++ /var/tmp/diff_new_pack.DXqPvk/_new 2012-02-14 11:23:46.000000000 +0100 @@ -1,35 +1,25 @@ diff --git a/application.ini b/application.ini -index 2019445..ca6fa4d 100644 +index 7102022..44b0c1c 100644 --- a/application.ini +++ b/application.ini @@ -25,4 +25,4 @@ ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] MinVersion=6.0 --MaxVersion=8.0.* -+MaxVersion=9.0.* +-MaxVersion=9.0.* ++MaxVersion=10.0.* diff --git a/src/common.mk b/src/common.mk -index c0af241..07e22a6 100644 +index 43a6302..b0174bd 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} \ +@@ -45,8 +45,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} +- ${XPIDL_HEADER} -o ${INTERFACE}.h -I ${SDK_IDL} ${IDL} +- ${XPIDL_TYPELIB} -o ${INTERFACE}.xpt -I ${SDK_IDL} ${IDL} ++ ${XPIDL_HEADER} -o ${INTERFACE}.h -I ${SDK_IDL} --cachedir=. ${IDL} ++ ${XPIDL_TYPELIB} -o ${INTERFACE}.xpt -I ${SDK_IDL} --cachedir=. ${IDL} ${XPT_LINK} ${XPT} ${INTERFACE}.xpt ${TARGET}: ${XPT} ${OBJS} ++++++ jungleji-chmsee-v1.99.06-0-gad31e43.tar.gz -> jungleji-chmsee-v1.99.07-0-gc2a00db.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/COPYING new/jungleji-chmsee-ccdf6d2/COPYING --- old/jungleji-chmsee-dd9130e/COPYING 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/COPYING 2012-01-01 11:32:58.000000000 +0100 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -305,7 +305,7 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/application.ini new/jungleji-chmsee-ccdf6d2/application.ini --- old/jungleji-chmsee-dd9130e/application.ini 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/application.ini 2012-01-01 11:32:58.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2011 Ji YongGang <jungl...@gmail.com> +# Copyright (C) 2012 Ji YongGang <jungl...@gmail.com> # # ChmSee is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,10 +19,10 @@ [App] Name=ChmSee -Version=1.99.06 +Version=1.99.07 BuildID=2011040511 ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] MinVersion=6.0 -MaxVersion=8.0.* +MaxVersion=9.0.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/chrome/content/book.js new/jungleji-chmsee-ccdf6d2/chrome/content/book.js --- old/jungleji-chmsee-dd9130e/chrome/content/book.js 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/chrome/content/book.js 2012-01-01 11:32:58.000000000 +0100 @@ -39,6 +39,8 @@ if (uri.scheme === "about") { if (uri.path === "mozilla") { book.title = "Welcome"; + } else if (uri.path === "config") { + book.title = "about:config"; } } else if (uri.scheme === "file") { d("Book::getBookFromUrl", "path = " + uri.path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/chrome/content/main.js new/jungleji-chmsee-ccdf6d2/chrome/content/main.js --- old/jungleji-chmsee-dd9130e/chrome/content/main.js 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/chrome/content/main.js 2012-01-01 11:32:58.000000000 +0100 @@ -141,9 +141,7 @@ 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."); + notice(window, "Open book failed!\nYou may need to rebuild the chmsee XPCOM component."); return; } var newTab = createBookTab(book); @@ -342,6 +340,11 @@ window.openDialog("chrome://chmsee/content/preferences.xul", "Preferences", features); }; +var aboutConfig = function () { + appendTab(createPageTab(Book.getBookFromUrl("about:config"))); + contentTabbox.selectedIndex = contentTabbox.tabs.itemCount - 1; +}; + /*** Other functions ***/ var openCmdLineFiles = function(cmdLine) { @@ -371,22 +374,26 @@ }; var loadSavedTabs = function () { - var data = LastUrls.read(); - var urls = JSON.parse(data); - var book = null; - var newTab = null; - - for (var i = 0; i < urls.length; i += 1) { - book = Book.getBookFromUrl(urls[i]); - if (book.type === "book") { - newTab = createBookTab(book); - appendTab(newTab); - refreshBookTab(newTab); - } else { - appendTab(createPageTab(book)); + try { + var data = LastUrls.read(); + var urls = JSON.parse(data); + var book = null; + var newTab = null; + + for (var i = 0; i < urls.length; i += 1) { + book = Book.getBookFromUrl(urls[i]); + if (book.type === "book") { + newTab = createBookTab(book); + appendTab(newTab); + refreshBookTab(newTab); + } else { + appendTab(createPageTab(book)); + } } + } catch (e) { + d("loadSavedTabs", e.name + ": " + e.message); + appendTab(createPageTab(Book.getBookFromUrl("about:mozilla"))); } - contentTabbox.selectedIndex = 0; }; var saveCurrentTabs = function () { @@ -569,6 +576,11 @@ var tabpanels = contentTabbox.tabpanels; var currentIndex = contentTabbox.selectedIndex; + var book = tab.panel.book; + if (book.type == "book") { + Book.saveBookInfo(book); + } + tabs.removeChild(tab.tab); tabpanels.removeChild(tab.panel); adjustTabWidth(tabs); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/chrome/content/main.xul new/jungleji-chmsee-ccdf6d2/chrome/content/main.xul --- old/jungleji-chmsee-dd9130e/chrome/content/main.xul 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/chrome/content/main.xul 2012-01-01 11:32:58.000000000 +0100 @@ -43,6 +43,8 @@ <command id="cmd_removebookmark" oncommand="removeBookmark();"/> <command id="cmd_print" oncommand="onPrint();"/> + + <command id="cmd_aboutConfig" oncommand="aboutConfig();"/> </commandset> <commandset id="updateCopyCmd" @@ -130,6 +132,7 @@ <menu id="help-menu" label="&helpMenu.label;" accesskey="&helpMenu.accesskey;"> <menupopup id="help-popup"> <menuitem label="&about.label;" accesskey="&about.accesskey;"/> + <menuitem label="&aboutConfig.label;" accesskey="&aboutConfig.accesskey;" command="cmd_aboutConfig" /> </menupopup> </menu> </menubar> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/chrome/content/rdfUtils.js new/jungleji-chmsee-ccdf6d2/chrome/content/rdfUtils.js --- old/jungleji-chmsee-dd9130e/chrome/content/rdfUtils.js 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/chrome/content/rdfUtils.js 2012-01-01 11:32:58.000000000 +0100 @@ -180,7 +180,7 @@ this.name = ""; this.local = ""; this.containers = []; - this.lastRes = null; + this.res = []; this.treeType = parseInfo.type; // false: list, true: tree }; @@ -194,8 +194,9 @@ if (this.treeType) { if (this.containers.length == 0) { resource = rdfService.GetResource("urn:chmsee:root"); + this.res.push(resource); } else { - resource = this.lastRes; + resource = this.res[this.res.length - 1]; } var container = rdfContainerUtils.MakeSeq(this.ds, resource); this.containers.push(container); @@ -225,6 +226,7 @@ if (this.treeType) { if (this.containers.length > 0) { this.containers.pop(); + this.res.pop(); } } } else if (tag.toLowerCase() == "object" && this.isItem) { @@ -240,7 +242,7 @@ this.containers[this.containers.length - 1].AppendElement(res); - this.lastRes = res; + this.res.push(res); this.isItem = false; } }, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/chrome/content/utils.js new/jungleji-chmsee-ccdf6d2/chrome/content/utils.js --- old/jungleji-chmsee-dd9130e/chrome/content/utils.js 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/chrome/content/utils.js 2012-01-01 11:32:58.000000000 +0100 @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -var EXPORTED_SYMBOLS = ["Prefs", "LastUrls", "Bookmarks", "d", "CsScheme"]; +var EXPORTED_SYMBOLS = ["Prefs", "LastUrls", "Bookmarks", "d", "CsScheme", "notice"]; const Cc = Components.classes; const Ci = Components.interfaces; @@ -171,7 +171,6 @@ }, getItems: function () { - d("Bookmarks::getItems", ""); var items = []; try { var historyService = Cc["@mozilla.org/browser/nav-history-service;1"].getService(Ci.nsINavHistoryService); @@ -193,7 +192,7 @@ } rootNode.containerOpen = false; - }catch(e) { + } catch(e) { d("Bookmarks::getItems", "error e.name = " + e.name + ", message = " + e.message); } @@ -214,3 +213,10 @@ if (CsDebug) dump(f + " >>> " + s + "\n"); }; + + +var notice = function (win, msg) { + let prompts = Cc["@mozilla.org/embedcomp/prompt-service;1"].getService(Ci.nsIPromptService); + + prompts.alert(win, "ChmSee 2.0", msg); +}; \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/chrome/locale/en-US/main.dtd new/jungleji-chmsee-ccdf6d2/chrome/locale/en-US/main.dtd --- old/jungleji-chmsee-dd9130e/chrome/locale/en-US/main.dtd 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/chrome/locale/en-US/main.dtd 2012-01-01 11:32:58.000000000 +0100 @@ -51,6 +51,8 @@ <!ENTITY helpMenu.accesskey "h"> <!ENTITY about.label "About"> <!ENTITY about.accesskey "a"> +<!ENTITY aboutConfig.label "about:config"> +<!ENTITY aboutConfig.accesskey "c"> <!ENTITY openCmd.tooltip "Open a CHM file"> <!ENTITY togglePanel.label "Show/Hide panel"> <!ENTITY togglePanel.tooltip "Show/Hide book tree panel"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/defaults/preferences/pref.js new/jungleji-chmsee-ccdf6d2/defaults/preferences/pref.js --- old/jungleji-chmsee-dd9130e/defaults/preferences/pref.js 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/defaults/preferences/pref.js 2012-01-01 11:32:58.000000000 +0100 @@ -24,3 +24,6 @@ pref("extensions.update.url", "chrome://mozapps/locale/extensions/extensions.properties"); pref("extensions.getMoreExtensionsURL", "chrome://mozapps/locale/extensions/extensions.properties"); pref("extensions.getMoreThemesURL", "chrome://mozapps/locale/extensions/extensions.properties"); + +/* chmsee preference */ +pref("chmsee.open.lasturls", true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/src/Makefile.fedora new/jungleji-chmsee-ccdf6d2/src/Makefile.fedora --- old/jungleji-chmsee-dd9130e/src/Makefile.fedora 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/src/Makefile.fedora 2012-01-01 11:32:58.000000000 +0100 @@ -1,5 +1,5 @@ ## -*- Mode: makefile -*- -LIBXUL_SDK = /usr/lib64/xulrunner-sdk-2 +LIBXUL_SDK := $(shell pkg-config --variable=sdkdir libxul) NSPR_INCLUDES = -I/usr/include/nspr4 NSPR_LIBS = -lplds4 -lplc4 -lnspr4 -lpthread -ldl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/src/Makefile.sample new/jungleji-chmsee-ccdf6d2/src/Makefile.sample --- old/jungleji-chmsee-dd9130e/src/Makefile.sample 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/src/Makefile.sample 2012-01-01 11:32:58.000000000 +0100 @@ -1,6 +1,6 @@ ## -*- Mode: makefile -*- ## REPLACE WITH YOUR XULRUNNER SDK DIRECTORY -LIBXUL_SDK = /usr/lib/xulrunner-devel-7.0 +LIBXUL_SDK := $(shell pkg-config --variable=sdkdir libxul) ## REPLACE WITH YOUR NSPR CFLAGS NSPR_INCLUDES = -I/usr/include/nspr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-dd9130e/src/common.mk new/jungleji-chmsee-ccdf6d2/src/common.mk --- old/jungleji-chmsee-dd9130e/src/common.mk 2011-11-20 11:47:10.000000000 +0100 +++ new/jungleji-chmsee-ccdf6d2/src/common.mk 2012-01-01 11:32:58.000000000 +0100 @@ -11,8 +11,10 @@ XPT = ${COMPONENTSDIR}/xpcomchm.xpt SDK_IDL = ${LIBXUL_SDK}/idl -XPIDL = ${LIBXUL_SDK}/bin/xpidl -XPT_LINK = ${LIBXUL_SDK}/sdk/bin/xpt.py link +XPIDL = python ${LIBXUL_SDK}/sdk/bin/xpidl.py +XPIDL_HEADER = python ${LIBXUL_SDK}/sdk/bin/header.py +XPIDL_TYPELIB = python ${LIBXUL_SDK}/sdk/bin/typelib.py +XPT_LINK = python ${LIBXUL_SDK}/sdk/bin/xpt.py link MOZ_DEBUG_DISABLE_DEFS = -DNDEBUG -DTRIMMED @@ -43,8 +45,8 @@ all: ${TARGET} ${XPT}: ${IDL} - ${XPIDL} -w -v -m header -I ${SDK_IDL} ${IDL} - ${XPIDL} -w -v -m typelib -I ${SDK_IDL} ${IDL} + ${XPIDL_HEADER} -o ${INTERFACE}.h -I ${SDK_IDL} ${IDL} + ${XPIDL_TYPELIB} -o ${INTERFACE}.xpt -I ${SDK_IDL} ${IDL} ${XPT_LINK} ${XPT} ${INTERFACE}.xpt ${TARGET}: ${XPT} ${OBJS} -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
