[arch-commits] Commit in electron/trunk (7 files)

Nicola Squartini tensor5 at archlinux.org
Fri Sep 16 09:31:52 UTC 2016


    Date: Friday, September 16, 2016 @ 09:31:51
  Author: tensor5
Revision: 189550

upgpkg: electron 1.4.0-1

Modified:
  electron/trunk/PKGBUILD
  electron/trunk/chromium-gtk3-use-x11-backend.patch
  electron/trunk/chromium-use-system-ffmpeg.patch
  electron/trunk/chromium-use-system-minizip.patch
  electron/trunk/libchromiumcontent-use-system-ffmpeg.patch
  electron/trunk/use-system-libraries-in-node.patch
Deleted:
  electron/trunk/chromium-use-system-libpng.patch

--------------------------------------------+
 PKGBUILD                                   |   25 ++++++++++++++-----------
 chromium-gtk3-use-x11-backend.patch        |    4 ++--
 chromium-use-system-ffmpeg.patch           |    2 +-
 chromium-use-system-libpng.patch           |   11 -----------
 chromium-use-system-minizip.patch          |    2 +-
 libchromiumcontent-use-system-ffmpeg.patch |    8 ++++----
 use-system-libraries-in-node.patch         |    4 ++--
 7 files changed, 24 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-16 09:22:57 UTC (rev 189549)
+++ PKGBUILD	2016-09-16 09:31:51 UTC (rev 189550)
@@ -1,9 +1,9 @@
 # $Id$
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
-_chromiumver=52.0.2743.82
+_chromiumver=53.0.2785.113
 pkgname=electron
-pkgver=1.3.6
+pkgver=1.4.0
 pkgrel=1
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('i686' 'x86_64')
@@ -47,7 +47,6 @@
         'chromium-gtk3-use-x11-backend.patch'
         'chromium-unset-madv_free.patch'
         'chromium-use-system-ffmpeg.patch'
-        'chromium-use-system-libpng.patch'
         'chromium-use-system-minizip.patch'
         'electron.sh'
        )
@@ -62,7 +61,7 @@
             'SKIP'
             'SKIP'
             'SKIP'
-            '7c03da5e66623b47689c7075cb8a3299484122fd45deadfd5f089eb6c399f35e'
+            'f2768f4c79516344db73569c4844e0d8722dd73a7b0df13ba4747511001b5a2a'
             '14dbd1eecb7034d9e19e1f0c61b0a36ed3b9c610db008ff2a6da2a540ade1221'
             '7fd0fc72a14b2a08ce0f258a750a9d181386b9277312f2ed5446c29b8ec4e282'
             '75b2e9827f0593e59a35c36c6039ad10d35d7499fed6d97c4ed48ef1cce54c2b'
@@ -70,7 +69,7 @@
             '3f9bc0e3ee316f172b390584287fb93778ad8923f99f8e80ead8cfd5fa23127a'
             '00506737d1005f76caa8d5505acd4c1d19b42ca62e9f07a26664659447413694'
             'e56184ddcceb29cfb1fcbca52678f72b7b8f8c8e69791016062f381aa78182f2'
-            'eb8f4d2b376dce69bec4741301696e9a9b7796fcdb00e80281438d84dc4d8659'
+            '17cffe3de8c8470f10b78485b1702c4516ba5b0c91689a6afab9dd86f7ab04bc'
             'dc3286a1947240ab6ec562263af0b3c9971da2a4ab45970e3e664563e877280f'
             'fd237dada74a67a5652e0a4661d1e7f3a53a3bfa010b963579346f5456e9f190'
             '3bf045dc4ac1cb32491c4a20de313c3056824e75308f97b9e869fd5a2a166480'
@@ -79,13 +78,12 @@
             '68977a78fb41a549eb449dd35f94e0168d647245516397f0ecdfa7a03a147045'
             '4de540ec76736ef3e14475090916a42c03692c542822b430f1ab3f6d36655511'
             '7bc4cc154643712556f2cfbcba72bc08d032a52a39bccc61c91a7b230fe9a80e'
-            '1c4c4ad492cd5bb437d4b0ee1001e3e01e952eee23b56e697e44294c715c97ba'
+            '6751b93f47c294a5b3ebca0e5fbb608cc034ac5ac0b30872916f42ba2cae4c5e'
             '2fb2157c854dab173a2ef9b4aa0ab5bb3c0dd077447c4719c7554eee6e0546b6'
-            '2ecc112e797a0de512dc267be1be6bd86a2c8adde0a308c341896fb0dadb4366'
+            '9fd584d6198b915ad35198d1fcb6318e5ecb43b0befca95384148a305e2954dd'
             'ccba3002243fb1f9a67c8a60af310706caa591d12aef45f1d0f4bda47626f3ab'
-            'f890e35922a5e049491259354c221c8a51baff84092ef566ea590495e615445f'
-            'caaa63eabcfdced965638b3353448fabda9bc4e6d898d8ec278ecac31502ded1'
-            'ae8db257191600e5d1e3d3142c8b430652047c2b3575d82696573f1649154c62'
+            '7cda59fe372b37beca079adf55b951b4f3a6c7a5490813b729fa145562d2ba12'
+            'bc78d7af8e514ea28caa6c6ccaf78cc3e80044ef862e2ca7978439f183e36179'
             'c4d171ea37c421e5e586f8735595012ad4aada9a3be9bfe86bc8abb5c5d1488e'
            )
 
@@ -120,6 +118,12 @@
 prepare() {
   cd "${srcdir}"/electron
 
+  ### Bump version (temporary fix)
+  git config user.email "tensor5 at gmail.com"
+  git config user.name "Nicola Squartini"
+  python2 script/bump-version.py 1.4.0
+  ###
+
   patch -Np1 -i "${srcdir}"/gtk3-menu-bar.patch
   patch -Np1 -i "${srcdir}"/gtk3-warnings.patch
   patch -Np1 -i "${srcdir}"/use-system-clang.patch
@@ -180,7 +184,6 @@
   patch -Np1 -i "${srcdir}"/chromium-gtk3-use-x11-backend.patch
   patch -Np1 -i "${srcdir}"/chromium-unset-madv_free.patch  # fixes crash with kernels < 4.5
   patch -Np1 -i "${srcdir}"/chromium-use-system-ffmpeg.patch
-  patch -Np1 -i "${srcdir}"/chromium-use-system-libpng.patch
   patch -Np1 -i "${srcdir}"/chromium-use-system-minizip.patch
   python2 build/linux/unbundle/replace_gyp_files.py "${_chromium_flags[@]/#/-D}"
 }

Modified: chromium-gtk3-use-x11-backend.patch
===================================================================
--- chromium-gtk3-use-x11-backend.patch	2016-09-16 09:22:57 UTC (rev 189549)
+++ chromium-gtk3-use-x11-backend.patch	2016-09-16 09:31:51 UTC (rev 189550)
@@ -1,7 +1,7 @@
 --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
 +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc
-@@ -487,6 +487,9 @@
-       default_font_style_(gfx::Font::NORMAL),
+@@ -488,6 +488,9 @@
+       default_font_weight_(gfx::Font::Weight::NORMAL),
        middle_click_action_(GetDefaultMiddleClickAction()),
        device_scale_factor_(1.0) {
 +#if GTK_MAJOR_VERSION > 2

Modified: chromium-use-system-ffmpeg.patch
===================================================================
--- chromium-use-system-ffmpeg.patch	2016-09-16 09:22:57 UTC (rev 189549)
+++ chromium-use-system-ffmpeg.patch	2016-09-16 09:31:51 UTC (rev 189550)
@@ -21,7 +21,7 @@
  #include <libavutil/imgutils.h>
 --- a/media/filters/ffmpeg_demuxer.cc
 +++ b/media/filters/ffmpeg_demuxer.cc
-@@ -1101,24 +1101,6 @@
+@@ -1106,24 +1106,6 @@
    // If no estimate is found, the stream entry will be kInfiniteDuration().
    std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams,
                                                      kInfiniteDuration());

Deleted: chromium-use-system-libpng.patch
===================================================================
--- chromium-use-system-libpng.patch	2016-09-16 09:22:57 UTC (rev 189549)
+++ chromium-use-system-libpng.patch	2016-09-16 09:31:51 UTC (rev 189550)
@@ -1,11 +0,0 @@
---- a/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
-+++ b/third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp
-@@ -234,7 +234,7 @@
- #endif
-             png_uint_32 profileLength = 0;
-             if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
--                setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
-+                setColorProfileAndTransform((const char*)profile, profileLength, imageHasAlpha, false /* useSRGB */);
-             }
-         }
- #endif // PNG_iCCP_SUPPORTED

Modified: chromium-use-system-minizip.patch
===================================================================
--- chromium-use-system-minizip.patch	2016-09-16 09:22:57 UTC (rev 189549)
+++ chromium-use-system-minizip.patch	2016-09-16 09:31:51 UTC (rev 189550)
@@ -1,6 +1,6 @@
 --- a/third_party/zlib/google/zip_reader.cc
 +++ b/third_party/zlib/google/zip_reader.cc
-@@ -281,10 +281,9 @@
+@@ -279,10 +279,9 @@
  
    current_entry_info_.reset();
    reached_end_ = false;

Modified: libchromiumcontent-use-system-ffmpeg.patch
===================================================================
--- libchromiumcontent-use-system-ffmpeg.patch	2016-09-16 09:22:57 UTC (rev 189549)
+++ libchromiumcontent-use-system-ffmpeg.patch	2016-09-16 09:31:51 UTC (rev 189550)
@@ -1,14 +1,14 @@
 --- a/script/create-dist
 +++ b/script/create-dist
-@@ -89,7 +89,6 @@
-     'libsystem_wrappers.a',
-     'libcdm_renderer.a',
+@@ -93,7 +93,6 @@
      'libsecurity_state.a',
+     'libcookie_config.a',
+     'libos_crypt.a',
 -    os.path.join('lib', 'libffmpeg.so'),
    ],
    'win32': [
      'chromedriver.exe',
-@@ -302,7 +301,6 @@
+@@ -314,7 +313,6 @@
        copy_generated_sources(target_arch, component, output_dir)
        copy_locales(target_arch, component, output_dir)
  

Modified: use-system-libraries-in-node.patch
===================================================================
--- use-system-libraries-in-node.patch	2016-09-16 09:22:57 UTC (rev 189549)
+++ use-system-libraries-in-node.patch	2016-09-16 09:31:51 UTC (rev 189550)
@@ -17,7 +17,7 @@
      'node_tag': '',
      'node_use_dtrace': 'false',
      'node_use_etw': 'false',
-@@ -108,17 +108,6 @@
+@@ -109,17 +109,6 @@
          'conditions': [
            ['OS=="linux"', {
              'cflags': [
@@ -35,7 +35,7 @@
                # Required when building as shared library.
                '-fPIC',
              ],
-@@ -197,6 +186,13 @@
+@@ -198,6 +187,13 @@
              ],
            }],
            ['OS=="linux" and libchromiumcontent_component==0', {



More information about the arch-commits mailing list