Francois Andriot
13 years ago
parent
85dd6befe9
commit
0ed4c9714e
@ -0,0 +1,287 @@
|
|||||||
|
diff -Nuar kdeadmin.ORI/knetworkconf/backends/network-conf.in kdeadmin.P/knetworkconf/backends/network-conf.in
|
||||||
|
--- kdeadmin.ORI/knetworkconf/backends/network-conf.in 2012-01-11 20:15:15.161715402 +0100
|
||||||
|
+++ kdeadmin.P/knetworkconf/backends/network-conf.in 2012-01-11 20:39:21.746715574 +0100
|
||||||
|
@@ -63,6 +63,7 @@
|
||||||
|
$version = "@VERSION@";
|
||||||
|
@platforms = ("redhat-5.2", "redhat-6.0", "redhat-6.1", "redhat-6.2", "redhat-7.0", "redhat-7.1",
|
||||||
|
"redhat-7.2", "redhat-8.0", "redhat-9",
|
||||||
|
+ "rhel-5", "rhel-6",
|
||||||
|
"openna-1.0",
|
||||||
|
"mandrake-7.1", "mandrake-7.2", "mandrake-9.0", "mandrake-9.1", "mandrake-9.2",
|
||||||
|
"mandrake-10.0", "mandrake-10.1","mandrake-10.2", "mandriva-2006.0",
|
||||||
|
@@ -72,7 +73,7 @@
|
||||||
|
"debian-2.2", "debian-3.0", "debian-3.1", "debian-4.0", "debian-5.0", "debian-testing",
|
||||||
|
"ubuntu-5.04", "ubuntu-5.10", "ubuntu-6.06", "ubuntu-6.10", "ubuntu-7.04", "ubuntu-7.10", "ubuntu-8.04", "ubuntu-8.10", "ubuntu-9.04", "ubuntu-9.10", "ubuntu-10.04", "ubuntu-10.10",
|
||||||
|
"suse-7.0", "suse-9.0", "suse-9.1",
|
||||||
|
- "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath",
|
||||||
|
+ "turbolinux-7.0", "fedora-1", "fedora-2", "fedora-3", "fedora-4", "fedora-5", "rpath", "fedora-15", "fedora-16",
|
||||||
|
"pld-1.0", "pld-1.1", "pld-1.99",
|
||||||
|
"conectiva-9", "conectiva-10",
|
||||||
|
"vine-3.0", "vine-3.1",
|
||||||
|
diff -Nuar kdeadmin.ORI/knetworkconf/backends/network.pl.in kdeadmin.P/knetworkconf/backends/network.pl.in
|
||||||
|
--- kdeadmin.ORI/knetworkconf/backends/network.pl.in 2012-01-11 20:15:15.161715402 +0100
|
||||||
|
+++ kdeadmin.P/knetworkconf/backends/network.pl.in 2012-01-11 20:33:43.120340531 +0100
|
||||||
|
@@ -492,6 +492,8 @@
|
||||||
|
"redhat-7.2" => "redhat-6.2",
|
||||||
|
"redhat-8.0" => "redhat-6.2",
|
||||||
|
"redhat-9" => "redhat-6.2",
|
||||||
|
+ "rhel-5" => "redhat-6.2",
|
||||||
|
+ "rhel-6" => "redhat-6.2",
|
||||||
|
"openna-1.0" => "redhat-6.2",
|
||||||
|
"debian-2.2" => "debian-2.2",
|
||||||
|
"debian-3.0" => "debian-2.2",
|
||||||
|
@@ -538,6 +540,8 @@
|
||||||
|
"fedora-3" => "redhat-6.2",
|
||||||
|
"fedora-4" => "redhat-6.2",
|
||||||
|
"fedora-5" => "redhat-6.2",
|
||||||
|
+ "fedora-15" => "redhat-6.2",
|
||||||
|
+ "fedora-16" => "redhat-6.2",
|
||||||
|
"rpath" => "redhat-6.2",
|
||||||
|
"vine-3.0" => "redhat-6.2",
|
||||||
|
"vine-3.1" => "redhat-6.2",
|
||||||
|
@@ -1816,6 +1820,8 @@
|
||||||
|
"redhat-7.2" => \&gst_network_rh72_get_file,
|
||||||
|
"redhat-8.0" => \&gst_network_rh72_get_file,
|
||||||
|
"redhat-9" => \&gst_network_rh72_get_file,
|
||||||
|
+ "rhel-5" => \&gst_network_rh72_get_file,
|
||||||
|
+ "rhel-6" => \&gst_network_rh72_get_file,
|
||||||
|
"openna-1.0" => \&gst_network_rh62_get_file,
|
||||||
|
"mandrake-7.2" => \&gst_network_rh62_get_file,
|
||||||
|
"mandrake-7.1" => \&gst_network_rh62_get_file,
|
||||||
|
@@ -1863,6 +1869,8 @@
|
||||||
|
"fedora-3" => \&gst_network_rh72_get_file,
|
||||||
|
"fedora-4" => \&gst_network_rh72_get_file,
|
||||||
|
"fedora-5" => \&gst_network_rh72_get_file,
|
||||||
|
+ "fedora-15" => \&gst_network_rh72_get_file,
|
||||||
|
+ "fedora-16" => \&gst_network_rh72_get_file,
|
||||||
|
"rpath" => \&gst_network_rh72_get_file,
|
||||||
|
"vine-3.0" => \&gst_network_rh62_get_file,
|
||||||
|
"vine-3.1" => \&gst_network_rh62_get_file,
|
||||||
|
@@ -3961,6 +3969,8 @@
|
||||||
|
"redhat-7.2" => "lo",
|
||||||
|
"redhat-8.0" => "lo",
|
||||||
|
"redhat-9" => "",
|
||||||
|
+ "rhel-5" => "",
|
||||||
|
+ "rhel-6" => "",
|
||||||
|
"openna-1.0" => "lo",
|
||||||
|
"mandrake-7.1" => "lo",
|
||||||
|
"mandrake-7.2" => "lo",
|
||||||
|
@@ -4008,6 +4018,8 @@
|
||||||
|
"fedora-3" => "",
|
||||||
|
"fedora-4" => "",
|
||||||
|
"fedora-5" => "",
|
||||||
|
+ "fedora-15" => "",
|
||||||
|
+ "fedora-16" => "",
|
||||||
|
"rpath" => "",
|
||||||
|
"vine-3.0" => "lo",
|
||||||
|
"vine-3.1" => "lo",
|
||||||
|
@@ -4150,6 +4162,8 @@
|
||||||
|
"redhat-7.2" => "redhat-7.2",
|
||||||
|
"redhat-8.0" => "redhat-7.2",
|
||||||
|
"redhat-9" => "redhat-7.2",
|
||||||
|
+ "rhel-5" => "redhat-7.2",
|
||||||
|
+ "rhel-6" => "redhat-7.2",
|
||||||
|
"openna-1.0" => "redhat-6.2",
|
||||||
|
"mandrake-7.1" => "redhat-6.2",
|
||||||
|
"mandrake-7.2" => "redhat-6.2",
|
||||||
|
@@ -4197,6 +4211,8 @@
|
||||||
|
"fedora-3" => "redhat-7.2",
|
||||||
|
"fedora-4" => "redhat-7.2",
|
||||||
|
"fedora-5" => "redhat-7.2",
|
||||||
|
+ "fedora-15" => "redhat-7.2",
|
||||||
|
+ "fedora-16" => "redhat-7.2",
|
||||||
|
"rpath" => "redhat-7.2",
|
||||||
|
"vine-3.0" => "redhat-7.0",
|
||||||
|
"vine-3.1" => "redhat-7.0",
|
||||||
|
@@ -4585,6 +4604,8 @@
|
||||||
|
"redhat-7.2" => "redhat-7.2",
|
||||||
|
"redhat-8.0" => "redhat-8.0",
|
||||||
|
"redhat-9" => "redhat-8.0",
|
||||||
|
+ "rhel-5" => "redhat-8.0",
|
||||||
|
+ "rhel-6" => "redhat-8.0",
|
||||||
|
"openna-1.0" => "redhat-6.2",
|
||||||
|
"mandrake-7.1" => "redhat-6.2",
|
||||||
|
"mandrake-7.2" => "redhat-6.2",
|
||||||
|
@@ -4632,6 +4650,8 @@
|
||||||
|
"fedora-3" => "redhat-7.2",
|
||||||
|
"fedora-4" => "redhat-7.2",
|
||||||
|
"fedora-5" => "redhat-7.2",
|
||||||
|
+ "fedora-15" => "redhat-7.2",
|
||||||
|
+ "fedora-16" => "redhat-7.2",
|
||||||
|
"rpath" => "redhat-7.2",
|
||||||
|
"vine-3.0" => "vine-3.0",
|
||||||
|
"vine-3.1" => "vine-3.0",
|
||||||
|
@@ -5445,6 +5465,8 @@
|
||||||
|
"redhat-7.2" => "redhat-7.2",
|
||||||
|
"redhat-8.0" => "redhat-7.2",
|
||||||
|
"redhat-9" => "redhat-7.2",
|
||||||
|
+ "rhel-5" => "redhat-7.2",
|
||||||
|
+ "rhel-6" => "redhat-7.2",
|
||||||
|
"mandrake-7.1" => "redhat-6.2",
|
||||||
|
"mandrake-7.2" => "redhat-6.2",
|
||||||
|
"mandrake-9.0" => "redhat-7.0",
|
||||||
|
@@ -5491,6 +5513,8 @@
|
||||||
|
"fedora-3" => "redhat-7.2",
|
||||||
|
"fedora-4" => "redhat-7.2",
|
||||||
|
"fedora-5" => "redhat-7.2",
|
||||||
|
+ "fedora-15" => "redhat-7.2",
|
||||||
|
+ "fedora-16" => "redhat-7.2",
|
||||||
|
"rpath" => "redhat-7.2",
|
||||||
|
"vine-3.0" => "redhat-7.0",
|
||||||
|
"vine-3.1" => "redhat-7.0",
|
||||||
|
@@ -5872,6 +5896,8 @@
|
||||||
|
"redhat-7.2" => "redhat-7.2",
|
||||||
|
"redhat-8.0" => "redhat-8.0",
|
||||||
|
"redhat-9" => "redhat-8.0",
|
||||||
|
+ "rhel-5" => "redhat-8.0",
|
||||||
|
+ "rhel-6" => "redhat-8.0",
|
||||||
|
"mandrake-7.1" => "redhat-6.2",
|
||||||
|
"mandrake-7.2" => "redhat-6.2",
|
||||||
|
"mandrake-9.0" => "mandrake-9.0",
|
||||||
|
@@ -5918,6 +5944,8 @@
|
||||||
|
"fedora-3" => "redhat-7.2",
|
||||||
|
"fedora-4" => "redhat-7.2",
|
||||||
|
"fedora-5" => "redhat-7.2",
|
||||||
|
+ "fedora-15" => "redhat-7.2",
|
||||||
|
+ "fedora-16" => "redhat-7.2",
|
||||||
|
"rpath" => "redhat-7.2",
|
||||||
|
"vine-3.0" => "vine-3.0",
|
||||||
|
"vine-3.1" => "vine-3.0",
|
||||||
|
diff -Nuar kdeadmin.ORI/knetworkconf/backends/platform.pl.in kdeadmin.P/knetworkconf/backends/platform.pl.in
|
||||||
|
--- kdeadmin.ORI/knetworkconf/backends/platform.pl.in 2012-01-11 20:15:15.161715402 +0100
|
||||||
|
+++ kdeadmin.P/knetworkconf/backends/platform.pl.in 2012-01-11 20:38:27.401468302 +0100
|
||||||
|
@@ -71,6 +71,8 @@
|
||||||
|
"redhat-7.3" => "Red Hat Linux 7.3 Valhalla",
|
||||||
|
"redhat-8.0" => "Red Hat Linux 8.0 Psyche",
|
||||||
|
"redhat-9" => "Red Hat Linux 9.0 Shrike",
|
||||||
|
+ "rhel-5" => "Enterprise Linux 5",
|
||||||
|
+ "rhel-6" => "Enterprise Linux 6",
|
||||||
|
"openna-1.0" => "OpenNA Linux 1.0 VSLC",
|
||||||
|
"mandrake-7.1" => "Linux Mandrake 7.1",
|
||||||
|
"mandrake-7.2" => "Linux Mandrake 7.2 Odyssey",
|
||||||
|
@@ -116,6 +118,8 @@
|
||||||
|
"fedora-3" => "Fedora Core 3 (Heidelberg)",
|
||||||
|
"fedora-4" => "Fedora Core 4 (Stentz)",
|
||||||
|
"fedora-5" => "Fedora Core 5 (Bordeaux)",
|
||||||
|
+ "fedora-15" => "Fedora 15 (LoveLock)",
|
||||||
|
+ "fedora-16" => "Fedora 16 (Verne)",
|
||||||
|
"rpath" => "rPath Linux",
|
||||||
|
"ark" => "Ark Linux",
|
||||||
|
};
|
||||||
|
@@ -184,6 +188,27 @@
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+sub check_rhel
|
||||||
|
+{
|
||||||
|
+ open RELEASE, "$gst_prefix/etc/redhat-release" or return -1;
|
||||||
|
+ while (<RELEASE>)
|
||||||
|
+ {
|
||||||
|
+ chomp;
|
||||||
|
+ if (
|
||||||
|
+ (/^CentOS release (\d)([\d\.]+)\s+.*/)
|
||||||
|
+ or (/^Scientific Linux release (\d)([\d\.]+)\s+.*/)
|
||||||
|
+ or (/^Red Hat Enterprise Linux \w release (\d)([\d\.]+)\s+.*/)
|
||||||
|
+ )
|
||||||
|
+ {
|
||||||
|
+ close RELEASE;
|
||||||
|
+ return "rhel-$1";
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ close RELEASE;
|
||||||
|
+ return -1;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
sub check_openna
|
||||||
|
{
|
||||||
|
open OPENNA, "$gst_prefix/etc/openna-release" or return -1;
|
||||||
|
@@ -577,7 +602,7 @@
|
||||||
|
my %check = (
|
||||||
|
# Red Hat check must run after Vine, Mandrake and Fedora, and Mandrake after BlackPanther
|
||||||
|
"Linux" => [ \&check_lsb, \&check_debian, \&check_caldera, \&check_suse, \&check_blackpanther, \&check_vine,
|
||||||
|
- \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_redhat, \&check_openna,
|
||||||
|
+ \&check_fedora, \&check_mandrake, \&check_mandriva, \&check_conectiva, \&check_linuxppc, \&check_rhel, \&check_redhat, \&check_openna,
|
||||||
|
\&check_turbolinux, \&check_slackware, \&check_vlos, \&check_gentoo, \&check_pld, \&check_rpath, \&check_archlinux, \&check_ark ],
|
||||||
|
"FreeBSD" => [ \&check_freebsd ],
|
||||||
|
"SunOS" => [ \&check_solaris ]
|
||||||
|
diff -Nuar kdeadmin.ORI/knetworkconf/backends/service.pl.in kdeadmin.P/knetworkconf/backends/service.pl.in
|
||||||
|
--- kdeadmin.ORI/knetworkconf/backends/service.pl.in 2012-01-11 20:15:15.160715344 +0100
|
||||||
|
+++ kdeadmin.P/knetworkconf/backends/service.pl.in 2012-01-11 20:21:36.452645160 +0100
|
||||||
|
@@ -59,6 +59,9 @@
|
||||||
|
"redhat-8.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
"redhat-9" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
"openna-1.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
+
|
||||||
|
+ "rhel-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
+ "rhel-6" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
|
||||||
|
"mandrake-7.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
"mandrake-7.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
@@ -110,6 +113,9 @@
|
||||||
|
"fedora-5" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
"rpath" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
|
||||||
|
+ "fedora-15" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
+ "fedora-16" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
+
|
||||||
|
"vine-3.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
"vine-3.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
"ark" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||||
|
@@ -139,6 +145,9 @@
|
||||||
|
"redhat-9" => [3, 5],
|
||||||
|
"openna-1.0" => [3, 5],
|
||||||
|
|
||||||
|
+ "rhel-5" => [3, 5],
|
||||||
|
+ "rhel-6" => [3, 5],
|
||||||
|
+
|
||||||
|
"mandrake-7.1" => [3, 5],
|
||||||
|
"mandrake-7.2" => [3, 5],
|
||||||
|
"mandrake-9.0" => [3, 5],
|
||||||
|
@@ -189,6 +198,9 @@
|
||||||
|
"fedora-4" => [3, 5],
|
||||||
|
"fedora-5" => [3, 5],
|
||||||
|
"rpath" => [3, 5],
|
||||||
|
+
|
||||||
|
+ "fedora-15" => [3, 5],
|
||||||
|
+ "fedora-16" => [3, 5],
|
||||||
|
|
||||||
|
"vine-3.0" => [3, 5],
|
||||||
|
"vine-3.1" => [3, 5],
|
||||||
|
@@ -218,6 +230,9 @@
|
||||||
|
"redhat-9" => "redhat-5.2",
|
||||||
|
"openna-1.0" => "redhat-5.2",
|
||||||
|
|
||||||
|
+ "rhel-5" => "redhat-5.2",
|
||||||
|
+ "rhel-6" => "redhat-5.2",
|
||||||
|
+
|
||||||
|
"mandrake-7.1" => "redhat-5.2",
|
||||||
|
"mandrake-7.2" => "redhat-5.2",
|
||||||
|
"mandrake-9.0" => "redhat-5.2",
|
||||||
|
@@ -267,6 +282,9 @@
|
||||||
|
"fedora-5" => "redhat-5.2",
|
||||||
|
"rpath" => "redhat-5.2",
|
||||||
|
|
||||||
|
+ "fedora-15" => "redhat-5.2",
|
||||||
|
+ "fedora-16" => "redhat-5.2",
|
||||||
|
+
|
||||||
|
"vine-3.0" => "redhat-5.2",
|
||||||
|
"vine-3.1" => "redhat-5.2",
|
||||||
|
"ark" => "redhat-5.2",
|
||||||
|
@@ -1744,12 +1762,16 @@
|
||||||
|
"redhat-7.3" => \&gst_service_redhat_get_status,
|
||||||
|
"redhat-8.0" => \&gst_service_redhat_get_status,
|
||||||
|
"redhat-9" => \&gst_service_redhat_get_status,
|
||||||
|
+ "rhel-5" => \&gst_service_redhat_get_status,
|
||||||
|
+ "rhel-6" => \&gst_service_redhat_get_status,
|
||||||
|
"mandrake-7.2" => \&gst_service_redhat_get_status,
|
||||||
|
"fedora-1" => \&gst_service_redhat_get_status,
|
||||||
|
"fedora-2" => \&gst_service_redhat_get_status,
|
||||||
|
"fedora-3" => \&gst_service_redhat_get_status,
|
||||||
|
"fedora-4" => \&gst_service_redhat_get_status,
|
||||||
|
"fedora-5" => \&gst_service_redhat_get_status,
|
||||||
|
+ "fedora-15" => \&gst_service_redhat_get_status,
|
||||||
|
+ "fedora-16" => \&gst_service_redhat_get_status,
|
||||||
|
|
||||||
|
"rpath" => \&gst_service_redhat_get_status,
|
||||||
|
|
||||||
@ -0,0 +1,135 @@
|
|||||||
|
commit 45fb5561be6e828c78180c781f74d0ae9d1c3ea4
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1326230757 -0600
|
||||||
|
|
||||||
|
Enable xtest support flag
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index b832a92..f4d11ac 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -65,6 +65,7 @@ option( WITH_XRANDR "Enable xrandr support" OFF )
|
||||||
|
option( WITH_XRENDER "Enable xrender support" OFF )
|
||||||
|
option( WITH_XDAMAGE "Enable xdamage support" OFF )
|
||||||
|
option( WITH_XEXT "Enable xext support" OFF )
|
||||||
|
+option( WITH_XTEST "Enable xext support" OFF )
|
||||||
|
option( WITH_LIBUSB "Enable control of some mouse models through libusb" OFF )
|
||||||
|
option( WITH_LIBRAW1394 "Enable visualization of ieee1394 devices through libraw1394" OFF )
|
||||||
|
option( WITH_SUDO_KDESU_BACKEND "Use sudo as backend for kdesu (default is su)" OFF )
|
||||||
|
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
|
||||||
|
index 7b7a1b4..df892e1 100644
|
||||||
|
--- a/ConfigureChecks.cmake
|
||||||
|
+++ b/ConfigureChecks.cmake
|
||||||
|
@@ -100,12 +100,25 @@ endif( )
|
||||||
|
# xext (kwin/kompmgr)
|
||||||
|
if( WITH_XEXT )
|
||||||
|
pkg_search_module( XEXT xext )
|
||||||
|
- if( NOT XEXT_FOUND )
|
||||||
|
+ if( XEXT_FOUND )
|
||||||
|
+ set( HAVE_XEXT 1 )
|
||||||
|
+ else( XEXT_FOUND )
|
||||||
|
tde_message_fatal( "xext is requested, but was not found on your system" )
|
||||||
|
endif( )
|
||||||
|
endif( )
|
||||||
|
|
||||||
|
|
||||||
|
+# xtest (kxkb)
|
||||||
|
+if( WITH_XTEST )
|
||||||
|
+ pkg_search_module( XTEST xtst )
|
||||||
|
+ if( XTEST_FOUND )
|
||||||
|
+ set( HAVE_XTEST 1 )
|
||||||
|
+ else( XTEST_FOUND )
|
||||||
|
+ tde_message_fatal( "xtest is requested, but was not found on your system" )
|
||||||
|
+ endif( )
|
||||||
|
+endif( )
|
||||||
|
+
|
||||||
|
+
|
||||||
|
# GL
|
||||||
|
if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
|
||||||
|
check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
|
||||||
|
diff --git a/config.h.cmake b/config.h.cmake
|
||||||
|
index d72a96c..a8de2fa 100644
|
||||||
|
--- a/config.h.cmake
|
||||||
|
+++ b/config.h.cmake
|
||||||
|
@@ -18,6 +18,9 @@
|
||||||
|
// konsole, kdm, kxkb
|
||||||
|
#cmakedefine HAVE_XKB 1
|
||||||
|
|
||||||
|
+// kxkb
|
||||||
|
+#cmakedefine HAVE_XTEST 1
|
||||||
|
+
|
||||||
|
// kdm, kioslave
|
||||||
|
#cmakedefine HAVE_TERMIOS_H 1
|
||||||
|
|
||||||
|
diff --git a/kxkb/CMakeLists.txt b/kxkb/CMakeLists.txt
|
||||||
|
index 703591a..f36a003 100644
|
||||||
|
--- a/kxkb/CMakeLists.txt
|
||||||
|
+++ b/kxkb/CMakeLists.txt
|
||||||
|
@@ -22,6 +22,7 @@ include_directories(
|
||||||
|
|
||||||
|
link_directories(
|
||||||
|
${TQT_LIBRARY_DIRS}
|
||||||
|
+ ${XTEST_LIBDIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@@ -39,7 +40,7 @@ tde_add_kpart( kcm_keyboard AUTOMOC
|
||||||
|
extension.cpp x11helper.cpp rules.cpp kxkbconfig.cpp
|
||||||
|
pixmap.cpp kcmlayout.cpp kcmlayoutwidget.ui
|
||||||
|
kcmmisc.cpp kcmmiscwidget.ui
|
||||||
|
- LINK kio-shared xkbfile
|
||||||
|
+ LINK kio-shared xkbfile ${XTEST_LIBRARIES}
|
||||||
|
DESTINATION ${PLUGIN_INSTALL_DIR}
|
||||||
|
)
|
||||||
|
|
||||||
|
diff --git a/kxkb/kcmmisc.cpp b/kxkb/kcmmisc.cpp
|
||||||
|
index b4c18a4..8850d89 100644
|
||||||
|
--- a/kxkb/kcmmisc.cpp
|
||||||
|
+++ b/kxkb/kcmmisc.cpp
|
||||||
|
@@ -344,6 +344,21 @@ int xkb_set_off()
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
+int xkb_state()
|
||||||
|
+ {
|
||||||
|
+ unsigned int mask;
|
||||||
|
+ unsigned int numlockState;
|
||||||
|
+ XkbStateRec xkbState;
|
||||||
|
+ if( !xkb_init())
|
||||||
|
+ return 0;
|
||||||
|
+ mask = xkb_numlock_mask();
|
||||||
|
+ if( mask == 0 )
|
||||||
|
+ return 0;
|
||||||
|
+ XkbGetState( dpy, XkbUseCoreKbd, &xkbState);
|
||||||
|
+ numlockState = xkbState.locked_mods & mask;
|
||||||
|
+ return numlockState;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
int xkb_toggle()
|
||||||
|
{
|
||||||
|
unsigned int mask;
|
||||||
|
@@ -443,7 +458,14 @@ void numlock_toggle()
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
|
#ifdef HAVE_XTEST
|
||||||
|
+#ifdef HAVE_XKB
|
||||||
|
+ if (xkb_state())
|
||||||
|
+ xtest_set_on();
|
||||||
|
+ else
|
||||||
|
+ xtest_set_off();
|
||||||
|
+#else // HAVE_XKB
|
||||||
|
xtest_toggle();
|
||||||
|
+#endif // HAVE_XKB
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
// This code is taken from xset utility from XFree 4.3 (http://www.xfree86.org/)
|
||||||
|
--- kdebase/khotkeys/shared/CMakeLists.txt.ORI 2012-01-14 21:49:34.423813010 +0100
|
||||||
|
+++ kdebase/khotkeys/shared/CMakeLists.txt 2012-01-14 21:53:23.915008098 +0100
|
||||||
|
@@ -36,6 +36,6 @@
|
||||||
|
tde_add_library( ${target} SHARED AUTOMOC
|
||||||
|
SOURCES ${${target}_SRCS}
|
||||||
|
VERSION 1.0.0
|
||||||
|
- LINK kio-shared
|
||||||
|
+ LINK kio-shared ${XTEST_LIBRARIES}
|
||||||
|
DESTINATION ${LIB_INSTALL_DIR}
|
||||||
|
)
|
||||||
Binary file not shown.
@ -0,0 +1,67 @@
|
|||||||
|
commit 24f144faf98249012e7b1657a5dfe93750f0dfde
|
||||||
|
Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
|
||||||
|
Date: 1326095653 -0600
|
||||||
|
|
||||||
|
Add inotify CMake support to tdelibs
|
||||||
|
|
||||||
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
|
index e26c252..ede0a3a 100644
|
||||||
|
--- a/CMakeLists.txt
|
||||||
|
+++ b/CMakeLists.txt
|
||||||
|
@@ -76,6 +76,7 @@
|
||||||
|
OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF )
|
||||||
|
OPTION( WITH_AVAHI "Enable AVAHI support" OFF )
|
||||||
|
OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON )
|
||||||
|
+OPTION( WITH_INOTIFY "Enable inotify support for kio" ON )
|
||||||
|
|
||||||
|
OPTION( WITH_ASPELL "Enable aspell support" OFF )
|
||||||
|
OPTION( WITH_HSPELL "Enable hspell support" OFF )
|
||||||
|
@@ -726,6 +727,26 @@ if( WITH_GCC_VISIBILITY )
|
||||||
|
set( HAVE_PCREPOSIX 1 )
|
||||||
|
endif( )
|
||||||
|
|
||||||
|
+##### check for inotify ###########################
|
||||||
|
+
|
||||||
|
+if( WITH_INOTIFY )
|
||||||
|
+ check_include_file( "inotify.h" INOTIFY_FOUND )
|
||||||
|
+ check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND )
|
||||||
|
+ if( NOT INOTIFY_FOUND )
|
||||||
|
+ if( NOT INOTIFY_SYS_FOUND )
|
||||||
|
+ message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" )
|
||||||
|
+ endif( NOT INOTIFY_SYS_FOUND )
|
||||||
|
+ endif( NOT INOTIFY_FOUND )
|
||||||
|
+ if( INOTIFY_FOUND )
|
||||||
|
+ set( HAVE_INOTIFY 1 )
|
||||||
|
+ endif( INOTIFY_FOUND )
|
||||||
|
+ if( INOTIFY_SYS_FOUND )
|
||||||
|
+ set( HAVE_INOTIFY 1 )
|
||||||
|
+ set( HAVE_SYS_INOTIFY 1 )
|
||||||
|
+ endif( INOTIFY_SYS_FOUND )
|
||||||
|
+endif( )
|
||||||
|
+
|
||||||
|
+
|
||||||
|
##### check for aspell ##########################
|
||||||
|
# we need ASPELL_DATADIR too
|
||||||
|
|
||||||
|
diff --git a/config.h.cmake b/config.h.cmake
|
||||||
|
index 1893270..d9b0ef5 100644
|
||||||
|
--- a/config.h.cmake
|
||||||
|
+++ b/config.h.cmake
|
||||||
|
@@ -234,7 +234,7 @@
|
||||||
|
#cmakedefine HAVE_INITGROUPS_PROTO 1
|
||||||
|
|
||||||
|
/* Define if your system has Linux Inode Notification */
|
||||||
|
-#undef HAVE_INOTIFY
|
||||||
|
+#cmakedefine HAVE_INOTIFY 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||||
|
#cmakedefine HAVE_INTTYPES_H 1
|
||||||
|
@@ -555,7 +555,7 @@
|
||||||
|
#cmakedefine HAVE_SYS_FILIO_H 1
|
||||||
|
|
||||||
|
/* Define if your system has glibc support for inotify */
|
||||||
|
-#undef HAVE_SYS_INOTIFY
|
||||||
|
+#cmakedefine HAVE_SYS_INOTIFY 1
|
||||||
|
|
||||||
|
/* Define to 1 if you have the <sys/mman.h> header file. */
|
||||||
|
#cmakedefine HAVE_SYS_MMAN_H 1
|
||||||
Loading…
Reference in new issue