[libQtGTL] improved .dso_linking patch fix build against llvm3-ized OpenGTL

Sat Jan 14 13:20:59 UTC 2012

commit 75bbf6c345a591012596ec82c0b1b447988e407d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Jan 14 07:20:55 2012 -0600

    improved .dso_linking patch
    fix build against llvm3-ized OpenGTL

 libQtGTL-0.9.1-dso_linking.patch             |   58 ++++++++++++++++++++++----
 libQtGTL-0.9.1-opengtl_metadata_header.patch |   24 +++++++++++
 libQtGTL.spec                                |   15 +++++-
 3 files changed, 86 insertions(+), 11 deletions(-)
---

diff --git a/libQtGTL-0.9.1-dso_linking.patch b/libQtGTL-0.9.1-dso_linking.patch
index a023191..8618a01 100644
--- a/libQtGTL-0.9.1-dso_linking.patch
+++ b/libQtGTL-0.9.1-dso_linking.patch
@@ -1,12 +1,54 @@
+diff -up libQtGTL-0.9.1/examples/QtCTL/CMakeLists.txt.dso libQtGTL-0.9.1/examples/QtCTL/CMakeLists.txt
+--- libQtGTL-0.9.1/examples/QtCTL/CMakeLists.txt.dso	2010-02-13 04:23:11.000000000 -0600
++++ libQtGTL-0.9.1/examples/QtCTL/CMakeLists.txt	2012-01-14 06:19:05.807398813 -0600
+@@ -21,5 +21,5 @@ qt4_automoc(${Qt_CTL_SRCS})
+ 
+ add_executable(qCTL ${Qt_CTL_SRCS})
+ # set_target_properties( QtCTL PROPERTIES COMPILE_FLAGS ${OPENCTL_COMPILE_FLAGS})
+-target_link_libraries(qCTL ${QT_LIBRARY_DIR} ${QT_QTGUI_LIBRARY} ${OPENCTL_LIBRARIES} QtGTL)
++target_link_libraries(qCTL ${QT_LIBRARY_DIR} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${OPENCTL_LIBRARIES} QtGTL)
+ # install(TARGETS QtCTL DESTINATION ${BIN_INSTALL_DIR} )
+diff -up libQtGTL-0.9.1/examples/QtShiva/CMakeLists.txt.dso libQtGTL-0.9.1/examples/QtShiva/CMakeLists.txt
+--- libQtGTL-0.9.1/examples/QtShiva/CMakeLists.txt.dso	2010-02-13 04:23:11.000000000 -0600
++++ libQtGTL-0.9.1/examples/QtShiva/CMakeLists.txt	2012-01-14 06:19:05.807398813 -0600
+@@ -20,5 +20,5 @@ qt4_wrap_ui(Qt_SHIVA_SRCS MainWindow.ui)
+ qt4_automoc(${Qt_SHIVA_SRCS})
+ 
+ add_executable(qShiva ${Qt_SHIVA_SRCS} )
+-target_link_libraries(qShiva ${QT_LIBRARY_DIR} ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LIBRARIES} QtGTL QtShiva)
++target_link_libraries(qShiva ${QT_LIBRARY_DIR} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LIBRARIES} QtGTL QtShiva)
+ # install(TARGETS QtShiva DESTINATION ${BIN_INSTALL_DIR} )
 diff -up libQtGTL-0.9.1/QtGTL/CMakeLists.txt.dso libQtGTL-0.9.1/QtGTL/CMakeLists.txt
 --- libQtGTL-0.9.1/QtGTL/CMakeLists.txt.dso	2010-02-13 04:23:11.000000000 -0600
-+++ libQtGTL-0.9.1/QtGTL/CMakeLists.txt	2010-04-08 10:30:56.984474364 -0500
-@@ -13,7 +13,7 @@ set(libQtGTL_SRCS
- qt4_automoc(${libQtShiva_SRCS})
++++ libQtGTL-0.9.1/QtGTL/CMakeLists.txt	2012-01-14 06:19:05.808398800 -0600
+@@ -1,5 +1,6 @@
+ 
+ find_package(GTLCore REQUIRED)
++find_package(OpenShiva REQUIRED)
  
- add_library(QtGTL SHARED ${libQtGTL_SRCS})
--target_link_libraries(QtGTL ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LIBRARIES} )
-+target_link_libraries(QtGTL ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${OPENSHIVA_LIBRARIES} )
+ include_directories(${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${GTLCORE_INCLUDE_DIR})
  
- install(TARGETS QtGTL DESTINATION ${LIB_INSTALL_DIR} )
- install( FILES QImageBuffer.h QImageImage.h DESTINATION ${INCLUDE_INSTALL_DIR}/QtGTL )
+diff -up libQtGTL-0.9.1/QtGTL/QtGTL.pc.cmake.dso libQtGTL-0.9.1/QtGTL/QtGTL.pc.cmake
+--- libQtGTL-0.9.1/QtGTL/QtGTL.pc.cmake.dso	2010-02-13 04:23:11.000000000 -0600
++++ libQtGTL-0.9.1/QtGTL/QtGTL.pc.cmake	2012-01-14 06:24:01.634700459 -0600
+@@ -6,6 +6,6 @@ includedir=@INCLUDE_INSTALL_DIR@
+ Name: QtGTL
+ Description: Qt Wrappers for Graphics Transformation Language
+ Version: @QTGTL_VERSION@
+-Requires:
+-Libs: -L${libdir} -lGTLCore -lQtGTL
++Requires: GTLCore
++Libs: -L${libdir} -lQtGTL
+ Cflags: -I${includedir}
+diff -up libQtGTL-0.9.1/QtShiva/QtShiva.pc.cmake.dso libQtGTL-0.9.1/QtShiva/QtShiva.pc.cmake
+--- libQtGTL-0.9.1/QtShiva/QtShiva.pc.cmake.dso	2010-02-13 04:23:11.000000000 -0600
++++ libQtGTL-0.9.1/QtShiva/QtShiva.pc.cmake	2012-01-14 06:24:54.375041116 -0600
+@@ -6,6 +6,6 @@ includedir=@INCLUDE_INSTALL_DIR@
+ Name: QtShiva
+ Description: Qt Wrapers for the Shiva Kernel Transformation Language
+ Version: @QTSHIVA_VERSION@
+-Requires:
+-Libs: -L${libdir} -lOpenShiva -lQtShiva
++Requires: OpenShiva
++Libs: -L${libdir} -lQtShiva
+ Cflags: -I${includedir}
diff --git a/libQtGTL-0.9.1-opengtl_metadata_header.patch b/libQtGTL-0.9.1-opengtl_metadata_header.patch
new file mode 100644
index 0000000..ec45025
--- /dev/null
+++ b/libQtGTL-0.9.1-opengtl_metadata_header.patch
@@ -0,0 +1,24 @@
+diff -r b332a3c8e894 -r f7913d273bb4 QtShiva/KernelParametersWidget.cpp
+--- a/QtShiva/KernelParametersWidget.cpp
++++ b/QtShiva/KernelParametersWidget.cpp
+@@ -23,7 +23,7 @@
+ 
+ #include <GTLCore/Value.h>
+ #include <OpenShiva/Kernel.h>
+-#include <OpenShiva/Metadata.h>
++#include <GTLFragment/Metadata.h>
+ 
+ using namespace QtShiva;
+ 
+diff -r b332a3c8e894 -r f7913d273bb4 QtShiva/SourceParametersWidget.cpp
+--- a/QtShiva/SourceParametersWidget.cpp
++++ b/QtShiva/SourceParametersWidget.cpp
+@@ -25,7 +25,7 @@
+ 
+ #include <GTLCore/Value.h>
+ #include <OpenShiva/Source.h>
+-#include <OpenShiva/Metadata.h>
++#include <GTLFragment/Metadata.h>
+ 
+ class SourceParametersWidget::SourceParametrisation : public ParametersWidgetBase::Parametrisation {
+   public:
diff --git a/libQtGTL.spec b/libQtGTL.spec
index 3edf8ab..0de600e 100644
--- a/libQtGTL.spec
+++ b/libQtGTL.spec
@@ -1,8 +1,8 @@
 
 Summary: Qt bindings for OpenGTL
 Name:    libQtGTL
-Version: 0.9.1
-Release: 5%{?dist}
+Version: 0.9.2
+Release: 6%{?dist}
 
 License: LGPLv2 
 Group:   System Environment/Libraries
@@ -16,6 +16,9 @@ ExcludeArch: ppc64
 ## upstreamable patches
 Patch50: libQtGTL-0.9.1-dso_linking.patch
 
+## upstream patches
+Patch100: libQtGTL-0.9.1-opengtl_metadata_header.patch
+
 BuildRequires: cmake
 # aka OpenGTL-devel
 BuildRequires: pkgconfig(GTLCore) pkgconfig(OpenShiva)
@@ -29,7 +32,6 @@ BuildRequires: pkgconfig(QtGui)
 %package devel
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: OpenGTL-devel
 %description devel
 %{summary}.
 
@@ -38,6 +40,9 @@ Requires: OpenGTL-devel
 %setup -q
 
 %patch50 -p1 -b .dso_linking
+%if 0%{?fedora} > 16
+%patch100 -p1 -b .opengtl_metadata_header
+%endif
 
 
 %build
@@ -84,6 +89,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Jan 14 2012 Rex Dieter <rdieter at fedoraproject.org> 0.9.1-6
+- improved .dso_linking patch
+- fix build against llvm3-ized OpenGTL
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
