[packages/minify] - drop obsolete files

glen glen at pld-linux.org
Sun Sep 1 10:27:12 CEST 2013


commit 6f35bf4d566688d056a47b778b565aabf4454c71
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Sep 1 11:27:02 2013 +0300

    - drop obsolete files

 32abbfa328dcccf785452dd9cd032f224e378645.patch |  36 --------
 8c54519b32b2230293be60c5f9a8f514401171fc.patch | 120 -------------------------
 a82d70b0baaa85c8ca234e39918d678e2b4bea76.patch |  37 --------
 3 files changed, 193 deletions(-)
---
diff --git a/32abbfa328dcccf785452dd9cd032f224e378645.patch b/32abbfa328dcccf785452dd9cd032f224e378645.patch
deleted file mode 100644
index 3776b6e..0000000
--- a/32abbfa328dcccf785452dd9cd032f224e378645.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 32abbfa328dcccf785452dd9cd032f224e378645 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen at delfi.ee>
-Date: Sun, 2 Dec 2012 23:20:22 +0200
-Subject: [PATCH] allow setGroup keys be list of groups comma separated
-
-this allows loading multiple groups on page with
-Minify_HTML_Helper::getUri, keeping array method for loading list of
-sources
-
-the backend side for handling this in Minify_Controller_MinApp is
-already present.
----
- min/lib/Minify/HTML/Helper.php |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/min/lib/Minify/HTML/Helper.php b/min/lib/Minify/HTML/Helper.php
-index 807fdc9..64afc03 100644
---- a/min/lib/Minify/HTML/Helper.php
-+++ b/min/lib/Minify/HTML/Helper.php
-@@ -103,8 +103,11 @@ public function setGroup($key, $checkLastModified = true)
-             }
-             if (is_file($this->groupsConfigFile)) {
-                 $gc = (require $this->groupsConfigFile);
--                if (isset($gc[$key])) {
--                    $this->_lastModified = self::getLastModified($gc[$key]);
-+                $keys = explode(',', $key);
-+                foreach ($keys as $key) {
-+                    if (isset($gc[$key])) {
-+                        $this->_lastModified = self::getLastModified($gc[$key], $this->_lastModified);
-+                    }
-                 }
-             }
-         }
--- 
-1.7.10
-
diff --git a/8c54519b32b2230293be60c5f9a8f514401171fc.patch b/8c54519b32b2230293be60c5f9a8f514401171fc.patch
deleted file mode 100644
index 17ae9ea..0000000
--- a/8c54519b32b2230293be60c5f9a8f514401171fc.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 8c54519b32b2230293be60c5f9a8f514401171fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen at delfi.ee>
-Date: Tue, 15 Jan 2013 14:53:45 +0200
-Subject: [PATCH] Minify_YUICompressor: add support for increasing stack size
-
----
- min/lib/Minify/YUICompressor.php      |   14 +++++++---
- min_unit_tests/test_Minify_YuiCSS.php |   46 +++++++++++++++++++++++++++++++++
- min_unit_tests/test_all.php           |    1 +
- 3 files changed, 58 insertions(+), 3 deletions(-)
- create mode 100644 min_unit_tests/test_Minify_YuiCSS.php
-
-diff --git a/min/lib/Minify/YUICompressor.php b/min/lib/Minify/YUICompressor.php
-index ef44629..8e6bfcb 100644
---- a/min/lib/Minify/YUICompressor.php
-+++ b/min/lib/Minify/YUICompressor.php
-@@ -13,14 +13,17 @@
-  * Java environment.
-  * 
-  * <code>
-- * Minify_YUICompressor::$jarFile = '/path/to/yuicompressor-2.3.5.jar';
-+ * Minify_YUICompressor::$jarFile = '/path/to/yuicompressor-2.4.6.jar';
-  * Minify_YUICompressor::$tempDir = '/tmp';
-  * $code = Minify_YUICompressor::minifyJs(
-  *   $code
-  *   ,array('nomunge' => true, 'line-break' => 1000)
-  * );
-  * </code>
-- * 
-+ *
-+ * Note: In case you run out stack (default is 512k), you may increase stack size in $options:
-+ *   array('stack-size' => '2048k')
-+ *
-  * @todo unit tests, $options docs
-  * 
-  * @package Minify
-@@ -108,10 +111,15 @@ private static function _getCmd($userOptions, $type, $tmpFile)
-                 ,'nomunge' => false
-                 ,'preserve-semi' => false
-                 ,'disable-optimizations' => false
-+	            ,'stack-size' => ''
-             )
-             ,$userOptions
-         );
--        $cmd = self::$javaExecutable . ' -jar ' . escapeshellarg(self::$jarFile)
-+        $cmd = self::$javaExecutable
-+	         . (!empty($o['stack-size'])
-+	            ? ' -Xss' . $o['stack-size']
-+	            : '')
-+	         . ' -jar ' . escapeshellarg(self::$jarFile)
-              . " --type {$type}"
-              . (preg_match('/^[\\da-zA-Z0-9\\-]+$/', $o['charset'])
-                 ? " --charset {$o['charset']}" 
-diff --git a/min_unit_tests/test_Minify_YuiCSS.php b/min_unit_tests/test_Minify_YuiCSS.php
-new file mode 100644
-index 0000000..b0f33d0
---- /dev/null
-+++ b/min_unit_tests/test_Minify_YuiCSS.php
-@@ -0,0 +1,46 @@
-+<?php
-+require_once '_inc.php';
-+
-+function test_Minify_YuiCSS()
-+{
-+    // XXX this may need customizing
-+    Minify_YUICompressor::$jarFile = '/usr/share/java/yuicompressor.jar';
-+    Minify_YUICompressor::$tempDir = sys_get_temp_dir();
-+
-+    $src = "/* stack overflow test */
-+    div.image {
-+      width:            100px;
-+      height:           100px;
-+      background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAALCAYAAABGbhwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1RDg4RDYwQzU2N0ExMUUyOUNCMEY5NzdDNzlGNzg3MSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1RDg4RDYwRDU2N0ExMUUyOUNCMEY5NzdDNzlGNzg3MSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkM0RjRBMkZGNTY3NzExRTI5Q0IwRjk3N0M3OUY3ODcxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkM0RjRBMzAwNTY3NzExRTI5Q0IwRjk3N0M3OUY3ODcxIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+2Di36AAAALBJREFUeNpi+P//PwMQ60NpdMwIxAYgNogTBsQHgNgGi0IVIN4CxH4whSDwAk2xLBCvh8odhgmuRlNsCMSboWLHgDgE2Zp5SIrXQNlXgNgI5kZkh9+AKvgGpZWAmAUkz8SAADxAfAfK5oTS7ED8B8yCmqYOxOuA+AcQXwDiJVATn8I8CFIUCA0CmMNNoZqXILnZHiQQjeRwU7RwhCk+xAB17A4gdgFiNiyBDlKcBBBgAG/qVav+VuC1AAAAAElFTkSuQmCC');
-+    }
-+    ";
-+    $minExpected = "div.image{width:100px;height:100px;background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAALCAYAAABGbhwYAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyRpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo1RDg4RDYwQzU2N0ExMUUyOUNCMEY5NzdDNzlGNzg3MSIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo1RDg4RDYwRDU2N0ExMUUyOUNCMEY5NzdDNzlGNzg3MSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkM0RjRBMkZGNTY3NzExRTI5Q0IwRjk3N0M3OUY3ODcxIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkM0RjRBMzAwNTY3NzExRTI5Q0IwRjk3N0M3OUY3ODcxIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+2Di36AAAALBJREFUeNpi+P//PwMQ60NpdMwIxAYgNogTBsQHgNgGi0IVIN4CxH4whSDwAk2xLBCvh8odhgmuRlNsCMSboWLHgDgE2Zp5SIrXQNlXgNgI5kZkh9+AKvgGpZWAmAUkz8SAADxAfAfK5oTS7ED8B8yCmqYOxOuA+AcQXwDiJVATn8I8CFIUCA0CmMNNoZqXILnZHiQQjeRwU7RwhCk+xAB17A4gdgFiNiyBDlKcBBBgAG/qVav+VuC1AAAAAElFTkSuQmCC')}";
-+
-+    // fails with java.lang.StackOverflowError as of Yui 2.4.6
-+    // unfortunately error output is not caught from yui, so have to guess
-+    try {
-+        $minOutput = Minify_YUICompressor::minifyCss($src);
-+        assertTrue(false, "Expected exception Not thrown");
-+    } catch (Exception $e) {
-+        assertTrue($e->getMessage() == 'Minify_YUICompressor : YUI compressor execution failed.', 'got expected Exception');
-+    }
-+
-+    try {
-+        $options = array(
-+            'stack-size' => '2m',
-+        );
-+        $minOutput = Minify_YUICompressor::minifyCss($src, $options);
-+    } catch (Exception $e) {
-+        assertTrue(false, $e->getMessage());;
-+        $minOutput = false;
-+    }
-+
-+    $passed = assertTrue($minExpected == $minOutput, 'Minify_YUICompressor : Overall');
-+    if (__FILE__ === realpath($_SERVER['SCRIPT_FILENAME'])) {
-+        echo "\n---Output: " .countBytes($minOutput). " bytes\n\n{$minOutput}\n\n";
-+        echo "---Expected: " .countBytes($minExpected). " bytes\n\n{$minExpected}\n\n";
-+        echo "---Source: " .countBytes($src). " bytes\n\n{$src}\n\n\n";
-+    }
-+}
-+
-+test_Minify_YuiCSS();
-diff --git a/min_unit_tests/test_all.php b/min_unit_tests/test_all.php
-index ff26b51..caba028 100644
---- a/min_unit_tests/test_all.php
-+++ b/min_unit_tests/test_all.php
-@@ -10,6 +10,7 @@
- require 'test_Minify_CSS.php';
- require 'test_Minify_CSS_UriRewriter.php';
- require 'test_Minify_JS_ClosureCompiler.php';
-+require 'test_Minify_YuiCSS.php';
- require 'test_Minify_CommentPreserver.php';
- require 'test_Minify_HTML.php';
- require 'test_Minify_ImportProcessor.php';
--- 
-1.7.10
-
diff --git a/a82d70b0baaa85c8ca234e39918d678e2b4bea76.patch b/a82d70b0baaa85c8ca234e39918d678e2b4bea76.patch
deleted file mode 100644
index c3d9190..0000000
--- a/a82d70b0baaa85c8ca234e39918d678e2b4bea76.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From a82d70b0baaa85c8ca234e39918d678e2b4bea76 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?= <glen at delfi.ee>
-Date: Sun, 25 Nov 2012 15:26:28 +0200
-Subject: [PATCH] use "Connection: close" of file_get_contents
-
-otherwise php will do keepalive request, and wait timeout seconds before
-can return actual response. similar problem does not happen with curl
-backend
----
- min/lib/Minify/JS/ClosureCompiler.php |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/min/lib/Minify/JS/ClosureCompiler.php b/min/lib/Minify/JS/ClosureCompiler.php
-index fb474d1..51f7cd1 100644
---- a/min/lib/Minify/JS/ClosureCompiler.php
-+++ b/min/lib/Minify/JS/ClosureCompiler.php
-@@ -69,7 +69,7 @@ public function min($js)
-         }
-         return $response;
-     }
--    
-+
-     protected $_fallbackFunc = null;
- 
-     protected function _getResponse($postBody)
-@@ -79,7 +79,7 @@ protected function _getResponse($postBody)
-             $contents = file_get_contents(self::URL, false, stream_context_create(array(
-                 'http' => array(
-                     'method' => 'POST',
--                    'header' => 'Content-type: application/x-www-form-urlencoded',
-+                    'header' => "Content-type: application/x-www-form-urlencoded\r\nConnection: close\r\n",
-                     'content' => $postBody,
-                     'max_redirects' => 0,
-                     'timeout' => 15,
--- 
-1.7.10
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/minify.git/commitdiff/6f35bf4d566688d056a47b778b565aabf4454c71



More information about the pld-cvs-commit mailing list