Bug#949864: qgis: FTBFS with default python3.8

2020-01-26 Thread Gianfranco Costamagna
control: tags -1 important
(I don't remember how to tag it as experimental only, and I don't want 
autoremoval to start kicking!)

> We just need to add a test for python3 >= 3.8 and set PYTHON_LIBRARY
> accordingly.

yes, but I don't usually want to add more code to rules file, they are usually 
kept forever :)
But if you plan to backport, so its probably something useful to do.

BTW, I tried a plain cmake .. && make, and python was correctly detected...
Maybe its time to drop that check completely?

(sorry if I didn't understand correctly the reason for it!)

Gianfranco



Bug#949864: qgis: FTBFS with default python3.8

2020-01-26 Thread Sebastiaan Couwenberg
Control: tags -1 pending

On 1/26/20 11:00 AM, Gianfranco Costamagna wrote:
> Hello, when built on experimental, the python3-config command needs a new 
> flag to find correctly the python3.8 library (thanks Doko for the suggestion)
> 
> so, the following (unfortunately non-retro-compatible) patch, fixes the issue:

We just need to add a test for python3 >= 3.8 and set PYTHON_LIBRARY
accordingly.

> --- qgis-3.4.15+dfsg/debian/changelog 2020-01-22 05:57:39.0 +0100
> +++ qgis-3.4.15+dfsg/debian/changelog 2020-01-25 22:17:14.0 +0100
> @@ -1,3 +1,10 @@
> +qgis (3.4.15+dfsg-1.1) experimental; urgency=medium
> +
> +  * Manually add --embed to rules file to fix FTBFS due to change in
> +behaviour of python3-config --ldflags (from doko) (Closes: #-1)
> +
> + -- Gianfranco Costamagna   Sat, 25 Jan 2020 
> 22:17:14 +0100
> +
>  qgis (3.4.15+dfsg-1) unstable; urgency=medium
>  
>* Move from experimental to unstable.
> diff -Nru qgis-3.4.15+dfsg/debian/rules qgis-3.4.15+dfsg/debian/rules
> --- qgis-3.4.15+dfsg/debian/rules 2019-11-11 09:07:24.0 +0100
> +++ qgis-3.4.15+dfsg/debian/rules 2020-01-25 22:17:14.0 +0100
> @@ -93,7 +93,7 @@
>   -DWITH_SERVER_PLUGINS=TRUE \
>   -DWITH_QWTPOLAR=FALSE \
>   -DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
> - -DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) 
> -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
> + -DPYTHON_LIBRARY=$(shell python3-config --ldflags --embed | sed -e 
> 's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
>  
>  ifneq ($(SHA),)
>   CMAKE_OPTS += -DSHA=$(SHA)

Kind Regards,

Bas

-- 
 GPG Key ID: 4096R/6750F10AE88D4AF1
Fingerprint: 8182 DE41 7056 408D 6146  50D1 6750 F10A E88D 4AF1



Bug#949864: qgis: FTBFS with default python3.8

2020-01-26 Thread Gianfranco Costamagna
Source: qgis
Version: 3.4.15+dfsg-1
Severity: serious
tags: patch

Hello, when built on experimental, the python3-config command needs a new flag 
to find correctly the python3.8 library (thanks Doko for the suggestion)


so, the following (unfortunately non-retro-compatible) patch, fixes the issue:


--- qgis-3.4.15+dfsg/debian/changelog   2020-01-22 05:57:39.0 +0100
+++ qgis-3.4.15+dfsg/debian/changelog   2020-01-25 22:17:14.0 +0100
@@ -1,3 +1,10 @@
+qgis (3.4.15+dfsg-1.1) experimental; urgency=medium
+
+  * Manually add --embed to rules file to fix FTBFS due to change in
+behaviour of python3-config --ldflags (from doko) (Closes: #-1)
+
+ -- Gianfranco Costamagna   Sat, 25 Jan 2020 
22:17:14 +0100
+
 qgis (3.4.15+dfsg-1) unstable; urgency=medium
 
   * Move from experimental to unstable.
diff -Nru qgis-3.4.15+dfsg/debian/rules qgis-3.4.15+dfsg/debian/rules
--- qgis-3.4.15+dfsg/debian/rules   2019-11-11 09:07:24.0 +0100
+++ qgis-3.4.15+dfsg/debian/rules   2020-01-25 22:17:14.0 +0100
@@ -93,7 +93,7 @@
-DWITH_SERVER_PLUGINS=TRUE \
-DWITH_QWTPOLAR=FALSE \
-DQT_PLUGINS_DIR=$(QT_PLUGINS_DIR) \
-   -DPYTHON_LIBRARY=$(shell python3-config --ldflags | sed -e 's\#-L\(.*\) 
-L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
+   -DPYTHON_LIBRARY=$(shell python3-config --ldflags --embed | sed -e 
's\#-L\(.*\) -L/usr/lib -l\([^ ]*\) .*$$\#\1/lib\2.so\#')
 
 ifneq ($(SHA),)
CMAKE_OPTS += -DSHA=$(SHA)