[arch-commits] Commit in libproxy/repos (12 files)

2016-10-31 Thread Jan de Groot 
Date: Monday, October 31, 2016 @ 09:24:08
  Author: jgc
Revision: 279522

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  libproxy/repos/extra-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 279521, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/extra-i686/PKGBUILD
(from rev 279521, libproxy/trunk/PKGBUILD)
  libproxy/repos/extra-i686/libproxy-0.4.11-crash.patch
(from rev 279521, libproxy/trunk/libproxy-0.4.11-crash.patch)
  libproxy/repos/extra-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 279521, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/extra-x86_64/PKGBUILD
(from rev 279521, libproxy/trunk/PKGBUILD)
  libproxy/repos/extra-x86_64/libproxy-0.4.11-crash.patch
(from rev 279521, libproxy/trunk/libproxy-0.4.11-crash.patch)
Deleted:
  libproxy/repos/extra-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
  libproxy/repos/extra-i686/PKGBUILD
  libproxy/repos/extra-i686/libproxy-0.4.11-crash.patch
  libproxy/repos/extra-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
  libproxy/repos/extra-x86_64/PKGBUILD
  libproxy/repos/extra-x86_64/libproxy-0.4.11-crash.patch

-+
 /0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch |  180 
++
 /PKGBUILD   |  104 +
 /libproxy-0.4.11-crash.patch|   82 
 extra-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch   |   90 -
 extra-i686/PKGBUILD |   52 --
 extra-i686/libproxy-0.4.11-crash.patch  |   41 --
 extra-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch |   90 -
 extra-x86_64/PKGBUILD   |   52 --
 extra-x86_64/libproxy-0.4.11-crash.patch|   41 --
 9 files changed, 366 insertions(+), 366 deletions(-)

Deleted: extra-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
===
--- extra-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch   
2016-10-31 09:24:02 UTC (rev 279521)
+++ extra-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch   
2016-10-31 09:24:08 UTC (rev 279522)
@@ -1,90 +0,0 @@
-From 44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001
-From: Colin Walters 
-Date: Mon, 3 Jun 2013 17:09:25 -0400
-Subject: [PATCH] pacrunner_mozjs: Also support mozjs-17.0
-
-GNOME 3.10 is moving to hard require mozjs-17.0, so we should support
-it too.  See also:
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59830
-https://bugzilla.gnome.org/show_bug.cgi?id=690982

- libproxy/cmake/modules/pacrunner_mozjs.cmk |8 +++-
- libproxy/modules/pacrunner_mozjs.cpp   |   16 +---
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk 
b/libproxy/cmake/modules/pacrunner_mozjs.cmk
-index 21072db..49856a6 100644
 a/libproxy/cmake/modules/pacrunner_mozjs.cmk
-+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
-@@ -14,7 +14,13 @@ elseif(NOT APPLE)
-   include_directories(${MOZJS_INCLUDE_DIRS})
-   link_directories(${MOZJS_LIBRARY_DIRS})
- else()
--  set(MOZJS_FOUND 0)
-+  pkg_search_module(MOZJS mozjs-17.0)
-+  if(MOZJS_FOUND)
-+include_directories(${MOZJS_INCLUDE_DIRS})
-+link_directories(${MOZJS_LIBRARY_DIRS})
-+  else()
-+set(MOZJS_FOUND 0)
-+  endif()
- endif()
-   else()
- set(MOZJS_FOUND 0)
-diff --git a/libproxy/modules/pacrunner_mozjs.cpp 
b/libproxy/modules/pacrunner_mozjs.cpp
-index abb4b9d..f5e678c 100644
 a/libproxy/modules/pacrunner_mozjs.cpp
-+++ b/libproxy/modules/pacrunner_mozjs.cpp
-@@ -19,6 +19,7 @@
- 
- #include  // ?
- #include  // gethostname
-+#include 
- 
- #include "../extension_pacrunner.hpp"
- using namespace libproxy;
-@@ -76,12 +77,12 @@ static JSBool dnsResolve_(JSContext *cx, jsval hostname, 
jsval *vp) {
-   return true;
- }
- 
--static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) {
-+static JSBool dnsResolve(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
-   jsval *argv = JS_ARGV(cx, vp);
-   return dnsResolve_(cx, argv[0], vp);
- }
- 
--static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
-+static JSBool myIpAddress(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
-   char *hostname = (char *) JS_malloc(cx, 1024);
-   if (!gethostname(hostname, 1023)) {
-   JSString *myhost = JS_NewStringCopyN(cx, hostname, 
strlen(hostname));
-@@ -98,7 +99,12 @@ static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, 
jsval *vp) {
- static JSClass cls = {
-   "global", JSCLASS_GLOBAL_FLAGS,
-   JS_PropertyStub,

[arch-commits] Commit in libproxy/repos (12 files)

2016-02-19 Thread Jan de Groot 
Date: Friday, February 19, 2016 @ 15:46:14
  Author: jgc
Revision: 25

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  libproxy/repos/testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 259998, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/testing-i686/PKGBUILD
(from rev 259998, libproxy/trunk/PKGBUILD)
  libproxy/repos/testing-i686/libproxy-0.4.11-crash.patch
(from rev 259998, libproxy/trunk/libproxy-0.4.11-crash.patch)
  
libproxy/repos/testing-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 259998, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/testing-x86_64/PKGBUILD
(from rev 259998, libproxy/trunk/PKGBUILD)
  libproxy/repos/testing-x86_64/libproxy-0.4.11-crash.patch
(from rev 259998, libproxy/trunk/libproxy-0.4.11-crash.patch)
Deleted:
  libproxy/repos/testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
  libproxy/repos/testing-i686/PKGBUILD
  libproxy/repos/testing-i686/libproxy-0.4.11-crash.patch
  
libproxy/repos/testing-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
  libproxy/repos/testing-x86_64/PKGBUILD
  libproxy/repos/testing-x86_64/libproxy-0.4.11-crash.patch

---+
 /0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch   |  180 
++
 /PKGBUILD |  104 +
 /libproxy-0.4.11-crash.patch  |   82 
 testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch   |   90 -
 testing-i686/PKGBUILD |   52 --
 testing-i686/libproxy-0.4.11-crash.patch  |   41 --
 testing-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch |   90 -
 testing-x86_64/PKGBUILD   |   52 --
 testing-x86_64/libproxy-0.4.11-crash.patch|   41 --
 9 files changed, 366 insertions(+), 366 deletions(-)

Deleted: testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
===
--- testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
2016-02-19 14:46:06 UTC (rev 259998)
+++ testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
2016-02-19 14:46:14 UTC (rev 25)
@@ -1,90 +0,0 @@
-From 44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001
-From: Colin Walters 
-Date: Mon, 3 Jun 2013 17:09:25 -0400
-Subject: [PATCH] pacrunner_mozjs: Also support mozjs-17.0
-
-GNOME 3.10 is moving to hard require mozjs-17.0, so we should support
-it too.  See also:
-
-https://bugs.freedesktop.org/show_bug.cgi?id=59830
-https://bugzilla.gnome.org/show_bug.cgi?id=690982

- libproxy/cmake/modules/pacrunner_mozjs.cmk |8 +++-
- libproxy/modules/pacrunner_mozjs.cpp   |   16 +---
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk 
b/libproxy/cmake/modules/pacrunner_mozjs.cmk
-index 21072db..49856a6 100644
 a/libproxy/cmake/modules/pacrunner_mozjs.cmk
-+++ b/libproxy/cmake/modules/pacrunner_mozjs.cmk
-@@ -14,7 +14,13 @@ elseif(NOT APPLE)
-   include_directories(${MOZJS_INCLUDE_DIRS})
-   link_directories(${MOZJS_LIBRARY_DIRS})
- else()
--  set(MOZJS_FOUND 0)
-+  pkg_search_module(MOZJS mozjs-17.0)
-+  if(MOZJS_FOUND)
-+include_directories(${MOZJS_INCLUDE_DIRS})
-+link_directories(${MOZJS_LIBRARY_DIRS})
-+  else()
-+set(MOZJS_FOUND 0)
-+  endif()
- endif()
-   else()
- set(MOZJS_FOUND 0)
-diff --git a/libproxy/modules/pacrunner_mozjs.cpp 
b/libproxy/modules/pacrunner_mozjs.cpp
-index abb4b9d..f5e678c 100644
 a/libproxy/modules/pacrunner_mozjs.cpp
-+++ b/libproxy/modules/pacrunner_mozjs.cpp
-@@ -19,6 +19,7 @@
- 
- #include  // ?
- #include  // gethostname
-+#include 
- 
- #include "../extension_pacrunner.hpp"
- using namespace libproxy;
-@@ -76,12 +77,12 @@ static JSBool dnsResolve_(JSContext *cx, jsval hostname, 
jsval *vp) {
-   return true;
- }
- 
--static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) {
-+static JSBool dnsResolve(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
-   jsval *argv = JS_ARGV(cx, vp);
-   return dnsResolve_(cx, argv[0], vp);
- }
- 
--static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
-+static JSBool myIpAddress(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
-   char *hostname = (char *) JS_malloc(cx, 1024);
-   if (!gethostname(hostname, 1023)) {
-   JSString *myhost = JS_NewStringCopyN(cx, hostname, 
strlen(hostname));
-@@ -98,7 +99,12 @@ static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, 
jsval *vp) {
- static JSClass cls = {
-   "global",

[arch-commits] Commit in libproxy/repos (12 files)

2015-12-05 Thread Evangelos Foutras 
Date: Sunday, December 6, 2015 @ 06:42:47
  Author: foutrelis
Revision: 252600

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  libproxy/repos/staging-i686/
  libproxy/repos/staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 252597, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/staging-i686/PKGBUILD
(from rev 252597, libproxy/trunk/PKGBUILD)
  libproxy/repos/staging-i686/dont_segfault_on_exit.patch
(from rev 252597, libproxy/trunk/dont_segfault_on_exit.patch)
  libproxy/repos/staging-i686/libproxy-0.4.11-crash.patch
(from rev 252597, libproxy/trunk/libproxy-0.4.11-crash.patch)
  libproxy/repos/staging-i686/libproxy-0.4.11-fdleak.patch
(from rev 252597, libproxy/trunk/libproxy-0.4.11-fdleak.patch)
  libproxy/repos/staging-x86_64/
  
libproxy/repos/staging-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 252597, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/staging-x86_64/PKGBUILD
(from rev 252597, libproxy/trunk/PKGBUILD)
  libproxy/repos/staging-x86_64/dont_segfault_on_exit.patch
(from rev 252597, libproxy/trunk/dont_segfault_on_exit.patch)
  libproxy/repos/staging-x86_64/libproxy-0.4.11-crash.patch
(from rev 252597, libproxy/trunk/libproxy-0.4.11-crash.patch)
  libproxy/repos/staging-x86_64/libproxy-0.4.11-fdleak.patch
(from rev 252597, libproxy/trunk/libproxy-0.4.11-fdleak.patch)

---+
 staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch   |   90 
++
 staging-i686/PKGBUILD |   59 ++
 staging-i686/dont_segfault_on_exit.patch  |   14 +
 staging-i686/libproxy-0.4.11-crash.patch  |   41 
 staging-i686/libproxy-0.4.11-fdleak.patch |   20 ++
 staging-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch |   90 
++
 staging-x86_64/PKGBUILD   |   59 ++
 staging-x86_64/dont_segfault_on_exit.patch|   14 +
 staging-x86_64/libproxy-0.4.11-crash.patch|   41 
 staging-x86_64/libproxy-0.4.11-fdleak.patch   |   20 ++
 10 files changed, 448 insertions(+)

Copied: 
libproxy/repos/staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
(from rev 252597, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
===
--- staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
(rev 0)
+++ staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
2015-12-06 05:42:47 UTC (rev 252600)
@@ -0,0 +1,90 @@
+From 44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001
+From: Colin Walters 
+Date: Mon, 3 Jun 2013 17:09:25 -0400
+Subject: [PATCH] pacrunner_mozjs: Also support mozjs-17.0
+
+GNOME 3.10 is moving to hard require mozjs-17.0, so we should support
+it too.  See also:
+
+https://bugs.freedesktop.org/show_bug.cgi?id=59830
+https://bugzilla.gnome.org/show_bug.cgi?id=690982
+---
+ libproxy/cmake/modules/pacrunner_mozjs.cmk |8 +++-
+ libproxy/modules/pacrunner_mozjs.cpp   |   16 +---
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk 
b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+index 21072db..49856a6 100644
+--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
 b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+@@ -14,7 +14,13 @@ elseif(NOT APPLE)
+   include_directories(${MOZJS_INCLUDE_DIRS})
+   link_directories(${MOZJS_LIBRARY_DIRS})
+ else()
+-  set(MOZJS_FOUND 0)
++  pkg_search_module(MOZJS mozjs-17.0)
++  if(MOZJS_FOUND)
++include_directories(${MOZJS_INCLUDE_DIRS})
++link_directories(${MOZJS_LIBRARY_DIRS})
++  else()
++set(MOZJS_FOUND 0)
++  endif()
+ endif()
+   else()
+ set(MOZJS_FOUND 0)
+diff --git a/libproxy/modules/pacrunner_mozjs.cpp 
b/libproxy/modules/pacrunner_mozjs.cpp
+index abb4b9d..f5e678c 100644
+--- a/libproxy/modules/pacrunner_mozjs.cpp
 b/libproxy/modules/pacrunner_mozjs.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include  // ?
+ #include  // gethostname
++#include 
+ 
+ #include "../extension_pacrunner.hpp"
+ using namespace libproxy;
+@@ -76,12 +77,12 @@ static JSBool dnsResolve_(JSContext *cx, jsval hostname, 
jsval *vp) {
+   return true;
+ }
+ 
+-static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) {
++static JSBool dnsResolve(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
+   jsval *argv = JS_ARGV(cx, vp);
+   return dnsResolve_(cx, argv[0], vp);
+ }
+ 
+-static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
++static JSBool myIpAddress(JSContext *cx,

[arch-commits] Commit in libproxy/repos (12 files)

2015-06-14 Thread Evangelos Foutras 
Date: Sunday, June 14, 2015 @ 17:26:32
  Author: foutrelis
Revision: 240760

archrelease: copy trunk to staging-i686, staging-x86_64

Added:
  libproxy/repos/staging-i686/
  libproxy/repos/staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 240759, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/staging-i686/PKGBUILD
(from rev 240759, libproxy/trunk/PKGBUILD)
  libproxy/repos/staging-i686/dont_segfault_on_exit.patch
(from rev 240759, libproxy/trunk/dont_segfault_on_exit.patch)
  libproxy/repos/staging-i686/libproxy-0.4.11-crash.patch
(from rev 240759, libproxy/trunk/libproxy-0.4.11-crash.patch)
  libproxy/repos/staging-i686/libproxy-0.4.11-fdleak.patch
(from rev 240759, libproxy/trunk/libproxy-0.4.11-fdleak.patch)
  libproxy/repos/staging-x86_64/
  
libproxy/repos/staging-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 240759, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/staging-x86_64/PKGBUILD
(from rev 240759, libproxy/trunk/PKGBUILD)
  libproxy/repos/staging-x86_64/dont_segfault_on_exit.patch
(from rev 240759, libproxy/trunk/dont_segfault_on_exit.patch)
  libproxy/repos/staging-x86_64/libproxy-0.4.11-crash.patch
(from rev 240759, libproxy/trunk/libproxy-0.4.11-crash.patch)
  libproxy/repos/staging-x86_64/libproxy-0.4.11-fdleak.patch
(from rev 240759, libproxy/trunk/libproxy-0.4.11-fdleak.patch)

---+
 staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch   |   90 
++
 staging-i686/PKGBUILD |   59 ++
 staging-i686/dont_segfault_on_exit.patch  |   14 +
 staging-i686/libproxy-0.4.11-crash.patch  |   41 
 staging-i686/libproxy-0.4.11-fdleak.patch |   20 ++
 staging-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch |   90 
++
 staging-x86_64/PKGBUILD   |   59 ++
 staging-x86_64/dont_segfault_on_exit.patch|   14 +
 staging-x86_64/libproxy-0.4.11-crash.patch|   41 
 staging-x86_64/libproxy-0.4.11-fdleak.patch   |   20 ++
 10 files changed, 448 insertions(+)

Copied: 
libproxy/repos/staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
(from rev 240759, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
===
--- staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
(rev 0)
+++ staging-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
2015-06-14 15:26:32 UTC (rev 240760)
@@ -0,0 +1,90 @@
+From 44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001
+From: Colin Walters walt...@verbum.org
+Date: Mon, 3 Jun 2013 17:09:25 -0400
+Subject: [PATCH] pacrunner_mozjs: Also support mozjs-17.0
+
+GNOME 3.10 is moving to hard require mozjs-17.0, so we should support
+it too.  See also:
+
+https://bugs.freedesktop.org/show_bug.cgi?id=59830
+https://bugzilla.gnome.org/show_bug.cgi?id=690982
+---
+ libproxy/cmake/modules/pacrunner_mozjs.cmk |8 +++-
+ libproxy/modules/pacrunner_mozjs.cpp   |   16 +---
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk 
b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+index 21072db..49856a6 100644
+--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
 b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+@@ -14,7 +14,13 @@ elseif(NOT APPLE)
+   include_directories(${MOZJS_INCLUDE_DIRS})
+   link_directories(${MOZJS_LIBRARY_DIRS})
+ else()
+-  set(MOZJS_FOUND 0)
++  pkg_search_module(MOZJS mozjs-17.0)
++  if(MOZJS_FOUND)
++include_directories(${MOZJS_INCLUDE_DIRS})
++link_directories(${MOZJS_LIBRARY_DIRS})
++  else()
++set(MOZJS_FOUND 0)
++  endif()
+ endif()
+   else()
+ set(MOZJS_FOUND 0)
+diff --git a/libproxy/modules/pacrunner_mozjs.cpp 
b/libproxy/modules/pacrunner_mozjs.cpp
+index abb4b9d..f5e678c 100644
+--- a/libproxy/modules/pacrunner_mozjs.cpp
 b/libproxy/modules/pacrunner_mozjs.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include cstring // ?
+ #include unistd.h // gethostname
++#include stdint.h
+ 
+ #include ../extension_pacrunner.hpp
+ using namespace libproxy;
+@@ -76,12 +77,12 @@ static JSBool dnsResolve_(JSContext *cx, jsval hostname, 
jsval *vp) {
+   return true;
+ }
+ 
+-static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) {
++static JSBool dnsResolve(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
+   jsval *argv = JS_ARGV(cx, vp);
+   return dnsResolve_(cx, argv[0], vp);
+ }
+ 
+-static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
++static JSBool

[arch-commits] Commit in libproxy/repos (12 files)

2015-03-05 Thread Jan de Groot 
Date: Thursday, March 5, 2015 @ 09:57:39
  Author: jgc
Revision: 232883

archrelease: copy trunk to testing-i686, testing-x86_64

Added:
  libproxy/repos/testing-i686/
  libproxy/repos/testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 232882, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/testing-i686/PKGBUILD
(from rev 232882, libproxy/trunk/PKGBUILD)
  libproxy/repos/testing-i686/dont_segfault_on_exit.patch
(from rev 232882, libproxy/trunk/dont_segfault_on_exit.patch)
  libproxy/repos/testing-i686/libproxy-0.4.11-crash.patch
(from rev 232882, libproxy/trunk/libproxy-0.4.11-crash.patch)
  libproxy/repos/testing-i686/libproxy-0.4.11-fdleak.patch
(from rev 232882, libproxy/trunk/libproxy-0.4.11-fdleak.patch)
  libproxy/repos/testing-x86_64/
  
libproxy/repos/testing-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch
(from rev 232882, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
  libproxy/repos/testing-x86_64/PKGBUILD
(from rev 232882, libproxy/trunk/PKGBUILD)
  libproxy/repos/testing-x86_64/dont_segfault_on_exit.patch
(from rev 232882, libproxy/trunk/dont_segfault_on_exit.patch)
  libproxy/repos/testing-x86_64/libproxy-0.4.11-crash.patch
(from rev 232882, libproxy/trunk/libproxy-0.4.11-crash.patch)
  libproxy/repos/testing-x86_64/libproxy-0.4.11-fdleak.patch
(from rev 232882, libproxy/trunk/libproxy-0.4.11-fdleak.patch)

---+
 testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch   |   90 
++
 testing-i686/PKGBUILD |   59 ++
 testing-i686/dont_segfault_on_exit.patch  |   14 +
 testing-i686/libproxy-0.4.11-crash.patch  |   41 
 testing-i686/libproxy-0.4.11-fdleak.patch |   20 ++
 testing-x86_64/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch |   90 
++
 testing-x86_64/PKGBUILD   |   59 ++
 testing-x86_64/dont_segfault_on_exit.patch|   14 +
 testing-x86_64/libproxy-0.4.11-crash.patch|   41 
 testing-x86_64/libproxy-0.4.11-fdleak.patch   |   20 ++
 10 files changed, 448 insertions(+)

Copied: 
libproxy/repos/testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
(from rev 232882, 
libproxy/trunk/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch)
===
--- testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
(rev 0)
+++ testing-i686/0001-pacrunner_mozjs-Also-support-mozjs-17.0.patch 
2015-03-05 08:57:39 UTC (rev 232883)
@@ -0,0 +1,90 @@
+From 44ce0c8a251d987d0d83f05e93d31aa659d7 Mon Sep 17 00:00:00 2001
+From: Colin Walters walt...@verbum.org
+Date: Mon, 3 Jun 2013 17:09:25 -0400
+Subject: [PATCH] pacrunner_mozjs: Also support mozjs-17.0
+
+GNOME 3.10 is moving to hard require mozjs-17.0, so we should support
+it too.  See also:
+
+https://bugs.freedesktop.org/show_bug.cgi?id=59830
+https://bugzilla.gnome.org/show_bug.cgi?id=690982
+---
+ libproxy/cmake/modules/pacrunner_mozjs.cmk |8 +++-
+ libproxy/modules/pacrunner_mozjs.cpp   |   16 +---
+ 2 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/libproxy/cmake/modules/pacrunner_mozjs.cmk 
b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+index 21072db..49856a6 100644
+--- a/libproxy/cmake/modules/pacrunner_mozjs.cmk
 b/libproxy/cmake/modules/pacrunner_mozjs.cmk
+@@ -14,7 +14,13 @@ elseif(NOT APPLE)
+   include_directories(${MOZJS_INCLUDE_DIRS})
+   link_directories(${MOZJS_LIBRARY_DIRS})
+ else()
+-  set(MOZJS_FOUND 0)
++  pkg_search_module(MOZJS mozjs-17.0)
++  if(MOZJS_FOUND)
++include_directories(${MOZJS_INCLUDE_DIRS})
++link_directories(${MOZJS_LIBRARY_DIRS})
++  else()
++set(MOZJS_FOUND 0)
++  endif()
+ endif()
+   else()
+ set(MOZJS_FOUND 0)
+diff --git a/libproxy/modules/pacrunner_mozjs.cpp 
b/libproxy/modules/pacrunner_mozjs.cpp
+index abb4b9d..f5e678c 100644
+--- a/libproxy/modules/pacrunner_mozjs.cpp
 b/libproxy/modules/pacrunner_mozjs.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include cstring // ?
+ #include unistd.h // gethostname
++#include stdint.h
+ 
+ #include ../extension_pacrunner.hpp
+ using namespace libproxy;
+@@ -76,12 +77,12 @@ static JSBool dnsResolve_(JSContext *cx, jsval hostname, 
jsval *vp) {
+   return true;
+ }
+ 
+-static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) {
++static JSBool dnsResolve(JSContext *cx, uint32_t /*argc*/, jsval *vp) {
+   jsval *argv = JS_ARGV(cx, vp);
+   return dnsResolve_(cx, argv[0], vp);
+ }
+ 
+-static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) {
++static JSBool