add rhel/fedora condition
This commit is contained in:
parent
6bbcaeb229
commit
a41ffeb07b
|
@ -0,0 +1,101 @@
|
||||||
|
diff -up kdelibs-4.8.3/CMakeLists.txt.webkit kdelibs-4.8.3/CMakeLists.txt
|
||||||
|
--- kdelibs-4.8.3/CMakeLists.txt.webkit 2012-04-29 22:38:24.266748427 +0200
|
||||||
|
+++ kdelibs-4.8.3/CMakeLists.txt 2012-05-04 12:35:38.086634268 +0200
|
||||||
|
@@ -325,7 +325,6 @@ if(NOT WINCE)
|
||||||
|
add_subdirectory( plasma )
|
||||||
|
endif(NOT WINCE)
|
||||||
|
add_subdirectory( kunitconversion )
|
||||||
|
-add_subdirectory( kdewebkit )
|
||||||
|
add_subdirectory( includes )
|
||||||
|
|
||||||
|
add_subdirectory( experimental )
|
||||||
|
diff -up kdelibs-4.8.3/kdewidgets/CMakeLists.txt.webkit kdelibs-4.8.3/kdewidgets/CMakeLists.txt
|
||||||
|
--- kdelibs-4.8.3/kdewidgets/CMakeLists.txt.webkit 2012-05-04 12:35:38.000000000 +0200
|
||||||
|
+++ kdelibs-4.8.3/kdewidgets/CMakeLists.txt 2012-05-04 12:37:23.482261882 +0200
|
||||||
|
@@ -88,41 +88,6 @@ if(QT_QTDESIGNER_FOUND)
|
||||||
|
install(TARGETS kdedeprecated DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||||||
|
endif(NOT KDE_NO_DEPRECATED)
|
||||||
|
|
||||||
|
-
|
||||||
|
- # kdewebkit widgets
|
||||||
|
- include_directories(
|
||||||
|
- ${CMAKE_SOURCE_DIR}/kdewebkit
|
||||||
|
- )
|
||||||
|
-
|
||||||
|
- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
|
||||||
|
- COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kdewebkit.widgets
|
||||||
|
- MAIN_DEPENDENCY kdewebkit.widgets DEPENDS makekdewidgets4)
|
||||||
|
-
|
||||||
|
- set(kdewebkitwidgets_PART_SRCS
|
||||||
|
- classpreviews.cpp
|
||||||
|
- ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp
|
||||||
|
- )
|
||||||
|
-
|
||||||
|
- qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.cpp ${CMAKE_CURRENT_BINARY_DIR}/kdewebkitwidgets.moc)
|
||||||
|
-
|
||||||
|
-
|
||||||
|
- qt4_add_resources(kdewebkitwidgets_PART_SRCS kdewebkitwidgets.qrc)
|
||||||
|
-
|
||||||
|
- kde4_add_plugin(kdewebkitwidgets ${kdewebkitwidgets_PART_SRCS})
|
||||||
|
-
|
||||||
|
- target_link_libraries(kdewebkitwidgets ${KDE4_KDEUI_LIBS} ${KDE4_KDEWEBKIT_LIBS} ${QT_QTWEBKIT_LIBRARY})
|
||||||
|
-# if(NOT WIN32)
|
||||||
|
-# set_target_properties(kdewebkitwidgets PROPERTIES
|
||||||
|
-# INSTALL_RPATH_USE_LINK_PATH TRUE
|
||||||
|
-# SKIP_BUILD_RPATH TRUE
|
||||||
|
-# BUILD_WITH_INSTALL_RPATH TRUE
|
||||||
|
-# INSTALL_RPATH ${LIB_INSTALL_DIR}
|
||||||
|
-# )
|
||||||
|
-# endif(NOT WIN32)
|
||||||
|
-
|
||||||
|
- install(TARGETS kdewebkitwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
|
||||||
|
-
|
||||||
|
-
|
||||||
|
if (QT_QT3SUPPORT_FOUND)
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
diff -up kdelibs-4.8.3/plasma/CMakeLists.txt.webkit kdelibs-4.8.3/plasma/CMakeLists.txt
|
||||||
|
--- kdelibs-4.8.3/plasma/CMakeLists.txt.webkit 2012-02-29 22:55:52.532149866 +0100
|
||||||
|
+++ kdelibs-4.8.3/plasma/CMakeLists.txt 2012-05-04 12:35:38.088634242 +0200
|
||||||
|
@@ -10,6 +10,8 @@ if(KDE_PLATFORM_FEATURE_BINARY_COMPATIBL
|
||||||
|
set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
|
||||||
|
endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
|
||||||
|
|
||||||
|
+set(PLASMA_NO_KDEWEBKIT TRUE)
|
||||||
|
+
|
||||||
|
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
|
||||||
|
${KDE4_KDECORE_INCLUDES}
|
||||||
|
${KDE4_KDEUI_INCLUDES}
|
||||||
|
@@ -114,7 +116,6 @@ set(plasma_LIB_SRCS
|
||||||
|
framesvg.cpp
|
||||||
|
plasma.cpp
|
||||||
|
popupapplet.cpp
|
||||||
|
- private/animablegraphicswebview.cpp
|
||||||
|
private/applethandle.cpp
|
||||||
|
private/associatedapplicationmanager.cpp
|
||||||
|
private/datacontainer_p.cpp
|
||||||
|
@@ -202,7 +203,6 @@ set(plasma_LIB_SRCS
|
||||||
|
widgets/textbrowser.cpp
|
||||||
|
widgets/treeview.cpp
|
||||||
|
widgets/textedit.cpp
|
||||||
|
- widgets/webview.cpp
|
||||||
|
|
||||||
|
#Temporary QtJolie branch
|
||||||
|
private/qtjolie-branch/qtjolie/abstractadaptor.cpp
|
||||||
|
@@ -266,7 +266,7 @@ endif(PHONON_FOUND)
|
||||||
|
|
||||||
|
kde4_add_library(plasma ${LIBRARY_TYPE} ${plasma_LIB_SRCS})
|
||||||
|
|
||||||
|
-target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
|
||||||
|
+target_link_libraries(plasma ${QT_QTUITOOLS_LIBRARY}
|
||||||
|
${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
|
||||||
|
${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
|
||||||
|
|
||||||
|
@@ -406,7 +406,6 @@ install(FILES
|
||||||
|
widgets/textbrowser.h
|
||||||
|
widgets/treeview.h
|
||||||
|
widgets/textedit.h
|
||||||
|
- widgets/webview.h
|
||||||
|
DESTINATION ${INCLUDE_INSTALL_DIR}/plasma/widgets COMPONENT Devel)
|
||||||
|
|
||||||
|
install(FILES
|
17
kdelibs.spec
17
kdelibs.spec
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.8.3
|
Version: 4.8.3
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
|
@ -149,6 +149,9 @@ Patch100: kdelibs-4.8.3-kdeclarative-install-location.patch
|
||||||
# Not Upstreamed? why not ? -- Rex
|
# Not Upstreamed? why not ? -- Rex
|
||||||
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
||||||
|
|
||||||
|
# rhel patches
|
||||||
|
Patch300: kdelibs-4.8.3-webkit.patch
|
||||||
|
|
||||||
# force upgrade of apps using the discontinued KatePart Smart* interfaces to
|
# force upgrade of apps using the discontinued KatePart Smart* interfaces to
|
||||||
# versions using the new Moving* interfaces instead
|
# versions using the new Moving* interfaces instead
|
||||||
# conditionize these? how long to carry them? -- rex
|
# conditionize these? how long to carry them? -- rex
|
||||||
|
@ -159,7 +162,9 @@ Conflicts: kile < 2.1-0.9
|
||||||
Conflicts: rkward < 0.5.4
|
Conflicts: rkward < 0.5.4
|
||||||
|
|
||||||
BuildRequires: qt4-devel >= %{qt4_ver}
|
BuildRequires: qt4-devel >= %{qt4_ver}
|
||||||
|
%if 0%{?fedora}
|
||||||
BuildRequires: pkgconfig(QtWebKit)
|
BuildRequires: pkgconfig(QtWebKit)
|
||||||
|
%endif
|
||||||
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
Requires: redhat-menus
|
Requires: redhat-menus
|
||||||
|
@ -261,7 +266,9 @@ Requires: pkgconfig(phonon)
|
||||||
# considered part of nepomuk-devel
|
# considered part of nepomuk-devel
|
||||||
Requires: pkgconfig(shared-desktop-ontologies) pkgconfig(soprano)
|
Requires: pkgconfig(shared-desktop-ontologies) pkgconfig(soprano)
|
||||||
Requires: qt4-devel
|
Requires: qt4-devel
|
||||||
Requires: pkgconfig(QtWebKit)
|
%if 0%{?fedora}
|
||||||
|
Requires: pkgconfig(QtWebKit)
|
||||||
|
%endif
|
||||||
# do we really still need all these below? -- Rex
|
# do we really still need all these below? -- Rex
|
||||||
Requires: pkgconfig(libstreams)
|
Requires: pkgconfig(libstreams)
|
||||||
Requires: pkgconfig(gamin)
|
Requires: pkgconfig(gamin)
|
||||||
|
@ -342,7 +349,8 @@ popd
|
||||||
# security fixes
|
# security fixes
|
||||||
%patch200 -p1 -b .CVE-2009-2702
|
%patch200 -p1 -b .CVE-2009-2702
|
||||||
|
|
||||||
|
# rhel patches
|
||||||
|
%patch300 -p1 -b .webkit
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|
||||||
|
@ -590,6 +598,9 @@ rm -rf %{buildroot}
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu May 03 2012 Than Ngo <than@redhat.com> - 6:4.8.3-2
|
||||||
|
- add rhel/fedora condition
|
||||||
|
|
||||||
* Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 6:4.8.3-1
|
* Mon Apr 30 2012 Jaroslav Reznik <jreznik@redhat.com> - 6:4.8.3-1
|
||||||
- 4.8.3
|
- 4.8.3
|
||||||
- remove cmake implicit link directories patch
|
- remove cmake implicit link directories patch
|
||||||
|
|
Loading…
Reference in New Issue