diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-01 09:33:30 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-05-01 09:33:30 +0200 |
| commit | 30361fcf6cc3dfa38d4b033ccb9fe33ddd17ebe7 (patch) | |
| tree | 0648f91a71513075d7a0ba354292162d121b42d8 /extra/webkitgtk | |
| parent | c9f24b5e67b10a25e7ffa9afaefbd6ca76342940 (diff) | |
Remove unused patch, reorder webkitgtk mips64el changes.
Diffstat (limited to 'extra/webkitgtk')
| -rw-r--r-- | extra/webkitgtk/PKGBUILD | 14 | ||||
| -rw-r--r-- | extra/webkitgtk/python3.patch | 20 |
2 files changed, 7 insertions, 27 deletions
diff --git a/extra/webkitgtk/PKGBUILD b/extra/webkitgtk/PKGBUILD index 548aab32c..42150b61d 100644 --- a/extra/webkitgtk/PKGBUILD +++ b/extra/webkitgtk/PKGBUILD @@ -16,11 +16,6 @@ sha256sums=('6303552a39d7912725d75bc55f530cdb99171fb873e299798d0bb932d6ea76cb') prepare() { cd $pkgbase-$pkgver mkdir build-gtk3 -} - -build() { - cd $pkgbase-$pkgver/build-gtk3 - if [ "$CARCH" = "mips64el" ]; then # Fix MIPS N32 support. sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \ @@ -28,10 +23,15 @@ build() { # Don't enable JIT even if configure finds that it's not supported. sed -i 's/#define ENABLE_JIT 1/#define ENABLE_JIT 0/' \ Source/WTF/wtf/Platform.h + fi +} -# --disable-optimizations will add -O0 - export CFLAGS="${CFLAGS/-O[0-9]}" +build() { + cd $pkgbase-$pkgver/build-gtk3 + if [ "$CARCH" = "mips64el" ]; then + # --disable-optimizations will add -O0 + export CFLAGS="${CFLAGS/-O[0-9]}" extra="--disable-fast-malloc --disable-optimizations" fi diff --git a/extra/webkitgtk/python3.patch b/extra/webkitgtk/python3.patch deleted file mode 100644 index efd640043..000000000 --- a/extra/webkitgtk/python3.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/Tools/gtk/generate-feature-defines-files b/Tools/gtk/generate-feature-defines-files -index 1a92bf50a05831655308cb62646eb05a6db4b63c..f5b2c7e61eab12bf0eb25b0f9c595f2fd83ebbe9 100755 ---- a/Tools/gtk/generate-feature-defines-files -+++ b/Tools/gtk/generate-feature-defines-files -@@ -32,13 +32,13 @@ def write_file_if_contents_changed(filename, contents): - - def write_feature_defines_header(feature_defines): - contents = '' -- for (feature, value) in feature_defines.iteritems(): -+ for (feature, value) in feature_defines.items(): - contents += '#define {0} {1}\n'.format(feature, value) - write_file_if_contents_changed("WebKitFeatures.h", contents) - - def write_flattened_feature_defines_file(feature_defines): - contents = '' -- for (feature, value) in feature_defines.iteritems(): -+ for (feature, value) in feature_defines.items(): - contents += '{0}={1}\n'.format(feature, value) - write_file_if_contents_changed("WebKitFeatures.txt", contents) - |