diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-08 16:38:05 -0300 |
| commit | c6e5d0d788ee2654a67bac4429d92f1f1df64c69 (patch) | |
| tree | 84d3087e9c9f9aab24d69f83c8e7d1d7bde8dd17 /community/picard | |
| parent | 89bffd8b9efae5fd29ca78a4741839ca68eb108f (diff) | |
| parent | bc83221d3c667b70e51dfff6ed212aada3906ee6 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/kid3/kid3.install
community/cherokee/PKGBUILD
community/supercollider/supercollider.install
core/libusb/PKGBUILD
core/systemd/PKGBUILD
core/udev/PKGBUILD
extra/gimp-devel/PKGBUILD
extra/maxima/PKGBUILD
libre/kdenetwork-kopete-libre/PKGBUILD
staging/kdebase-workspace/kdm
staging/kdebindings-perlkde/PKGBUILD
staging/kdebindings-perlqt/PKGBUILD
staging/kdemultimedia/PKGBUILD
staging/kdenetwork/PKGBUILD
staging/kdeplasma-addons/kdeplasma-addons-applets.install
Diffstat (limited to 'community/picard')
| -rw-r--r-- | community/picard/typeheader.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/community/picard/typeheader.patch b/community/picard/typeheader.patch deleted file mode 100644 index b34852673..000000000 --- a/community/picard/typeheader.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Naur old/picard/webservice.py new/picard/webservice.py ---- old/picard/webservice.py 2011-10-23 19:15:29.000000000 +0200 -+++ new/picard/webservice.py 2012-04-28 17:43:17.562422696 +0200 -@@ -149,8 +149,11 @@ - url.setPassword(self.config.setting["password"]) - request = QtNetwork.QNetworkRequest(url) - request.setRawHeader("User-Agent", "MusicBrainz-Picard/%s" % version_string) -- if method == "POST" and host == self.config.setting["server_host"]: -- request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8") -+ if data is not None: -+ if method == "POST" and host == self.config.setting["server_host"]: -+ request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/xml; charset=utf-8") -+ else: -+ request.setHeader(QtNetwork.QNetworkRequest.ContentTypeHeader, "application/x-www-form-urlencoded") - send = self._request_methods[method] - reply = send(request, data) if data is not None else send(request) - key = (host, port) -@@ -370,6 +373,7 @@ - def _encode_acoustid_args(self, args): - filters = [] - args['client'] = ACOUSTID_KEY -+ args['clientversion'] = version_string - args['format'] = 'xml' - for name, value in args.items(): - value = str(QUrl.toPercentEncoding(value)) |