diff options
author | Taegil Bae | 2019-05-17 23:17:55 +0900 |
---|---|---|
committer | Taegil Bae | 2019-05-17 23:17:55 +0900 |
commit | 51188ad1dbf3367c7842ddcf555c0ce3ed0e6713 (patch) | |
tree | e49d370f3d818d68782a05f9092c81fe2e150f49 | |
parent | 18ec3d36cbff91c0d530eda4f359dec6ba7b03be (diff) | |
download | aur-51188ad1dbf3367c7842ddcf555c0ce3ed0e6713.tar.gz |
Delete unneeded patches
-rw-r--r-- | add_sup_subext.patch | 13 | ||||
-rw-r--r-- | qml_fix.patch | 71 | ||||
-rw-r--r-- | upgrade_waf.patch | 75 |
3 files changed, 0 insertions, 159 deletions
diff --git a/add_sup_subext.patch b/add_sup_subext.patch deleted file mode 100644 index fd6af88346d9..000000000000 --- a/add_sup_subext.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/bomi/global.cpp b/src/bomi/global.cpp -index b9403466..e674c947 100644 ---- a/src/bomi/global.cpp -+++ b/src/bomi/global.cpp -@@ -35,7 +35,7 @@ static const QStringList audioExts = { - }; - - static const QStringList subExts = { -- u"ass"_q, u"smi"_q, u"srt"_q, u"ssa"_q, u"sub"_q, u"txt"_q -+ u"ass"_q, u"smi"_q, u"srt"_q, u"ssa"_q, u"sub"_q, u"txt"_q, u"sup"_q - }; - - static const QStringList plExts = { u"cue"_q, u"pls"_q, u"m3u"_q, u"m3u8"_q }; diff --git a/qml_fix.patch b/qml_fix.patch deleted file mode 100644 index 557319175269..000000000000 --- a/qml_fix.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff --git a/src/bomi/imports/bomi/MessageBox.qml b/src/bomi/imports/bomi/MessageBox.qml -index 96ef2500..6c7df178 100644 ---- a/src/bomi/imports/bomi/MessageBox.qml -+++ b/src/bomi/imports/bomi/MessageBox.qml -@@ -84,7 +84,7 @@ Rectangle { - buttons: [B.ButtonBox.Cancel, B.ButtonBox.Ok] - visible: buttons.length > 0 - width: 150; height: 25 -- anchors.horizontalCenter: parent.horizontalCenter -+ Layout.alignment: Qt.AlignHCenter - source: Rectangle { - color: mouseArea.pressed ? Qt.rgba(1.0, 1.0, 1.0, 1.0) - : Qt.rgba(0.3, 0.3, 0.3, 1.0) -diff --git a/src/bomi/skins/Tethys/bomi.qml b/src/bomi/skins/Tethys/bomi.qml -index 5afdd641..8c34ed90 100644 ---- a/src/bomi/skins/Tethys/bomi.qml -+++ b/src/bomi/skins/Tethys/bomi.qml -@@ -259,13 +259,13 @@ B.AppWithDock { - anchors.rightMargin: anchors.leftMargin - Loader { - readonly property int bigSize: 32 -- anchors.verticalCenter: parent.verticalCenter -+ Layout.alignment: Qt.AlignVCenter - sourceComponent: mediaButtonComponent - } - B.TimeDuration { - id: td; spacing: 2 - height: parent.height; width: contentWidth -- anchors.verticalCenter: parent.verticalCenter -+ Layout.alignment: Qt.AlignVCenter - textStyle { - color: "white"; style: Text.Raised; styleColor: "black" - font.pixelSize: 9; -@@ -277,7 +277,7 @@ B.AppWithDock { - - Loader { - readonly property var timeDuration: td -- anchors.verticalCenter: parent.verticalCenter -+ Layout.alignment: Qt.AlignVCenter - width: 100; height: 14 - sourceComponent: timeslider - Layout.fillWidth: true -@@ -285,13 +285,13 @@ B.AppWithDock { - - Loader { - sourceComponent: volumeIcon -- anchors.verticalCenter: parent.verticalCenter -+ Layout.alignment: Qt.AlignVCenter - } - - B.VolumeSlider { - id: volumeCompact; style: sliders - width: 70; height: 14 -- anchors.verticalCenter: parent.verticalCenter -+ Layout.alignment: Qt.AlignVCenter - visible: app.width > 500 - } - -diff --git a/src/bomi/skins/metro/bomi.qml b/src/bomi/skins/metro/bomi.qml -index bdafb308..d364f7b9 100644 ---- a/src/bomi/skins/metro/bomi.qml -+++ b/src/bomi/skins/metro/bomi.qml -@@ -137,7 +137,7 @@ B.AppWithDock { - MetroButton { prefix: "next"; action: "play/next" } - Item { - height: 30; Layout.fillWidth: true -- anchors.verticalCenter: parent.verticalCenter -+ Layout.alignment: Qt.AlignVCenter - MouseArea { - id: volumeArea - width: volume.width; height: 30 diff --git a/upgrade_waf.patch b/upgrade_waf.patch deleted file mode 100644 index 36ee3da2ef88..000000000000 --- a/upgrade_waf.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/src/mpv/bootstrap.py b/src/mpv/bootstrap.py -index c62914cb..798e8540 100755 ---- a/src/mpv/bootstrap.py -+++ b/src/mpv/bootstrap.py -@@ -5,10 +5,10 @@ - from __future__ import print_function - import os, sys, stat, hashlib, subprocess - --WAFRELEASE = "waf-1.8.4" --WAFURLS = ["http://ftp.waf.io/pub/release/" + WAFRELEASE, -+WAFRELEASE = "waf-2.0.14" -+WAFURLS = ["https://waf.io/" + WAFRELEASE, - "http://www.freehackers.org/~tnagy/release/" + WAFRELEASE] --SHA256HASH = "f02035fa5d8814f33f19b2b20d43822ddef6bb39b955ca196c2a247a1f9ffaa8" -+SHA256HASH = "c5bc6083bba5e24415bb83872fa9e048afa150109a7e8855af679076d0779b22" - - if os.path.exists("waf"): - wafver = subprocess.check_output([sys.executable, './waf', '--version']).decode() -diff --git a/src/mpv/wscript b/src/mpv/wscript -index d28d18fb..e659b43f 100644 ---- a/src/mpv/wscript -+++ b/src/mpv/wscript -@@ -811,15 +811,6 @@ standalone_features = [ - ] - - _INSTALL_DIRS_LIST = [ -- ('bindir', '${PREFIX}/bin', 'binary files'), -- ('libdir', '${PREFIX}/lib', 'library files'), -- ('confdir', '${PREFIX}/etc/mpv', 'configuration files'), -- -- ('incdir', '${PREFIX}/include', 'include files'), -- -- ('datadir', '${PREFIX}/share', 'data files'), -- ('mandir', '${DATADIR}/man', 'man pages '), -- ('docdir', '${DATADIR}/doc/mpv', 'documentation files'), - ('zshdir', '${DATADIR}/zsh/site-functions', 'zsh completion functions'), - ] - -@@ -827,6 +818,7 @@ def options(opt): - opt.load('compiler_c') - opt.load('waf_customizations') - opt.load('features') -+ opt.load('gnu_dirs') - - group = opt.get_option_group("build and install options") - for ident, default, desc in _INSTALL_DIRS_LIST: -@@ -897,6 +889,7 @@ def configure(ctx): - ctx.load('dependencies') - ctx.load('detections.compiler') - ctx.load('detections.devices') -+ ctx.load('gnu_dirs') - - ctx.parse_dependencies(build_options) - ctx.parse_dependencies(main_dependencies) -diff --git a/src/mpv/wscript_build.py b/src/mpv/wscript_build.py -index 0d0685b0..04d435a5 100644 ---- a/src/mpv/wscript_build.py -+++ b/src/mpv/wscript_build.py -@@ -510,14 +510,14 @@ def build(ctx): - features = 'subst', - PREFIX = ctx.env.PREFIX, - LIBDIR = ctx.env.LIBDIR, -- INCDIR = ctx.env.INCDIR, -+ INCDIR = ctx.env.INCLUDEDIR, - VERSION = libversion, - PRIV_LIBS = get_deps(), - ) - - headers = ["client.h", "qthelper.hpp", "opengl_cb.h"] - for f in headers: -- ctx.install_as(ctx.env.INCDIR + '/mpv/' + f, 'libmpv/' + f) -+ ctx.install_as(ctx.env.INCLUDEDIR + '/mpv/' + f, 'libmpv/' + f) - - ctx.install_as(ctx.env.LIBDIR + '/pkgconfig/mpv.pc', 'libmpv/mpv.pc') - |