rev 10921 - in trunk/packages/kdenetwork/debian: . patches
Ana Beatriz Guerrero López
ana at alioth.debian.org
Mon Jun 9 22:53:03 UTC 2008
Author: ana
Date: 2008-06-09 22:53:02 +0000 (Mon, 09 Jun 2008)
New Revision: 10921
Added:
trunk/packages/kdenetwork/debian/patches/24_kppp_armel.diff
Modified:
trunk/packages/kdenetwork/debian/changelog
trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff
trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
Log:
* Add patch from Martin Meredith to detect newer libgadu versions.
(Closes: #477957) Patch is 13_improve-libgadu-detection.diff.
* Add patch from Riku Vopio to get kppp building in armel.
(Closes: #484552) Patch is 24_kppp_armel.diff.
* Redo buildprep.
Modified: trunk/packages/kdenetwork/debian/changelog
===================================================================
--- trunk/packages/kdenetwork/debian/changelog 2008-06-09 19:39:51 UTC (rev 10920)
+++ trunk/packages/kdenetwork/debian/changelog 2008-06-09 22:53:02 UTC (rev 10921)
@@ -1,10 +1,14 @@
kdenetwork (4:3.5.9-2) unstable; urgency=low
- * Add --with-xmms=no to cofigure flags to avoid searching for xmms
+ * Add --with-xmms=no to configure flags to avoid searching for xmms
in the configure.
- This does not fix 477957, problem here is with libgadu (TODO).
+ * Add patch from Martin Meredith to detect newer libgadu versions.
+ (Closes: #477957) Patch is 13_improve-libgadu-detection.diff.
+ * Add patch from Riku Vopio to get kppp building in armel.
+ (Closes: #484552) Patch is 24_kppp_armel.diff.
+ * Redo buildprep.
- -- Ana Beatriz Guerrero Lopez <ana at debian.org> Sat, 26 Apr 2008 12:07:14 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Mon, 09 Jun 2008 23:05:21 +0200
kdenetwork (4:3.5.9-1) unstable; urgency=low
Modified: trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff 2008-06-09 19:39:51 UTC (rev 10920)
+++ trunk/packages/kdenetwork/debian/patches/13_improve-libgadu-detection.diff 2008-06-09 22:53:02 UTC (rev 10921)
@@ -1,25 +1,46 @@
---- kdenetwork/kopete/protocols/configure.in.in
-+++ kdenetwork/kopete/protocols/configure.in.in
-@@ -40,8 +40,20 @@
- int main()
- {
- #if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
-- int maj, min, date;
-- sscanf( gg_libgadu_version(), "%u.%u.%u", &maj,&min,&date );
-+ int maj, min, date, items;
-+ const char *libgadu_version = gg_libgadu_version();
-+
-+ items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
-+
-+ if ( items != 3 ) { /* version in YYYYDDMM format only */
-+ sscanf( libgadu_version, "%u", &date );
-+
-+ if ( date < 20040520 )
-+ return 1;
-+ else
-+ return 0;
-+ }
-+
- if ( maj != 1 ) {
- return 1;
- }
+Patch by Martin Meredith <mez at ubuntu.com>
+
+libgadu was changed to have it's own package (split from ekg)
+it started using proper version numbers (see #310276) - As before,
+it had been using a date as a version number, it had worked, however,
+this split caused the new package to be built with the correct version
+information, therefore, as it was a higher version than kdenetwork was
+expecting, this would fall over.
+diff -Nur kdenetwork-3.5.9/kopete/protocols/configure.in.in kdenetwork-3.5.9.new/kopete/protocols/configure.in.in
+--- kdenetwork-3.5.9/kopete/protocols/configure.in.in 2006-10-01 18:27:00.000000000 +0100
++++ kdenetwork-3.5.9.new/kopete/protocols/configure.in.in 2008-05-24 03:42:40.000000000 +0100
+@@ -39,9 +39,21 @@
+
+ int main()
+ {
+-#if defined __GG_LIBGADU_HAVE_PTHREAD && defined GG_LOGIN60
+- int maj, min, date;
+- sscanf( gg_libgadu_version(), "%u.%u.%u", &maj,&min,&date );
++#if defined GG_CONFIG_HAVE_PTHREAD && defined GG_LOGIN60
++ int maj, min, date, items;
++ const char *libgadu_version = gg_libgadu_version();
++
++ items = sscanf( libgadu_version, "%u.%u.%u", &maj,&min,&date );
++
++ if ( items != 3 ) { /* version in YYYYDDMM format only */
++ sscanf( libgadu_version, "%u", &date );
++
++ if ( date < 20040520 )
++ return 1;
++ else
++ return 0;
++ }
++
+ if ( maj != 1 ) {
+ return 1;
+ }
+@@ -49,7 +61,7 @@
+ return 1;
+ }
+
+- if ( min == 5 || min == 6 ){
++ if ( min >= 5 && min <= 8){
+ return 0;
+ }
+
+
Added: trunk/packages/kdenetwork/debian/patches/24_kppp_armel.diff
===================================================================
--- trunk/packages/kdenetwork/debian/patches/24_kppp_armel.diff (rev 0)
+++ trunk/packages/kdenetwork/debian/patches/24_kppp_armel.diff 2008-06-09 22:53:02 UTC (rev 10921)
@@ -0,0 +1,52 @@
+Patch from fedora.
+Build of kdenetwork fails with:
+
+ cp: cannot stat `./debian/tmp/usr/bin/kppp': No such file or directory
+
+Which is due to:
+
+ checking if kppp should be compiled... no
+
+inclusion of if_ppp.h fails to get used, since aligned_u64 isn't defined. The following
+patch from fedora appears to rectify building kppp with a recent linux-libc-dev.
+
+diff -up kdenetwork-3.5.9/kppp/configure.in.in.ppp kdenetwork-3.5.9/kppp/configure.in.in
+--- kdenetwork-3.5.9/kppp/configure.in.in.ppp 2008-02-13 03:37:48.000000000 -0600
++++ kdenetwork-3.5.9/kppp/configure.in.in 2008-02-15 21:29:00.000000000 -0600
+@@ -30,6 +30,9 @@ AC_TRY_LINK([
+ #ifndef STREAMS
+
+ #if defined(linux)
++ #ifndef aligned_u64
++ #define aligned_u64 unsigned long long __attribute__((aligned(8)))
++ #endif
+ #include <linux/if_ppp.h>
+ #elif defined(__DragonFly__)
+ #include <net/ppp/if_ppp.h>
+diff -up kdenetwork-3.5.9/kppp/opener.cpp.ppp kdenetwork-3.5.9/kppp/opener.cpp
+--- kdenetwork-3.5.9/kppp/opener.cpp.ppp 2008-02-13 03:37:48.000000000 -0600
++++ kdenetwork-3.5.9/kppp/opener.cpp 2008-02-15 21:30:44.000000000 -0600
+@@ -73,6 +73,9 @@ extern "C" int _Precvmsg(int, void*, int
+ # include <net/if.h>
+ # include <net/ppp/if_ppp.h>
+ # elif defined HAVE_LINUX_IF_PPP_H
++# ifndef aligned_u64
++# define aligned_u64 unsigned long long __attribute__((aligned(8)))
++# endif
+ # include <linux/if_ppp.h>
+ # endif
+ #else
+diff -up kdenetwork-3.5.9/kppp/pppstats.cpp.ppp kdenetwork-3.5.9/kppp/pppstats.cpp
+--- kdenetwork-3.5.9/kppp/pppstats.cpp.ppp 2008-02-13 03:37:48.000000000 -0600
++++ kdenetwork-3.5.9/kppp/pppstats.cpp 2008-02-15 21:29:00.000000000 -0600
+@@ -73,6 +73,9 @@
+ #ifndef HAVE_NET_IF_PPP_H
+ #ifdef HAVE_LINUX_IF_PPP_H
+ #include <linux/if.h>
++ #ifndef aligned_u64
++ #define aligned_u64 unsigned long long __attribute__((aligned(8)))
++ #endif
+ #include <linux/if_ppp.h>
+ #elif defined(__DragonFly__)
+ #include <net/if.h>
+
Modified: trunk/packages/kdenetwork/debian/patches/98_buildprep.diff
===================================================================
More information about the pkg-kde-commits
mailing list