[Pkg-running-devel] [antpm] 12/14: drop patches merged upstream
Kristof Ralovich
ralovich-guest at moszumanska.debian.org
Sat Oct 10 11:28:36 UTC 2015
This is an automated email from the git hooks/post-receive script.
ralovich-guest pushed a commit to branch master
in repository antpm.
commit 0d59b2ea7b5ec64097b57478ae2e4065849daa33
Author: RALOVICH, Kristof <tade60 at freemail.hu>
Date: Sat Oct 10 12:38:35 2015 +0200
drop patches merged upstream
---
...ixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre | 39 --------------------
.../03-gant-try-fixing-FTBFS-under-hurd-i386 | 41 ----------------------
debian/patches/04-fix-missing-IUCLC.patch | 25 -------------
debian/patches/gant-no-devname.patch | 33 -----------------
.../{link-boost-atomic.patch => link-boost-atomic} | 10 +++++-
debian/patches/link-boost-atomic2.patch | 10 ------
debian/patches/series | 7 +---
7 files changed, 10 insertions(+), 155 deletions(-)
diff --git a/debian/patches/02-try-fixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre b/debian/patches/02-try-fixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre
deleted file mode 100644
index 2351b2d..0000000
--- a/debian/patches/02-try-fixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre
+++ /dev/null
@@ -1,39 +0,0 @@
-From bf990a5e81f2af5c33583cc500eb655ad1bf173d Mon Sep 17 00:00:00 2001
-From: "RALOVICH, Kristof" <tade60 at freemail.hu>
-Date: Thu, 27 Mar 2014 09:42:48 +0100
-Subject: [PATCH 1/2] try fixing FTBFS under hurd-i386, kfreebsd-amd64,
- kfreebsd-i386
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- from /«PKGBUILDDIR»/src/common.cpp:20:
-/«PKGBUILDDIR»/src/Log.hpp: In constructor 'antpm::Log::Log(const char*)':
-/«PKGBUILDDIR»/src/Log.hpp:176:8: error: '::access' has not been declared
- if(::access(logFileName, 0x00) != -1)
- ^
-make[4]: *** [CMakeFiles/antpm.dir/common.cpp.o] Error 1
-make[4]: *** Waiting for unfinished jobs....
-make[4]: Leaving directory `/«PKGBUILDDIR»/cmake-build'
-make[3]: *** [CMakeFiles/antpm.dir/all] Error 2
-make[3]: Leaving directory `/«PKGBUILDDIR»/cmake-build'
-make[2]: *** [all] Error 2
-make[2]: Leaving directory `/«PKGBUILDDIR»/cmake-build'
-make[1]: *** [override_dh_auto_build] Error 2
-make[1]: Leaving directory `/«PKGBUILDDIR»'
-make: *** [build-arch] Error 2
----
- src/Log.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/Log.hpp
-+++ b/src/Log.hpp
-@@ -29,7 +29,7 @@
- # include <crtdbg.h>
- # include <io.h>
- #endif
--#ifdef __linux__
-+#if defined(__linux__) || defined(__GNU__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
- # include <unistd.h>
- #endif
- #include <iostream>
diff --git a/debian/patches/03-gant-try-fixing-FTBFS-under-hurd-i386 b/debian/patches/03-gant-try-fixing-FTBFS-under-hurd-i386
deleted file mode 100644
index 0c3266d..0000000
--- a/debian/patches/03-gant-try-fixing-FTBFS-under-hurd-i386
+++ /dev/null
@@ -1,41 +0,0 @@
-From ac496ff03df3ecb6fb447021aa5fd66dbe20824d Mon Sep 17 00:00:00 2001
-From: "RALOVICH, Kristof" <tade60 at freemail.hu>
-Date: Sat, 5 Apr 2014 11:37:55 +0200
-Subject: [PATCH] gant: try fixing FTBFS under hurd-i386
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-> /«PKGBUILDDIR»/src/gant/antlib.c:415:73: error: 'IUCLC' undeclared (first use in this function)
----
- src/gant/antlib.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/gant/antlib.c b/src/gant/antlib.c
-index 26e880f..283eb10 100644
---- a/src/gant/antlib.c
-+++ b/src/gant/antlib.c
-@@ -1,5 +1,11 @@
- /* copyright 2008 paul at ant.sbrk.co.uk. released under GPLv3 */
- /* vers 0.6t */
-+
-+#define _XOPEN_SOURCE 500
-+#define _BSD_SOURCE
-+#if defined(__GNU__) /* Hurd */
-+# define _GNU_SOURCE
-+#endif
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -9,6 +15,8 @@
- #include <pthread.h>
- #include <termios.h>
- #include <stdlib.h>
-+#include <strings.h> /* bzero */
-+#include <sys/select.h> /* fd_set */
-
- #define __declspec(X)
-
---
-1.8.3.2
-
diff --git a/debian/patches/04-fix-missing-IUCLC.patch b/debian/patches/04-fix-missing-IUCLC.patch
deleted file mode 100644
index 69f5f5b..0000000
--- a/debian/patches/04-fix-missing-IUCLC.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- a/src/SerialTty.cpp
-+++ b/src/SerialTty.cpp
-@@ -41,6 +41,9 @@
- #include "common.hpp"
- #include "DeviceSettings.hpp"
-
-+#ifndef IUCLC
-+# define IUCLC 0
-+#endif
-
- namespace fs = boost::filesystem;
- using namespace std;
---- a/src/gant/antlib.c
-+++ b/src/gant/antlib.c
-@@ -20,6 +20,10 @@
- #define MAXCHAN 32
- #define BSIZE 8*10000
-
-+#ifndef IUCLC
-+# define IUCLC 0
-+#endif
-+
- #define uchar unsigned char
-
- #define hexval(c) ((c >= '0' && c <= '9') ? (c-'0') : ((c&0xdf)-'A'+10))
diff --git a/debian/patches/gant-no-devname.patch b/debian/patches/gant-no-devname.patch
deleted file mode 100644
index 1f551d4..0000000
--- a/debian/patches/gant-no-devname.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/src/gant/gant.c
-+++ b/src/gant/gant.c
-@@ -107,7 +107,7 @@
- uint waitauth;
- int nphase0;
- char modelname[256];
--char devname[256];
-+char deviname[256];
- ushort part = 0;
- ushort ver = 0;
- uint unitid = 0;
-@@ -225,7 +225,7 @@
- rc = xmlTextWriterEndElement(tcxfile); XML_ERROR_CHECK; /* Lap (Is it a good idea to do it here?) */
- rc = xmlTextWriterStartElement(tcxfile, BAD_CAST "Creator"); XML_ERROR_CHECK;
- rc = xmlTextWriterWriteAttribute(tcxfile, BAD_CAST "xsi:type", BAD_CAST "Device_t"); XML_ERROR_CHECK;
-- rc = xmlTextWriterWriteFormatElement(tcxfile, BAD_CAST "Name", "%s", devname); XML_ERROR_CHECK;
-+ rc = xmlTextWriterWriteFormatElement(tcxfile, BAD_CAST "Name", "%s", deviname); XML_ERROR_CHECK;
- rc = xmlTextWriterWriteFormatElement(tcxfile, BAD_CAST "UnitId", "%u", unitid); XML_ERROR_CHECK;
- rc = xmlTextWriterWriteFormatElement(tcxfile, BAD_CAST "ProductID", "%u", part); XML_ERROR_CHECK;
- rc = xmlTextWriterStartElement(tcxfile, BAD_CAST "Version"); XML_ERROR_CHECK;
-@@ -383,9 +383,9 @@
- dump_data(stderr, data+doff, 0, pktlen);
- break;
- case 525:
-- memset(devname, 0, sizeof devname);
-- memcpy(devname, data + doff, pktlen);
-- DEBUG_OUT(1, "Packet %d: Devname: \"%s\"", pkttype, devname);
-+ memset(deviname, 0, sizeof deviname);
-+ memcpy(deviname, data + doff, pktlen);
-+ DEBUG_OUT(1, "Packet %d: Devname: \"%s\"", pkttype, deviname);
- break;
- case 12:
- DEBUG_OUT(1, "Packet %d: xfer complete (subtype %u)", pkttype, data[doff] + data[doff + 1] * 256);
diff --git a/debian/patches/link-boost-atomic.patch b/debian/patches/link-boost-atomic
similarity index 65%
rename from debian/patches/link-boost-atomic.patch
rename to debian/patches/link-boost-atomic
index c459b60..0b0285e 100644
--- a/debian/patches/link-boost-atomic.patch
+++ b/debian/patches/link-boost-atomic
@@ -1,6 +1,6 @@
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -64,7 +64,7 @@
+@@ -69,7 +69,7 @@
ENDIF()
set(Boost_USE_MULTITHREADED ON)
set(Boost_USE_STATIC_RUNTIME OFF)
@@ -9,3 +9,11 @@
IF(NOT Boost_FOUND)
MESSAGE(FATAL_ERROR "Boost not found!")
ENDIF()
+@@ -131,6 +131,7 @@
+ ${Boost_DATE_TIME_LIBRARY}
+ ${LIBUSB_LIBRARIES}
+ ${Boost_THREAD_LIBRARY}
++ ${Boost_ATOMIC_LIBRARY}
+ ${Boost_SYSTEM_LIBRARY}
+ ${Boost_FILESYSTEM_LIBRARY}
+ ${MY_ANTPM_LIBRARIES}
diff --git a/debian/patches/link-boost-atomic2.patch b/debian/patches/link-boost-atomic2.patch
deleted file mode 100644
index 455dbf6..0000000
--- a/debian/patches/link-boost-atomic2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -126,6 +126,7 @@
- ${Boost_DATE_TIME_LIBRARY}
- ${LIBUSB_LIBRARIES}
- ${Boost_THREAD_LIBRARY}
-+ ${Boost_ATOMIC_LIBRARY}
- ${Boost_SYSTEM_LIBRARY}
- ${Boost_FILESYSTEM_LIBRARY}
- stdc++
diff --git a/debian/patches/series b/debian/patches/series
index 26fbf7d..96c7215 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,3 @@
-gant-no-devname.patch
-link-boost-atomic.patch
-04-fix-missing-IUCLC.patch
+link-boost-atomic
01-include-cstdint
-02-try-fixing-FTBFS-under-hurd-i386-kfreebsd-amd64-kfre
-03-gant-try-fixing-FTBFS-under-hurd-i386
-link-boost-atomic2.patch
no_date_reproducible_build.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/antpm.git
More information about the Pkg-running-devel
mailing list