- Remove patch files as requested by maintainer in the PR, and unbreak

Reported by:	pointyhat
Pointy hat to:	wen
Feature safe:	yes

2 files changed, 0 insertions, 65 deletions

diff --git a/devel/php-libawl/files/patch-inc-iCalendar.php b/devel/php-libawl/files/patch-inc-iCalendar.php
deleted file mode 100644
index 8c2e1b8cda9b..000000000000
--- a/devel/php-libawl/files/patch-inc-iCalendar.php
+++ /dev/null
@@ -1,37 +0,0 @@
---- inc/iCalendar.php.old	2011-02-28 14:10:05.863011862 +0100
-+++ inc/iCalendar.php	2011-02-28 14:10:54.276562796 +0100
-@@ -233,7 +233,7 @@
-   function RenderParameters() {
-     $rendered = "";
-     foreach( $this->parameters AS $k => $v ) {
--      $escaped = preg_replace( "/([;:\"])/", '\\\\$1', $v);
-+      $escaped = preg_replace( "/([;:])/", '\\\\$1', $v);
-       $rendered .= sprintf( ";%s=%s", $k, $escaped );
-     }
-     return $rendered;
-@@ -273,7 +273,7 @@
-       default:
-         $escaped = str_replace( '\\', '\\\\', $escaped);
-         $escaped = preg_replace( '/\r?\n/', '\\n', $escaped);
--        $escaped = preg_replace( "/([,;\"])/", '\\\\$1', $escaped);
-+        $escaped = preg_replace( "/([,;])/", '\\\\$1', $escaped);
-     }
-     $property = sprintf( "%s%s:", $this->name, $this->RenderParameters() );
-     if ( (strlen($property) + strlen($escaped)) <= 72 ) {
-@@ -786,7 +786,7 @@
-   */
-   function CloneConfidential() {
-     $confidential = clone($this);
--    $keep_properties = array( 'DTSTAMP', 'DTSTART', 'RRULE', 'DURATION', 'DTEND', 'UID', 'CLASS', 'TRANSP' );
-+    $keep_properties = array( 'DTSTAMP', 'DTSTART', 'RRULE', 'DURATION', 'DTEND', 'DUE', 'UID', 'CLASS', 'TRANSP', 'CREATED', 'LAST-MODIFIED' );
-     $resource_components = array( 'VEVENT', 'VTODO', 'VJOURNAL' );
-     $confidential->MaskComponents(array( 'VTIMEZONE', 'VEVENT', 'VTODO', 'VJOURNAL' ));
-     $confidential->MaskProperties($keep_properties, $resource_components );
-@@ -822,6 +822,7 @@
-     foreach( $this->components AS $v ) {   $rendered .= $v->Render();  }
-     $rendered .= "END:$this->type\r\n";
- 
-+    $rendered = preg_replace('{(?<!\r)\n}', '\r\n', $rendered);
-     if ( $unrestricted ) $this->rendered = $rendered;
- 
-     return $rendered;
diff --git a/devel/php-libawl/files/patch-inc-vComponents.php b/devel/php-libawl/files/patch-inc-vComponents.php
deleted file mode 100644
index 36f33b699748..000000000000
--- a/devel/php-libawl/files/patch-inc-vComponents.php
+++ /dev/null
@@ -1,28 +0,0 @@
---- inc/vComponent.php.old	2010-12-01 04:18:52.000000000 +0100
-+++ inc/vComponent.php	2011-02-28 14:11:24.757189028 +0100
-@@ -203,7 +203,7 @@
-   function RenderParameters() {
-     $rendered = "";
-     foreach( $this->parameters AS $k => $v ) {
--      $escaped = preg_replace( "/([;:\"])/", '\\\\$1', $v);
-+      $escaped = preg_replace( "/([;:])/", '\\\\$1', $v);
-       $rendered .= sprintf( ";%s=%s", $k, $escaped );
-     }
-     return $rendered;
-@@ -235,7 +235,7 @@
-       default:
-         $escaped = str_replace( '\\', '\\\\', $escaped);
-         $escaped = preg_replace( '/\r?\n/', '\\n', $escaped);
--        $escaped = preg_replace( "/([,;\"])/", '\\\\$1', $escaped);
-+        $escaped = preg_replace( "/([,;])/", '\\\\$1', $escaped);
-     }
- 
-     $property = sprintf( "%s%s:", $this->name, $this->RenderParameters() );
-@@ -800,6 +800,7 @@
-     foreach( $this->components AS $v ) {   $rendered .= $v->Render();  }
-     $rendered .= "END:$this->type\r\n";
- 
-+    $rendered = preg_replace('{(?<!\r)\n}', '\r\n', $rendered);
-     if ( $unrestricted ) $this->rendered = $rendered;
- 
-     return $rendered;