From 36f44a39630a329b79432836ec6aecb8ab54a6e5 Mon Sep 17 00:00:00 2001

From: Julien Lepiller <julien@lepiller.eu>

Date: Tue, 28 Feb 2017 13:39:58 +0100

Subject: [PATCH] remove third party

---

 tools/gn/bootstrap/bootstrap.py | 34 +---------------------------------

 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py

index 90adca2..0c790a2 100755

--- a/tools/gn/bootstrap/bootstrap.py

+++ b/tools/gn/bootstrap/bootstrap.py

@@ -541,29 +541,9 @@ def write_gn_ninja(path, root_gen_dir, options):

         'base/time/time_posix.cc',

         'base/trace_event/heap_profiler_allocation_register_posix.cc',

     ])

-    static_libraries['libevent'] = {

-        'sources': [

-            'base/third_party/libevent/buffer.c',

-            'base/third_party/libevent/evbuffer.c',

-            'base/third_party/libevent/evdns.c',

-            'base/third_party/libevent/event.c',

-            'base/third_party/libevent/event_tagging.c',

-            'base/third_party/libevent/evrpc.c',

-            'base/third_party/libevent/evutil.c',

-            'base/third_party/libevent/http.c',

-            'base/third_party/libevent/log.c',

-            'base/third_party/libevent/poll.c',

-            'base/third_party/libevent/select.c',

-            'base/third_party/libevent/signal.c',

-            'base/third_party/libevent/strlcpy.c',

-        ],

-        'tool': 'cc',

-        'include_dirs': [],

-        'cflags': cflags + ['-DHAVE_CONFIG_H'],

-    }

   if is_linux:

-    libs.extend(['-lrt', '-latomic'])

+    libs.extend(['-lrt', '-latomic', '-levent'])

     ldflags.extend(['-pthread'])

     static_libraries['xdg_user_dirs'] = {

@@ -587,12 +567,6 @@ def write_gn_ninja(path, root_gen_dir, options):

         'base/threading/platform_thread_linux.cc',

         'base/trace_event/malloc_dump_provider.cc',

     ])

-    static_libraries['libevent']['include_dirs'].extend([

-        os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux')

-    ])

-    static_libraries['libevent']['sources'].extend([

-        'base/third_party/libevent/epoll.c',

-    ])

   if is_mac:

@@ -622,12 +596,6 @@ def write_gn_ninja(path, root_gen_dir, options):

         'base/threading/platform_thread_mac.mm',

         'base/trace_event/malloc_dump_provider.cc',

     ])

-    static_libraries['libevent']['include_dirs'].extend([

-        os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'mac')

-    ])

-    static_libraries['libevent']['sources'].extend([

-        'base/third_party/libevent/kqueue.c',

-    ])

     libs.extend([

         '-framework', 'AppKit',

-- 

2.7.4

  #:use-module (gnu packages compression)

  #:use-module (gnu packages icu4c)

  #:use-module (gnu packages fontutils)

  #:use-module (gnu packages gnuzilla)

  #:use-module (gnu packages image)

  #:use-module (gnu packages libevent)

  #:use-module (gnu packages xml)

        (patches (search-patches "chromium-gn-remove-third-party.patch"))

           (delete-file-recursively "base/third_party/libevent")))))

(define-public skia

  (package

    (name "skia")

    (version "0")

    (source

      (origin

        (method git-fetch)

        (uri (git-reference

               (url "https://skia.googlesource.com/skia.git")

               (commit "c746bc15c167bc2a22169c2211fd2e65d9e266f5")))

        (file-name (string-append name "-" version))

        (sha256

         (base32

          "1x5m8ri6hmj9pbq4amglhkwbkcvhqp4vh8njwlrnlrsaipfdy62c"))

        (modules '((guix build utils)))

        (snippet

         `(delete-file-recursively "third_party"))))

    (build-system gnu-build-system)

    (arguments

     `(#:tests? #f

       #:phases

       (modify-phases %standard-phases

         (replace 'configure

           (lambda* (#:key outputs #:allow-other-keys)

             (zero? (system*

                      "gn" "gen" "out/Shared"

                      (string-append "--args="

                                     "cc=\"gcc\" "

                                     "cxx=\"g++\" "

                                     "skia_use_sfntly=false "

                                     "skia_use_system_expat=true "

                                     "skia_use_system_libjpeg_turbo=true "

                                     "skia_use_system_freetype2=true "

                                     ;"skia_use_system_icu=true "

                                     "skia_use_system_libpng=true "

                                     "skia_use_system_libwebp=true "

                                     "skia_use_system_zlib=true "

                                     "is_official_build=true "

                                     "is_component_build=true")))))

         (replace 'build

           (lambda* (#:key outputs #:allow-other-keys)

             (zero? (system* "ninja" "-C" "out/Shared")))))))

    (native-inputs

     `(("gn" ,google-gn)

       ("ninja" ,ninja)

       ("python" ,python-2)))

    (inputs

     `(("expat" ,expat)

       ("freetype" ,freetype)

       ("libpng" ,libpng)

       ("libz" ,zlib)

       ("icu" ,icu4c)

       ("libwebp" ,libwebp)

       ("libjpeg-turbo" ,libjpeg-turbo)))

    (home-page "https://skia.org")

    (synopsis "Graphics library")

    (description "Graphics library.")

    (license "bsd-3")))

         (add-before 'build 'fix-include

           (lambda* (#:key inputs #:allow-other-keys)

             (let* ((libevent (assoc-ref inputs "libevent"))

                    (event-h (string-append libevent "/include/event.h")))

               (substitute* "base/message_loop/message_pump_libevent.cc"

                 (("base/third_party/libevent/event.h") event-h)))))

    (inputs

     `(("libevent" ,libevent)

       ("icu" ,icu4c)

       ("nspr" ,nspr)))