Hello community, here is the log from the commit of package chmsee for openSUSE:Factory checked in at 2013-02-20 09:19:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/chmsee (Old) and /work/SRC/openSUSE:Factory/.chmsee.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "chmsee", Maintainer is "orpha...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/chmsee/chmsee.changes 2012-12-14 06:35:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chmsee.new/chmsee.changes 2013-02-20 09:19:05.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Feb 17 15:57:14 UTC 2013 - w...@rosenauer.org + +- Update to version 2.0: + * compatibility up to Gecko 19.0 (bnc#804248) +- Drop chmsee-newer-firefox.patch: currently we're up-to-date, no + newer firefox available. + +------------------------------------------------------------------- Old: ---- chmsee-1.99.15.tar.gz chmsee-newer-firefox.patch New: ---- chmsee-2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chmsee.spec ++++++ --- /var/tmp/diff_new_pack.jiUhlp/_old 2013-02-20 09:19:06.000000000 +0100 +++ /var/tmp/diff_new_pack.jiUhlp/_new 2013-02-20 09:19:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package chmsee # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -20,13 +20,11 @@ Summary: A Gtk+2 CHM document viewer License: GPL-2.0+ Group: Productivity/Graphics/Viewers -Version: 1.99.15 +Version: 2.0 Release: 0 Url: http://code.google.com/p/chmsee/ Source0: chmsee-%{version}.tar.gz Source1: Makefile -# PATCH-FIX-UPSTREAM chmsee-newer-firefox.patch vu...@opensuse.org -- Declare chmsee compatible with Firefox 17 -Patch0: chmsee-newer-firefox.patch BuildRequires: chmlib-devel BuildRequires: fdupes BuildRequires: gcc-c++ @@ -34,7 +32,7 @@ BuildRequires: python BuildRequires: shared-mime-info BuildRequires: update-desktop-files -BuildRequires: pkgconfig(libxul) >= 13.0 +BuildRequires: pkgconfig(libxul) >= 17.0 %define xulrunner_version %(rpm -q --queryformat '%{VERSION}' xulrunner-devel) %define xulrunner_base %(pkg-config --variable=libdir libxul) Requires: xulrunner >= %{xulrunner_version} @@ -51,7 +49,6 @@ %prep %setup -q #-n jungleji-chmsee-d5fb276 cp %{SOURCE1} src -%patch0 -p1 %build pushd src ++++++ chmsee-1.99.15.tar.gz -> chmsee-2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/NEWS new/chmsee-2.0/NEWS --- old/chmsee-1.99.15/NEWS 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/NEWS 2013-01-18 06:52:22.000000000 +0100 @@ -1,10 +1,10 @@ -ChmSee 1.99.x 2011-xx-xx ------------------------ +ChmSee 2.0 2013-01-18 +--------------------- * Move ChmSee from gtk + gecko embbeding to xul + xpcom * Support multi-documents * Call Print function -ChmSee 1.3.x 2011-xx-xx +ChmSee 1.3.1 2011-05-03 ----------------------- * Update Vietnamese po * Fix a bug cause of opening an unextracted chm with subpage failure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/README.md new/chmsee-2.0/README.md --- old/chmsee-1.99.15/README.md 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/README.md 2013-01-18 06:52:22.000000000 +0100 @@ -8,29 +8,28 @@ Building ======== -For ChmSee 2.0(1.99+), ChmSee has been changed from GTK+ based -application to a xulrunner application. +ChmSee 2.0 has been refacted from GTK+ based to a xulrunner application. -Now in ChmSee, most of codes use cross-platform languages: JavaScript, -XUL, CSS. So building is unnecessary for them. +Most of ChmSee codes use cross-platform languages: JavaScript, XUL, +CSS, building is unnecessary for them. -But you still need to compile a C/C++ component, it's a XPCOM -component which is used to retrieve HTML and image from packed chm -file. All source codes for this component are located in `chmsee/src` -directory. +But there is still a component you need to compile, because it is written +by C++ language. This is an important component that used to retrieve +HTML and image from packed chm file. The source codes for this +component are located in `chmsee/src` directory. -Before building, you must confirm *xulrunner sdk* and *chmlib* already +Before compiling, you must confirm *xulrunner sdk* and *chmlib* already installed in your system. Then `cd chmsee/src` directory, choose one of Makefile.${OS} files and -rename it to Makefile. If there is no proper Makefile.${OS} file for -your OS in chmsee distribution, you can create one by copying from a -similar Makefile.${OS} or Makefile.sample and modify the INCLUDE, LIB -or CFLAGS variables in it. - -When the Makefile is ready, type GNU `make` in the `chmsee/src` -directory. If building succeed, the compiled XPCOM component and its -xpt defines will be output to `chmsee/components` directory. +rename it to Makefile. If there isn't proper Makefile.${OS} file for +your OS in chmsee distribution, you can create it yourself by copying +a similar Makefile.${OS} or Makefile.sample to Makefile and modify the +INCLUDE, LIB or CFLAGS variables in it. + +If the Makefile is ready, type GNU `make` in the `chmsee/src` +directory. After building finished, the compiled XPCOM component and +its xpt defines will be output to `chmsee/components` directory. Running ======= @@ -39,9 +38,8 @@ platform command from xulrunner sdk or firefox. In the following examples, ChmSee source directory is located in -`~/downloads/chmsee`, xulrunner sdk is installed to -`/usr/lib/xulrunner-sdk` and firefox is installed to -`/usr/lib/firefox`. +`~/downloads/chmsee`, and xulrunner sdk is installed to +`/usr/lib/xulrunner-sdk`, firefox is installed to `/usr/lib/firefox`. Launch ChmSee with xulrunner sdk tool: @@ -57,7 +55,7 @@ ========== You can also use xulrunner sdk tool *xulrunner* to install ChmSee -to any directory you want. +to any directory. If you want to install it to `~/tools/chmsee`, enter following command: @@ -82,7 +80,7 @@ Report bug ========== -If you encounter any ChmSee problem, please issue them to +If you encounter any ChmSee problem, please issue to [http://code.google.com/p/chmsee/issues/entry](http://code.google.com/p/chmsee/issues/entry), thanks. @@ -91,4 +89,4 @@ ChmSee logo comes from Open Clip Art Library. [http://www.openclipart.org/detail/17922](http://www.openclipart.org/detail/17922) -The logo author is AJ Ashton. +It's author is AJ Ashton, thanks. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/about.md new/chmsee-2.0/about.md --- old/chmsee-1.99.15/about.md 1970-01-01 01:00:00.000000000 +0100 +++ new/chmsee-2.0/about.md 2013-01-18 06:52:22.000000000 +0100 @@ -0,0 +1,57 @@ +<link href="chrome://chmsee/content/swiss.css" rel="stylesheet"></link> + + **ChmSee 2.0** + +An HTML Help viewer for Unix/Linux. + +Homepage: [http://code.google.com/p/chmsee](http://code.google.com/p/chmsee) + +Usage +===== + +If your favorite browser is Firefox, you will find ChmSee looks like a +simple one. ChmSee benifits from the same xulrunner behind Firefox, +and you can use the similar Firefox navigation commands and shortcuts: + +* File + * Open file: <code>Ctrl+O</code> + * Open tab: <code>Ctrl+T</code> + * Close tab: <code>Ctrl+W</code> +* Zoom + * Zoom in: <code>Ctrl+=</code> + * Zoom out: <code>Ctrl+-</code> + * Zoom reset: <code>Ctrl+0</code> +* Toggle panel: <code>F9</code> +* Bookmark: <code>Ctrl+D</code> +* Find: <code>Ctrl+F</code> +* Print: <code>Ctrl+P</code> +* About: <code>F1</code> +* Quit: <code>Ctrl+Q</code> + +Bug report +========== + +If you encounter any ChmSee problem, please issue to +[http://code.google.com/p/chmsee/issues/entry](http://code.google.com/p/chmsee/issues/entry), +thanks. + +Authors +======= + +ChmSee's original developer was zhong. The recent versions (after +0.9.6) are developed by Ji YongGang and Li Daobing. + +Logo author +=========== + +The logo of ChmSee(two books graphic) comes from Open Clip Art Library. +[http://www.openclipart.org/detail/17922](http://www.openclipart.org/detail/17922). +It's author is AJ Ashton, thanks. + +License +======= + +ChmSee is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/application.ini new/chmsee-2.0/application.ini --- old/chmsee-1.99.15/application.ini 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/application.ini 2013-01-18 06:52:22.000000000 +0100 @@ -1,5 +1,5 @@ # -# Copyright (C) 2012 Ji YongGang <jungl...@gmail.com> +# Copyright (C) 2013 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.15 +Version=2.0 BuildID=2011040511 ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] -MinVersion=15.0 -MaxVersion=17.* +MinVersion=17.0 +MaxVersion=19.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/chrome/content/about.html new/chmsee-2.0/chrome/content/about.html --- old/chmsee-1.99.15/chrome/content/about.html 1970-01-01 01:00:00.000000000 +0100 +++ new/chmsee-2.0/chrome/content/about.html 2013-01-18 06:52:22.000000000 +0100 @@ -0,0 +1,58 @@ +<p><link href="chrome://chmsee/content/swiss.css" rel="stylesheet"></link></p> + +<p><img src="chrome://chmsee/content/chmsee.png" alt="ChmSee" title="ChmSee" /> <strong>ChmSee 2.0</strong></p> + +<p>An HTML Help viewer for Unix/Linux.</p> + +<p>Homepage: <a href="http://code.google.com/p/chmsee";>http://code.google.com/p/chmsee</a></p> + +<h1>Usage</h1> + +<p>If your favorite browser is Firefox, you will find ChmSee looks like a +simple one. ChmSee benifits from the same xulrunner behind Firefox, +and you can use the similar Firefox navigation commands and shortcuts:</p> + +<ul> +<li>File +<ul> +<li>Open file: <code>Ctrl+O</code></li> +<li>Open tab: <code>Ctrl+T</code></li> +<li>Close tab: <code>Ctrl+W</code></li> +</ul></li> +<li>Zoom +<ul> +<li>Zoom in: <code>Ctrl+=</code></li> +<li>Zoom out: <code>Ctrl+-</code></li> +<li>Zoom reset: <code>Ctrl+0</code></li> +</ul></li> +<li>Toggle panel: <code>F9</code></li> +<li>Bookmark: <code>Ctrl+D</code></li> +<li>Find: <code>Ctrl+F</code></li> +<li>Print: <code>Ctrl+P</code></li> +<li>About: <code>F1</code></li> +<li>Quit: <code>Ctrl+Q</code></li> +</ul> + +<h1>Bug report</h1> + +<p>If you encounter any ChmSee problem, please issue to +<a href="http://code.google.com/p/chmsee/issues/entry";>http://code.google.com/p/chmsee/issues/entry</a>, +thanks.</p> + +<h1>Authors</h1> + +<p>ChmSee's original developer was zhong. The recent versions (after +0.9.6) are developed by Ji YongGang and Li Daobing.</p> + +<h1>Logo author</h1> + +<p>The logo of ChmSee(two books graphic) comes from Open Clip Art Library. +<a href="http://www.openclipart.org/detail/17922";>http://www.openclipart.org/detail/17922</a>. +It's author is AJ Ashton, thanks.</p> + +<h1>License</h1> + +<p>ChmSee is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version.</p> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/chrome/content/book.js new/chmsee-2.0/chrome/content/book.js --- old/chmsee-1.99.15/chrome/content/book.js 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/chrome/content/book.js 2013-01-18 06:52:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Ji YongGang <jungl...@gmail.com> + * Copyright (C) 2013 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 @@ -31,14 +31,20 @@ getBookFromUrl: function(url) { d("Book::getBookFromUrl", "url = " + url); var book = newBook(); + + if (url === "chrome://chmsee/content/about.html") { + url = "about:chmsee"; + } + book.url = url; var uri = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService).newURI(url, null, null); d("Book::getBookFromUrl", "scheme = " + uri.scheme); if (uri.scheme === "about") { - if (uri.path === "mozilla") { - book.title = "Welcome"; + if (uri.path === "chmsee") { + book.title = "About ChmSee"; + book.url = "chrome://chmsee/content/about.html"; } else if (uri.path === "config") { book.title = "about:config"; } Files old/chmsee-1.99.15/chrome/content/chmsee.png and new/chmsee-2.0/chrome/content/chmsee.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/chrome/content/main.js new/chmsee-2.0/chrome/content/main.js --- old/chmsee-1.99.15/chrome/content/main.js 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/chrome/content/main.js 2013-01-18 06:52:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Ji YongGang <jungl...@gmail.com> + * Copyright (C) 2013 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 @@ -342,6 +342,11 @@ window.openDialog("chrome://chmsee/content/preferences.xul", "Preferences", features); }; +var aboutChmSee = function () { + appendTab(createPageTab(Book.getBookFromUrl("about:chmsee"))); + contentTabbox.selectedIndex = contentTabbox.tabs.itemCount - 1; +}; + var aboutConfig = function () { appendTab(createPageTab(Book.getBookFromUrl("about:config"))); contentTabbox.selectedIndex = contentTabbox.tabs.itemCount - 1; @@ -372,7 +377,7 @@ } if (count == 0) - appendTab(createPageTab(Book.getBookFromUrl("about:mozilla"))); + appendTab(createPageTab(Book.getBookFromUrl("about:chmsee"))); }; var loadSavedTabs = function () { @@ -394,7 +399,7 @@ } } catch (e) { d("loadSavedTabs", e.name + ": " + e.message); - appendTab(createPageTab(Book.getBookFromUrl("about:mozilla"))); + appendTab(createPageTab(Book.getBookFromUrl("about:chmsee"))); } }; @@ -428,7 +433,7 @@ } else if (LastUrls.reopen) { loadSavedTabs(); } else { - appendTab(createPageTab(Book.getBookFromUrl("about:mozilla"))); + appendTab(createPageTab(Book.getBookFromUrl("about:chmsee"))); } contentTabbox.selectedIndex = 0; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/chrome/content/main.xul new/chmsee-2.0/chrome/content/main.xul --- old/chmsee-1.99.15/chrome/content/main.xul 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/chrome/content/main.xul 2013-01-18 06:52:22.000000000 +0100 @@ -44,6 +44,7 @@ <command id="cmd_print" oncommand="onPrint();"/> + <command id="cmd_aboutChmSee" oncommand="aboutChmSee();"/> <command id="cmd_aboutConfig" oncommand="aboutConfig();"/> </commandset> @@ -69,6 +70,7 @@ <key id="showfindbar-key" modifiers="accel" key="F" command="cmd_showfindbar"/> <key id="addbookmark-key" modifiers="accel" key="D" command="cmd_addbookmark"/> <key id="print-key" modifiers="accel" key="P" command="cmd_print"/> + <key id="about-key" keycode="VK_F1" command="cmd_aboutChmSee"/> </keyset> <popupset> @@ -109,7 +111,6 @@ </menu> <menu id="view-menu" label="&viewMenu.label;" accesskey="&viewMenu.accesskey;"> <menupopup id="view-popup"> - <menuitem label="&fullScreen.label;" accesskey="&fullScreen.accesskey;" oncommand="startDOMi();" /> <menuitem label="&panel.label;" accesskey="&panel.accesskey;" key="panel-key" command="cmd_togglepanel" /> <menuseparator /> <menuitem label="&home.label;" accesskey="&home.accesskey;" key="gohome-key" command="cmd_gohome" /> @@ -131,7 +132,7 @@ </menu> <menu id="help-menu" label="&helpMenu.label;" accesskey="&helpMenu.accesskey;"> <menupopup id="help-popup"> - <menuitem label="&about.label;" accesskey="&about.accesskey;"/> + <menuitem label="&about.label;" accesskey="&about.accesskey;" key="about-key" command="cmd_aboutChmSee"/> <menuitem label="&aboutConfig.label;" accesskey="&aboutConfig.accesskey;" command="cmd_aboutConfig" /> </menupopup> </menu> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/chrome/content/swiss.css new/chmsee-2.0/chrome/content/swiss.css --- old/chmsee-1.99.15/chrome/content/swiss.css 1970-01-01 01:00:00.000000000 +0100 +++ new/chmsee-2.0/chrome/content/swiss.css 2013-01-18 06:52:22.000000000 +0100 @@ -0,0 +1,118 @@ +@charset "utf-8"; + +/** + * markdown.css + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation, either version 3 of the License, or (at your option) any + * later version. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more + * details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see http://gnu.org/licenses/lgpl.txt. + * + * @project Weblog and Open Source Projects of Florian Wolters + * @version GIT: $Id$ + * @package xhtml-css + * @author Florian Wolters <florian.wolters...@googlemail.com> + * @copyright 2012 Florian Wolters + * @cssdoc version 1.0-pre + * @license http://gnu.org/licenses/lgpl.txt GNU Lesser General Public License + * @link http://github.com/FlorianWolters/jekyll-bootstrap-theme + * @media all + * @valid true + */ + +body { + font-family: sans-serif; + padding:1em; + margin:auto; + max-width:48em; + background:#fefefe; +} + +h1, h2, h3, h4, h5, h6 { + font-weight: bold; +} + +h1 { + color: #000000; + font-size: 28px; +} + +h2 { + border-bottom: 1px solid #CCCCCC; + color: #000000; + font-size: 24px; +} + +h3 { + font-size: 18px; +} + +h4 { + font-size: 16px; +} + +h5 { + font-size: 14px; +} + +h6 { + color: #777777; + background-color: inherit; + font-size: 14px; +} + +hr { + height: 0.2em; + border: 0; + color: #CCCCCC; + background-color: #CCCCCC; +} + +p, blockquote, ul, ol, dl, li, table, pre { + margin: 15px 0; +} + +code, pre { + border-radius: 3px; + background-color: #F8F8F8; + color: inherit; +} + +code { + border: 1px solid #EAEAEA; + margin: 0 2px; + padding: 0 5px; +} + +pre { + border: 1px solid #CCCCCC; + line-height: 1.25em; + overflow: auto; + padding: 6px 10px; +} + +pre > code { + border: 0; + margin: 0; + padding: 0; +} + +a, a:visited { + color: #4183C4; + background-color: inherit; + text-decoration: none; +} + +strong { + font-size: 36px; + padding-left: 2em; + vertical-align: 50%; +} \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/chrome/content/utils.js new/chmsee-2.0/chrome/content/utils.js --- old/chmsee-1.99.15/chrome/content/utils.js 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/chrome/content/utils.js 2013-01-18 06:52:22.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011 Ji YongGang <jungl...@gmail.com> + * Copyright (C) 2013 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 Files old/chmsee-1.99.15/chrome/skin/osx/gtk-go-back.png and new/chmsee-2.0/chrome/skin/osx/gtk-go-back.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-go-down.png and new/chmsee-2.0/chrome/skin/osx/gtk-go-down.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-go-forward.png and new/chmsee-2.0/chrome/skin/osx/gtk-go-forward.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-go-up.png and new/chmsee-2.0/chrome/skin/osx/gtk-go-up.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-home.png and new/chmsee-2.0/chrome/skin/osx/gtk-home.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-open.png and new/chmsee-2.0/chrome/skin/osx/gtk-open.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-preferences.png and new/chmsee-2.0/chrome/skin/osx/gtk-preferences.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-zoom-100.png and new/chmsee-2.0/chrome/skin/osx/gtk-zoom-100.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-zoom-in.png and new/chmsee-2.0/chrome/skin/osx/gtk-zoom-in.png differ Files old/chmsee-1.99.15/chrome/skin/osx/gtk-zoom-out.png and new/chmsee-2.0/chrome/skin/osx/gtk-zoom-out.png differ Files old/chmsee-1.99.15/chrome/skin/osx/hide-pane.png and new/chmsee-2.0/chrome/skin/osx/hide-pane.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/chrome/skin/osx/main.css new/chmsee-2.0/chrome/skin/osx/main.css --- old/chmsee-1.99.15/chrome/skin/osx/main.css 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/chrome/skin/osx/main.css 1970-01-01 01:00:00.000000000 +0100 @@ -1,100 +0,0 @@ -@import url(chrome://global/skin/); - -tabpanels { - border: 0px; - margin: 0px; - padding: 1px; -} - -tabpanel { - border: 0px; - margin: 0px; -} - -#openfile-btn { - list-style-image: url("chrome://chmsee/skin/gtk-open.png"); -} - -#openfile-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-open.png"); -} - -#home-btn { - list-style-image: url("chrome://chmsee/skin/gtk-home.png"); -} - -#home-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-home.png"); -} - -#back-btn { - list-style-image: url("chrome://chmsee/skin/gtk-go-back.png"); -} - -#back-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-go-back.png"); -} - -#forward-btn { - list-style-image: url("chrome://chmsee/skin/gtk-go-forward.png"); -} - -#forward-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-go-forward.png"); -} - -#previous-btn { - list-style-image: url("chrome://chmsee/skin/gtk-go-up.png"); -} - -#previous-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-go-up.png"); -} - -#next-btn { - list-style-image: url("chrome://chmsee/skin/gtk-go-down.png"); -} - -#next-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-go-down.png"); -} - -#zoomin-btn { - list-style-image: url("chrome://chmsee/skin/gtk-zoom-in.png"); -} - -#zoomin-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-zoom-in.png"); -} - -#zoomout-btn { - list-style-image: url("chrome://chmsee/skin/gtk-zoom-out.png"); -} - -#zoomout-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-zoom-out.png"); -} - -#zoomreset-btn { - list-style-image: url("chrome://chmsee/skin/gtk-zoom-100.png"); -} - -#zoomreset-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/gtk-zoom-100.png"); -} - -#panel-btn { - list-style-image: url("chrome://chmsee/skin/show-pane.png"); -} - -#panel-btn[disabled] { - list-style-image: url("chrome://chmsee/skin/show-pane.png"); -} - -#preferences-btn { - list-style-image: url("chrome://chmsee/skin/gtk-preferences.png"); -} - -toolbar[printpreview="true"] { - -moz-binding: url("chrome://global/content/printPreviewBindings.xml#printpreviewtoolbar"); -} Files old/chmsee-1.99.15/chrome/skin/osx/show-pane.png and new/chmsee-2.0/chrome/skin/osx/show-pane.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/components/components.manifest new/chmsee-2.0/components/components.manifest --- old/chmsee-1.99.15/components/components.manifest 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/components/components.manifest 2013-01-18 06:52:22.000000000 +0100 @@ -1,6 +1,3 @@ interfaces xpcomchm.xpt binary-component libxpcomchm.so binary-component libxpcomchm.dylib os=Darwin - -component {e75fd986-51d4-11e0-938b-00241d8cf371} csprotocol.js -contract @mozilla.org/network/protocol;1?name=chmsee {e75fd986-51d4-11e0-938b-00241d8cf371} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/components/csprotocol.js new/chmsee-2.0/components/csprotocol.js --- old/chmsee-1.99.15/components/csprotocol.js 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/components/csprotocol.js 1970-01-01 01:00:00.000000000 +0100 @@ -1,115 +0,0 @@ -/* - * Copyright (C) 2011 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 - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - - * ChmSee is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - - * You should have received a copy of the GNU General Public License - * along with ChmSee; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -const Cc = Components.classes; -const Ci = Components.interfaces; -const Cr = Components.results; -const Cu = Components.utils; - -const nsIProtocolHandler = Ci.nsIProtocolHandler; -const nsIURI = Ci.nsIURI; -const nsIIOService = Ci.nsIIOService; -const nsIPrefService = Ci.nsIPrefService; -const nsIWindowWatcher = Ci.nsIWindowWatcher; -const nsIChannel = Ci.nsIChannel; -const nsIContentPolicy = Ci.nsIContentPolicy; - -const SCHEME = "chmsee"; -const PROTOCOL_CID = Components.ID("e75fd986-51d4-11e0-938b-00241d8cf371"); - -Cu.import("chrome://chmsee/content/utils.js"); -Cu.import("resource://gre/modules/XPCOMUtils.jsm"); - -var ChmseeProtocolHandler = function (scheme) { - this.scheme = scheme; -}; - -ChmseeProtocolHandler.prototype = { - defaultPort: -1, - protocolFlags: nsIProtocolHandler.URI_NORELATIVE - | nsIProtocolHandler.URI_LOADABLE_BY_ANYONE - | nsIProtocolHandler.URI_FORBIDS_AUTOMATIC_DOCUMENT_REPLACEMENT - | nsIProtocolHandler.URI_NOAUTH, - - allowPort: function(aPort, aScheme) { - return true; - }, - - newURI: function(aSpec, aCharset, aBaseURI) { - d("newURI", "aSpec = " + aSpec + ", aCharset = " + aCharset + ", aBaseURI = " + aBaseURI.spec); - - var uri = Cc["@mozilla.org/network/simple-uri;1"].createInstance(nsIURI); - - if (aSpec.indexOf("chmsee://") == 0) { - uri.spec = aSpec; - } else { - var base = aBaseURI.spec; - var pos = base.lastIndexOf("/"); - var dir = base.substring(0, pos + 1); - d("newURI", "dir = " + dir); - - if (pos > 0) { - uri.spec = dir + aSpec; - } - } - - return uri; - }, - - newChannel: function(aURI) { - d("newChannel", "aURI.spec = " + aURI.spec); - - var filepath = "file://" + aURI.spec.substring(9); - d("newChannel", "filepath = " + filepath); - - var iOService = Cc["@mozilla.org/network/io-service;1"].getService(nsIIOService); - var channel = iOService.newChannel(filepath, null, null); - return channel; - }, -}; - -var ChmseeProtocolHandlerFactory = function (scheme) { - this.scheme = scheme; -}; - -ChmseeProtocolHandlerFactory.prototype = { - createInstance: function(outer, iid) { - if (outer != null) - throw Cr.NS_ERROR_NO_AGGREGATION; - - if (!iid.equals(nsIProtocolHandler)) - throw Cr.NS_ERROR_NO_INTERFACE; - - return new ChmseeProtocolHandler(this.scheme); - }, -}; - -var Chmsee = function () { - this.wrappedJSObject = this; -}; - -Chmsee.prototype = { - classID: PROTOCOL_CID, - _xpcom_factory: new ChmseeProtocolHandlerFactory(SCHEME), - QueryInterface: XPCOMUtils.generateQI([nsIProtocolHandler]), -}; - -var csComponents = [Chmsee]; - -const NSGetFactory = XPCOMUtils.generateNSGetFactory(csComponents); \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/src/Makefile.arch new/chmsee-2.0/src/Makefile.arch --- old/chmsee-1.99.15/src/Makefile.arch 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/src/Makefile.arch 2013-01-18 06:52:22.000000000 +0100 @@ -1,3 +1,5 @@ +## -*- Mode: makefile -*- + LIBXUL_SDK = $(shell pkg-config --variable=sdkdir libxul) NSPR_INCLUDES = -I/usr/include/nspr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/src/Makefile.fedora new/chmsee-2.0/src/Makefile.fedora --- old/chmsee-1.99.15/src/Makefile.fedora 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/src/Makefile.fedora 2013-01-18 06:52:22.000000000 +0100 @@ -1,4 +1,5 @@ ## -*- Mode: makefile -*- + LIBXUL_SDK := $(shell pkg-config --variable=sdkdir libxul) NSPR_INCLUDES = -I/usr/include/nspr4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/src/Makefile.netbsd new/chmsee-2.0/src/Makefile.netbsd --- old/chmsee-1.99.15/src/Makefile.netbsd 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/src/Makefile.netbsd 2013-01-18 06:52:22.000000000 +0100 @@ -1,3 +1,5 @@ +## -*- Mode: makefile -*- + LIBXUL_SDK = $(shell pkg-config --variable=sdkdir libxul) NSPR_INCLUDES = -I/usr/pkg/include/nspr diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/src/Makefile.osx new/chmsee-2.0/src/Makefile.osx --- old/chmsee-1.99.15/src/Makefile.osx 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/src/Makefile.osx 1970-01-01 01:00:00.000000000 +0100 @@ -1,18 +0,0 @@ -## -*- Mode: makefile -*- - -LIBXUL_SDK = /usr/local/xulrunner-sdk -XULRUNNER = /Library/Frameworks/XUL.framework/Versions/Current - -NSPR_INCLUDES = -I/usr/local/xulrunner-sdk/include -NSPR_LIBS = -L/usr/local/xulrunner-sdk/lib -lplds4 -lplc4 -lnspr4 - -CHMLIB_INCLUDES = -I/usr/local/include -CHMLIB_LIBS = -L/usr/local/lib -lchm - -PYTHON2 = /usr/bin/python -XPCOMCHM = libxpcomchm.dylib - -DEFINES = -DXP_UNIX -DXP_MACOSX -LDFLAGS = -dynamiclib -L$(XULRUNNER) -L${LIBXUL_SDK}/bin -Wl,-executable_path,$(XULRUNNER) - -include ./common.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/chmsee-1.99.15/src/common.mk new/chmsee-2.0/src/common.mk --- old/chmsee-1.99.15/src/common.mk 2012-10-26 05:28:24.000000000 +0200 +++ new/chmsee-2.0/src/common.mk 2013-01-18 06:52:22.000000000 +0100 @@ -11,10 +11,10 @@ XPT = ${COMPONENTSDIR}/xpcomchm.xpt SDK_IDL = ${LIBXUL_SDK}/idl -XPIDL = ${PYTHON2} ${LIBXUL_SDK}/sdk/bin/xpidl.py -XPIDL_HEADER = ${PYTHON2} ${LIBXUL_SDK}/sdk/bin/header.py + +XPIDL_HEADER = ${PYTHON2} ${LIBXUL_SDK}/sdk/bin/header.py XPIDL_TYPELIB = ${PYTHON2} ${LIBXUL_SDK}/sdk/bin/typelib.py -XPT_LINK = ${PYTHON2} ${LIBXUL_SDK}/sdk/bin/xpt.py link +XPT_LINK = ${PYTHON2} ${LIBXUL_SDK}/sdk/bin/xpt.py link MOZ_DEBUG_DISABLE_DEFS = -DNDEBUG -DTRIMMED -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
