Merge pull request #60 from shundhammer/huha-missing-icons-02

Fix for missing icons: Require Qt SVG plug-in
libyui · Nov 8, 2018 · bcc6e5b · bcc6e5b
2 parents e66a3d2 + a20149d
commit bcc6e5b
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 11 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,6 +1,6 @@
 SET( VERSION_MAJOR "2" )
 SET( VERSION_MINOR "45" )
-SET( VERSION_PATCH "23" )
+SET( VERSION_PATCH "24" )
 SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 
 ##### This is need for the libyui core, ONLY.

diff --git a/package/libyui-qt-pkg-doc.spec b/package/libyui-qt-pkg-doc.spec
@@ -20,7 +20,7 @@
 %define so_version 9
 
 Name:           %{parent}-doc
-Version:        2.45.23
+Version:        2.45.24
 Release:        0
 Source:         %{parent}-%{version}.tar.bz2
 

diff --git a/package/libyui-qt-pkg.changes b/package/libyui-qt-pkg.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Nov  7 14:00:54 UTC 2018 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Require and link against libQt5Svg (bsc#1114654)
+- 2.45.24
+
 -------------------------------------------------------------------
 Tue Nov  6 15:21:12 UTC 2018 - Stefan Hundhammer <shundhammer@suse.com>
 

diff --git a/package/libyui-qt-pkg.spec b/package/libyui-qt-pkg.spec
@@ -17,7 +17,7 @@
 
 
 Name:           libyui-qt-pkg
-Version:        2.45.23
+Version:        2.45.24
 Release:        0
 Source:         %{name}-%{version}.tar.bz2
 
@@ -54,6 +54,9 @@ component for libYUI.
 
 %package -n %{bin_name}
 
+# bsc#1114654: Need Qt SVG support for icons (built-in and from theme)
+Requires:       libQt5Svg5
+
 Requires:       libyui%{so_version}
 Provides:       %{name} = %{version}
 
@@ -125,7 +128,7 @@ cmake .. \
         -DCMAKE_BUILD_TYPE=RELEASE
 %endif
 
-make %{?jobs:-j%jobs}
+make VERBOSE=1 %{?jobs:-j%jobs}
 
 %install
 cd build

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,13 +1,25 @@
 # Find includes in corresponding build directories
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set( CMAKE_INCLUDE_CURRENT_DIR ON )
+
 # Instruct CMake to run moc automatically when needed.
-set(CMAKE_AUTOMOC ON)
+set( CMAKE_AUTOMOC ON )
+
+find_package( Qt5Core	   CONFIG REQUIRED )
+find_package( Qt5Gui	   CONFIG REQUIRED )
+find_package( Qt5Widgets   CONFIG REQUIRED )
+find_package( Qt5Svg	   CONFIG REQUIRED )
+find_package( Qt5X11Extras CONFIG REQUIRED )
 
-set(CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH})
+set( CMAKE_INCLUDE_PATH ${QT_INCLUDES} ${CMAKE_INCLUDE_PATH} )
 
 PROCESS_SOURCES()
-target_link_libraries(
-  ${TARGETLIB} Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Svg Qt5::X11Extras
-  )
 
-SUBDIRS(icons)
+target_link_libraries( ${TARGETLIB}
+		       Qt5::Core
+		       Qt5::Gui
+		       Qt5::Widgets
+		       Qt5::Svg
+		       Qt5::X11Extras
+		      )
+
+SUBDIRS( icons )