commit 21c3ad3e4087c49a79cb41e936f8e8b37e7e120f
Author: Elan Ruusamäe <g...@delfi.ee>
Date: Sun Oct 9 15:25:36 2016 +0300
new, version 47.0.2526.110
from
https://build.opensuse.org/source/home:MargueriteSu:branches:devel:languages:nodejs/libchromiumcontent
dist-no-zip.patch | 13 +++++
gcc5.patch | 52 ++++++++++++++++++++
libchromiumcontent.spec | 123 ++++++++++++++++++++++++++++++++++++++++++++++++
no-bitfield-width.patch | 35 ++++++++++++++
no-download.patch | 17 +++++++
no-sysroot.patch | 20 ++++++++
6 files changed, 260 insertions(+)
---
diff --git a/libchromiumcontent.spec b/libchromiumcontent.spec
new file mode 100644
index 0000000..91fa52e
--- /dev/null
+++ b/libchromiumcontent.spec
@@ -0,0 +1,123 @@
+Summary: Shared library build of Chromium’s Content module
+Name: libchromiumcontent
+Version: 47.0.2526.110
+Release: 0.1
+License: MIT
+Group: Libraries
+Source0:
https://build.opensuse.org/source/home:MargueriteSu:branches:devel:languages:nodejs/libchromiumcontent/%{name}-%{version}.tar.xz
+Source1:
https://build.opensuse.org/source/home:MargueriteSu:branches:devel:languages:nodejs/libchromiumcontent/chromium-%{version}.tar.xz
+Patch0: no-download.patch
+Patch1: no-sysroot.patch
+Patch2: gcc5.patch
+Patch3: no-bitfield-width.patch
+Patch4: dist-no-zip.patch
+URL: https://github.com/atom/libchromiumcontent
+BuildRequires: GConf2-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: atk-devel
+BuildRequires: binutils
+BuildRequires: bison
+BuildRequires: clang
+BuildRequires: cups-devel
+BuildRequires: dbus-devel
+BuildRequires: gperf
+BuildRequires: gtk+2-devel
+BuildRequires: heimdal-devel
+BuildRequires: libexif-devel
+BuildRequires: libgnome-keyring-devel
+BuildRequires: libstdc++-devel
+BuildRequires: nss-devel
+BuildRequires: pciutils-devel
+BuildRequires: pkg-config
+BuildRequires: pulseaudio-devel
+BuildRequires: python
+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXScrnSaver-devel
+BuildRequires: xorg-lib-libXcomposite-devel
+BuildRequires: xorg-lib-libXcursor-devel
+BuildRequires: xorg-lib-libXi-devel
+BuildRequires: xorg-lib-libXrandr-devel
+BuildRequires: xorg-lib-libXtst-devel
+BuildRequires: xz
+Conflicts: chromium
+ExclusiveArch: %{x8664} %{ix86}
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%ifarch %{x8664}
+%define target x64
+%endif
+%ifarch %{ix86}
+%define target ia32
+%endif
+
+%description
+A single, shared library that includes the Chromium Content module and
+all its dependencies.
+
+%package devel
+Summary: Development files for libchromiumcontent
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Development files for libchromiumcontent
+
+%package static
+Summary: Static files for libchromiumcontent
+Group: Development/Libraries
+Requires: %{name}-devel = %{version}-%{release}
+
+%description static
+Static files for libchromiumcontent
+
+%prep
+%setup -q -a1
+# unpack chromium source
+mkdir -p vendor/chromium
+cp -a chromium-%{version} vendor/chromium/src
+# use system clang
+mkdir -p vendor/chromium/src/third_party/llvm-build/Release+Asserts/{bin,lib}
+ln -s %{_bindir}/clang
vendor/chromium/src/third_party/llvm-build/Release+Asserts/bin/clang
+ln -s %{_bindir}/clang++
vendor/chromium/src/third_party/llvm-build/Release+Asserts/bin/clang++
+
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+%build
+script/update -t %{target}
+script/build -t %{target}
+script/create-dist -t %{target}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d
$RPM_BUILD_ROOT%{_libdir}/%{name}/{shared_library,static_library,src}
+cp -a dist/main/shared_library/*
$RPM_BUILD_ROOT%{_libdir}/%{name}/shared_library
+cp -a dist/main/static_library/*
$RPM_BUILD_ROOT%{_libdir}/%{name}/static_library
+cp -a dist/main/src/* $RPM_BUILD_ROOT%{_libdir}/%{name}/src
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc README.md LICENSE.txt
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/shared_library
+%exclude %{_libdir}/%{name}/shared_library/gen
+%exclude %{_libdir}/%{name}/shared_library/*.a
+
+%files devel
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/src
+%{_libdir}/%{name}/shared_library/gen
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/%{name}/shared_library/*.a
+%{_libdir}/%{name}/static_library
diff --git a/dist-no-zip.patch b/dist-no-zip.patch
new file mode 100644
index 0000000..4734033
--- /dev/null
+++ b/dist-no-zip.patch
@@ -0,0 +1,13 @@
+Index: libchromiumcontent-47.0.2526.110/script/create-dist
+===================================================================
+--- libchromiumcontent-47.0.2526.110.orig/script/create-dist
++++ libchromiumcontent-47.0.2526.110/script/create-dist
+@@ -246,7 +246,7 @@ def main():
+ copy_ffmpeg(target_arch)
+ copy_sources()
+ generate_licenses()
+- create_zip()
++ #create_zip()
+
+
+ def parse_args():
diff --git a/gcc5.patch b/gcc5.patch
new file mode 100644
index 0000000..ec76774
--- /dev/null
+++ b/gcc5.patch
@@ -0,0 +1,52 @@
+Index:
libchromiumcontent-47.0.2526.110/vendor/chromium/src/build/compiler_version.py
+===================================================================
+---
libchromiumcontent-47.0.2526.110.orig/vendor/chromium/src/build/compiler_version.py
++++
libchromiumcontent-47.0.2526.110/vendor/chromium/src/build/compiler_version.py
+@@ -56,7 +56,7 @@ def GetVersion(compiler, tool):
+ if tool == "compiler":
+ compiler = compiler + " -dumpversion"
+ # 4.6
+- version_re = re.compile(r"(\d+)\.(\d+)")
++ version_re = re.compile(r"(\d+)")
+ elif tool == "assembler":
+ compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
+ # Unmodified: GNU assembler (GNU Binutils) 2.24
+@@ -88,7 +88,11 @@ def GetVersion(compiler, tool):
+ raise subprocess.CalledProcessError(pipe.returncode, compiler)
+
+ parsed_output = version_re.match(tool_output)
+- result = parsed_output.group(1) + parsed_output.group(2)
++ if tool == "compiler":
++ result = parsed_output.group(1) + "1"
++ else:
++ result = parsed_output.group(1) + parsed_output.group(2)
++
+ compiler_version_cache[cache_key] = result
+ return result
+ except Exception, e:
+Index:
libchromiumcontent-47.0.2526.110/vendor/chromium/src/native_client/build/compiler_version.py
+===================================================================
+---
libchromiumcontent-47.0.2526.110.orig/vendor/chromium/src/native_client/build/compiler_version.py
++++
libchromiumcontent-47.0.2526.110/vendor/chromium/src/native_client/build/compiler_version.py
+@@ -56,7 +56,7 @@ def GetVersion(compiler, tool):
+ if tool == "compiler":
+ compiler = compiler + " -dumpversion"
+ # 4.6
+- version_re = re.compile(r"(\d+)\.(\d+)")
++ version_re = re.compile(r"(\d+)")
+ elif tool == "assembler":
+ compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
+ # Unmodified: GNU assembler (GNU Binutils) 2.24
+@@ -88,7 +88,11 @@ def GetVersion(compiler, tool):
+ raise subprocess.CalledProcessError(pipe.returncode, compiler)
+
+ parsed_output = version_re.match(tool_output)
+- result = parsed_output.group(1) + parsed_output.group(2)
++ if tool == "compiler":
++ result = parsed_output.group(1) + "1"
++ else:
++ result = parsed_output.group(1) + parsed_output.group(2)
++
+ compiler_version_cache[cache_key] = result
+ return result
+ except Exception, e:
diff --git a/no-bitfield-width.patch b/no-bitfield-width.patch
new file mode 100644
index 0000000..d40839c
--- /dev/null
+++ b/no-bitfield-width.patch
@@ -0,0 +1,35 @@
+Index: libchromiumcontent-47.0.2526.110/vendor/chromium/src/build/common.gypi
+===================================================================
+--- libchromiumcontent-47.0.2526.110.orig/vendor/chromium/src/build/common.gypi
++++ libchromiumcontent-47.0.2526.110/vendor/chromium/src/build/common.gypi
+@@ -442,7 +442,7 @@
+ # Run tools/clang/scripts/update.sh to make sure they are compiled.
+ # This causes 'clang_chrome_plugins_flags' to be set.
+ # Has no effect if 'clang' is not set as well.
+- 'clang_use_chrome_plugins%': 1,
++ 'clang_use_chrome_plugins%': 0,
+
+ # Enable building with ASAN (Clang's -fsanitize=address option).
+ # -fsanitize=address only works with clang, but asan=1 implies clang=1
+@@ -2620,7 +2620,7 @@
+ '-Wno-shift-negative-value',
+
+ # TODO(thakis): Consider enabling this?
+- '-Wno-bitfield-width',
++ #'-Wno-bitfield-width',
+ ],
+ },
+ 'includes': [ 'set_clang_warning_flags.gypi', ],
+Index:
libchromiumcontent-47.0.2526.110/vendor/chromium/src/build/config/compiler/BUILD.gn
+===================================================================
+---
libchromiumcontent-47.0.2526.110.orig/vendor/chromium/src/build/config/compiler/BUILD.gn
++++
libchromiumcontent-47.0.2526.110/vendor/chromium/src/build/config/compiler/BUILD.gn
+@@ -735,7 +735,7 @@ config("default_warnings") {
+ "-Wno-shift-negative-value",
+
+ # TODO(thakis): Consider enabling this?
+- "-Wno-bitfield-width",
++ #"-Wno-bitfield-width",
+ ]
+ }
+ }
diff --git a/no-download.patch b/no-download.patch
new file mode 100644
index 0000000..c03cf8d
--- /dev/null
+++ b/no-download.patch
@@ -0,0 +1,17 @@
+Index: libchromiumcontent/script/update
+===================================================================
+--- libchromiumcontent.orig/script/update
++++ libchromiumcontent/script/update
+@@ -27,9 +27,9 @@ TARBALL_URL = 'https://github.com/{0}/re
+ def main():
+ args = parse_args()
+
+- version = chromium_version()
+- if not is_source_tarball_updated(version):
+- download_source_tarball(version)
++# version = chromium_version()
++# if not is_source_tarball_updated(version):
++# download_source_tarball(version)
+
+ if sys.platform == 'linux2':
+ install_sysroot()
diff --git a/no-sysroot.patch b/no-sysroot.patch
new file mode 100644
index 0000000..bb6e4a1
--- /dev/null
+++ b/no-sysroot.patch
@@ -0,0 +1,20 @@
+Index: libchromiumcontent-50.0.2661.11/script/update
+===================================================================
+--- libchromiumcontent-50.0.2661.11.orig/script/update
++++ libchromiumcontent-50.0.2661.11/script/update
+@@ -31,13 +31,12 @@ def main():
+ # if not is_source_tarball_updated(version):
+ # download_source_tarball(version)
+
+- if sys.platform == 'linux2':
+- install_sysroot()
++# if sys.platform == 'linux2':
++# install_sysroot()
+
+ target_arch = args.target_arch
+ return (apply_patches() or
+ copy_chromiumcontent_files() or
+- update_clang() or
+ run_gyp(target_arch))
+
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libchromiumcontent.git/commitdiff/21c3ad3e4087c49a79cb41e936f8e8b37e7e120f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
