diff options
| author | Denis Kozadaev <denis@dilos.org> | 2020-01-30 22:13:12 +0300 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2020-03-08 15:18:26 +0100 |
| commit | 68af774d40c0aff40318d5f4d506178eb0cbdefb (patch) | |
| tree | 92bdd95c40c6f40385e66a79e9ca5b82111b44ec /dilos/tdeadmin/debian/patches/dilos.patch | |
| parent | a1898a98eead2e16efab9d9e09a3b4a65ed8920b (diff) | |
| download | tde-packaging-68af774d40c0aff40318d5f4d506178eb0cbdefb.tar.gz tde-packaging-68af774d40c0aff40318d5f4d506178eb0cbdefb.zip | |
DilOS: tdeadmin build pack
Signed-off-by: Denis Kozadaev <denis@dilos.org>
(cherry picked from commit 103898319a341592a4247ba1aa16511b603b583f)
Diffstat (limited to 'dilos/tdeadmin/debian/patches/dilos.patch')
| -rw-r--r-- | dilos/tdeadmin/debian/patches/dilos.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/dilos/tdeadmin/debian/patches/dilos.patch b/dilos/tdeadmin/debian/patches/dilos.patch new file mode 100644 index 000000000..aa71af2d1 --- /dev/null +++ b/dilos/tdeadmin/debian/patches/dilos.patch @@ -0,0 +1,62 @@ +Index: tdeadmin/kdat/ConfigureChecks.cmake +=================================================================== +--- tdeadmin.orig/kdat/ConfigureChecks.cmake ++++ tdeadmin/kdat/ConfigureChecks.cmake +@@ -10,7 +10,7 @@ check_cxx_source_compiles(" + #include <sys/mtio.h> + int main() { + struct mtget tapeStatus; +- return GMT_EOF ( tapeStatus.mt_gstat ); ++ return GMT_EOF ( tapeStatus.mt_dsreg ); + }" + HAVE_MTGET_GSTAT + ) +Index: tdeadmin/lilo-config/common/String.cc +=================================================================== +--- tdeadmin.orig/lilo-config/common/String.cc ++++ tdeadmin/lilo-config/common/String.cc +@@ -27,7 +27,9 @@ + ** Bug reports and questions can be sent to kde-devel@kde.org + */ + #define _GNU_SOURCE 1 ++#ifndef __dilos__ + #include <features.h> ++#endif /* __dilos__ */ + #include <string.h> + #include <string> + #include "String.h" +Index: tdeadmin/lilo-config/common/Files.cc +=================================================================== +--- tdeadmin.orig/lilo-config/common/Files.cc ++++ tdeadmin/lilo-config/common/Files.cc +@@ -35,8 +35,10 @@ StringList &Files::glob(String name, enu + glob_t gl; + int flags=0; + StringList *result; ++#ifndef __dilos__ + if(dotfiles) + flags |= GLOB_PERIOD; ++#endif /* __dilos__ */ + if(braces) + flags |= GLOB_BRACE; + ::glob(name, flags, NULL, &gl); +Index: tdeadmin/lilo-config/common/lilo.cc +=================================================================== +--- tdeadmin.orig/lilo-config/common/lilo.cc ++++ tdeadmin/lilo-config/common/lilo.cc +@@ -317,10 +317,15 @@ bool liloconf::probe() + char *tmp=tmpnam(NULL); + tmp=tmpnam(NULL); + mkdir(tmp, 0700); ++#ifdef __dilos__ ++ if(!mount(*it, tmp, MS_RDONLY|MS_NOSUID, "pcfs", NULL)) ++ mp=tmp; ++#else /* !__dilos__ */ + if(!mount(*it, tmp, "msdos", MS_MGC_VAL|MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC, NULL)) + mp=tmp; + else if(!mount(*it, mp, "vfat", MS_MGC_VAL|MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC, NULL)) + mp=tmp; ++#endif /* __dilos__ */ + } + if(!mp.empty()) { + struct stat s; |