commit 84da19c8ed4ff17856b4e2685f99739254346d0d
Merge: 26764c8 eab30d9
Author: Elan Ruusamäe <[email protected]>
Date: Mon May 16 19:11:57 2016 +0300
up to 2.1.1
Merge branch 'dev-2.1'
some old devel, works, publish as can work on this later as well
0005-unbundle-qt.patch | 149 +++++++++++++++---------------
get-source.sh | 86 ++++++++++++++++++
phantomjs-disable-breakpad.patch | 114 -----------------------
phantomjs-qt.patch | 11 ---
phantomjs.spec | 191 ++++++++++++++++++++++++++++++++++-----
5 files changed, 327 insertions(+), 224 deletions(-)
---
diff --cc phantomjs.spec
index 4847f80,6689aa1..24fc033
--- a/phantomjs.spec
+++ b/phantomjs.spec
@@@ -1,12 -1,24 +1,24 @@@
+ # NOTES
+ # - fedora's attempt to package this:
https://bugzilla.redhat.com/show_bug.cgi?id=891461
+ #
+ # Conditional build:
%bcond_with system_qcommandline
+ %bcond_with system_qt
+ %bcond_without tests # build without tests
+
+ %define qtbase 5.5.1
Summary: Headless WebKit with a JavaScript API
Name: phantomjs
- Version: 2.0.0
- Release: 3
+ Version: 2.1.1
-Release: 0.21
++Release: 1
License: BSD
Group: Applications/Networking
- Source0:
https://bitbucket.org/ariya/phantomjs/downloads/%{name}-%{version}-source.zip
- # Source0-md5: feabe9064100e241d21347739312e64d
+ Source0:
https://github.com/ariya/phantomjs/archive/%{version}/%{name}-%{version}.tar.gz
+ # Source0-md5: db2d71e67e3557a977c2f269f1ec7fee
+ Source1:
http://download.qt.io/official_releases/qt/5.5/%{qtbase}/submodules/qtbase-opensource-src-%{qtbase}.tar.xz
+ # Source1-md5: 687e2b122fa2c3390b5e20a166d38038
+ Source2:
http://download.qt.io/official_releases/qt/5.5/%{qtbase}/submodules/qtwebkit-opensource-src-%{qtbase}.tar.xz
+ # Source2-md5: 681328edb539b8fa3a273b38c90b3e31
Patch0: %{name}-qt.patch
Patch1: %{name}-env.patch
Patch3: 0003-unbundle-mongoose.patch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/phantomjs.git/commitdiff/84da19c8ed4ff17856b4e2685f99739254346d0d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
