Ticket #12917: s21ej8r9RP.diff

File s21ej8r9RP.diff, 15.0 KB (added by kallisti5, 3 years ago)

Jessica's fix for Haiku build breakage.

Line 
1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2
3<html xmlns="http://www.w3.org/1999/xhtml">
4
5<head>
6    <title>Paste // Slexy 2.0</title>
7    <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
8    <meta name="Description" content="The Internet's Hottest Pastebin. Paste errors to debug, show off your code, or show off your tech specs. Slexy is the new Sexy." />
9    <link rel="stylesheet" href="/application/views/stylesheet_2.0.8.css" type="text/css" />
10    <link rel="shortcut icon" href="/favicon.ico" />
11        <style type="text/css">
12        #content .main .notices {
13            background: #a8d980;
14            border: 1px dotted #666;
15            padding-left: 3px;
16            padding-right: 3px;
17            margin-left: auto;
18            margin-right: auto;
19            width: 772px;
20            font-size: 12px;
21            text-align: center;
22            margin-top:10px;
23        }
24       
25        #content .main .notices span {
26            padding: 5px 0px 5px 0px;
27            margin: 0;
28            border: none;
29            color: #000;
30            display: block;
31        }
32       
33        #content .main .notices b {
34            color: #000;
35        }
36    </style>
37        </head>
38
39<body>
40
41<div id="content">
42    <div id="header">
43        <div id="logo">
44            <a href="/" title="Slexy 2.0"><img src="/application/views/images/slexy2.png" alt="Slexy 2.0" /></a>
45        </div>
46        <div id="carbonads-container">
47            <div class="carbonad" style="border-style: dotted;height: 115px;border: 8px dotted #e6e6e6;border-width:0 8px 5px;border-bottom-color:#eee;"">
48                <div id="azcarbon"></div>
49            </div>
50        </div>
51    </div>
52
53    <div id="navigation">
54        <div class="menu">
55            <span class="link"><a href="/">Paste</a></span>
56            &middot;
57            <span class="link"><a href="/recent">Recent</a></span>
58            &middot;
59            <span class="link"><a href="http://carbonads.net" target="_blank">Advertise</a></span>
60            &middot;
61            <span class="link"><a href="/contact">Contact</a></span>
62            &middot;
63            <span class="link"><a href="/about">About</a></span>
64        </div>
65    </div>
66
67    <script type="text/javascript">var z = document.createElement("script"); z.type = "text/javascript"; z.async = true; z.src = "http://engine.carbonads.com/z/18848/azcarbon_2_1_0_HORIZ?r="+(new Date).getTime(); var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(z, s);</script>
68    <div class="main" style="font-size: 13px;">
69    <div class="adserv"><a href="/adserv/43"><b>Slexy Feature</b> | Save your Name, Language, Line Number, and Tabbing preferences! Just click on 'Save Settings' before pasting.</a></div>
70   
71       
72        <table id="data" style="width:100%;height:50px;">
73        <tr>
74            <td valign="top">Author: <b>Anonymous</b></td>
75            <td valign="top">Language: <b>text</b></td>
76        </tr>
77       
78        <tr>
79            <td valign="top" style="width:400px;">Description: <b>No description</b></td>
80            <td valign="top">Timestamp: <b>2016-12-12 18:13:01 -0500</b></td>
81        </tr>
82       
83                <tr>
84                    <td valign="top">This paste is: <b>private</b></td>         <td valign="top">Expires: <b>2016-12-13 18:13:01 -0500</b></td>             </tr>
85                </table>
86
87        <table style="width:100%;height:50px;">
88        <tr>
89            <td>
90                <a href="/raw/s21ej8r9RP">View raw paste</a>
91            </td>
92            <td align="right">
93                                                            </td>
94            <td align="right" style="width:65px;">
95                <a href="/reply/s21ej8r9RP">Reply</a>
96            </td>
97        </tr>
98        </table>
99
100        <div style="padding: 5px;">
101        <div class="text" style="font-family:monospace;"><ol><li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">From 158b8e002238d8aaac7e0775e9dc0558d0a9caa2 Mon Sep 17 00:00:00 2001</div></li>
102<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">From: Jessica Hamilton &lt;jessica.l.hamilton@gmail.com&gt;</div></li>
103<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">Date: Sun, 11 Dec 2016 14:30:27 +0000</div></li>
104<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">Subject: [PATCH] get_package_dependencies: set include path for curl on Haiku</div></li>
105<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
106<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">---</div></li>
107<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;src/tools/get_package_dependencies/HTTPClient.cpp | 2 ++</div></li>
108<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;src/tools/get_package_dependencies/HTTPClient.h &nbsp; | 4 +++-</div></li>
109<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;src/tools/get_package_dependencies/Jamfile &nbsp; &nbsp; &nbsp; &nbsp;| 6 ++++++</div></li>
110<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;3 files changed, 11 insertions(+), 1 deletion(-)</div></li>
111<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
112<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">diff --git a/src/tools/get_package_dependencies/HTTPClient.cpp b/src/tools/get_package_dependencies/HTTPClient.cpp</div></li>
113<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">index 2297d4d..d4e6777 100644</div></li>
114<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">--- a/src/tools/get_package_dependencies/HTTPClient.cpp</div></li>
115<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+++ b/src/tools/get_package_dependencies/HTTPClient.cpp</div></li>
116<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">@@ -11,6 +11,8 @@</div></li>
117<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
118<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;#include &lt;File.h&gt;</div></li>
119<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
120<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+#include &lt;curl/curl.h&gt;</div></li>
121<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+</div></li>
122<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
123<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;HTTPClient::HTTPClient()</div></li>
124<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp; &nbsp; &nbsp; &nbsp; :</div></li>
125<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">diff --git a/src/tools/get_package_dependencies/HTTPClient.h b/src/tools/get_package_dependencies/HTTPClient.h</div></li>
126<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">index d178153..1b5fd33 100644</div></li>
127<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">--- a/src/tools/get_package_dependencies/HTTPClient.h</div></li>
128<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+++ b/src/tools/get_package_dependencies/HTTPClient.h</div></li>
129<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">@@ -11,7 +11,9 @@</div></li>
130<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
131<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;#include &lt;String.h&gt;</div></li>
132<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;#include &lt;Entry.h&gt;</div></li>
133<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">-#include &lt;curl/curl.h&gt;</div></li>
134<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+</div></li>
135<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+</div></li>
136<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+typedef void CURL;</div></li>
137<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
138<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
139<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;class HTTPClient {</div></li>
140<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">diff --git a/src/tools/get_package_dependencies/Jamfile b/src/tools/get_package_dependencies/Jamfile</div></li>
141<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">index 452afab..d6c7624 100644</div></li>
142<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">--- a/src/tools/get_package_dependencies/Jamfile</div></li>
143<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+++ b/src/tools/get_package_dependencies/Jamfile</div></li>
144<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">@@ -6,6 +6,12 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src bin pkgman ] ;</div></li>
145<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
146<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;USES_BE_API on &lt;build&gt;get_package_dependencies = true ;</div></li>
147<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
148<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+# TODO: remove this hack once gcc2 has -iquote implemented</div></li>
149<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+if $(HOST_PLATFORM) = haiku_host &amp;&amp; &nbsp;$(HOST_GCC_VERSION[1]) &lt; 3 {</div></li>
150<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+ &nbsp; &nbsp; &nbsp; local locations = system/non-packaged system ;</div></li>
151<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+ &nbsp; &nbsp; &nbsp; SourceHdrs HTTPClient.cpp : /boot/$(locations)/develop/headers/curl ;</div></li>
152<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+}</div></li>
153<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">+</div></li>
154<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;BuildPlatformMain &lt;build&gt;get_package_dependencies :</div></li>
155<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp; &nbsp; &nbsp; &nbsp; get_package_dependencies.cpp</div></li>
156<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp; &nbsp; &nbsp; &nbsp; HTTPClient.cpp</div></li>
157<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">-- </div></li>
158<li style="background: #f0f0f0;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">2.7.0</div></li>
159<li style="background: #fcfcfc;"><div style="font: normal normal 1em/1.2em monospace; margin:0; padding:0; background:none; vertical-align:top;">&nbsp;</div></li>
160</ol></div>     </div>
161
162        <table style="width:100%;height:50px;">
163        <tr>
164            <td>
165                <a href="/raw/s21ej8r9RP">View raw paste</a>
166            </td>
167            <td align="right">
168                                                            </td>
169            <td align="right" style="width:65px;">
170                <a href="/reply/s21ej8r9RP">Reply</a>
171            </td>
172        </tr>
173        </table>
174       
175       
176    </div>
177
178
179</div>
180
181<div id="footer">
182    Slexy &copy; 2016 Alesandro Ortiz // Created by Tom Bell<br />
183    Slexy v2.0.8
184</div>
185
186</body>
187
188</html>