diff options
Diffstat (limited to 'dilos/core/tdeutils/debian/patches')
6 files changed, 188 insertions, 0 deletions
diff --git a/dilos/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff b/dilos/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff new file mode 100644 index 000000000..3837407f6 --- /dev/null +++ b/dilos/core/tdeutils/debian/patches/01-klaptopdaemon-setuphandler.diff @@ -0,0 +1,35 @@ +diff --git a/klaptopdaemon/acpi.cpp b/klaptopdaemon/acpi.cpp +index 4dfb247..cd8f4b0 100644 +--- a/klaptopdaemon/acpi.cpp ++++ b/klaptopdaemon/acpi.cpp +@@ -178,7 +178,7 @@ void AcpiConfig::setupHelper() + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << "chown root "+helper+"; chmod +s "+helper; ++ proc << "dpkg-statoverride --update --add root root 6755 "+helper; + proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results + } + } else { +diff --git a/klaptopdaemon/apm.cpp b/klaptopdaemon/apm.cpp +index 9de0c85..e348943 100644 +--- a/klaptopdaemon/apm.cpp ++++ b/klaptopdaemon/apm.cpp +@@ -166,7 +166,7 @@ void ApmConfig::setupHelper() + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name; ++ proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name; + proc.start(TDEProcess::Block); // run it sync so has_apm below sees the results + } + } else { +@@ -200,7 +200,7 @@ void ApmConfig::setupHelper2() // we use the acpi helper to do software suspend + proc << tdesu; + proc << "-u"; + proc << "root"; +- proc << "chown root "+helper+"; chmod +s "+helper; ++ proc << "dpkg-statoverride --update --add root root 6755 "+helper; + proc.start(TDEProcess::Block); // run it sync so has_acpi below sees the results + } + } else { diff --git a/dilos/core/tdeutils/debian/patches/common/04_am_maintainer_mode.diff b/dilos/core/tdeutils/debian/patches/common/04_am_maintainer_mode.diff new file mode 100644 index 000000000..391a80285 --- /dev/null +++ b/dilos/core/tdeutils/debian/patches/common/04_am_maintainer_mode.diff @@ -0,0 +1,11 @@ +--- a/admin/configure.in.min ++++ b/admin/configure.in.min +@@ -38,6 +38,8 @@ + dnl Automake doc recommends to do this only here. (Janos) + AM_INIT_AUTOMAKE(@MODULENAME@, @VERSION@) dnl searches for some needed programs + ++AM_MAINTAINER_MODE ++ + KDE_SET_PREFIX + + dnl generate the config header diff --git a/dilos/core/tdeutils/debian/patches/common/06_disable_no_undefined.diff b/dilos/core/tdeutils/debian/patches/common/06_disable_no_undefined.diff new file mode 100644 index 000000000..05c932c3c --- /dev/null +++ b/dilos/core/tdeutils/debian/patches/common/06_disable_no_undefined.diff @@ -0,0 +1,18 @@ +--- a/admin/acinclude.m4.in ++++ b/admin/acinclude.m4.in +@@ -1689,15 +1689,6 @@ + KDE_USE_CLOSURE_TRUE="#" + KDE_USE_CLOSURE_FALSE="" + KDE_NO_UNDEFINED="" +- case $host in +- *-*-linux-gnu) +- KDE_CHECK_COMPILER_FLAG([Wl,--no-undefined], +- [KDE_CHECK_COMPILER_FLAG([Wl,--allow-shlib-undefined], +- [KDE_NO_UNDEFINED="-Wl,--no-undefined -Wl,--allow-shlib-undefined"], +- [KDE_NO_UNDEFINED=""])], +- [KDE_NO_UNDEFINED=""]) +- ;; +- esac + fi + AC_SUBST(KDE_USE_CLOSURE_TRUE) + AC_SUBST(KDE_USE_CLOSURE_FALSE) diff --git a/dilos/core/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff b/dilos/core/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff new file mode 100644 index 000000000..28c95742b --- /dev/null +++ b/dilos/core/tdeutils/debian/patches/common/kubuntu_01_kdepot.diff @@ -0,0 +1,26 @@ +--- kde/admin/cvs.sh 2005-11-26 02:42:02.000000000 +0000 ++++ kde/admin/cvs.sh 2005-11-26 02:42:26.000000000 +0000 +@@ -537,6 +537,8 @@ + if test -z "$PREPARETIPS"; then PREPARETIPS=preparetips ; fi + export EXTRACTRC PREPARETIPS + ++kdepotpath=/usr/include/tde/tde.pot ++ + for subdir in $dirs; do + test -z "$VERBOSE" || echo "Making messages in $subdir" + (cd $subdir +@@ -554,10 +556,10 @@ + fi + perl -e '$mes=0; while (<STDIN>) { next if (/^(if\s|else\s|endif)/); if (/^messages:/) { $mes=1; print $_; next; } if ($mes) { if (/$\\(XGETTEXT\)/ && / -o/) { s/ -o \$\(podir\)/ _translatorinfo.cpp -o \$\(podir\)/ } print $_; } else { print $_; } }' < Makefile.am | egrep -v '^include ' > _transMakefile + +- kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot +- if ! test -f $kdepotpath; then +- kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot +- fi ++# kdepotpath=${includedir:-`tde-config --expandvars --install include`}/tde.pot ++# if ! test -f $kdepotpath; then ++# kdepotpath=`tde-config --expandvars --prefix`/include/tde.pot ++# fi + + $MAKE -s -f _transMakefile podir=$podir EXTRACTRC="$EXTRACTRC" PREPARETIPS="$PREPARETIPS" srcdir=. \ + XGETTEXT="${XGETTEXT:-xgettext} --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale -x $kdepotpath" messages diff --git a/dilos/core/tdeutils/debian/patches/dilos.patch b/dilos/core/tdeutils/debian/patches/dilos.patch new file mode 100644 index 000000000..8cba588f1 --- /dev/null +++ b/dilos/core/tdeutils/debian/patches/dilos.patch @@ -0,0 +1,92 @@ +Index: tdeutils/ConfigureChecks.cmake +=================================================================== +--- tdeutils.orig/ConfigureChecks.cmake ++++ tdeutils/ConfigureChecks.cmake +@@ -150,10 +150,12 @@ if ( BUILD_KSIM ) + check_include_file( "sys/vfs.h" HAVE_SYS_VFS_H ) + check_include_file( "sys/mount.h" HAVE_SYS_MOUNT_H ) + check_include_file( "mntent.h" HAVE_MNTENT_H ) ++ check_include_file( "sys/mntent.h" HAVE_SYS_MNTENT_H ) + check_include_file( "sys/ucred.h" HAVE_SYS_UCRED_H ) +- check_include_file( "sys/mnttab.h" HAVE_SYS_MNTTAB_H ) ++ check_include_file( "ucred.h" HAVE_UCRED_H ) ++ check_include_files( "stdio.h;sys/mnttab.h" HAVE_SYS_MNTTAB_H ) + +- check_include_file( "sys/loadavg.h" HAVE_SYS_LOADAVG_H ) ++ check_include_files( "sys/time.h;sys/loadavg.h" HAVE_SYS_LOADAVG_H ) + check_function_exists( getloadavg HAVE_GETLOADAVG ) + check_function_exists( statfs HAVE_STATFS ) + check_function_exists( statvfs HAVE_STATVFS ) +Index: tdeutils/ksim/monitors/filesystem/filesystemstats.cpp +=================================================================== +--- tdeutils.orig/ksim/monitors/filesystem/filesystemstats.cpp ++++ tdeutils/ksim/monitors/filesystem/filesystemstats.cpp +@@ -30,6 +30,10 @@ + #include <sys/types.h> + #include <sys/param.h> + ++#ifdef __dilos__ ++#include <ucred.h> ++#endif /* __dilos__ */ ++ + #if defined(HAVE_SYS_STATVFS_H) + #include <sys/statvfs.h> + #elif defined( HAVE_SYS_STATFS_H ) +@@ -47,6 +51,10 @@ + #define _PATH_MOUNTED MNTTAB + #endif + #endif ++#ifdef HAVE_SYS_MNTENT_H ++#include <sys/mntent.h> ++#define _PATH_MOUNTED MNTTAB ++#endif + #ifdef HAVE_SYS_UCRED_H + #include <sys/ucred.h> + #endif +@@ -133,6 +141,21 @@ ksim_mntent * ksim_getmntent( FILE * fil + } + + #define delete_mntent( x ) ++#elif defined(HAVE_SYS_MNTENT_H) ++#define USE_MNTENT ++ ++// Dummy setup ++typedef struct mnttab ksim_mntent; ++ksim_mntent * ksim_getmntent( FILE * file ) ++{ ++ static ksim_mntent ent; ++ if (getmntent(file, &ent) == 0) ++ return (&ent); ++ ++ return (NULL); ++} ++ ++#define delete_mntent( x ) + #elif defined( HAVE_GETMNTINFO ) + #define USE_MNTINFO + #else +Index: tdeutils/ksim/systeminfo.cpp +=================================================================== +--- tdeutils.orig/ksim/systeminfo.cpp ++++ tdeutils/ksim/systeminfo.cpp +@@ -32,7 +32,7 @@ + #include <linux/kernel.h> + #endif + +-#ifdef HAVE_SYS_LOADAVG_H ++#if defined(HAVE_SYS_LOADAVG_H) || defined(__dilos__) + #include <sys/loadavg.h> + #endif + +Index: tdeutils/config.h.cmake +=================================================================== +--- tdeutils.orig/config.h.cmake ++++ tdeutils/config.h.cmake +@@ -82,6 +82,7 @@ + #cmakedefine HAVE_SYS_VFS_H + #cmakedefine HAVE_SYS_MOUNT_H + #cmakedefine HAVE_MNTENT_H ++#cmakedefine HAVE_SYS_MNTENT_H + #cmakedefine HAVE_SYS_UCRED_H + #cmakedefine HAVE_SYS_MNTTAB_H + #cmakedefine HAVE_SYS_LOADAVG_H diff --git a/dilos/core/tdeutils/debian/patches/series b/dilos/core/tdeutils/debian/patches/series new file mode 100644 index 000000000..1da01ce4b --- /dev/null +++ b/dilos/core/tdeutils/debian/patches/series @@ -0,0 +1,6 @@ +common/04_am_maintainer_mode.diff +common/06_disable_no_undefined.diff +common/kubuntu_01_kdepot.diff + +01-klaptopdaemon-setuphandler.diff +dilos.patch |