Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (bb78533374d8108c8f9c2592c2ed56f3450ef4af)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Sukneet Basuta <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (bb78533374d8108c8f9c2592c2ed56f3450ef4af)
  • Date: Wed, 30 May 2012 07:13:31 -0500

GIT changes to master grimoire by Sukneet Basuta <sukneet AT sourcemage.org>:

net/libproxy/HISTORY | 5 +++++
net/libproxy/PRE_BUILD | 4 ++++
net/libproxy/unistd.patch | 39 +++++++++++++++++++++++++++++++++++++++
3 files changed, 48 insertions(+)

New commits:
commit bb78533374d8108c8f9c2592c2ed56f3450ef4af
Author: Sukneet Basuta <sukneet AT sourcemage.org>
Commit: Sukneet Basuta <sukneet AT sourcemage.org>

libproxy: fix compilation with gcc 4.7
compilation with gcc 4.6 still works
unistd.patch: added, from fedora. Add unistd.h to files that need it
PRE_BUILD: added

diff --git a/net/libproxy/HISTORY b/net/libproxy/HISTORY
index 4d8cbab..e67ecc5 100644
--- a/net/libproxy/HISTORY
+++ b/net/libproxy/HISTORY
@@ -1,3 +1,8 @@
+2012-05-30 Sukneet Basuta <sukneet AT sourcemage.org>
+ * PRE_BUILD: added, to apply patch
+ * unistd.patch: added, fix compilation with gcc 4.7
+ from Fedora
+
2012-05-25 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: added missing opt deps and flags

diff --git a/net/libproxy/PRE_BUILD b/net/libproxy/PRE_BUILD
new file mode 100755
index 0000000..6fd1407
--- /dev/null
+++ b/net/libproxy/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd $SOURCE_DIRECTORY &&
+
+patch -p1 < $SPELL_DIRECTORY/unistd.patch
diff --git a/net/libproxy/unistd.patch b/net/libproxy/unistd.patch
new file mode 100644
index 0000000..9d5ccd3
--- /dev/null
+++ b/net/libproxy/unistd.patch
@@ -0,0 +1,39 @@
+--- libproxy-0.4.7/libproxy/url.cpp.orig 2012-02-28 21:05:15.572948027
+0000
++++ libproxy-0.4.7/libproxy/url.cpp 2012-02-28 21:05:45.635937474 +0000
+@@ -27,6 +27,7 @@
+ #define close _close
+ #endif
+ #include <fcntl.h> // For ::open()
++#include <unistd.h> // For ::read() and ::close()
+ #include <cstring> // For memcpy()
+ #include <sstream> // For int/string conversion (using stringstream)
+ #include <cstdio> // For sscanf()
+--- libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp.orig 2012-02-28
21:06:01.552943358 +0000
++++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp 2012-02-28
21:11:21.429953982 +0000
+@@ -18,6 +18,7 @@
+
******************************************************************************/
+
+ #include <sys/stat.h>
++#include <unistd.h>
+ #include <cstdlib>
+ #include <map>
+ #include <fstream>
+--- libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp.orig 2012-02-28
21:06:11.637943033 +0000
++++ libproxy-0.4.7/libproxy/modules/pacrunner_mozjs.cpp 2012-02-28
21:11:46.560961409 +0000
+@@ -17,6 +17,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
+
******************************************************************************/
+
++#include <unistd.h> // for ::gethostname()
+ #include <cstring> // ?
+
+ #include "../extension_pacrunner.hpp"
+--- libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp.orig 2012-02-28
21:06:29.615943614 +0000
++++ libproxy-0.4.7/libproxy/modules/pacrunner_webkit.cpp 2012-02-28
21:12:35.530965553 +0000
+@@ -17,6 +17,7 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301 USA
+
******************************************************************************/
+
++#include <unistd.h> // for ::gethostname()
+ #include "../extension_pacrunner.hpp"
+ using namespace libproxy;



  • [SM-Commit] GIT changes to master grimoire by Sukneet Basuta (bb78533374d8108c8f9c2592c2ed56f3450ef4af), Sukneet Basuta, 05/30/2012

Archive powered by MHonArc 2.6.24.

Top of Page