RHEL/Fedora: updates kdelibs, kdebase, kdeadmin

3 files changed, 147 insertions, 7 deletions

diff --git a/redhat/kdebase/kdebase-3.5.13-enable_xtest_support.patch b/redhat/kdebase/kdebase-3.5.13-enable_xtest_support.patch
new file mode 100644
index 000000000..cec848973
--- /dev/null
+++ b/redhat/kdebase/kdebase-3.5.13-enable_xtest_support.patch
@@ -0,0 +1,135 @@
+commit 45fb5561be6e828c78180c781f74d0ae9d1c3ea4
+Author: Timothy Pearson <[email protected]>
+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}
+ )
diff --git a/redhat/kdebase/tiles-fixed-png-images.tar.gz b/redhat/kdebase/tiles-fixed-png-images.tar.gz
new file mode 100644
index 000000000..67b5226d6
--- /dev/null
+++ b/redhat/kdebase/tiles-fixed-png-images.tar.gz
diff --git a/redhat/kdebase/trinity-kdebase-3.5.13.spec b/redhat/kdebase/trinity-kdebase-3.5.13.spec
index cef831805..bc99f494d 100644
--- a/redhat/kdebase/trinity-kdebase-3.5.13.spec
+++ b/redhat/kdebase/trinity-kdebase-3.5.13.spec
@@ -47,11 +47,8 @@ Source3:	pamd.kdm-trinity-np%{?dist}
 Source4:	pamd.kcheckpass-trinity%{?dist}
 Source5:	pamd.kscreensaver-trinity%{?dist}
 
-# TDE Official patches (from SVN), unmodified
-# (none)
-
-# TDE Official patches (from SVN), modified
-# (none)
+# [kdebase] Fix corrupted PNG images [Bug #298]
+Source6:	tiles-fixed-png-images.tar.gz
 
 # TDE unofficial patches, fixing FTBFS
 ## [kdebase/kioslave/media/mediamanager] FTBFS missing dbus-tqt includes
@@ -100,6 +97,8 @@ Patch28:	kdebase-3.5.13-randrtray_merge_x11_reconfig_requests.patch
 Patch29:	kdebase-3.5.13-fix_multihead_desktop_lock.patch
 ## [kdebase/kdm/kfrontend] Allows to hide KDM menu button
 Patch30:	kdebase-3.5.12-kdm_hide_menu_button.patch
+## [kdebase/kxkb] Enables xtest support
+Patch31:	kdebase-3.5.13-enable_xtest_support.patch
 
 # Fedora 15 Theme: "Lovelock"
 %if 0%{?fedora} == 15
@@ -279,6 +278,8 @@ Protocol handlers (KIOslaves) for personal information management, including:
 
 %prep
 %setup -q -n kdebase
+%__tar xfz %{SOURCE6} -C kicker/data/tiles
+
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
@@ -304,6 +305,7 @@ Protocol handlers (KIOslaves) for personal information management, including:
 %patch28 -p0
 %patch29 -p0
 %patch30 -p1
+%patch31 -p1
 
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
@@ -360,6 +362,7 @@ cd build
   -DWITH_XRENDER=ON \
   -DWITH_XDAMAGE=ON \
   -DWITH_XEXT=ON \
+  -DWITH_XTEST=ON \
   -DWITH_LIBUSB=ON \
   -DWITH_LIBRAW1394=ON \
   -DWITH_PAM=ON \
@@ -689,8 +692,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 %{_datadir}/cmake/*.cmake
 
 %changelog
-* The Jan 05 2012 Francois Andriot <[email protected]> - 3.5.13-15
-- Add KDM option to hide 'Menu' button on login prompt
+* Thu Jan 05 2012 Francois Andriot <[email protected]> - 3.5.13-15
+- Add a KDM option to hide 'Menu' button on login prompt
+- Fix corrupted PNG tiles [Bug #298]
+- Adds 'xtest' support
 
 * Mon Jan 02 2012 Francois Andriot <[email protected]> - 3.5.13-14
 - Fix Konqueror Icon Activation Effect [Bug #335]