Attachment 2489 Details for Bug 2431 – patches for tdelibs to compile on FreeBSD 10.1

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] patches for tdelibs to compile on FreeBSD 10.1

tdelibs-freebsd.patch (text/plain), 3.19 KB, created by Nikolaus Klepp on 2015-04-25 05:42:16 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nikolaus Klepp

Created: 2015-04-25 05:42:16 CDT

Size: 3.19 KB

patch

obsolete

>diff -crB /home/nik/TDE/tde/main/tdelibs/tdecore/kpty.cpp /tmp/tdelibs/tdecore/kpty.cpp
>*** /home/nik/TDE/tde/main/tdelibs/tdecore/kpty.cpp	2015-01-20 21:05:39.000000000 +0100
>--- /tmp/tdelibs/tdecore/kpty.cpp	2015-04-25 12:24:58.000000000 +0200
>***************
>*** 76,81 ****
>--- 76,86 ----
>  # define USE_LOGIN
>  #endif
>  
>+ #ifdef __FreeBSD__
>+ #warning "FIXME: FreeBSD uses utmpx.h - as I do not have time to port stuff from utmp to utmpx I decided to disable that feature."
>+ #undef USE_LOGIN
>+ #endif
>+ 
>  #ifdef USE_LOGIN
>  # include <utmp.h>
>  #endif
>diff -crB /home/nik/TDE/tde/main/tdelibs/tdeio/tdeio/connection.cpp /tmp/tdelibs/tdeio/tdeio/connection.cpp
>*** /home/nik/TDE/tde/main/tdelibs/tdeio/tdeio/connection.cpp	2015-01-20 21:05:39.000000000 +0100
>--- /tmp/tdelibs/tdeio/tdeio/connection.cpp	2015-04-25 11:55:41.000000000 +0200
>***************
>*** 43,49 ****
>  #include <kdebug.h>
>  #include <tqsocketnotifier.h>
>  
>! #if defined(__OpenBSD__)
>  #define __progname getprogname()
>  #else
>  extern char *__progname;
>--- 43,49 ----
>  #include <kdebug.h>
>  #include <tqsocketnotifier.h>
>  
>! #if defined(__OpenBSD__) || defined(__FreeBSD__)
>  #define __progname getprogname()
>  #else
>  extern char *__progname;
>diff -crB /home/nik/TDE/tde/main/tdelibs/tdeio/tdeio/kurlcompletion.cpp /tmp/tdelibs/tdeio/tdeio/kurlcompletion.cpp
>*** /home/nik/TDE/tde/main/tdelibs/tdeio/tdeio/kurlcompletion.cpp	2015-01-20 21:05:39.000000000 +0100
>--- /tmp/tdelibs/tdeio/tdeio/kurlcompletion.cpp	2015-04-25 11:56:48.000000000 +0200
>***************
>*** 778,790 ****
>  // Environment variables
>  //
>  
>! #if !defined(__OpenBSD__)
>  extern char **environ; // Array of environment variables
>  #endif
>  
>  bool KURLCompletion::envCompletion(const MyURL &url, TQString *match)
>  {
>! #if defined(__OpenBSD__)
>  	return false;
>  #else
>  	if ( url.file().at(0) != '$' )
>--- 778,790 ----
>  // Environment variables
>  //
>  
>! #if !defined(__OpenBSD__) && !defined(__FreeBSD__)
>  extern char **environ; // Array of environment variables
>  #endif
>  
>  bool KURLCompletion::envCompletion(const MyURL &url, TQString *match)
>  {
>! #if defined(__OpenBSD__) || defined(__FreeBSD__) 
>  	return false;
>  #else
>  	if ( url.file().at(0) != '$' )
>diff -crB /home/nik/TDE/tde/main/tdelibs/tdeprint/cups/make_driver_db_cups.cpp /tmp/tdelibs/tdeprint/cups/make_driver_db_cups.cpp
>*** /home/nik/TDE/tde/main/tdelibs/tdeprint/cups/make_driver_db_cups.cpp	2015-01-20 21:05:39.000000000 +0100
>--- /tmp/tdelibs/tdeprint/cups/make_driver_db_cups.cpp	2015-04-25 12:14:53.000000000 +0200
>***************
>*** 18,23 ****
>--- 18,27 ----
>   *  Boston, MA 02110-1301, USA.
>   **/
>  
>+ #if defined(__FreeBSD__)
>+ #define _WITH_GETLINE
>+ #endif
>+ 
>  #include <config.h>
>  #include <stdio.h>
>  #include <stdlib.h>
>diff -crB /home/nik/TDE/tde/main/tdelibs/tdeprint/ppdloader.cpp /tmp/tdelibs/tdeprint/ppdloader.cpp
>*** /home/nik/TDE/tde/main/tdelibs/tdeprint/ppdloader.cpp	2015-01-20 21:05:39.000000000 +0100
>--- /tmp/tdelibs/tdeprint/ppdloader.cpp	2015-04-25 12:14:26.000000000 +0200
>***************
>*** 17,22 ****
>--- 17,26 ----
>   *  Boston, MA 02110-1301, USA.
>   **/
>  
>+ #if defined(__FreeBSD__)
>+ #define _WITH_GETLINE
>+ #endif
>+ 
>  #include "ppdloader.h"
>  #include "foomatic2loader.h"
>  #include "driver.h"

Actions: View | Diff

Attachments on bug 2431: 2489