[packages/phantomjs/dev] up to 1.9.7, compile fails in gifwriter

[glen]

commit ae02ec386d3ce0292a12d6a0a01f12b18df6c5eb
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Mar 2 16:02:29 2014 +0200

    up to 1.9.7, compile fails in gifwriter
    
    gif/gifwriter.cpp: In function 'bool exportGif(const QImage&, const QString&)':
    gif/gifwriter.cpp:73:72: error: 'QuantizeBuffer' was not declared in this scope
                        rBuffer, gBuffer, bBuffer, outputBuffer, cmap.Colors);
                                                                            ^
    gif/gifwriter.cpp:103:28: error: cannot convert 'const char*' to 'GifFileType*' for argument '1' to 'void EGifSetGifVersion(GifFileType*, bool)'
         EGifSetGifVersion("87a");
                                ^
    gif/gifwriter.cpp:105:52: error: too few arguments to function 'GifFileType* EGifOpen(void*, OutputFunc, int*)'
         GifFileType *gif = EGifOpen(&file, saveGifBlock);
                                                        ^
    In file included from gif/gifwriter.cpp:32:0:
    /usr/include/gif_lib.h:129:14: note: declared here
     GifFileType *EGifOpen(void *userPtr, OutputFunc writeFunc, int *Error);

 0004-unbundle-breakpad.patch | 33 ++++++++++++++++++++++-----------
 phantomjs.spec               |  8 ++++----
 2 files changed, 26 insertions(+), 15 deletions(-)
---
diff --git a/phantomjs.spec b/phantomjs.spec
index 263dc66..d5a28e9 100644
--- a/phantomjs.spec
+++ b/phantomjs.spec
@@ -1,11 +1,11 @@
 Summary:	Headless WebKit with a JavaScript API
 Name:		phantomjs
-Version:	1.9.0
-Release:	1
+Version:	1.9.7
+Release:	0.1
 License:	BSD
 Group:		Applications/Networking
-Source0:	http://phantomjs.googlecode.com/files/%{name}-%{version}-source.zip
-# Source0-md5:	a779eb301cac2df9f366be5b2d17cef7
+Source0:	https://bitbucket.org/ariya/phantomjs/downloads/%{name}-%{version}-source.zip
+# Source0-md5:	5d308d2db7d8b494f99dbb5664447547
 Patch1:		0001-gifwriter-bgcolor-narrowing.patch
 Patch2:		0002-unbundle-giflib.patch
 Patch3:		0003-unbundle-mongoose.patch
diff --git a/0004-unbundle-breakpad.patch b/0004-unbundle-breakpad.patch
index 29a9e56..1dc0a71 100644
--- a/0004-unbundle-breakpad.patch
+++ b/0004-unbundle-breakpad.patch
@@ -39,23 +39,26 @@ index 734c084..64560aa 100644
  
      QApplication app(argc, argv);
  
-diff --git a/src/phantomjs.pro b/src/phantomjs.pro
-index 2b3fb1b..d453b31 100644
---- a/src/phantomjs.pro
-+++ b/src/phantomjs.pro
-@@ -60,44 +60,6 @@ LIBS += -lmongoose
- include(linenoise/linenoise.pri)
+--- phantomjs-1.9.7/src/phantomjs.pro~	2014-03-02 15:55:56.000000000 +0200
++++ phantomjs-1.9.7/src/phantomjs.pro	2014-03-02 15:57:03.766411109 +0200
+@@ -61,13 +61,6 @@
  include(qcommandline/qcommandline.pri)
  
--linux*|mac {
+ linux*|mac {
 -    INCLUDEPATH += breakpad/src
 -
 -    SOURCES += breakpad/src/client/minidump_file_writer.cc \
 -      breakpad/src/common/convert_UTF.c \
 -      breakpad/src/common/md5.cc \
 -      breakpad/src/common/string_conversion.cc 
--}
 -
+     QTPLUGIN += \
+         qcncodecs \
+         qjpcodecs \
+@@ -75,35 +68,6 @@
+         qtwcodecs
+ }
+ 
 -linux* {
 -    SOURCES += breakpad/src/client/linux/crash_generation/crash_generation_client.cc \
 -      breakpad/src/client/linux/handler/exception_handler.cc \
@@ -88,6 +91,14 @@ index 2b3fb1b..d453b31 100644
  win32: RC_FILE = phantomjs_win.rc
  os2:   RC_FILE = phantomjs_os2.rc
  
--- 
-1.7.11.7
-
+@@ -117,10 +81,6 @@
+ 
+ win32-msvc* {
+     LIBS += -lCrypt32
+-    INCLUDEPATH += breakpad/src
+-    SOURCES += breakpad/src/client/windows/handler/exception_handler.cc \
+-      breakpad/src/client/windows/crash_generation/crash_generation_client.cc \
+-      breakpad/src/common/windows/guid_string.cc
+     CONFIG(static) {
+         DEFINES += STATIC_BUILD
+         QTPLUGIN += \
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/phantomjs.git/commitdiff/ae02ec386d3ce0292a12d6a0a01f12b18df6c5eb