summaryrefslogtreecommitdiffstats
path: root/redhat/tdelibs
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/tdelibs')
-rw-r--r--redhat/tdelibs/tdelibs-3.5.13.2-fix_arts_include.patch25
-rw-r--r--redhat/tdelibs/tdelibs-3.5.13.2.spec3
2 files changed, 28 insertions, 0 deletions
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2-fix_arts_include.patch b/redhat/tdelibs/tdelibs-3.5.13.2-fix_arts_include.patch
new file mode 100644
index 000000000..34cca461b
--- /dev/null
+++ b/redhat/tdelibs/tdelibs-3.5.13.2-fix_arts_include.patch
@@ -0,0 +1,25 @@
+diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
+index 3b58525..091be35 100644
+--- a/arts/kde/CMakeLists.txt
++++ b/arts/kde/CMakeLists.txt
+@@ -27,11 +27,6 @@ link_directories(
+ ${ARTS_LIBRARY_DIRS}
+ )
+
+-# pkg-config stripping -I/usr/include
+-if( NOT ARTS_INCLUDE_DIRS )
+- set( ARTS_INCLUDE_DIRS "/usr/include" )
+-endif()
+-
+
+ ##### headers ###################################
+
+@@ -58,7 +53,7 @@ set( ${target}_SRCS
+ add_custom_command(
+ OUTPUT artskde.cc artskde.h
+ COMMAND ${ARTS_MCOPIDL_EXECUTABLE}
+- -I${ARTS_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
++ -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
+ DEPENDS artskde.idl
+ )
+
diff --git a/redhat/tdelibs/tdelibs-3.5.13.2.spec b/redhat/tdelibs/tdelibs-3.5.13.2.spec
index d490fec26..1956c6237 100644
--- a/redhat/tdelibs/tdelibs-3.5.13.2.spec
+++ b/redhat/tdelibs/tdelibs-3.5.13.2.spec
@@ -38,6 +38,8 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Patch1: tdelibs-3.5.13.2-fix_xdg_menu.patch
# Fix startup of KDE4 applications
Patch2: tdelibs-3.5.13.2-fix-starting-kde4-applications.patch
+# Fix ARTS includes directory
+Patch3: tdelibs-3.5.13.2-fix_arts_include.patch
# Patches from Mandriva
Patch101: tdelibs-3.5.13.2-xdg_dirs_set_path.patch
@@ -374,6 +376,7 @@ applications for TDE.
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .xdg
%patch2 -p1 -b .kde4
+%patch3 -p1 -b .arts
%patch101 -p1 -b .xdg_path
%patch102 -p1 -b .cups_by_default