Project

General

Profile

Bug #2921 » 0001-nonprism-openshot-updated-to-2.5.1.patch

oaken-source, 2020-11-04 11:01 AM

View differences:

nonprism/openshot/PKGBUILD
1
# $Id$
2
# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
3
# Maintainer (Arch): Florian Pritz <bluewind@xinu.at>
1
# Maintainer (Arch): David Runge <dvzrv@archlinux.org>
2
# Contributor (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
3
# Contributor (Arch): Florian Pritz <bluewind@xinu.at>
4 4
# Contributor (Arch): Asa Marco <marcoasa90[at]gmail[.]com>
5 5
# Contributor: Andreas Grapentin <andreas@grapentin.org>
6 6
# Contributor: André Silva <emulatorman@hyperbola.info>
......
11 11
#  - neuter google analytics and exception tracking as it all happens over http
12 12

  
13 13
pkgname=openshot
14
pkgver=2.4.4
14
pkgver=2.5.1
15 15
pkgrel=1
16 16
pkgrel+=.nonprism1
17
pkgdesc="a free, non-linear video editor for GNU/Linux based on MLT framework, without nonfree faac recommendation and Youtube uploader support"
17
pkgdesc="An award-winning free and open-source video editor"
18
pkgdesc+=", without nonfree faac recommendation and Youtube uploader support"
18 19
arch=('any')
19
url="http://www.openshot.org/"
20
license=('GPL')
21
depends=('mlt-python-bindings' 'sdl' 'librsvg' 'mplayer'
22
	 'pyxdg' 'python-pyqt5' 'python-httplib2' 'python-pillow' 'dvgrab'
23
	 'ladspa' 'sox' 'vid.stab' 'qt5-svg' 'sdl_image'
24
	 'libopenshot' 'python-pyzmq' 'qt5-webkit' 'python-setuptools'
25
         'python-requests')
26
optdepends=('frei0r-plugins: effects'
27
	    'libquicktime' 'libavc1394' 'jack')
20
url="https://www.openshot.org/"
21
license=('GPL3')
22
depends=('ffmpeg' 'mlt' 'python-pyqt5' 'python-requests' 'libopenshot'
23
'libopenshot-audio' 'python-pyzmq' 'qt5-base' 'qt5-svg' 'qt5-webkit')
28 24
makedepends=('python-setuptools')
29

  
30

  
31
source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenShot/openshot-qt/archive/v$pkgver.tar.gz"
32
        'nonprism.patch'
33
	'neuter_tracking.patch')
34
sha256sums=('8197923b3fff2010ee69c75469818543674a12fcb8fcb08944471e4ead3426be'
35
            '31b78e88c83bba0ff469afdbbdc36577ca64a55640e4220e9a88ccf0c7f105dc'
36
            '3990bdf10f46cd5255d01b0b113fe10e3ffed16da0577dfcaad470edd016aef9')
25
source=("$pkgname-$pkgver.tar.gz::https://github.com/OpenShot/openshot-qt/archive/v$pkgver.tar.gz")
26
source+=('nonprism.patch'
27
         'neuter_tracking.patch')
28
sha256sums=('4c25eb9a5de42e749de4c6ca2f7a313c60e1283fe52d70c121629dbb8bb2df7b'
29
            'b7fea3b32dd1666403caab7ff70c59cbdedceee8d3180b7a8878ee239a67623d'
30
            '138260661ca9cd1b2bb62556a2e718d0f95e3bf02a92451e39cba5e958ef7ef8')
37 31

  
38 32
prepare() {
39
  cd "$srcdir"/openshot-qt-$pkgver
33
  mv -v "${pkgname}-qt-${pkgver}" "${pkgname}-${pkgver}"
34

  
35
  cd "${pkgname}-${pkgver}"
40 36
  patch -Np1 -i $srcdir/nonprism.patch
41 37
  patch -Np1 -i $srcdir/neuter_tracking.patch
42 38
}
43 39

  
40
build() {
41
  cd "${pkgname}-${pkgver}"
42
  python setup.py build
43
}
44

  
44 45
package() {
45
  cd "$srcdir"/openshot-qt-$pkgver
46
  python setup.py install --root="$pkgdir/" --optimize=1
46
  cd "${pkgname}-${pkgver}"
47
  python setup.py install --skip-build \
48
                          --optimize=1 \
49
                          --prefix=/usr \
50
                          --root="${pkgdir}"
51
  install -vDm 644 {AUTHORS,{CONTRIBUTING,README}.md} \
52
    -t "${pkgdir}/usr/share/doc/${pkgname}"
47 53
}
nonprism/openshot/neuter_tracking.patch
1 1
--- a/src/classes/metrics.py	2018-09-22 18:49:41.000000000 -0300
2 2
+++ b/src/classes/metrics.py	2019-02-08 08:53:21.561261422 -0400
3
@@ -152,10 +152,10 @@
4
         url_params = urllib.parse.urlencode(params)
5
         url = "http://www.google-analytics.com/collect?%s" % url_params
3
@@ -163,10 +163,11 @@ def send_metric(params):
4
             url_params = urllib.parse.urlencode(metric_params)
5
             url = "http://www.google-analytics.com/collect?%s" % url_params
6 6
 
7
-        # Send metric HTTP data
8
+        # Don't Send metric HTTP data
9
         try:
10
-            r = requests.get(url, headers={"user-agent": user_agent}, verify=False)
11
-            log.info("Track metric: [%s] %s | (%s bytes)" % (r.status_code, r.url, len(r.content)))
12
+            # r = requests.get(url, headers={"user-agent": user_agent}, verify=False)
13
+            log.info("Track disabled - nonprism!")
7
-            # Send metric HTTP data
8
+            # Send metric HTTP data (disabled)
9
             try:
10
-                r = requests.get(url, headers={"user-agent": user_agent}, verify=False)
11
-                log.info("Track metric: [%s] %s | (%s bytes)" % (r.status_code, r.url, len(r.content)))
12
+                # r = requests.get(url, headers={"user-agent": user_agent}, verify=False)
13
+                # log.info("Track metric: [%s] %s | (%s bytes)" % (r.status_code, r.url, len(r.content)))
14
+                log.info("Tracking disabled")
14 15
 
15
         except Exception as Ex:
16
             log.error("Failed to Track metric: %s" % (Ex))
17
@@ -172,10 +172,10 @@
18
                                         "unique_install_id": s.get("unique_install_id" )})
16
             except Exception as Ex:
17
                 log.error("Failed to Track metric: %s" % (Ex))
18
@@ -191,10 +192,11 @@ def send_exception(stacktrace, source):
19
                                        "unique_install_id": s.get("unique_install_id")})
19 20
         url = "http://www.openshot.org/exception/json/"
20 21
 
21 22
-        # Send exception HTTP data
22
+        # Don't Send exception HTTP data
23
+        # Send exception HTTP data (disabled)
23 24
         try:
24 25
-            r = requests.post(url, data=data, headers={"user-agent": user_agent, "content-type": "application/x-www-form-urlencoded"}, verify=False)
25 26
-            log.info("Track exception: [%s] %s | %s" % (r.status_code, r.url, r.text))
26 27
+            # r = requests.post(url, data=data, headers={"user-agent": user_agent, "content-type": "application/x-www-form-urlencoded"}, verify=False)
27
+            log.info("Tracking disabled - nonprism!")
28
+            # log.info("Track exception: [%s] %s | %s" % (r.status_code, r.url, r.text))
29
+            log.info("Tracking disabled")
28 30
 
29 31
         except Exception as Ex:
30 32
             log.error("Failed to Track exception: %s" % (Ex))
nonprism/openshot/nonprism.patch
2 2
index df9a7feb3..c69c643b1 100644
3 3
--- a/src/windows/main_window.py
4 4
+++ b/src/windows/main_window.py
5
@@ -609,17 +609,6 @@ class MainWindow(QMainWindow, updates.UpdateWatcher, updates.UpdateInterface):
5
@@ -724,17 +724,6 @@ class MainWindow(QMainWindow, updates.Up
6 6
         else:
7 7
             log.info('canceled')
8 8
 
9
- 
    (1-1/1)