rdieter pushed to marble (f20). "1:14.12.3-4 (..more)"

Wed Mar 25 13:14:13 UTC 2015

>From e4156a8cf447978779c35894c499a9a394c2f27e Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 12 Mar 2015 13:48:32 -0500
Subject: 1:14.12.3-4

- widget-qt5: don't try to use qt4 versions of qextserialport quazip
- wigget-qt5: omit libRoutingPlugin.so for now, it links qt4 libphonon

diff --git a/marble-14.12.3-qextserialport.patch b/marble-14.12.3-qextserialport.patch
new file mode 100644
index 0000000..75fe875
--- /dev/null
+++ b/marble-14.12.3-qextserialport.patch
@@ -0,0 +1,16 @@
+diff -up marble-14.12.3/cmake/modules/FindQextSerialPort.cmake.qextserialport marble-14.12.3/cmake/modules/FindQextSerialPort.cmake
+--- marble-14.12.3/cmake/modules/FindQextSerialPort.cmake.qextserialport	2015-02-23 02:27:55.000000000 -0600
++++ marble-14.12.3/cmake/modules/FindQextSerialPort.cmake	2015-03-12 11:55:13.972592671 -0500
+@@ -7,7 +7,11 @@ if(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSE
+ else(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARIES)
+ 
+   find_path(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATH_SUFFIXES QtExtSerialPort HINTS ${QT_INCLUDE_DIR})
+-  find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport HINTS ${QT_LIBRARY_DIR})
++  if(QT5BUILD)
++  find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport-qt5 qextserialport-1.2-qt5 HINTS ${QT_LIBRARY_DIR})
++  else(QT5BUILD)
++  find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport qextserialport-1.2 HINTS ${QT_LIBRARY_DIR})
++  endif(QT5BUILD)
+ 
+   include(FindPackageHandleStandardArgs)
+   find_package_handle_standard_args(QextSerialPort DEFAULT_MSG QEXTSERIALPORT_INCLUDE_DIR QEXTSERIALPORT_LIBRARIES)
diff --git a/marble-14.12.3-quazip_qt5.patch b/marble-14.12.3-quazip_qt5.patch
new file mode 100644
index 0000000..0f4805a
--- /dev/null
+++ b/marble-14.12.3-quazip_qt5.patch
@@ -0,0 +1,15 @@
+diff -up marble-14.12.3/cmake/modules/Findquazip.cmake.quazip marble-14.12.3/cmake/modules/Findquazip.cmake
+--- marble-14.12.3/cmake/modules/Findquazip.cmake.quazip	2015-02-23 02:27:55.000000000 -0600
++++ marble-14.12.3/cmake/modules/Findquazip.cmake	2015-03-12 12:04:25.222115177 -0500
+@@ -7,7 +7,11 @@ if(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARI
+ else(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARIES)
+ 
+   find_path(QUAZIP_INCLUDE_DIR NAMES quazip/quazip.h)
++  if(QT5BUILD)
++  find_library(QUAZIP_LIBRARIES NAMES quazip-qt5)
++  else(QT5BUILD)
+   find_library(QUAZIP_LIBRARIES NAMES quazip)
++  endif(QT5BUILD)
+ 
+   include(FindPackageHandleStandardArgs)
+   find_package_handle_standard_args(quazip DEFAULT_MSG QUAZIP_INCLUDE_DIR QUAZIP_LIBRARIES)
diff --git a/marble-4.11.90-qextserialport.patch b/marble-4.11.90-qextserialport.patch
deleted file mode 100644
index d30850b..0000000
--- a/marble-4.11.90-qextserialport.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up marble-4.11.90/cmake/modules/FindQextSerialPort.cmake.qextserialport marble-4.11.90/cmake/modules/FindQextSerialPort.cmake
---- marble-4.11.90/cmake/modules/FindQextSerialPort.cmake.qextserialport	2013-11-15 23:13:22.312594680 -0600
-+++ marble-4.11.90/cmake/modules/FindQextSerialPort.cmake	2013-11-15 23:14:47.161042461 -0600
-@@ -7,7 +7,7 @@ if(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSE
- else(QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARIES)
- 
-   find_path(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATH_SUFFIXES QtExtSerialPort HINTS ${QT_INCLUDE_DIR})
--  find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport HINTS ${QT_LIBRARY_DIR})
-+  find_library(QEXTSERIALPORT_LIBRARIES NAMES qextserialport qextserialport-1.2 HINTS ${QT_LIBRARY_DIR})
- 
-   include(FindPackageHandleStandardArgs)
-   find_package_handle_standard_args(QextSerialPort DEFAULT_MSG QEXTSERIALPORT_INCLUDE_DIR QEXTSERIALPORT_LIBRARIES)
diff --git a/marble.spec b/marble.spec
index 1a6bb55..f409eff 100644
--- a/marble.spec
+++ b/marble.spec
@@ -12,7 +12,7 @@ Name:    marble
 Summary: Virtual globe and world atlas 
 Epoch:   1
 Version: 14.12.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: LGPLv2+
 #URL:    https://projects.kde.org/projects/kde/kdeedu/marble
@@ -25,9 +25,10 @@ URL:     http://edu.kde.org/marble/
 %endif
 Source0:  http://download.kde.org/%{stable}/applications/%{version}/src/%{name}-%{version}.tar.xz
 
-# find libqextserialport-1.2.so
-# TODO: upstreamable? Or do we want to fix qextserialport-devel instead?
-Patch0: marble-4.11.90-qextserialport.patch
+# find libqextserialport-1.2.so and qt5 versions
+Patch0: marble-14.12.3-qextserialport.patch
+# find quazip-qt5
+Patch1: marble-14.12.3-quazip_qt5.patch
 
 ## upstreamable patches
 # 1. add/fix support for MOBILE/TOUCH marble app versions
@@ -217,6 +218,7 @@ Requires: %{name}-widget-qt5%{?_isa} = %{epoch}:%{version}-%{release}
 %setup -q
 
 %patch0 -p1 -b .qextserialport
+%patch1 -p1 -b .quazip_qt5
 %patch50 -p1 -b .app_versions
 %patch51 -p1 -b .marblewidget
 %patch52 -p1 -b .opencachingcom_Qt5WebKitWidgets
@@ -273,8 +275,8 @@ sed -i -e "s|marblewidget |marblewidget-qt5 |g" \
 
 ## unpackaged files
 rm -fv  %{buildroot}%{_datadir}/applications/marble_{gpx,kml,kmz,osm,shp}.desktop
-# unpackaged for now, cause runtime crashes (at least when used with subsurface) -- rex
-rm -frv %{buildroot}%{_libdir}/marble/plugins/
+# FIXME: libRoutingPlugin.so links qt4 libphonon
+rm -fv %{buildroot}%{_libdir}/marble/plugins/libRoutingPlugin.so
 %endif
 
 
@@ -417,7 +419,7 @@ fi
 %files widget-qt5
 %{_libdir}/libmarblewidget-qt5.so.20
 %{_libdir}/libmarblewidget-qt5.so.0.19.*
-#{_libdir}/marble/plugins/
+%{_libdir}/marble/plugins/
 
 %files widget-qt5-devel
 %{_includedir}/marble/
@@ -428,6 +430,10 @@ fi
 
 
 %changelog
+* Thu Mar 12 2015 Rex Dieter <rdieter at fedoraproject.org> - 1:14.12.3-4
+- widget-qt5: don't try to use qt4 versions of qextserialport quazip
+- wigget-qt5: omit libRoutingPlugin.so for now, it links qt4 libphonon
+
 * Wed Mar 11 2015 Rex Dieter <rdieter at fedoraproject.org> - 1:14.12.3-3
 - install complete cityplacemarks.cache (#1093552)
 - disable -mobile (doesn't work very well)
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/marble.git/commit/?h=f20&id=e4156a8cf447978779c35894c499a9a394c2f27e

--
You received this message due to your preference settings at
https://apps.fedoraproject.org/notifications//fmnscmcommits.id.fedoraproject.org/email/29390
