summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-11-06 11:37:41 +0100
committerJohannes Huber <johu@gentoo.org>2016-11-06 11:37:58 +0100
commit7d60189c96304004cde7c6dd9776df65f57d7ec6 (patch)
tree3fa9e52b4cbc31f7cd12bed807200003bf3c0eb3 /kde-plasma/systemsettings/files
parentx11-wm/xmonad: disable tests (diff)
downloadgentoo-7d60189c96304004cde7c6dd9776df65f57d7ec6.tar.gz
gentoo-7d60189c96304004cde7c6dd9776df65f57d7ec6.tar.bz2
gentoo-7d60189c96304004cde7c6dd9776df65f57d7ec6.zip
kde-base/systemsettings -> kde-plasma/systemsettings
Diffstat (limited to 'kde-plasma/systemsettings/files')
-rw-r--r--kde-plasma/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch35
-rw-r--r--kde-plasma/systemsettings/files/systemsettings-kcm-randr.patch20
2 files changed, 55 insertions, 0 deletions
diff --git a/kde-plasma/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch b/kde-plasma/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch
new file mode 100644
index 000000000000..e98387ff9380
--- /dev/null
+++ b/kde-plasma/systemsettings/files/systemsettings-4.11.22-strigi-removal.patch
@@ -0,0 +1,35 @@
+diff -Naur kde-workspace-4.11.22.orig/CMakeLists.txt kde-workspace-4.11.22/CMakeLists.txt
+--- kde-workspace-4.11.22.orig/CMakeLists.txt 2015-08-12 09:03:15.000000000 +0200
++++ kde-workspace-4.11.22/CMakeLists.txt 2016-05-25 21:17:36.503606974 +0200
+@@ -20,12 +20,6 @@
+
+ option(WITH_XINERAMA "Xinerama support for multi-headed X displays" ON)
+
+-find_package(Strigi)
+-
+-set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and search support"
+- URL "http://strigi.sourceforge.net"
+- TYPE REQUIRED
+- )
+
+ find_package(ZLIB)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams"
+diff -Naur kde-workspace-4.11.22.orig/kcontrol/kfontinst/CMakeLists.txt kde-workspace-4.11.22/kcontrol/kfontinst/CMakeLists.txt
+--- kde-workspace-4.11.22.orig/kcontrol/kfontinst/CMakeLists.txt 2015-08-12 09:03:15.000000000 +0200
++++ kde-workspace-4.11.22/kcontrol/kfontinst/CMakeLists.txt 2016-05-25 21:18:13.023186175 +0200
+@@ -4,7 +4,6 @@
+ find_package(Qt4 REQUIRED)
+ find_package(Freetype REQUIRED)
+ find_package(Fontconfig REQUIRED)
+- find_package(Strigi REQUIRED)
+ find_package(X11 REQUIRED)
+ macro_log_feature(X11_Xft_FOUND "libxft" "X FreeType interface library" "http://www.x.org" FALSE "" "Font installer and font previews")
+ include(KDE4Defaults)
+@@ -40,7 +39,6 @@
+ add_subdirectory( lib )
+ add_subdirectory( dbus )
+ add_subdirectory( kcmfontinst )
+- add_subdirectory( strigi-analyzer )
+ add_subdirectory( apps )
+ add_subdirectory( kio )
+ add_subdirectory( thumbnail )
diff --git a/kde-plasma/systemsettings/files/systemsettings-kcm-randr.patch b/kde-plasma/systemsettings/files/systemsettings-kcm-randr.patch
new file mode 100644
index 000000000000..43019fcb74f1
--- /dev/null
+++ b/kde-plasma/systemsettings/files/systemsettings-kcm-randr.patch
@@ -0,0 +1,20 @@
+Adds option to disable the randr KCM (to use KScreen instead) wrt bug #524266.
+
+Source: http://pkgs.fedoraproject.org/cgit/kde-workspace.git/plain/kde-workspace-4.10.2-BUILD_KCM_RANDR.patch
+
+diff -up kde-workspace-4.10.2/kcontrol/CMakeLists.txt.BUILD_KCM_RANDR kde-workspace-4.10.2/kcontrol/CMakeLists.txt
+--- kde-workspace-4.10.2/kcontrol/CMakeLists.txt.BUILD_KCM_RANDR 2013-03-01 00:32:25.040847159 -0600
++++ kde-workspace-4.10.2/kcontrol/CMakeLists.txt 2013-04-18 08:58:31.086753204 -0500
+@@ -6,9 +6,10 @@ macro_log_feature(FREETYPE_FOUND "FreeTy
+ set(libkxftconfig_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/fonts/kxftconfig.cpp )
+
+
+-if( X11_Xrandr_FOUND )
++OPTION(BUILD_KCM_RANDR "Build kcontrol/randr module" ON)
++if(BUILD_KCM_RANDR AND X11_Xrandr_FOUND)
+ add_subdirectory( randr )
+-endif(X11_Xrandr_FOUND )
++endif(BUILD_KCM_RANDR AND X11_Xrandr_FOUND)
+
+ if(X11_Xkb_FOUND)
+ add_subdirectory( keyboard )