From ccf4a027b39710188818a6b1302a7b3ef5e12504 Mon Sep 17 00:00:00 2001
From: Lawrence Meckan <media@absalom.biz>
Date: Sun, 14 Jan 2018 19:10:17 +1000
Subject: [PATCH] Libsass 3.4.8 & start of work to get PECL / PHP Brew

---
 README.md                                |   7 +-
 config.m4                                |   2 +-
 lib/libsass                              |   2 +-
 package.xml                              | 102 +++++++++++++++++++++++
 src/php_sass.h                           |   2 +-
 tests/check_bundled_libsass_version.phpt |   2 +-
 6 files changed, 110 insertions(+), 7 deletions(-)
 create mode 100644 package.xml

diff --git a/README.md b/README.md
index 022de9d..4119dff 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 The `sass` extension for PHP gives you an object-oriented system of parsing [Sass](http://sass-lang.com/) from within your PHP applications. Under the hood it uses [libsass](https://github.com/hcatlin/libsass) to provide super speedy and compatible Sass parsing.
 
-![Libsass 3.4.5](https://img.shields.io/badge/libsass-3.4.5-yellow.svg) [![Build Status](https://travis-ci.org/absalomedia/sassphp.svg)](https://travis-ci.org/absalomedia/sassphp)
+![Libsass 3.4.8](https://img.shields.io/badge/libsass-3.4.8-yellow.svg) [![Build Status](https://travis-ci.org/absalomedia/sassphp.svg)](https://travis-ci.org/absalomedia/sassphp)
 
 ## What's Sass?
 
@@ -148,13 +148,14 @@ If there's a problem, the extension will throw a `SassException`:
 
 These extensions also utilise the [Libsass](https://github.com/hcatlin/libsass) library & remain in varying states of completion:
 
-* Facebook [HHVM](https://github.com/absalomedia/sasshhvm) native (non Zend) extension - with Libsass 3.4.5 - tested up to HHVM 3.11.x
-* [Nginx](https://github.com/absalomedia/sass-nginx-module) module - with Libsass 3.4.5
+* Facebook [HHVM](https://github.com/absalomedia/sasshhvm) native (non Zend) extension - with Libsass 3.4.8 - tested up to HHVM 3.11.x
+* [Nginx](https://github.com/absalomedia/sass-nginx-module) module - with Libsass 3.4.8
 
 ## Changelog
 
 | Release | Description |
 | --- | --- |
+| 0.5.13 | Karol - Caroline (Libsass 3.4.8) |
 | 0.5.13 | Ray - Manta (Libsass 3.4.5) & PHP stub file |
 | 0.5.12 | Cartography - MapRoot functions |
 | 0.5.11 | Zoomer (Libsass 3.4.4) stable |
diff --git a/config.m4 b/config.m4
index 472eb75..c0e0357 100644
--- a/config.m4
+++ b/config.m4
@@ -14,7 +14,7 @@ if test "$PHP_SASS" != "no"; then
 
   if test "x$sass_version" != "x" ; then
       # escape hell. This is what we need to pass to the
-      #  compiler: -DLIBSASS_VERSION="\"'3.3.3\""
+      #  compiler: -DLIBSASS_VERSION="\"'3.4.8\""
       CFLAGS="-DLIBSASS_VERSION=\"\\\"$sass_version\\\"\" $CFLAGS"
       CXXFLAGS="-DLIBSASS_VERSION=\"\\\"$sass_version\\\"\" $CXXFLAGS"
   fi
diff --git a/lib/libsass b/lib/libsass
index 3157321..a1f13ed 160000
--- a/lib/libsass
+++ b/lib/libsass
@@ -1 +1 @@
-Subproject commit 31573210c0d120ae56aaea543a0dbab5255cdfb7
+Subproject commit a1f13edf19f90f0723e02a736a33e0fc03c6c584
diff --git a/package.xml b/package.xml
new file mode 100644
index 0000000..9f21664
--- /dev/null
+++ b/package.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<package packagerversion="1.9.4" version="2.0" xmlns="http://pear.php.net/dtd/package-2.0" xmlns:tasks="http://pear.php.net/dtd/tasks-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pear.php.net/dtd/tasks-1.0 http://pear.php.net/dtd/tasks-1.0.xsd http://pear.php.net/dtd/package-2.0 http://pear.php.net/dtd/package-2.0.xsd">
+ <name>sass</name>
+ <channel>pecl.php.net</channel>
+ <summary>SASS - Sass for PHP</summary>
+ <description>SASS compliation for PHP</description>
+ <lead>
+  <name>Lawrence Meckan</name>
+  <user>absalomedia</user>
+  <email>media@absalom.biz</email>
+  <active>yes</active>
+ </lead>
+ <date>2018-01-14</date>
+ <time>08:00:00</time>
+ <version>
+  <release>0.5.14</release>
+  <api>3.4.8</api>
+ </version>
+ <stability>
+  <release>stable</release>
+  <api>stable</api>
+ </stability>
+ <license uri="https://opensource.org/licenses/MIT">MIT License</license>
+ <notes>
+-
+ </notes>
+ <contents>
+  <dir name="/">
+   <dir name="tests">
+    <file name="arginfo_present.phpt" role="test" />
+    <file name="available.phpt" role="test" />
+    <file name="check_bundled_libsass_version.phpt" role="test" />
+    <file name="class_exists.phpt" role="test" />
+    <file name="class_instantiable.phpt" role="test" />
+    <file name="file_comments.phpt" role="test" />
+    <file name="file_embed.phpt" role="test" />
+    <file name="file_indent.phpt" role="test" />
+    <file name="get_map_path.phpt" role="test" />
+    <file name="get_map_root.phpt" role="test" />
+    <file name="handles_comments.phpt" role="test" />
+    <file name="handles_embed.phpt" role="test" />
+    <file name="handles_include_path.phpt" role="test" />
+    <file name="handles_indent.phpt" role="test" />
+    <file name="handles_map_root.phpt" role="test" />
+    <file name="handles_map.phpt" role="test" />
+    <file name="handles_precision.phpt" role="test" />
+    <file name="handles_style.phpt" role="test" />
+    <file name="old_compile_file_alias_exists.phpt" role="test" />
+    <file name="parse_file_parses_file.phpt" role="test" />
+    <file name="parse_parses_correct_sass.phpt" role="test" />
+    <file name="throw_exception.phpt" role="test" />
+    <file name="support/foo.scss" role="test" />
+    <file name="support/import.scss" role="test" />
+    <file name="support/source_type.sass" role="test" />
+    <file name="support/test.scss" role="test" />
+   </dir>
+   <dir name="src">
+    <file name="php_sass.h" role="src" />
+    <file name="utilities.h" role="src" />
+    <file name="sass.c" role="src" />
+    <file name="utilities.c" role="src" />
+   </dir>
+   <file name="config.m4" role="src" />
+   <file name="config.w32" role="src" />
+   <file name="install.php" role="src" />  
+   <file name="LICENSE" role="doc" />
+   <file name="README.md" role="doc" />
+  </dir>
+ </contents>
+ <dependencies>
+  <required>
+   <php>
+    <min>5.6.0-dev</min>
+   </php>
+   <pearinstaller>
+    <min>1.10</min>
+   </pearinstaller>
+  </required>
+ </dependencies>
+ <providesextension>sass</providesextension>
+ <extsrcrelease>
+  <configureoption name="enable-sass-debug" default="no" prompt="Enable internal debugging in SASS" />
+ </extsrcrelease>
+ <changelog>
+  <release>
+   <date>2018-01-14</date>
+   <version>
+    <release>0.5.14</release>
+    <api>3.4.8</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="https://opensource.org/licenses/MIT">MIT License</license>
+   <notes>
+- Update libsass to 3.4.8
+- Start of work for PECL inclusion
+   </notes>
+  </release>
+ </changelog>
+</package>
\ No newline at end of file
diff --git a/src/php_sass.h b/src/php_sass.h
index 59e14a3..954e61a 100644
--- a/src/php_sass.h
+++ b/src/php_sass.h
@@ -14,7 +14,7 @@
 #include "config.h"
 #endif
 
-#define SASS_VERSION "0.5.13"
+#define SASS_VERSION "0.5.14"
 #define SASS_FLAVOR  "Sassyphpras"
 
 #include <php.h>
diff --git a/tests/check_bundled_libsass_version.phpt b/tests/check_bundled_libsass_version.phpt
index f8e605a..bc62b19 100644
--- a/tests/check_bundled_libsass_version.phpt
+++ b/tests/check_bundled_libsass_version.phpt
@@ -5,7 +5,7 @@ check bundled libsass version
 --FILE--
 <?php
 
-echo version_compare(Sass::getLibraryVersion(), '3.4.5')
+echo version_compare(Sass::getLibraryVersion(), '3.4.8')
 
 ?>
 --EXPECT--