Hello community, here is the log from the commit of package chmsee for openSUSE:Factory checked in at 2012-09-23 19:31:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-13 09:32:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.chmsee.new/chmsee.changes 2012-09-23 19:31:14.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Sep 16 21:02:23 UTC 2012 - w...@rosenauer.org + +- Update to version 1.99.14 (bnc#780651) + * compatibility with Gecko >= 15 +- use fdupes + +------------------------------------------------------------------- Old: ---- jungleji-chmsee-v1.99.08-0-g339d2c3.tar.gz New: ---- jungleji-chmsee-v1.99.14-0-gd5fb276.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ chmsee.spec ++++++ --- /var/tmp/diff_new_pack.ebhqbo/_old 2012-09-23 19:31:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ebhqbo/_new 2012-09-23 19:31:15.000000000 +0200 @@ -20,20 +20,21 @@ Summary: A Gtk+2 CHM document viewer License: GPL-2.0+ Group: Productivity/Graphics/Viewers -Version: 1.99.08 +Version: 1.99.14 Release: 0 Url: http://code.google.com/p/chmsee/ -Source0: jungleji-chmsee-v1.99.08-0-g339d2c3.tar.gz +Source0: jungleji-chmsee-v1.99.14-0-gd5fb276.tar.gz Source1: Makefile -# PATCH-FIX-UPSTREAM chmsee-newer-firefox.patch vu...@opensuse.org -- Declare chmsee compatible with Firefox 9 +# 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++ BuildRequires: pkg-config BuildRequires: python BuildRequires: shared-mime-info BuildRequires: update-desktop-files -BuildRequires: pkgconfig(libxul) >= 9.0 +BuildRequires: pkgconfig(libxul) >= 13.0 %define xulrunner_version %(rpm -q --queryformat '%{VERSION}' xulrunner-devel) %define xulrunner_base %(pkg-config --variable=libdir libxul) Requires: xulrunner >= %{xulrunner_version} @@ -48,7 +49,7 @@ and several other great people. %prep -%setup -q -n jungleji-chmsee-422e522 +%setup -q -n jungleji-chmsee-d5fb276 cp %{SOURCE1} src %patch0 -p1 @@ -91,6 +92,8 @@ install -D -m0644 data/chmsee.mime %{buildroot}/%{_datadir}/mime-info/chmsee.mime install -D -m0644 data/chmsee.keys %{buildroot}/%{_datadir}/mime-info/chmsee.keys DESTDIR=%{buildroot} mime-info-to-mime +# fdupes +%fdupes $RPM_BUILD_ROOT %post %if 0%{?suse_version} > 1130 @@ -112,7 +115,7 @@ %files %defattr(-, root, root) -%doc README COPYING AUTHORS ChangeLog NEWS HACKING +%doc COPYING AUTHORS NEWS README.md HACKING %{_bindir}/chmsee %{_libdir}/chmsee/ %{_datadir}/applications/*.desktop ++++++ Makefile ++++++ --- /var/tmp/diff_new_pack.ebhqbo/_old 2012-09-23 19:31:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ebhqbo/_new 2012-09-23 19:31:15.000000000 +0200 @@ -7,4 +7,11 @@ CHMLIB_INCLUDES = -I/usr/include CHMLIB_LIBS = -lchm +PYTHON2 = /usr/bin/python2 + +XPCOMCHM = libxpcomchm.so + +DEFINES = -pthread +LDFLAGS = -Wl,-soname,${TARGET} -L${LIBXUL_SDK}/bin -lpthread + include ./common.mk ++++++ chmsee-newer-firefox.patch ++++++ --- /var/tmp/diff_new_pack.ebhqbo/_old 2012-09-23 19:31:15.000000000 +0200 +++ /var/tmp/diff_new_pack.ebhqbo/_new 2012-09-23 19:31:15.000000000 +0200 @@ -5,6 +5,6 @@ @@ -25,4 +25,4 @@ ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] - MinVersion=9.0 --MaxVersion=10.* -+MaxVersion=11.* + MinVersion=13.0 +-MaxVersion=16.* ++MaxVersion=17.* ++++++ jungleji-chmsee-v1.99.08-0-g339d2c3.tar.gz -> jungleji-chmsee-v1.99.14-0-gd5fb276.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/README new/jungleji-chmsee-d5fb276/README --- old/jungleji-chmsee-422e522/README 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,62 +0,0 @@ -Introduction -============ - -ChmSee is an HTML Help viewer for Unix/Linux. - -Homepage: http://code.google.com/p/chmsee - -Building -======== - -From 2.0, ChmSee becomes a xulrunner application. I think this -migration will bring some interesting features and make developing -ChmSee more fun. - -In the new version of ChmSee, most of codes use cross-platform -languages: XUL, JavaScript, CSS and DTD. One advantage feature of -these script and markup language is that they do not need to build -before running. But ChmSee still depends on the CHMLIB - a C Lib used -to retrieved book contents from CHM file. In order to call functions -from CHMLIB, a C++ XPCOM component named libxpcomchm.so is introduced, -this module is the only one required to compile. - -The source codes of libxpcomchm.so are located in ./src directory. To -successfully compile this XPCOM component, you need to have -xulrunner-sdk 2.0 and chmlib installed. - -Then go to the ./src directory, choose one of Makefile.${OS} files and -rename it to Makefile. If there is no proper Makefile.${OS} file for -your system, you can copy and modify Makefile.sample file and set the -INCLUDE and LIB variables according to your building system. - -When the Makefile is ready, run `make` in this ./src directory, a -libxpcomchm.so file and its xpt defines will generate to the -components folder. - -Running -======= - -After building libxpcomchm.so, back to your chmsee directory and input -following command line, it will launch the ChmSee program: - -$ xulrunner application.ini - -There is another way: copy xulrunner-stub from xulrunner-sdk to chmsee -directory and rename it to chmsee, after that, you can run this chmsee -file to launch the program. - -TIP: Omit debug info - -$ xulrunner application.ini > /dev/null 2>&1 - -Report bug -========== - -If you encounter any ChmSee problem, please report them to -http://code.google.com/p/chmsee/issues/entry, thanks. - -About ChmSee logo -================= - -ChmSee logo comes from Open Clip Art Library. The author is AJ Ashton. -http://www.openclipart.org/detail/17922 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/README.md new/jungleji-chmsee-d5fb276/README.md --- old/jungleji-chmsee-422e522/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/README.md 2012-09-14 16:03:11.000000000 +0200 @@ -0,0 +1,94 @@ +Introduction +============ + +ChmSee is an HTML Help viewer for Unix/Linux. + +Homepage: [http://code.google.com/p/chmsee](http://code.google.com/p/chmsee) + +Building +======== + +For ChmSee 2.0(1.99+), ChmSee has been changed from GTK+ based +application to a xulrunner application. + +Now in ChmSee, most of codes use cross-platform languages: JavaScript, +XUL, CSS. So 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. + +Before building, 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. + +Running +======= + +You can launch ChmSee immediately in the chmsee folder with xulrunner +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`. + +Launch ChmSee with xulrunner sdk tool: + + $ cd ~/downloads/chmsee + $ /usr/lib/xulrunner-sdk/xulrunner application.ini + +Launch ChmSee with firefox: + + $ cd ~/downloads/chmsee + $ /usr/lib/firefox/firefox --app application.ini + +Installing +========== + +You can also use xulrunner sdk tool *xulrunner* to install ChmSee +to any directory you want. + +If you want to install it to `~/tools/chmsee`, enter following command: + + $ /usr/lib/xulrunner-sdk/xulrunner --install-app ~/downloads/chmsee ~/tools + +The `~/tools/chmsee` directory will be created and contains an execute +file `chmsee`, running this file will launch ChmSee program. + +If chmsee can not launch and display a "Could not find the Mozilla +runtime." message. You need ensure that there is a *xulrunner runtime* +directory located in the installed chmsee folder, if not, add one by +yourself: + + $ cd ~/tools/chmsee + $ ln -s /usr/lib/xulrunner-sdk xulrunner + +If you have *firefox* installed, this link can be changed to: + + $ ln -s /usr/lib/firefox xulrunner + + +Report bug +========== + +If you encounter any ChmSee problem, please issue them to +[http://code.google.com/p/chmsee/issues/entry](http://code.google.com/p/chmsee/issues/entry), +thanks. + +About ChmSee logo +================= + +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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/application.ini new/jungleji-chmsee-d5fb276/application.ini --- old/jungleji-chmsee-422e522/application.ini 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/application.ini 2012-09-14 16:03:11.000000000 +0200 @@ -19,10 +19,10 @@ [App] Name=ChmSee -Version=1.99.08 +Version=1.99.14 BuildID=2011040511 ID={f48601d0-39a1-11e0-a013-00241d8cf371} [Gecko] -MinVersion=9.0 -MaxVersion=10.* +MinVersion=13.0 +MaxVersion=16.* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/chrome/chrome.manifest new/jungleji-chmsee-d5fb276/chrome/chrome.manifest --- old/jungleji-chmsee-422e522/chrome/chrome.manifest 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/chrome/chrome.manifest 2012-09-14 16:03:11.000000000 +0200 @@ -1,3 +1,4 @@ content chmsee file:content/ skin chmsee classic/1.0 file:skin/ +skin chmsee classic/1.0 file:skin/osx/ os=Darwin locale chmsee en-US file:locale/en-US/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/chrome/content/book.js new/jungleji-chmsee-d5fb276/chrome/content/book.js --- old/jungleji-chmsee-422e522/chrome/content/book.js 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/chrome/content/book.js 2012-09-14 16:03:11.000000000 +0200 @@ -149,7 +149,10 @@ d("convertToUTF8", "string = " + string + ", charset = " + charset); var UTF8Service = Cc["@mozilla.org/intl/utf8converterservice;1"].getService(Ci.nsIUTF8ConverterService); - return UTF8Service.convertStringToUTF8(string, charset, false); + if (geckoVersion >= 15) + return UTF8Service.convertStringToUTF8(string, charset, false, false); + else + return UTF8Service.convertStringToUTF8(string, charset, false); }; var md5Hash = function (file) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/chrome/content/main.js new/jungleji-chmsee-d5fb276/chrome/content/main.js --- old/jungleji-chmsee-422e522/chrome/content/main.js 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/chrome/content/main.js 2012-09-14 16:03:11.000000000 +0200 @@ -31,6 +31,8 @@ var onWindowLoad = function () { d("onWindowLoad", "init"); + d("appInfo.platformVer", geckoVersion); + window.addEventListener("resize", onResize, true); initTabbox(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/chrome/content/utils.js new/jungleji-chmsee-d5fb276/chrome/content/utils.js --- old/jungleji-chmsee-422e522/chrome/content/utils.js 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/chrome/content/utils.js 2012-09-14 16:03:11.000000000 +0200 @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -var EXPORTED_SYMBOLS = ["Prefs", "LastUrls", "Bookmarks", "d", "CsScheme", "notice"]; +var EXPORTED_SYMBOLS = ["Prefs", "LastUrls", "Bookmarks", "d", "CsScheme", "notice", "geckoVersion"]; const Cc = Components.classes; const Ci = Components.interfaces; @@ -214,9 +214,11 @@ dump(f + " >>> " + s + "\n"); }; +var appInfo = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo); +var geckoVersion = appInfo.platformVersion; 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 +}; Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-go-back.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-go-back.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-go-down.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-go-down.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-go-forward.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-go-forward.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-go-up.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-go-up.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-home.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-home.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-open.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-open.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-preferences.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-preferences.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-zoom-100.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-zoom-100.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-zoom-in.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-zoom-in.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/gtk-zoom-out.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/gtk-zoom-out.png differ Files old/jungleji-chmsee-422e522/chrome/skin/osx/hide-pane.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/hide-pane.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/chrome/skin/osx/main.css new/jungleji-chmsee-d5fb276/chrome/skin/osx/main.css --- old/jungleji-chmsee-422e522/chrome/skin/osx/main.css 1970-01-01 01:00:00.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/chrome/skin/osx/main.css 2012-09-14 16:03:11.000000000 +0200 @@ -0,0 +1,100 @@ +@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/jungleji-chmsee-422e522/chrome/skin/osx/show-pane.png and new/jungleji-chmsee-d5fb276/chrome/skin/osx/show-pane.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/components/components.manifest new/jungleji-chmsee-d5fb276/components/components.manifest --- old/jungleji-chmsee-422e522/components/components.manifest 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/components/components.manifest 2012-09-14 16:03:11.000000000 +0200 @@ -1,5 +1,6 @@ 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/jungleji-chmsee-422e522/src/Makefile.arch new/jungleji-chmsee-d5fb276/src/Makefile.arch --- old/jungleji-chmsee-422e522/src/Makefile.arch 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/src/Makefile.arch 2012-09-14 16:03:11.000000000 +0200 @@ -6,4 +6,10 @@ CHMLIB_INCLUDES = -I/usr/include CHMLIB_LIBS = -lchm +PYTHON2 = /usr/bin/python2 +XPCOMCHM = libxpcomchm.so + +DEFINES = -pthread +LDFLAGS = -Wl,-soname,${TARGET} -L${LIBXUL_SDK}/bin -lpthread + include ./common.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/src/Makefile.debian new/jungleji-chmsee-d5fb276/src/Makefile.debian --- old/jungleji-chmsee-422e522/src/Makefile.debian 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/src/Makefile.debian 2012-09-14 16:03:11.000000000 +0200 @@ -1,3 +1,5 @@ +## -*- Mode: makefile -*- + LIBXUL_SDK = $(shell pkg-config --variable=sdkdir libxul) NSPR_INCLUDES = -I/usr/include/nspr @@ -6,6 +8,11 @@ CHMLIB_INCLUDES = -I/usr/include CHMLIB_LIBS = -lchm +PYTHON2 = /usr/bin/python +XPCOMCHM = libxpcomchm.so + +DEFINES = -pthread +LDFLAGS = -Wl,-soname,${TARGET} -L${LIBXUL_SDK}/bin -lpthread + 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-422e522/src/Makefile.fedora new/jungleji-chmsee-d5fb276/src/Makefile.fedora --- old/jungleji-chmsee-422e522/src/Makefile.fedora 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/src/Makefile.fedora 2012-09-14 16:03:11.000000000 +0200 @@ -7,4 +7,10 @@ CHMLIB_INCLUDES = -I/usr/include CHMLIB_LIBS = -lchm +PYTHON2 = /usr/bin/python2 +XPCOMCHM = libxpcomchm.so + +DEFINES = -pthread +LDFLAGS = -Wl,-soname,${TARGET} -L${LIBXUL_SDK}/bin -lpthread + include ./common.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/src/Makefile.freebsd new/jungleji-chmsee-d5fb276/src/Makefile.freebsd --- old/jungleji-chmsee-422e522/src/Makefile.freebsd 1970-01-01 01:00:00.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/src/Makefile.freebsd 2012-09-14 16:03:11.000000000 +0200 @@ -0,0 +1,18 @@ +LIBXUL_SDK = /usr/local/lib/firefox/ + +NSPR_INCLUDES = -I/usr/local/include/nspr +NSPR_LIBS = -pthread -L/usr/local/lib/nspr -lplds4 -lplc4 -lnspr4 + +CHMLIB_INCLUDES = -I/usr/local/include +CHMLIB_LIBS = -L/usr/local/lib -lchm + +PYTHON2 = /usr/local/bin/python2.7 +XPCOMCHM = libxpcomchm.so + +DEFINES = -pthread +LDFLAGS = -Wl,-soname,${TARGET} -L${LIBXUL_SDK}/bin -lpthread + +CC = /usr/bin/clang +CXX = /usr/bin/clang + +include ./common.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/src/Makefile.netbsd new/jungleji-chmsee-d5fb276/src/Makefile.netbsd --- old/jungleji-chmsee-422e522/src/Makefile.netbsd 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/src/Makefile.netbsd 2012-09-14 16:03:11.000000000 +0200 @@ -1,9 +1,15 @@ LIBXUL_SDK = /usr/pkg/lib/xulrunner-sdk -NSPR_INCLUDES = -I/usr/pkg/include/xulrunner -NSPR_LIBS = -Wl,-R/usr/pkg/lib/xulrunner -pthread -L/usr/pkg/lib/xulrunner -lplds4 -lplc4 -lnspr4 +NSPR_INCLUDES = -I/usr/pkg/include/nspr +NSPR_LIBS = -Wl,-R/usr/pkg/lib/nspr -pthread -L/usr/pkg/lib/nspr -lplds4 -lplc4 -lnspr4 CHMLIB_INCLUDES = -I/usr/pkg/include CHMLIB_LIBS = -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lchm -include ./common.mk \ No newline at end of file +PYTHON2 = /usr/pkg/bin/python2.7 +XPCOMCHM = libxpcomchm.so + +DEFINES = -pthread +LDFLAGS = -Wl,-soname,${TARGET} -Wl,-R${LIBXUL_SDK}/bin -L${LIBXUL_SDK}/bin -lpthread + +include ./common.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/src/Makefile.osx new/jungleji-chmsee-d5fb276/src/Makefile.osx --- old/jungleji-chmsee-422e522/src/Makefile.osx 1970-01-01 01:00:00.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/src/Makefile.osx 2012-09-14 16:03:11.000000000 +0200 @@ -0,0 +1,18 @@ +## -*- 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/jungleji-chmsee-422e522/src/Makefile.sample new/jungleji-chmsee-d5fb276/src/Makefile.sample --- old/jungleji-chmsee-422e522/src/Makefile.sample 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/src/Makefile.sample 2012-09-14 16:03:11.000000000 +0200 @@ -12,4 +12,15 @@ ## REPLACE WITH YOUR CHMLIB LIBS CHMLIB_LIBS = -lchm +## YOUR PYTHON 2.* PATH +PYTHON2 = /usr/bin/python2 + +## CHM XPCOM NAME ON YOUR SYSTEM +XPCOMCHM = libxpcomchm.so + +## C/C++ DEFINES +DEFINES = -pthread +## LDFLAGS +LDFLAGS = -Wl,-soname,${TARGET} -L${LIBXUL_SDK}/bin -lpthread + include ./common.mk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/jungleji-chmsee-422e522/src/common.mk new/jungleji-chmsee-d5fb276/src/common.mk --- old/jungleji-chmsee-422e522/src/common.mk 2012-02-19 15:38:07.000000000 +0100 +++ new/jungleji-chmsee-d5fb276/src/common.mk 2012-09-14 16:03:11.000000000 +0200 @@ -1,7 +1,7 @@ CHMSEE_ROOTDIR = .. COMPONENTSDIR = ${CHMSEE_ROOTDIR}/components -TARGET = ${COMPONENTSDIR}/libxpcomchm.so +TARGET = ${COMPONENTSDIR}/${XPCOMCHM} SRCS = csChm.cpp csChmModule.cpp csChmfile.c OBJS = csChm.o csChmModule.o csChmfile.o @@ -11,16 +11,16 @@ 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_TYPELIB = python2 ${LIBXUL_SDK}/sdk/bin/typelib.py -XPT_LINK = python2 ${LIBXUL_SDK}/sdk/bin/xpt.py link +XPIDL = ${PYTHON2} ${LIBXUL_SDK}/sdk/bin/xpidl.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 MOZ_DEBUG_DISABLE_DEFS = -DNDEBUG -DTRIMMED 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 -fshort-wchar -pthread -pipe +DEFINES += -Wall -Wpointer-arith -Wcast-align -Wno-variadic-macros \ + -O2 -fPIC -DPIC -fno-strict-aliasing -Dunix -fshort-wchar -pipe VISIBILITY_FLAGS = -fvisibility=hidden LIBXUL_CXXFLAGS = -DMOZILLA_CLIENT -include mozilla-config.h @@ -29,15 +29,11 @@ -Woverloaded-virtual -Wsynth -Wno-ctor-dtor-privacy -Wno-non-virtual-dtor -Wno-invalid-offsetof \ ${VISIBILITY_FLAGS} ${DEFINES} ${INCLUDES} ${LIBXUL_CXXFLAGS} - -XPCOM_FROZEN_LDOPTS = -Wl,-R${LIBXUL_SDK}/bin -L${LIBXUL_SDK}/bin -lxpcom -lmozalloc - LDFLAGS += ${DEFINES} \ ${INCLUDES} \ ${MOZ_DEBUG_DISABLE_DEFS} \ - -shared -Wl,-soname,${TARGET} -lpthread \ ${LIBXUL_SDK}/lib/libxpcomglue_s.a \ - ${XPCOM_FROZEN_LDOPTS} \ + -shared -lxpcom -lmozalloc \ ${NSPR_LIBS} \ ${CHMLIB_LIBS} @@ -50,7 +46,7 @@ ${XPT_LINK} ${XPT} ${INTERFACE}.xpt ${TARGET}: ${XPT} ${OBJS} - ${CC} ${OBJS} -o ${TARGET} ${LDFLAGS} + ${CXX} ${OBJS} -o ${TARGET} ${LDFLAGS} %.o: %.c ${CC} ${CFLAGS} -c $< -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
