diff --git a/abi_used_libs b/abi_used_libs --- a/abi_used_libs +++ b/abi_used_libs @@ -3,10 +3,9 @@ libQt5Gui.so.5 libQt5Network.so.5 libQt5PrintSupport.so.5 -libQt5Script.so.5 +libQt5Qml.so.5 libQt5Sql.so.5 -libQt5WebKit.so.5 -libQt5WebKitWidgets.so.5 +libQt5WebEngineWidgets.so.5 libQt5Widgets.so.5 libQt5Xml.so.5 libalglib-3.14.0.so diff --git a/files/qmapshack-qaction.patch b/files/qmapshack-qaction.patch deleted file mode 100644 --- a/files/qmapshack-qaction.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rupN qmapshack-1.11.1/src/qmapshack/helpers/CToolBarSetupDialog.cpp qmapshack-1.11.1-new/src/qmapshack/helpers/CToolBarSetupDialog.cpp ---- qmapshack-1.11.1/src/qmapshack/helpers/CToolBarSetupDialog.cpp 2018-04-10 13:32:15.000000000 +0200 -+++ qmapshack-1.11.1-new/src/qmapshack/helpers/CToolBarSetupDialog.cpp 2018-07-01 21:20:59.462555036 +0200 -@@ -20,6 +20,8 @@ - #include "helpers/CToolBarConfig.h" - #include "helpers/CToolBarSetupDialog.h" - -+#include -+ - bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item) - { - CDialogItem * dialogItem = dynamic_cast(item); diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : qmapshack -version : 1.11.1 -release : 2 +version : 1.12.0 +release : 3 source : - - https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.11.1.tar.gz : 3e65e443665041bb4c10ebd10fb49ca6df9015d9cecd2551a888bbdaa8a3117b + - https://bitbucket.org/maproom/qmapshack/downloads/qmapshack-1.12.0.tar.gz : 30ee69165a8548b529d5d9679da52099226405b9285b42b18342dd842730b734 license : GPL-3.0-or-later component : desktop summary : GPS mapping and management tool @@ -11,7 +11,7 @@ builddeps : - pkgconfig(Qt5Script) - pkgconfig(Qt5UiTools) - - pkgconfig(Qt5WebKit) + - pkgconfig(Qt5WebEngine) - pkgconfig(gdal) - pkgconfig(libturbojpeg) - pkgconfig(proj) @@ -19,8 +19,6 @@ - quazip-devel - routino-devel setup : | - %patch -p1 < $pkgfiles/qmapshack-qaction.patch - %cmake_ninja build : | %ninja_build diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ qmapshack - Bryan T. Meyers - bmeyers@datadrake.com + James Lee + jamesl33info@gmail.com GPL-3.0-or-later desktop @@ -79,12 +79,12 @@ - - 2018-08-20 - 1.11.1 + + 2018-12-18 + 1.12.0 Packaging update - Bryan T. Meyers - bmeyers@datadrake.com + James Lee + jamesl33info@gmail.com \ No newline at end of file