[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

kdenetwork, patch need revision or filing?



Hello,

I noticed that the kdenetwork in unstable (3.5.5-2) is not building [1]
because it build-depends on the linux-specific package libiw-dev. The
patch that is online in the patches directory [2] corrects this and some
other things but is outdated (it's for kdenetwork-3.4.2 while
kdenetwork-3.5.1 has been built for kfreebsd). Nothing has been filed in
BTS as far as I can tell and in kdenetwork-3.5.5 the same issues exist
(bad build-depends and architecture in debian/control as well as an
incorrect arch check in a header).

Attached is an updated version of the patch for 3.5.5-2. It follows the
advice in PORTING [3] about using wildcards like 'linux-any' in
build-depends. I will also file a bug against kdenetwork including this
patch, unless there is a reason that I am unaware of.

Regards,
Kostas Koukopoulos

[1]
http://experimental.ftbfs.de/fetch.php?&pkg=kdenetwork&ver=4%3A3.5.5-2&arch=kfreebsd-i386&stamp=1162628884&file=log&as=raw
[2] http://glibc-bsd.alioth.debian.org/patches/kdenetwork.diff
[3] http://glibc-bsd.alioth.debian.org/porting/PORTING
diff -Naur kdenetwork-3.5.5.orig/debian/control kdenetwork-3.5.5/debian/control
--- kdenetwork-3.5.5.orig/debian/control	2006-11-14 15:02:15.000000000 +0200
+++ kdenetwork-3.5.5/debian/control	2006-11-14 14:31:26.000000000 +0200
@@ -3,13 +3,13 @@
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
 Uploaders: Isaac Clerencia <isaac@debian.org>, Pierre Habouzit <madcoder@debian.org>, Christopher Martin <chrsmrtn@debian.org>, Adeodato Simó <dato@net.com.org.es>, Riku Voipio <riku.voipio@iki.fi>, Luk Claes <luk@debian.org>
-Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.5), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], xmms-dev, libxxf86vm-dev
+Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, docbook-to-man, doxygen, gawk, gettext, kdelibs4-dev (>= 4:3.5.5), libgadu-dev, libgsmme-dev, libiw-dev (>> 27+28pre8) [linux-any], libmeanwhile-dev (>= 1.0.2), libslp-dev, libtiff4-dev, libxml2-dev, libxslt1-dev, libxtst-dev, qt3-doc, sharutils, valgrind [i386 amd64], xmms-dev, libxxf86vm-dev
 Standards-Version: 3.7.2
 
 Package: kdenetwork
 Section: kde
 Architecture: all
-Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), kwifimanager (>= ${Source-Version}), librss1 (>= ${Source-Version})
+Depends: dcoprss (>= ${Source-Version}), kdenetwork-kfile-plugins (>= ${Source-Version}), kdict (>= ${Source-Version}), kdnssd (>= ${Source-Version}), kget (>= ${Source-Version}), knewsticker (>= ${Source-Version}), kopete (>= ${Source-Version}), kpf (>= ${Source-Version}), kppp (>= ${Source-Version}), krdc (>= ${Source-Version}), krfb (>= ${Source-Version}), ksirc (>= ${Source-Version}), librss1 (>= ${Source-Version})
 Recommends: kdenetwork-filesharing (>= ${Source-Version}), ktalkd (>= ${Source-Version}), lisa (>= ${Source-Version})
 Suggests: kdenetwork-doc-html (>= ${Source-Version})
 Description: network-related apps from the official KDE release
@@ -247,7 +247,7 @@
 
 Package: kwifimanager
 Section: net
-Architecture: any
+Architecture: linux-any
 Depends: ${shlibs:Depends}, wireless-tools
 Suggests: khelpcenter
 Description: wireless lan manager for KDE
diff -Naur kdenetwork-3.5.5.orig/debian/patches/14_kfreebsd.diff kdenetwork-3.5.5/debian/patches/14_kfreebsd.diff
--- kdenetwork-3.5.5.orig/debian/patches/14_kfreebsd.diff	1970-01-01 02:00:00.000000000 +0200
+++ kdenetwork-3.5.5/debian/patches/14_kfreebsd.diff	2006-11-14 14:33:29.000000000 +0200
@@ -0,0 +1,12 @@
+--- kde.orig/krfb/libvncserver/rfb.h	2005-05-23 14:07:26.000000000 +0200
++++ kde.patched/krfb/libvncserver/rfb.h	2005-08-30 21:58:54.000000000 +0200
+@@ -60,7 +60,7 @@
+ 
+ #include "rfbproto.h"
+ 
+-#ifdef __linux__
++#if defined(__linux__) || defined(__GLIBC__)
+ #include <endian.h>
+ #elif defined(__APPLE__) || defined(__FreeBSD__)
+ #include <sys/types.h>
+

Reply to: