ekiga: make debian patches use fetchpatch

3 files changed, 6 insertions, 44 deletions

diff --git a/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch b/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch
deleted file mode 100644
index d15e8b6ccfd4..000000000000
--- a/pkgs/applications/networking/instant-messengers/ekiga/autofoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4,7 +4,7 @@
- AC_PREREQ([2.53])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_SRCDIR(src/ekiga.cpp)
--AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
-+AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
- 
- AM_MAINTAINER_MODE([enable])
- AC_CONFIG_HEADERS([config.h])
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/boost.patch b/pkgs/applications/networking/instant-messengers/ekiga/boost.patch
deleted file mode 100644
index 9dad3d94f04b..000000000000
--- a/pkgs/applications/networking/instant-messengers/ekiga/boost.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/m4/ax_boost_base.m4
-+++ b/m4/ax_boost_base.m4
-@@ -33,7 +33,7 @@
- #   and this notice are preserved. This file is offered as-is, without any
- #   warranty.
- 
--#serial 20
-+#serial 22
- 
- AC_DEFUN([AX_BOOST_BASE],
- [
-@@ -91,9 +91,17 @@ if test "x$want_boost" = "xyes"; then
-     dnl are found, e.g. when only header-only libraries are installed!
-     libsubdirs="lib"
-     ax_arch=`uname -m`
--    if test $ax_arch = x86_64 -o $ax_arch = ppc64 -o $ax_arch = s390x -o $ax_arch = sparc64; then
-+    case $ax_arch in
-+      x86_64|ppc64|s390x|sparc64|aarch64)
-         libsubdirs="lib64 lib lib64"
--    fi
-+        ;;
-+    esac
-+
-+    dnl allow for real multi-arch paths e.g. /usr/lib/x86_64-linux-gnu. Give
-+    dnl them priority over the other paths since, if libs are found there, they
-+    dnl are almost assuredly the ones desired.
-+    AC_REQUIRE([AC_CANONICAL_HOST])
-+    libsubdirs="lib/${host_cpu}-${host_os} $libsubdirs"
- 
-     dnl first we check the system location for boost libraries
-     dnl this location ist chosen if boost libraries are installed with the --layout=system option
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index d4bb8bd55e0e..283d38ef5c74 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -35,8 +35,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches = [
-    ./autofoo.patch
-    ./boost.patch
+    (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/autofoo.patch;
+      sha256 = "1vyagslws4mm9yfz1m5p1kv9sxmk5lls9vxpm6j72q2ahsgydzx4";
+    })
+    (fetchpatch { url = https://sources.debian.net/data/main/e/ekiga/4.0.1-7/debian/patches/boost.patch;
+      sha256 = "01k0rw8ibrrf9zn9lx6dzbrgy58w089hqxqxqdv9whb65cldlj5s";
+    })
     (fetchpatch { url = https://src.fedoraproject.org/rpms/ekiga/raw/dbf5f5ba449d22bd79f0394cddb7d4d8a88ec6ac/f/ekiga-4.0.1-libresolv.patch;
       sha256 = "18wc68im8422ibpa0gkrkgjq41m7hikaha3xqmjs2km45i1cwcaz";
     })