Changes of Revision 358

vlc-beta.spec Changed
x
 
1
@@ -338,9 +338,11 @@
2
 test -x "$(type -p gcc-10)" && BUILDCC="$_"
3
 test -x "$(type -p gcc-10)" && CC="$_"
4
 test -x "$(type -p g++-10)" && CXX="$_"
5
+test -x "$(type -p qmake6)" && QMAKE="$_"
6
 export BUILDCC="$(readlink -f ${BUILDCC})"
7
 export CC="$(readlink -f ${CC})"
8
 export CXX="$(readlink -f ${CXX})"
9
+export QMAKE="$(readlink -f ${QMAKE})"
10
 CFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
11
 CXXFLAGS='%optflags -Wno-unused-variable -Wno-unused-parameter -Wno-deprecated-declarations -Wno-unused-but-set-variable'
12
 ./bootstrap
13
vlc-beta.patch Changed
17
 
1
@@ -9,11 +9,13 @@
2
              )
3
  
4
          if ret.returncode != 0:
5
-@@ -84,7 +84,7 @@ class QmlModuleChecker:
6
+@@ -83,8 +83,8 @@ class QmlModuleChecker:
7
+             return False
8
  
9
          ret = subprocess.run(
10
-              qmake, "-qtconf", qtconf, "-query",
11
+-             qmake, "-qtconf", qtconf, "-query",
12
 -            capture_output=True,
13
++             qmake, "-query",
14
 +            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
15
              encoding="utf8"
16
          )
17