Hello community,
here is the log from the commit of package tulip for openSUSE:Factory checked
in at 2014-02-12 11:09:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tulip (Old)
and /work/SRC/openSUSE:Factory/.tulip.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tulip"
Changes:
--------
--- /work/SRC/openSUSE:Factory/tulip/tulip.changes 2013-04-23
17:37:46.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.tulip.new/tulip.changes 2014-02-12
11:09:08.000000000 +0100
@@ -1,0 +2,5 @@
+Mon Feb 10 22:31:33 UTC 2014 - dims...@opensuse.org
+
+- Add tulip-cmake-2.8.12.patch: Fix build with cmake 2.8,12.
+
+-------------------------------------------------------------------
New:
----
tulip-cmake-2.8.12.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tulip.spec ++++++
--- /var/tmp/diff_new_pack.63xuJk/_old 2014-02-12 11:09:10.000000000 +0100
+++ /var/tmp/diff_new_pack.63xuJk/_new 2014-02-12 11:09:10.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package tulip
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -43,6 +43,7 @@
# copy and store it into /usr/lib64/libftgl.so, which conflicts
# with ftgl-devel
Patch8: tulip-system-ftgl.patch
+Patch9: tulip-cmake-2.8.12.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: Mesa-devel
BuildRequires: cmake
@@ -203,6 +204,10 @@
%patch6 -p1
%patch7
%patch8
+%if 0%{suse_version} > 1310
+# For cmake >= 2.8.12
+%patch9
+%endif
%build
++++++ tulip-cmake-2.8.12.patch ++++++
CMake 2.8.12 fix.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce60ff509c4ff27fe861fc5b2080f50897a68c4
changed the arguments of the internal macros QT4_EXTRACT_OPTIONS and
QT4_CREATE_MOC_COMMAND which the port uses directly, so we have to adapt.
Tulip 4.x should not have this problem, as it removed its QT4_* macro wrappers.
--- UseTulip.cmake.orig 2012-06-11 10:46:14.000000000 +0300
+++ UseTulip.cmake 2013-11-03 19:16:59.000000000 +0200
@@ -1,5 +1,5 @@
MACRO (TULIP_QT4_WRAP_UI outfiles )
- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
FOREACH (it ${ui_files})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
@@ -13,7 +13,7 @@
ENDMACRO (TULIP_QT4_WRAP_UI)
MACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE outfiles )
- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
FOREACH (it ${ui_files})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
@@ -27,7 +27,7 @@
ENDMACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE)
MACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE_TULIP outfiles )
- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
FOREACH (it ${ui_files})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
@@ -42,12 +42,12 @@
MACRO (TULIP_QT4_WRAP_CPP outfiles )
QT4_GET_MOC_FLAGS(moc_flags)
- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
FOREACH (it ${moc_files})
GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cpp)
- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}"
"${moc_target}")
SET(${outfiles} ${${outfiles}} ${outfile})
ENDFOREACH(it)
ENDMACRO (TULIP_QT4_WRAP_CPP)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
