[Pkg-kde-commits] rev 1596 - in branches/kde-3.4.0/packages/kdelibs/debian: . patches

Sun Aug 28 23:22:04 UTC 2005

Author: adeodato
Date: 2005-08-28 23:22:03 +0000 (Sun, 28 Aug 2005)
New Revision: 1596

Added:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/21_kdelibs.diff
Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/control
   branches/kde-3.4.0/packages/kdelibs/debian/rules
Log:
GNU/kFreeBSD support, one minute before we get kicked from the lab.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================

--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-28 22:47:29 UTC (rev 1595)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-28 23:22:03 UTC (rev 1596)
@@ -5,6 +5,17 @@
   * Build with g++-3.4 on arm, m68k and hppa; kdelibs triggers the same gcc
     4.0 ICE as arts does.
 
+  * Apply patch by Aurelien Jarno and Robert Millan for GNU/kFreeBSD support
+    (closes: #289599). Details for the interested:
+
+    + don't build-depend on libasound2-dev on !linux.
+    + use HAVE_SYS_PRCTL_H instead of Q_OS_LINUX in kinit.cpp.
+    + define _tcgetattr and _tcsetattr based on the actual availability of
+      functions and constants, instead of by operating system name.
+
+    Haven't included a hunk that added an extra check on MNT_NOWAIT, because
+    it's not still clear that is really needed.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 29 Aug 2005 00:10:38 +0200
 
 kdelibs (4:3.4.2-2) unstable; urgency=low

Modified: branches/kde-3.4.0/packages/kdelibs/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-28 22:47:29 UTC (rev 1595)
+++ branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-28 23:22:03 UTC (rev 1596)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at freeshell.org>, Adeodato Simó <asp16 at alu.ua.es>, Riku Voipio <riku.voipio at iki.fi>
-Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
+Build-Depends: g++-3.4 [arm m68k hppa], cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev, binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev [!kfreebsd-i386 !hurd-i386], libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
 Standards-Version: 3.6.2
 
@@ -67,7 +67,7 @@
 Package: kdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: kdelibs4c2 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev
+Depends: kdelibs4c2 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), ${libasound2-dev}, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev, libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev
 Provides: kdelibs-dev
 Replaces: kdebase-dev (<< 4:3.4.0)
 Description: development files for the KDE core libraries

Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/21_kdelibs.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/21_kdelibs.diff	2005-08-28 22:47:29 UTC (rev 1595)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/21_kdelibs.diff	2005-08-28 23:22:03 UTC (rev 1596)
@@ -0,0 +1,79 @@
+--- kde.orig/configure.in.in	2005-05-23 14:17:19.000000000 +0200
++++ kde.patched/configure.in.in	2005-08-27 23:48:59.000000000 +0200
+@@ -47,7 +47,7 @@
+ KDE_CHECK_STL
+ AC_HEADER_DIRENT
+ AC_HEADER_STDC
+-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h)
++AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h termios.h sys/prctl.h)
+ 
+ DCOPIDL2CPP="compiled"
+ DCOPIDL="compiled"
+@@ -118,7 +118,7 @@
+ AC_CHECK_MKSTEMPS
+ AC_CHECK_MKSTEMP
+ AC_CHECK_MKDTEMP
+-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday)
++AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday tcgetattr tcsetattr)
+ 
+ AH_BOTTOM([
+ /* provide a definition for a 32 bit entity, usable as a typedef, possibly
+--- kde.orig/kdecore/kpty.cpp	2005-05-23 14:16:21.000000000 +0200
++++ kde.patched/kdecore/kpty.cpp	2005-08-27 15:15:37.000000000 +0200
+@@ -95,24 +95,24 @@
+ # endif
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__)
++#if defined(HAVE_TCGETATTR)
++# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
++#elif defined(TIOCGETA)
+ # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
++#elif defined(TCGETS)
++# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+ #else
+-# if defined(_HPUX_SOURCE) || defined(__Lynx__)
+-#  define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
+-# else
+-#  define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
+-# endif
++# error
+ #endif
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__)
++#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
++# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
++#elif defined(TIOCSETA)
+ # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
++#elif defined(TCSETS)
++# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
+ #else
+-# ifdef _HPUX_SOURCE
+-#  define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
+-# else
+-#  define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
+-# endif
++# error
+ #endif
+ 
+ #if defined (_HPUX_SOURCE)
+--- kde.orig/kinit/kinit.cpp	2005-07-20 11:19:21.000000000 +0200
++++ kde.patched/kinit/kinit.cpp	2005-08-27 15:15:37.000000000 +0200
+@@ -59,7 +59,7 @@
+ #include <kapplication.h>
+ #include <klocale.h>
+ 
+-#ifdef Q_OS_LINUX
++#ifdef HAVE_SYS_PRCTL_H
+ #include <sys/prctl.h>
+ #ifndef PR_SET_NAME
+ #define PR_SET_NAME 15
+@@ -524,7 +524,7 @@
+        d.argv[argc] = 0;
+ 
+        /** Give the process a new name **/
+-#ifdef Q_OS_LINUX
++#ifdef HAVE_SYS_PRCTL_H
+        /* set the process name, so that killall works like intended */
+        r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0);
+        if ( r == 0 )

Modified: branches/kde-3.4.0/packages/kdelibs/debian/rules
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-08-28 22:47:29 UTC (rev 1595)
+++ branches/kde-3.4.0/packages/kdelibs/debian/rules	2005-08-28 23:22:03 UTC (rev 1596)
@@ -43,3 +43,12 @@
 
 binary-install/kdelibs-data::
 	install -p -D -m644 kded/applications.menu debian/kdelibs-data/etc/xdg/menus/kde-applications.menu
+
+### 
+
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+binary-predeb/kdelibs4-dev::
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	echo "libasound2-dev=libasound2-dev" >>debian/libarts1-dev.substvars
+endif


