Hello community, here is the log from the commit of package Photini for openSUSE:Factory checked in at 2018-04-26 13:38:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/Photini (Old) and /work/SRC/openSUSE:Factory/.Photini.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "Photini" Thu Apr 26 13:38:49 2018 rev:8 rq:601043 version:2018.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/Photini/Photini.changes 2018-02-10 18:00:16.847541447 +0100 +++ /work/SRC/openSUSE:Factory/.Photini.new/Photini.changes 2018-04-26 13:38:51.938245477 +0200 @@ -1,0 +2,10 @@ +Wed Apr 25 16:27:25 UTC 2018 - aloi...@gmx.com + +- Added Photini-Bing-map.patch + +------------------------------------------------------------------- +Wed Apr 25 13:00:41 UTC 2018 - aloi...@gmx.com + +- Added Photini-PyQt5-libGL.patch + +------------------------------------------------------------------- New: ---- Photini-Bing-map.patch Photini-PyQt5-libGL.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ Photini.spec ++++++ --- /var/tmp/diff_new_pack.mNgSNZ/_old 2018-04-26 13:38:52.510224511 +0200 +++ /var/tmp/diff_new_pack.mNgSNZ/_new 2018-04-26 13:38:52.514224365 +0200 @@ -24,6 +24,10 @@ Group: Productivity/Graphics/Other Url: https://github.com/jim-easterbrook/Photini Source0: https://github.com/jim-easterbrook/Photini/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM Photini-PyQt5-libGL.patch -- cf. gh#jim-easterbrook/Photini#30 and QTBUG #67537 +Patch0: Photini-PyQt5-libGL.patch +# PATCH-FIX-UPSTREAM Photini-Bing-map.patch -- cf. gh#jim-easterbrook/Photini#30 +Patch1: Photini-Bing-map.patch BuildRequires: ImageMagick BuildRequires: fdupes BuildRequires: hicolor-icon-theme @@ -51,6 +55,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 sed '/^Icon/cIcon=photini' -i src/linux/photini.desktop # remove shebang sed -e '1d' -i src/photini/importer.py src/photini/spelling.py src/photini/editor.py ++++++ Photini-Bing-map.patch ++++++ >From b9f8a5037d6e63f61fa4c58b29ff67e0252e7ccd Mon Sep 17 00:00:00 2001 From: Jim Easterbrook <j...@jim-easterbrook.me.uk> Date: Wed, 25 Apr 2018 17:09:56 +0100 Subject: [PATCH] Fix Bing map not displaying on some computers When using QtWebEngine and an OpenGL framebuffer is available the Bing map doesn't render, leaving a blank screen. This change disables use of an OpenGL framebuffer. --- src/photini/bingmap.py | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/photini/bingmap.py b/src/photini/bingmap.py index 43552e4..5616942 100644 --- a/src/photini/bingmap.py +++ b/src/photini/bingmap.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- ## Photini - a simple photo metadata editor. ## http://github.com/jim-easterbrook/Photini ## Copyright (C) 2012-18 Jim Easterbrook j...@jim-easterbrook.me.uk @@ -25,7 +24,6 @@ import webbrowser import requests -import six from photini.photinimap import PhotiniMap from photini.pyqt import ( @@ -33,14 +31,23 @@ logger = logging.getLogger(__name__) + +if QtWebEngineWidgets: + WebSettings = QtWebEngineWidgets.QWebEngineSettings +else: + WebSettings = QtWebKit.QWebSettings + + class BingMap(PhotiniMap): def __init__(self, *arg, **kw): super(BingMap, self).__init__(*arg, **kw) - if not QtWebEngineWidgets: - self.map.settings().setAttribute( - QtWebKit.QWebSettings.LocalContentCanAccessRemoteUrls, True) + if QtWebEngineWidgets: self.map.settings().setAttribute( - QtWebKit.QWebSettings.LocalContentCanAccessFileUrls, True) + WebSettings.Accelerated2dCanvasEnabled, False) + self.map.settings().setAttribute( + WebSettings.LocalContentCanAccessRemoteUrls, True) + self.map.settings().setAttribute( + WebSettings.LocalContentCanAccessFileUrls, True) def get_page_elements(self): url = 'http://www.bing.com/api/maps/mapcontrol?callback=initialize' ++++++ Photini-PyQt5-libGL.patch ++++++ >From f2f42c2ef2692810e3ffc82f90b88a27c5fe0460 Mon Sep 17 00:00:00 2001 From: Jim Easterbrook <j...@jim-easterbrook.me.uk> Date: Wed, 25 Apr 2018 13:12:38 +0100 Subject: [PATCH] Possible cure for bug #30 --- src/photini/pyqt.py | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletion(-) Index: Photini-2018.2.0/src/photini/pyqt.py =================================================================== --- Photini-2018.2.0.orig/src/photini/pyqt.py +++ Photini-2018.2.0/src/photini/pyqt.py @@ -22,9 +22,17 @@ from __future__ import unicode_literals from collections import namedtuple import re import six +import sys from photini.configstore import BaseConfigStore +# workaround for Qt bug affecting QtWebEngine +# https://bugreports.qt.io/browse/QTBUG-67537 +if sys.platform.startswith('linux'): + import ctypes + import ctypes.util + ctypes.CDLL(ctypes.util.find_library('GL'), ctypes.RTLD_GLOBAL) + # temporarily open config file to get any over-rides config = BaseConfigStore('editor') using_pyqt5 = config.get('pyqt', 'using_pyqt5', 'auto')
