diff options
| author | albator <albator@arcadia.vtf> | 2011-11-19 23:18:08 +0100 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-11-19 23:18:08 +0100 |
| commit | dbdf4011ad419963d63f1466343e77c5aec99f64 (patch) | |
| tree | b9ff65911abe24cde4f6ad3c06d1a4b21bf026c8 | |
| parent | 5a1d80efdaa4c2a716f7c8a6984dea6f2252a987 (diff) | |
| download | tde-packaging-dbdf4011.tar.gz tde-packaging-dbdf4011.zip | |
RHEL/Fedora: other kdebase fixes
| -rw-r--r-- | redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch | 43 | ||||
| -rw-r--r-- | redhat/kdebase/kdebase-3.5.13-startkde_icon.patch | 32 |
2 files changed, 75 insertions, 0 deletions
diff --git a/redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch b/redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch new file mode 100644 index 000000000..772d95f0e --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-kdm-crypt.patch @@ -0,0 +1,43 @@ +diff -u -r kdebase.orig/config.h.cmake kdebase/config.h.cmake +--- kdebase.orig/config.h.cmake 2011-10-30 00:02:15.000000000 +0300 ++++ kdebase/config.h.cmake 2011-11-19 00:59:26.088061733 +0200 +@@ -114,6 +114,7 @@ + #cmakedefine HAVE_SYSINFO 1 + #cmakedefine HAVE_STRNLEN 1 + #cmakedefine HAVE_GETIFADDRS 1 ++#cmakedefine HAVE_CRYPT 1 + + #cmakedefine HAVE_SETUSERCONTEXT 1 + #cmakedefine HAVE_GETUSERSHELL 1 +diff -u -r kdebase.orig/kdm/backend/CMakeLists.txt kdebase/kdm/backend/CMakeLists.txt +--- kdebase.orig/kdm/backend/CMakeLists.txt 2011-09-03 22:32:00.000000000 +0300 ++++ kdebase/kdm/backend/CMakeLists.txt 2011-11-19 01:05:03.820839491 +0200 +@@ -43,6 +43,6 @@ + process.c protodpy.c reset.c resource.c rpcauth.c + server.c session.c sessreg.c socket.c streams.c + util.c xdmauth.c xdmcp.c +- LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} ++ LINK X11 ${XAU_LIBRARIES} ${DBUS_TQT_LIBRARIES} ${CRYPT_LIBRARY} ${PAM_LIBRARY} ${XDMCP_LIBRARIES} + DESTINATION ${BIN_INSTALL_DIR} + ) +diff -u -r kdebase.orig/kdm/ConfigureChecks.cmake kdebase/kdm/ConfigureChecks.cmake +--- kdebase.orig/kdm/ConfigureChecks.cmake 2011-03-16 22:49:38.000000000 +0200 ++++ kdebase/kdm/ConfigureChecks.cmake 2011-11-19 01:05:40.426381860 +0200 +@@ -27,6 +27,16 @@ + check_function_exists( auth_timeok HAVE_AUTH_TIMEOK ) + tde_restore( CMAKE_REQUIRED_LIBRARIES ) + ++check_function_exists( crypt LIBC_HAVE_CRYPT ) ++if( LIBC_HAVE_CRYPT ) ++ set( HAVE_CRYPT 1 CACHE INTERNAL "" FORCE ) ++else( ) ++ check_library_exists( crypt crypt "" HAVE_CRYPT ) ++ if( HAVE_CRYPT ) ++ set( CRYPT_LIBRARY crypt ) ++ endif( ) ++endif( ) ++ + check_include_file( lastlog.h HAVE_LASTLOG_H ) + check_include_file( termio.h HAVE_TERMIO_H ) + + diff --git a/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch b/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch new file mode 100644 index 000000000..039290a0c --- /dev/null +++ b/redhat/kdebase/kdebase-3.5.13-startkde_icon.patch @@ -0,0 +1,32 @@ +--- kdebase/startkde.ORI 2011-11-14 22:23:07.191346324 +0100 ++++ kdebase/startkde 2011-11-14 22:38:28.480321300 +0100 +@@ -206,6 +206,29 @@ + fi + fi + ++# Default Start Button icon ++if [ ! -e $kdehome/share/config/kickerrc ]; then ++ # Fedora ++ if [ -r /usr/share/icons/hicolor/96x96/apps/fedora-logo-icon.png ]; then ++ cat <<EOF >$kdehome/share/config/kickerrc ++[KMenu] ++CustomIcon=fedora-logo-icon ++EOF ++ # RHEL 6 ++ elif [ -r /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png ]; then ++ cat <<EOF >$kdehome/share/config/kickerrc ++[KMenu] ++CustomIcon=system-logo-icon ++EOF ++ # RHEL 5 ++ elif [ -r /usr/share/pixmaps/redhat-starthere.png ]; then ++ cat <<EOF >$kdehome/share/config/kickerrc ++[KMenu] ++CustomIcon=/usr/share/pixmaps/redhat-starthere.png ++EOF ++ fi ++fi ++ + # XCursor mouse theme needs to be applied here to work even for kded or ksmserver. + if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then + kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize" |