diff --git a/desktop/toolkit/qt5/qt5-webengine/actions.py b/desktop/toolkit/qt5/qt5-webengine/actions.py
index 0b402993b6..b582c1fe31 100644
--- a/desktop/toolkit/qt5/qt5-webengine/actions.py
+++ b/desktop/toolkit/qt5/qt5-webengine/actions.py
@@ -14,7 +14,12 @@ def setup():
shelltools.export("QT5LINK", "/usr/lib/qt5/bin")
shelltools.export("QT5DIR", "/usr/lib/qt5")
shelltools.export("CFLAGS", "%s -I/usr/lib/sqlite3.11.0.0" % get.CFLAGS())
+<<<<<<< HEAD
shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
+=======
+ qt5.configure(parameters="WEBENGINE_CONFIG+=use_proprietary_codecs")
+ #shelltools.system("qmake-qt5 WEBENGINE_CONFIG+=use_proprietary_codecs qtwebengine.pro")
+>>>>>>> e48ac11fa2d0a58e97e44fadb628cef95f99f432
def build():
qt5.make()
diff --git a/desktop/toolkit/qt5/qt5-webengine/pspec.xml b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
index b9a8b947c4..d0396a2197 100644
--- a/desktop/toolkit/qt5/qt5-webengine/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-webengine/pspec.xml
@@ -22,6 +22,7 @@
bison
ninja
gperf
+ snappy-devel
gobject-introspection-devel
expat-devel
glib2-devel
@@ -90,6 +91,7 @@
libX11
libgcc
libpng
+ snappy
freetype
libXi
libXext
diff --git a/editor/medit/pspec.xml b/editor/medit/pspec.xml
index 54efbadc2c..cd3ab0d44b 100644
--- a/editor/medit/pspec.xml
+++ b/editor/medit/pspec.xml
@@ -71,7 +71,7 @@
- 2016-06-10
+ 2016-06-15
1.2.0
Release Bump
Pisi Linux Community
diff --git a/multimedia/editor/blender/pspec.xml b/multimedia/editor/blender/pspec.xml
index cbb46c7868..b8716d764e 100644
--- a/multimedia/editor/blender/pspec.xml
+++ b/multimedia/editor/blender/pspec.xml
@@ -103,7 +103,7 @@
- 2016-06-09
+ 2016-06-15
2.75a
Release Bump
Pisi Linux Community
diff --git a/multimedia/graphics/gegl/pspec.xml b/multimedia/graphics/gegl/pspec.xml
index dedec62887..f8114e9f10 100644
--- a/multimedia/graphics/gegl/pspec.xml
+++ b/multimedia/graphics/gegl/pspec.xml
@@ -84,7 +84,7 @@
- 2016-06-09
+ 2016-06-15
0.2.0
Release Bump
Pisi Linux Community
diff --git a/multimedia/graphics/openimageio/pspec.xml b/multimedia/graphics/openimageio/pspec.xml
index d03b991a9b..696c57afa7 100644
--- a/multimedia/graphics/openimageio/pspec.xml
+++ b/multimedia/graphics/openimageio/pspec.xml
@@ -91,7 +91,7 @@
- 2016-06-09
+ 2016-06-15
1.5.20
Release Bump
Pisi Linux Community
diff --git a/multimedia/video/mpv-player/pspec.xml b/multimedia/video/mpv-player/pspec.xml
index 3ad98de510..b2623ddca2 100644
--- a/multimedia/video/mpv-player/pspec.xml
+++ b/multimedia/video/mpv-player/pspec.xml
@@ -113,7 +113,7 @@
- 2016-06-09
+ 2016-06-15
0.17.0
Version Bump
Pisi Linux Community
diff --git a/network/analyzer/rrdtool/pspec.xml b/network/analyzer/rrdtool/pspec.xml
index dd632335b4..36d593d02a 100644
--- a/network/analyzer/rrdtool/pspec.xml
+++ b/network/analyzer/rrdtool/pspec.xml
@@ -74,7 +74,7 @@
- 2016-06-09
+ 2016-06-15
1.5.3
Release Bump
Pisi Linux Community
diff --git a/network/chat/pidgin/pspec.xml b/network/chat/pidgin/pspec.xml
index 1eb88201bb..03c972dd55 100644
--- a/network/chat/pidgin/pspec.xml
+++ b/network/chat/pidgin/pspec.xml
@@ -204,7 +204,7 @@
- 2016-06-09
+ 2016-06-15
2.10.11
Release Bump
Pisi Linux Community
diff --git a/network/connection/NetworkManager/pspec.xml b/network/connection/NetworkManager/pspec.xml
index b36c369a34..23773e1357 100644
--- a/network/connection/NetworkManager/pspec.xml
+++ b/network/connection/NetworkManager/pspec.xml
@@ -123,7 +123,7 @@
- 2016-06-09
+ 2016-06-15
1.0.10
Release Bump
Pisi Linux Community
diff --git a/network/web/chromium-browser/pspec.xml b/network/web/chromium-browser/pspec.xml
index 4cc9a58a63..795c5fe785 100644
--- a/network/web/chromium-browser/pspec.xml
+++ b/network/web/chromium-browser/pspec.xml
@@ -79,6 +79,8 @@
xdg-utils
xvid-devel
ninja
+ libffi-devel
+ yasm-devel
PNGImageDecoder.patch
diff --git a/server/openldap/pspec.xml b/server/openldap/pspec.xml
index 1f3a48f695..b121d79812 100644
--- a/server/openldap/pspec.xml
+++ b/server/openldap/pspec.xml
@@ -131,7 +131,7 @@
- 2016-06-08
+ 2016-06-15
2.4.44
Release Bump
Pisi Linux Community
diff --git a/server/samba/pspec.xml b/server/samba/pspec.xml
index 71b3ddec76..3c974a7347 100644
--- a/server/samba/pspec.xml
+++ b/server/samba/pspec.xml
@@ -133,7 +133,7 @@
- 2016-06-08
+ 2016-06-15
4.2.3
Release Bump
Pisi Linux Community
diff --git a/server/web/apache/pspec.xml b/server/web/apache/pspec.xml
index 3e0fda3e51..98b23ec27f 100644
--- a/server/web/apache/pspec.xml
+++ b/server/web/apache/pspec.xml
@@ -92,7 +92,7 @@
- 2016-06-08
+ 2016-06-14
2.4.20
Release Bump
Pisi Linux Community
diff --git a/util/admin/sudo/pspec.xml b/util/admin/sudo/pspec.xml
index cac2b80b16..dd1bbe2f57 100644
--- a/util/admin/sudo/pspec.xml
+++ b/util/admin/sudo/pspec.xml
@@ -60,7 +60,7 @@
- 2016-06-08
+ 2016-06-15
1.8.16
Release Bump
Pisi Linux Community
diff --git a/util/crypt/nss/pspec.xml b/util/crypt/nss/pspec.xml
index 9b59585423..9de9bd406c 100644
--- a/util/crypt/nss/pspec.xml
+++ b/util/crypt/nss/pspec.xml
@@ -15,7 +15,7 @@
library
Network Security Services
Network Security Services (NSS) is a set of libraries designed to support cross-platform development of security-enabled client and server applications. Applications built with NSS can support SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, X.509 v3 certificates, and other security standards.
- https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_22_RTM/src/nss-3.22.tar.gz
+ https://ftp.mozilla.org/pub/security/nss/releases/NSS_3_23_RTM/src/nss-3.23.tar.gz
nss.pc.in
nss-config.in
@@ -29,7 +29,6 @@
add_spi+cacert_ca_certs.patch
- ssl-renegotiate-transitional.patch
fedora/add-relro-linker-option.patch
@@ -75,6 +74,13 @@
+
+ 2016-06-15
+ 3.23
+ Version Bump
+ Pisi Linux Community
+ admin@pisilinux.org
+
2016-06-08
3.22
diff --git a/util/crypt/qca2-qt5/pspec.xml b/util/crypt/qca2-qt5/pspec.xml
index 49ac1114c4..2f4b1b9883 100644
--- a/util/crypt/qca2-qt5/pspec.xml
+++ b/util/crypt/qca2-qt5/pspec.xml
@@ -57,7 +57,7 @@
- 2016-06-08
+ 2016-06-15
2.1.1
Release Bump
Pisi Linux Community